diff options
4839 files changed, 68141 insertions, 34401 deletions
diff --git a/nixpkgs/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS index 8491532ee387..7d0681a720c5 100644 --- a/nixpkgs/.github/CODEOWNERS +++ b/nixpkgs/.github/CODEOWNERS @@ -76,6 +76,7 @@ /pkgs/development/interpreters/python @FRidh /pkgs/development/python-modules @FRidh @jonringer /doc/languages-frameworks/python.section.md @FRidh +/pkgs/development/tools/poetry2nix @adisbladis # Haskell /pkgs/development/compilers/ghc @cdepillabout diff --git a/nixpkgs/.github/workflows/pending-set.yml b/nixpkgs/.github/workflows/pending-set.yml index f59ac9439eac..944d1deefb9f 100644 --- a/nixpkgs/.github/workflows/pending-set.yml +++ b/nixpkgs/.github/workflows/pending-set.yml @@ -16,5 +16,5 @@ jobs: -X POST \ -H "Accept: application/vnd.github.v3+json" \ -H "Authorization: token $GITHUB_TOKEN" \ - -d '{"state": "failure", "target_url": " ", "description": "This failed status will be cleared when ofborg finishes eval.", "context": "Wait for ofborg"}' \ + -d '{"state": "pending", "target_url": " ", "description": "This pending status will be cleared when ofborg starts eval.", "context": "Wait for ofborg"}' \ "https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.pull_request.head.sha }}" diff --git a/nixpkgs/.version b/nixpkgs/.version index 62c36bbb17f3..b9b543d4254d 100644 --- a/nixpkgs/.version +++ b/nixpkgs/.version @@ -1 +1 @@ -21.03 +21.05 diff --git a/nixpkgs/doc/builders/packages/elm.section.md b/nixpkgs/doc/builders/packages/elm.section.md new file mode 100644 index 000000000000..53087c0e9ded --- /dev/null +++ b/nixpkgs/doc/builders/packages/elm.section.md @@ -0,0 +1,11 @@ +# Elm {#sec-elm} + +To start a development environment do + +```ShellSession +nix-shell -p elmPackages.elm elmPackages.elm-format +``` + +To update the Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>. + +To package Elm applications, [read about elm2nix](https://github.com/hercules-ci/elm2nix#elm2nix). diff --git a/nixpkgs/doc/builders/packages/elm.xml b/nixpkgs/doc/builders/packages/elm.xml deleted file mode 100644 index a067f6c7c70e..000000000000 --- a/nixpkgs/doc/builders/packages/elm.xml +++ /dev/null @@ -1,17 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="sec-elm"> - <title>Elm</title> - - <para> - To start a development environment do <command>nix-shell -p elmPackages.elm elmPackages.elm-format</command> - </para> - - <para> - To update Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>. - </para> - - <para> - To package Elm applications, <link xlink:href="https://github.com/hercules-ci/elm2nix#elm2nix">read about elm2nix</link>. - </para> -</section> diff --git a/nixpkgs/doc/builders/packages/index.xml b/nixpkgs/doc/builders/packages/index.xml index ab335e24ff99..e4f8a1d3120e 100644 --- a/nixpkgs/doc/builders/packages/index.xml +++ b/nixpkgs/doc/builders/packages/index.xml @@ -8,7 +8,7 @@ <xi:include href="citrix.xml" /> <xi:include href="dlib.xml" /> <xi:include href="eclipse.xml" /> - <xi:include href="elm.xml" /> + <xi:include href="elm.section.xml" /> <xi:include href="emacs.section.xml" /> <xi:include href="firefox.section.xml" /> <xi:include href="fish.section.xml" /> diff --git a/nixpkgs/doc/contributing/contributing-to-documentation.xml b/nixpkgs/doc/contributing/contributing-to-documentation.xml index b0266043775f..132fa3816e37 100644 --- a/nixpkgs/doc/contributing/contributing-to-documentation.xml +++ b/nixpkgs/doc/contributing/contributing-to-documentation.xml @@ -12,7 +12,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename> sub <screen> <prompt>$ </prompt>cd /path/to/nixpkgs/doc <prompt>$ </prompt>nix-shell -<prompt>[nix-shell]$ </prompt>make +<prompt>[nix-shell]$ </prompt>make $makeFlags </screen> <para> If you experience problems, run <command>make debug</command> to help understand the docbook errors. diff --git a/nixpkgs/doc/default.nix b/nixpkgs/doc/default.nix index 543a3874170b..25389fa2da7e 100644 --- a/nixpkgs/doc/default.nix +++ b/nixpkgs/doc/default.nix @@ -15,7 +15,7 @@ in pkgs.stdenv.mkDerivation { xmlformat ]; - src = ./.; + src = lib.cleanSource ./.; makeFlags = [ "PANDOC_LUA_FILTERS_DIR=${pkgs.pandoc-lua-filters}/share/pandoc/filters" diff --git a/nixpkgs/doc/functions/library/asserts.xml b/nixpkgs/doc/functions/library/asserts.xml index 10891039e869..7c94222ef139 100644 --- a/nixpkgs/doc/functions/library/asserts.xml +++ b/nixpkgs/doc/functions/library/asserts.xml @@ -103,7 +103,7 @@ stderr> assert failed <title>Ensuring a user provided a possible value</title> <programlisting><![CDATA[ let sslLibrary = "bearssl"; -in lib.asserts.assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]; +in lib.asserts.assertOneOf "sslLibrary" sslLibrary [ "openssl" "libressl" ]; => false stderr> trace: sslLibrary must be one of "openssl", "libressl", but is: "bearssl" ]]></programlisting> diff --git a/nixpkgs/doc/functions/library/attrsets.xml b/nixpkgs/doc/functions/library/attrsets.xml index 3c5823c25891..7ef0d16624c8 100644 --- a/nixpkgs/doc/functions/library/attrsets.xml +++ b/nixpkgs/doc/functions/library/attrsets.xml @@ -1711,4 +1711,43 @@ recursiveUpdate </example> </section> + <section xml:id="function-library-lib.attrsets.cartesianProductOfSets"> + <title><function>lib.attrsets.cartesianProductOfSets</function></title> + + <subtitle><literal>cartesianProductOfSets :: AttrSet -> [ AttrSet ]</literal> + </subtitle> + + <xi:include href="./locations.xml" xpointer="lib.attrsets.cartesianProductOfSets" /> + + <para> + Return the cartesian product of attribute set value combinations. + </para> + + <variablelist> + <varlistentry> + <term> + <varname>set</varname> + </term> + <listitem> + <para> + An attribute set with attributes that carry lists of values. + </para> + </listitem> + </varlistentry> + </variablelist> + + <example xml:id="function-library-lib.attrsets.cartesianProductOfSets-example"> + <title>Creating the cartesian product of a list of attribute values</title> +<programlisting><![CDATA[ +cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; } +=> [ + { a = 1; b = 10; } + { a = 1; b = 20; } + { a = 2; b = 10; } + { a = 2; b = 20; } + ] +]]></programlisting> + </example> + </section> + </section> diff --git a/nixpkgs/doc/languages-frameworks/agda.section.md b/nixpkgs/doc/languages-frameworks/agda.section.md index 66b4a2083021..f57b194a7266 100644 --- a/nixpkgs/doc/languages-frameworks/agda.section.md +++ b/nixpkgs/doc/languages-frameworks/agda.section.md @@ -46,7 +46,7 @@ depend: standard-library More information can be found in the [official Agda documentation on library management](https://agda.readthedocs.io/en/v2.6.1/tools/package-system.html). ## Compiling Agda -Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee` is made available to the Agda program via the `--with-compiler` flag. +Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee754` is made available to the Agda program via the `--with-compiler` flag. This can be overridden by a different version of `ghc` as follows: ``` diff --git a/nixpkgs/doc/languages-frameworks/python.section.md b/nixpkgs/doc/languages-frameworks/python.section.md index 2dea2cb1bcc9..71193ed0cc0b 100644 --- a/nixpkgs/doc/languages-frameworks/python.section.md +++ b/nixpkgs/doc/languages-frameworks/python.section.md @@ -610,6 +610,10 @@ Using the example above, the analagous pytestCheckHook usage would be: "download" "update" ]; + + disabledTestFiles = [ + "tests/test_failing.py" + ]; ``` This is expecially useful when tests need to be conditionallydisabled, diff --git a/nixpkgs/doc/stdenv/meta.xml b/nixpkgs/doc/stdenv/meta.xml index 10802d1af59f..91ace0b9cc95 100644 --- a/nixpkgs/doc/stdenv/meta.xml +++ b/nixpkgs/doc/stdenv/meta.xml @@ -75,7 +75,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </para> <variablelist> - <varlistentry> + <varlistentry xml:id="var-meta-description"> <term> <varname>description</varname> </term> @@ -94,7 +94,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-longDescription"> <term> <varname>longDescription</varname> </term> @@ -104,7 +104,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-branch"> <term> <varname>branch</varname> </term> @@ -114,7 +114,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-homepage"> <term> <varname>homepage</varname> </term> @@ -124,7 +124,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-downloadPage"> <term> <varname>downloadPage</varname> </term> @@ -134,7 +134,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-changelog"> <term> <varname>changelog</varname> </term> @@ -144,7 +144,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-license"> <term> <varname>license</varname> </term> @@ -183,7 +183,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-maintainers"> <term> <varname>maintainers</varname> </term> @@ -193,7 +193,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-priority"> <term> <varname>priority</varname> </term> @@ -203,7 +203,7 @@ hello-2.3 A program that produces a familiar, friendly greeting </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-platforms"> <term> <varname>platforms</varname> </term> @@ -217,7 +217,7 @@ meta.platforms = lib.platforms.linux; </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-tests"> <term> <varname>tests</varname> </term> @@ -244,7 +244,7 @@ meta.platforms = lib.platforms.linux; </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-timeout"> <term> <varname>timeout</varname> </term> @@ -254,7 +254,7 @@ meta.platforms = lib.platforms.linux; </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-hydraPlatforms"> <term> <varname>hydraPlatforms</varname> </term> @@ -268,7 +268,7 @@ meta.hydraPlatforms = []; </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-broken"> <term> <varname>broken</varname> </term> @@ -278,7 +278,7 @@ meta.hydraPlatforms = []; </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="var-meta-updateWalker"> <term> <varname>updateWalker</varname> </term> diff --git a/nixpkgs/doc/using/configuration.xml b/nixpkgs/doc/using/configuration.xml index 1e1df867e08e..2cd2615f54ae 100644 --- a/nixpkgs/doc/using/configuration.xml +++ b/nixpkgs/doc/using/configuration.xml @@ -138,11 +138,11 @@ </programlisting> </para> <para> - For a more useful example, try the following. This configuration only allows unfree packages named flash player and visual studio code: + For a more useful example, try the following. This configuration only allows unfree packages named roon-server and visual studio code: <programlisting> { allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "flashplayer" + "roon-server" "vscode" ]; } diff --git a/nixpkgs/doc/using/overlays.xml b/nixpkgs/doc/using/overlays.xml index 9ffbb4edd989..8bda235d43d8 100644 --- a/nixpkgs/doc/using/overlays.xml +++ b/nixpkgs/doc/using/overlays.xml @@ -236,10 +236,11 @@ self: super: { blas = super.blas.override { blasProvider = self.mkl; - } + }; + lapack = super.lapack.override { lapackProvider = self.mkl; - } + }; } </programlisting> <para> diff --git a/nixpkgs/lib/attrsets.nix b/nixpkgs/lib/attrsets.nix index d91d7a0cd47e..0ce3aaeca452 100644 --- a/nixpkgs/lib/attrsets.nix +++ b/nixpkgs/lib/attrsets.nix @@ -183,6 +183,24 @@ rec { else []; + /* Return the cartesian product of attribute set value combinations. + + Example: + cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; } + => [ + { a = 1; b = 10; } + { a = 1; b = 20; } + { a = 2; b = 10; } + { a = 2; b = 20; } + ] + */ + cartesianProductOfSets = attrsOfLists: + lib.foldl' (listOfAttrs: attrName: + concatMap (attrs: + map (listValue: attrs // { ${attrName} = listValue; }) attrsOfLists.${attrName} + ) listOfAttrs + ) [{}] (attrNames attrsOfLists); + /* Utility function that creates a {name, value} pair as expected by builtins.listToAttrs. @@ -493,5 +511,4 @@ rec { zipWithNames = zipAttrsWithNames; zip = builtins.trace "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith; - } diff --git a/nixpkgs/lib/debug.nix b/nixpkgs/lib/debug.nix index ea6aed60ab43..e3ca3352397e 100644 --- a/nixpkgs/lib/debug.nix +++ b/nixpkgs/lib/debug.nix @@ -148,6 +148,28 @@ rec { /* A combination of `traceVal` and `traceSeqN`. */ traceValSeqN = traceValSeqNFn id; + /* Trace the input and output of a function `f` named `name`, + both down to `depth`. + + This is useful for adding around a function call, + to see the before/after of values as they are transformed. + + Example: + traceFnSeqN 2 "id" (x: x) { a.b.c = 3; } + trace: { fn = "id"; from = { a.b = {…}; }; to = { a.b = {…}; }; } + => { a.b.c = 3; } + */ + traceFnSeqN = depth: name: f: v: + let res = f v; + in lib.traceSeqN + (depth + 1) + { + fn = name; + from = v; + to = res; + } + res; + # -- TESTING -- diff --git a/nixpkgs/lib/default.nix b/nixpkgs/lib/default.nix index f985266ed938..50320669e280 100644 --- a/nixpkgs/lib/default.nix +++ b/nixpkgs/lib/default.nix @@ -78,7 +78,7 @@ let zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil recursiveUpdate matchAttrs overrideExisting getOutput getBin getLib getDev getMan chooseDevOutputs zipWithNames zip - recurseIntoAttrs dontRecurseIntoAttrs; + recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets; inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists @@ -130,7 +130,7 @@ let assertMsg assertOneOf; inherit (self.debug) addErrorContextToAttrs traceIf traceVal traceValFn traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq - traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal + traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN traceShowVal traceShowValMarked showVal traceCall traceCall2 traceCall3 traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs diff --git a/nixpkgs/lib/licenses.nix b/nixpkgs/lib/licenses.nix index 190eeefc1bf8..ee136c7337c1 100644 --- a/nixpkgs/lib/licenses.nix +++ b/nixpkgs/lib/licenses.nix @@ -100,6 +100,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "BSD Zero Clause License"; }; + bsd1 = spdx { + spdxId = "BSD-1-Clause"; + fullName = "BSD 1-Clause License"; + }; + bsd2 = spdx { spdxId = "BSD-2-Clause"; fullName = ''BSD 2-clause "Simplified" License''; @@ -301,6 +306,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Free Documentation License v1.1 only"; }; + fdl11Plus = spdx { + spdxId = "GFDL-1.1-or-later"; + fullName = "GNU Free Documentation License v1.1 or later"; + }; + fdl12Only = spdx { spdxId = "GFDL-1.2-only"; fullName = "GNU Free Documentation License v1.2 only"; diff --git a/nixpkgs/lib/lists.nix b/nixpkgs/lib/lists.nix index 06cee2eb112a..e469f3ef2652 100644 --- a/nixpkgs/lib/lists.nix +++ b/nixpkgs/lib/lists.nix @@ -241,7 +241,7 @@ rec { /* Return a singleton list or an empty list, depending on a boolean value. Useful when building lists with optional elements - (e.g. `++ optional (system == "i686-linux") flashplayer'). + (e.g. `++ optional (system == "i686-linux") firefox'). Type: optional :: bool -> a -> [a] @@ -629,7 +629,9 @@ rec { crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]] => [ "13" "14" "23" "24" ] */ - crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f]; + crossLists = builtins.trace + "lib.crossLists is deprecated, use lib.cartesianProductOfSets instead" + (f: foldl (fs: args: concatMap (f: map f args) fs) [f]); /* Remove duplicate elements from the list. O(n^2) complexity. diff --git a/nixpkgs/lib/systems/default.nix b/nixpkgs/lib/systems/default.nix index 1a89120e2bf6..1bbe976c4d21 100644 --- a/nixpkgs/lib/systems/default.nix +++ b/nixpkgs/lib/systems/default.nix @@ -92,6 +92,8 @@ rec { else if final.isx86_32 then "i386" else if final.isx86_64 then "x86_64" else if final.isMips then "mips" + else if final.isPower then "powerpc" + else if final.isRiscV then "riscv" else final.parsed.cpu.name; qemuArch = diff --git a/nixpkgs/lib/systems/doubles.nix b/nixpkgs/lib/systems/doubles.nix index b0bc7dd1188a..07327fa22736 100644 --- a/nixpkgs/lib/systems/doubles.nix +++ b/nixpkgs/lib/systems/doubles.nix @@ -24,6 +24,7 @@ let "x86_64-redox" + "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" @@ -72,7 +73,7 @@ in { darwin = filterDoubles predicates.isDarwin; freebsd = filterDoubles predicates.isFreeBSD; # Should be better, but MinGW is unclear. - gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.elfv1; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.elfv2; }); illumos = filterDoubles predicates.isSunOS; linux = filterDoubles predicates.isLinux; netbsd = filterDoubles predicates.isNetBSD; @@ -85,5 +86,5 @@ in { embedded = filterDoubles predicates.isNone; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"]; + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux"]; } diff --git a/nixpkgs/lib/systems/examples.nix b/nixpkgs/lib/systems/examples.nix index e8cf15479c05..8a43b86db701 100644 --- a/nixpkgs/lib/systems/examples.nix +++ b/nixpkgs/lib/systems/examples.nix @@ -21,6 +21,19 @@ rec { config = "powerpc64le-unknown-linux-musl"; }; + ppc64-elfv1 = { + config = "powerpc64-unknown-linux-elfv1"; + }; + ppc64-elfv2 = { + config = "powerpc64-unknown-linux-elfv2"; + }; + ppc64 = ppc64-elfv2; # default to modern elfv2 + + ppc64-musl = { + config = "powerpc64-unknown-linux-musl"; + gcc = { abi = "elfv2"; }; # for gcc configuration + }; + sheevaplug = { config = "armv5tel-unknown-linux-gnueabi"; } // platforms.sheevaplug; @@ -131,6 +144,12 @@ rec { armhf-embedded = { config = "arm-none-eabihf"; libc = "newlib"; + # GCC8+ does not build without this + # (https://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg552339.html): + gcc = { + arch = "armv5t"; + fpu = "vfp"; + }; }; aarch64-embedded = { diff --git a/nixpkgs/lib/systems/parse.nix b/nixpkgs/lib/systems/parse.nix index a06ac0d11f74..8e012622ccd0 100644 --- a/nixpkgs/lib/systems/parse.nix +++ b/nixpkgs/lib/systems/parse.nix @@ -337,10 +337,18 @@ rec { The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead. ''; } + { assertion = platform: platform.system != "powerpc64-linux"; + message = '' + The "gnu" ABI is ambiguous on big-endian 64-bit PPC. Use "elfv1" or "elfv2" instead. + ''; + } ]; }; gnuabi64 = { abi = "64"; }; + elfv1 = { abi = "elfv1"; }; + elfv2 = { abi = "elfv2"; }; + musleabi = { float = "soft"; }; musleabihf = { float = "hard"; }; musl = {}; @@ -444,6 +452,7 @@ rec { if lib.versionAtLeast (parsed.cpu.version or "0") "6" then abis.gnueabihf else abis.gnueabi + else if cpu == "powerpc64" then abis.elfv2 else abis.gnu else abis.unknown; }; diff --git a/nixpkgs/lib/systems/platforms.nix b/nixpkgs/lib/systems/platforms.nix index f399c1873f5e..3bf90cd0cafb 100644 --- a/nixpkgs/lib/systems/platforms.nix +++ b/nixpkgs/lib/systems/platforms.nix @@ -300,7 +300,7 @@ rec { baseConfig = "multi_v7_defconfig"; DTB = true; autoModules = true; - PreferBuiltin = true; + preferBuiltin = true; target = "zImage"; extraConfig = '' # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig. diff --git a/nixpkgs/lib/tests/misc.nix b/nixpkgs/lib/tests/misc.nix index 35a5801c724f..0d249968402d 100644 --- a/nixpkgs/lib/tests/misc.nix +++ b/nixpkgs/lib/tests/misc.nix @@ -660,4 +660,71 @@ runTests { expected = [ [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ]; }; + testCartesianProductOfEmptySet = { + expr = cartesianProductOfSets {}; + expected = [ {} ]; + }; + + testCartesianProductOfOneSet = { + expr = cartesianProductOfSets { a = [ 1 2 3 ]; }; + expected = [ { a = 1; } { a = 2; } { a = 3; } ]; + }; + + testCartesianProductOfTwoSets = { + expr = cartesianProductOfSets { a = [ 1 ]; b = [ 10 20 ]; }; + expected = [ + { a = 1; b = 10; } + { a = 1; b = 20; } + ]; + }; + + testCartesianProductOfTwoSetsWithOneEmpty = { + expr = cartesianProductOfSets { a = [ ]; b = [ 10 20 ]; }; + expected = [ ]; + }; + + testCartesianProductOfThreeSets = { + expr = cartesianProductOfSets { + a = [ 1 2 3 ]; + b = [ 10 20 30 ]; + c = [ 100 200 300 ]; + }; + expected = [ + { a = 1; b = 10; c = 100; } + { a = 1; b = 10; c = 200; } + { a = 1; b = 10; c = 300; } + + { a = 1; b = 20; c = 100; } + { a = 1; b = 20; c = 200; } + { a = 1; b = 20; c = 300; } + + { a = 1; b = 30; c = 100; } + { a = 1; b = 30; c = 200; } + { a = 1; b = 30; c = 300; } + + { a = 2; b = 10; c = 100; } + { a = 2; b = 10; c = 200; } + { a = 2; b = 10; c = 300; } + + { a = 2; b = 20; c = 100; } + { a = 2; b = 20; c = 200; } + { a = 2; b = 20; c = 300; } + + { a = 2; b = 30; c = 100; } + { a = 2; b = 30; c = 200; } + { a = 2; b = 30; c = 300; } + + { a = 3; b = 10; c = 100; } + { a = 3; b = 10; c = 200; } + { a = 3; b = 10; c = 300; } + + { a = 3; b = 20; c = 100; } + { a = 3; b = 20; c = 200; } + { a = 3; b = 20; c = 300; } + + { a = 3; b = 30; c = 100; } + { a = 3; b = 30; c = 200; } + { a = 3; b = 30; c = 300; } + ]; + }; } diff --git a/nixpkgs/lib/tests/modules.sh b/nixpkgs/lib/tests/modules.sh index 309c5311361c..f843d303e440 100755 --- a/nixpkgs/lib/tests/modules.sh +++ b/nixpkgs/lib/tests/modules.sh @@ -262,6 +262,13 @@ 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 +## types.functionTo +checkConfigOutput "input is input" config.result ./functionTo/trivial.nix +checkConfigOutput "a b" config.result ./functionTo/merging-list.nix +checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix +checkConfigOutput "b a" config.result ./functionTo/list-order.nix +checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix + cat <<EOF ====== module tests ====== $pass Pass diff --git a/nixpkgs/lib/tests/modules/functionTo/list-order.nix b/nixpkgs/lib/tests/modules/functionTo/list-order.nix new file mode 100644 index 000000000000..77a1a43a84f0 --- /dev/null +++ b/nixpkgs/lib/tests/modules/functionTo/list-order.nix @@ -0,0 +1,25 @@ + +{ lib, config, ... }: +let + inherit (lib) types; +in { + options = { + fun = lib.mkOption { + type = types.functionTo (types.listOf types.str); + }; + + result = lib.mkOption { + type = types.str; + default = toString (config.fun { + a = "a"; + b = "b"; + c = "c"; + }); + }; + }; + + config.fun = lib.mkMerge [ + (input: lib.mkAfter [ input.a ]) + (input: [ input.b ]) + ]; +} diff --git a/nixpkgs/lib/tests/modules/functionTo/merging-attrs.nix b/nixpkgs/lib/tests/modules/functionTo/merging-attrs.nix new file mode 100644 index 000000000000..97c015f928ab --- /dev/null +++ b/nixpkgs/lib/tests/modules/functionTo/merging-attrs.nix @@ -0,0 +1,27 @@ +{ lib, config, ... }: +let + inherit (lib) types; +in { + options = { + fun = lib.mkOption { + type = types.functionTo (types.attrsOf types.str); + }; + + result = lib.mkOption { + type = types.str; + default = toString (lib.attrValues (config.fun { + a = "a"; + b = "b"; + c = "c"; + })); + }; + }; + + config.fun = lib.mkMerge [ + (input: { inherit (input) a; }) + (input: { inherit (input) b; }) + (input: { + b = lib.mkForce input.c; + }) + ]; +} diff --git a/nixpkgs/lib/tests/modules/functionTo/merging-list.nix b/nixpkgs/lib/tests/modules/functionTo/merging-list.nix new file mode 100644 index 000000000000..15fcd2bdcc42 --- /dev/null +++ b/nixpkgs/lib/tests/modules/functionTo/merging-list.nix @@ -0,0 +1,24 @@ +{ lib, config, ... }: +let + inherit (lib) types; +in { + options = { + fun = lib.mkOption { + type = types.functionTo (types.listOf types.str); + }; + + result = lib.mkOption { + type = types.str; + default = toString (config.fun { + a = "a"; + b = "b"; + c = "c"; + }); + }; + }; + + config.fun = lib.mkMerge [ + (input: [ input.a ]) + (input: [ input.b ]) + ]; +} diff --git a/nixpkgs/lib/tests/modules/functionTo/trivial.nix b/nixpkgs/lib/tests/modules/functionTo/trivial.nix new file mode 100644 index 000000000000..0962a0cf893d --- /dev/null +++ b/nixpkgs/lib/tests/modules/functionTo/trivial.nix @@ -0,0 +1,17 @@ +{ lib, config, ... }: +let + inherit (lib) types; +in { + options = { + fun = lib.mkOption { + type = types.functionTo types.str; + }; + + result = lib.mkOption { + type = types.str; + default = config.fun "input"; + }; + }; + + config.fun = input: "input is ${input}"; +} diff --git a/nixpkgs/lib/tests/modules/functionTo/wrong-type.nix b/nixpkgs/lib/tests/modules/functionTo/wrong-type.nix new file mode 100644 index 000000000000..fd65b75088da --- /dev/null +++ b/nixpkgs/lib/tests/modules/functionTo/wrong-type.nix @@ -0,0 +1,18 @@ + +{ lib, config, ... }: +let + inherit (lib) types; +in { + options = { + fun = lib.mkOption { + type = types.functionTo types.str; + }; + + result = lib.mkOption { + type = types.str; + default = config.fun 0; + }; + }; + + config.fun = input: input + 1; +} diff --git a/nixpkgs/lib/tests/systems.nix b/nixpkgs/lib/tests/systems.nix index eed7ee725bc4..c0800df25ed7 100644 --- a/nixpkgs/lib/tests/systems.nix +++ b/nixpkgs/lib/tests/systems.nix @@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ]; testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; diff --git a/nixpkgs/lib/types.nix b/nixpkgs/lib/types.nix index ee891f8231b6..d0a8e96149d7 100644 --- a/nixpkgs/lib/types.nix +++ b/nixpkgs/lib/types.nix @@ -453,6 +453,17 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; + functionTo = elemType: mkOptionType { + name = "functionTo"; + description = "function that evaluates to a(n) ${elemType.name}"; + check = isFunction; + merge = loc: defs: + fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue; + getSubOptions = elemType.getSubOptions; + getSubModules = elemType.getSubModules; + substSubModules = m: functionTo (elemType.substSubModules m); + }; + # A submodule (like typed attribute set). See NixOS manual. submodule = modules: submoduleWith { shorthandOnlyDefinesConfig = true; diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 30305dd21e54..f46e36c9899e 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -48,6 +48,12 @@ See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. */ { + _0qq = { + email = "0qqw0qqw@gmail.com"; + github = "0qq"; + githubId = 64707304; + name = "Dmitry Kulikov"; + }; _0x4A6F = { email = "mail-maintainer@0x4A6F.dev"; name = "Joachim Ernst"; @@ -538,12 +544,6 @@ githubId = 638836; name = "Andreas Rammhold"; }; - andreabedini = { - email = "andrea@kzn.io"; - github = "andreabedini"; - githubId = 69135; - name = "Andrea Bedini"; - }; andreasfelix = { email = "fandreas@physik.hu-berlin.de"; github = "andreasfelix"; @@ -868,6 +868,12 @@ githubId = 706854; name = "Etienne Laurin"; }; + attila-lendvai = { + name = "Attila Lendvai"; + email = "attila@lendvai.name"; + github = "attila-lendvai"; + githubId = 840345; + }; auntie = { email = "auntieNeo@gmail.com"; github = "auntieNeo"; @@ -898,6 +904,12 @@ githubId = 687218; name = "averelld"; }; + avh4 = { + email = "gruen0aermel@gmail.com"; + github = "avh4"; + githubId = 1222; + name = "Aaron VonderHaar"; + }; avitex = { email = "theavitex@gmail.com"; github = "avitex"; @@ -1036,6 +1048,12 @@ githubId = 1015044; name = "Brandon Carrell"; }; + bcc32 = { + email = "me@bcc32.com"; + github = "bcc32"; + githubId = 1239097; + name = "Aaron Zeng"; + }; bcdarwin = { email = "bcdarwin@gmail.com"; github = "bcdarwin"; @@ -2267,6 +2285,12 @@ githubId = 265220; name = "David Leung"; }; + DianaOlympos = { + email = "DianaOlympos@noreply.github.com"; + github = "DianaOlympos"; + githubId = 15774340; + name = "Thomas Depierre"; + }; dipinhora = { email = "dipinhora+github@gmail.com"; github = "dipinhora"; @@ -3031,6 +3055,12 @@ githubId = 9959940; name = "Andreas Fehn"; }; + felixsinger = { + email = "felixsinger@posteo.net"; + github = "felixsinger"; + githubId = 628359; + name = "Felix Singer"; + }; felschr = { email = "dev@felschr.com"; github = "felschr"; @@ -3053,6 +3083,12 @@ githubId = 8182846; name = "Francesco Gazzetta"; }; + figsoda = { + email = "figsoda@pm.me"; + github = "figsoda"; + githubId = 40620903; + name = "figsoda"; + }; fionera = { email = "nix@fionera.de"; github = "fionera"; @@ -3147,6 +3183,12 @@ githubId = 92793; name = "Friedrich von Never"; }; + fortuneteller2k = { + email = "lythe1107@gmail.com"; + github = "fortuneteller2k"; + githubId = 20619776; + name = "fortuneteller2k"; + }; fpletz = { email = "fpletz@fnordicwalking.de"; github = "fpletz"; @@ -3473,6 +3515,12 @@ fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; }]; }; + greizgh = { + email = "greizgh@ephax.org"; + github = "greizgh"; + githubId = 1313624; + name = "greizgh"; + }; greydot = { email = "lanablack@amok.cc"; github = "greydot"; @@ -3567,6 +3615,12 @@ githubId = 5317234; name = "Raphael Megzari"; }; + happy-river = { + email = "happyriver93@runbox.com"; + github = "happy-river"; + githubId = 54728477; + name = "Happy River"; + }; haslersn = { email = "haslersn@fius.informatik.uni-stuttgart.de"; github = "haslersn"; @@ -3657,6 +3711,12 @@ githubId = 3656888; name = "hhm"; }; + higebu = { + name = "Yuya Kusakabe"; + email = "yuya.kusakabe@gmail.com"; + github = "higebu"; + githubId = 733288; + }; hinton = { email = "t@larkery.com"; name = "Tom Hinton"; @@ -3699,6 +3759,12 @@ fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; }]; }; + humancalico = { + email = "humancalico@disroot.org"; + github = "humancalico"; + githubId = 51334444; + name = "Akshat Agarwal"; + }; hodapp = { email = "hodapp87@gmail.com"; github = "Hodapp87"; @@ -3723,6 +3789,12 @@ githubId = 130903; name = "Ana Hobden"; }; + holgerpeters = { + name = "Holger Peters"; + email = "holger.peters@posteo.de"; + github = "HolgerPeters"; + githubId = 4097049; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; @@ -3747,6 +3819,12 @@ githubId = 15371828; name = "Hugo Lageneste"; }; + hypersw = { + email = "baltic@hypersw.net"; + github = "hypersw"; + githubId = 2332070; + name = "Serge Baltic"; + }; hyphon81 = { email = "zero812n@gmail.com"; github = "hyphon81"; @@ -4061,6 +4139,12 @@ githubId = 45598; name = "William Casarin"; }; + jbcrail = { + name = "Joseph Crail"; + email = "jbcrail@gmail.com"; + github = "jbcrail"; + githubId = 6038; + }; jbedo = { email = "cu@cua0.org"; github = "jbedo"; @@ -4943,6 +5027,12 @@ githubId = 4032; name = "Kristoffer Thømt Ravneberg"; }; + kritnich = { + email = "kritnich@kritni.ch"; + github = "Kritnich"; + githubId = 22116767; + name = "Kritnich"; + }; kroell = { email = "nixosmainter@makroell.de"; github = "rokk4"; @@ -5019,6 +5109,16 @@ fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; }]; }; + l-as = { + email = "las@protonmail.ch"; + github = "L-as"; + githubId = 22075344; + keys = [{ + longkeyid = "rsa2048/0xAC458A7D1087D025"; + fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; + }]; + name = "Las Safin"; + }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; @@ -5210,6 +5310,12 @@ githubId = 307589; name = "Nathaniel Baxter"; }; + liamdiprose = { + email = "liam@liamdiprose.com"; + github = "liamdiprose"; + githubId = 1769386; + name = "Liam Diprose"; + }; liff = { email = "liff@iki.fi"; github = "liff"; @@ -5492,6 +5598,12 @@ githubId = 2057309; name = "Sergey Sofeychuk"; }; + lxea = { + email = "nix@amk.ie"; + github = "lxea"; + githubId = 7910815; + name = "Alex McGrath"; + }; lynty = { email = "ltdong93+nix@gmail.com"; github = "lynty"; @@ -5624,6 +5736,12 @@ email = "markus@wotringer.de"; name = "Markus Wotringer"; }; + marijanp = { + name = "Marijan Petričević"; + email = "marijan.petricevic94@gmail.com"; + github = "marijanp"; + githubId = 13599169; + }; marius851000 = { email = "mariusdavid@laposte.net"; name = "Marius David"; @@ -6653,6 +6771,12 @@ githubId = 148037; name = "Joachim Breitner"; }; + nomisiv = { + email = "simon@nomisiv.com"; + github = "NomisIV"; + githubId = 47303199; + name = "Simon Gutgesell"; + }; noneucat = { email = "andy@lolc.at"; github = "noneucat"; @@ -7013,6 +7137,12 @@ githubId = 15645854; name = "Brad Christensen"; }; + payas = { + email = "relekarpayas@gmail.com"; + github = "payasrelekar"; + githubId = 24254289; + name = "Payas Relekar"; + }; pawelpacana = { email = "pawel.pacana@gmail.com"; github = "pawelpacana"; @@ -7062,7 +7192,7 @@ name = "Paulus Esterhazy"; }; petabyteboy = { - email = "me@pbb.lc"; + email = "milan@petabyte.dev"; github = "petabyteboy"; githubId = 3250809; name = "Milan Pässler"; @@ -7473,6 +7603,12 @@ githubId = 115877; name = "Kenny Shen"; }; + queezle = { + email = "git@queezle.net"; + github = "qzle"; + githubId = 1024891; + name = "Jens Nolte"; + }; quentini = { email = "quentini@airmail.cc"; github = "QuentinI"; @@ -7685,6 +7821,12 @@ githubId = 42433779; name = "Rémy Grünblatt"; }; + rguevara84 = { + email = "fuzztkd@gmail.com"; + github = "rguevara84"; + githubId = 12279531; + name = "Ricardo Guevara"; + }; rht = { email = "rhtbot@protonmail.com"; github = "rht"; @@ -8365,6 +8507,12 @@ githubId = 997855; name = "Narazaki Shuji"; }; + shofius = { + name = "Sam Hofius"; + email = "sam@samhofi.us"; + github = "kf5grd"; + githubId = 18297490; + }; shou = { email = "x+g@shou.io"; github = "Shou"; @@ -8603,6 +8751,12 @@ githubId = 7669898; name = "Katharina Fey"; }; + spease = { + email = "peasteven@gmail.com"; + github = "spease"; + githubId = 2825204; + name = "Steven Pease"; + }; spencerjanssen = { email = "spencerjanssen@gmail.com"; github = "spencerjanssen"; @@ -8633,6 +8787,12 @@ githubId = 36899624; name = "squalus"; }; + srapenne = { + email = "solene@perso.pw"; + github = "rapenne-s"; + githubId = 248016; + name = "Solène Rapenne"; + }; srghma = { email = "srghma@gmail.com"; github = "srghma"; @@ -9273,6 +9433,12 @@ fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B"; }]; }; + tmountain = { + email = "tinymountain@gmail.com"; + github = "tmountain"; + githubId = 135297; + name = "Travis Whitton"; + }; tmplt = { email = "tmplt@dragons.rocks"; github = "tmplt"; @@ -9858,6 +10024,12 @@ githubId = 6016963; name = "Patrick Winter"; }; + winterqt = { + email = "nixos@winter.cafe"; + github = "winterqt"; + githubId = 78392041; + name = "Winter"; + }; wishfort36 = { email = "42300264+wishfort36@users.noreply.github.com"; github = "wishfort36"; @@ -9876,6 +10048,12 @@ githubId = 43315; name = "William Roe"; }; + wldhx = { + email = "wldhx+nixpkgs@wldhx.me"; + github = "wldhx"; + githubId = 15619766; + name = "wldhx"; + }; wmertens = { email = "Wout.Mertens@gmail.com"; github = "wmertens"; @@ -10514,4 +10692,10 @@ github = "zupo"; githubId = 311580; }; + felixscheinost = { + name = "Felix Scheinost"; + email = "felix.scheinost@posteo.de"; + github = "felixscheinost"; + githubId = 31761492; + }; } diff --git a/nixpkgs/maintainers/team-list.nix b/nixpkgs/maintainers/team-list.nix index b34c3f71bd82..7d778a8ae30c 100644 --- a/nixpkgs/maintainers/team-list.nix +++ b/nixpkgs/maintainers/team-list.nix @@ -29,6 +29,18 @@ with lib.maintainers; { scope = "Maintain ACME-related packages and modules."; }; + beam = { + members = [ + ankhers + Br1ght0ne + DianaOlympos + gleber + happysalada + yurrriq + ]; + scope = "Maintain BEAM-related packages and modules."; + }; + cinnamon = { members = [ mkg20001 diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.xml index 5d055c45d2d8..3ed97b94b510 100644 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.xml +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.xml @@ -11,8 +11,7 @@ </para> <para> - It makes virtio modules available on the initrd, sets the system time from - the hardware clock to work around a bug in qemu-kvm, and - <link linkend="opt-security.rngd.enable">enables rngd</link>. + It makes virtio modules available on the initrd and sets the system time from + the hardware clock to work around a bug in qemu-kvm. </para> </section> diff --git a/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml b/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml index bf18457c2b38..e083d51406c7 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml @@ -8,7 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. </para> - <xi:include href="rl-2103.xml" /> + <xi:include href="rl-2105.xml" /> <xi:include href="rl-2009.xml" /> <xi:include href="rl-2003.xml" /> <xi:include href="rl-1909.xml" /> diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml index 0b1d0d509d78..a6cff1a8faed 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml @@ -6,7 +6,9 @@ <title>Release 20.09 (“Nightingale”, 2020.10/27)</title> <para> - Support is planned until the end of April 2021, handing over to 21.03. + Support is planned until the end of June 2021, handing over to 21.05. + (Plans <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md#core-changes"> + have shifted</link> by two months since release of 20.09.) </para> <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -1538,7 +1540,7 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; <listitem> <para> Specifying <link linkend="opt-services.dovecot2.mailboxes">mailboxes</link> in the <package>dovecot2</package> module - as a list is deprecated and will break eval in 21.03. Instead, an attribute-set should be specified where the <literal>name</literal> + as a list is deprecated and will break eval in 21.05. Instead, an attribute-set should be specified where the <literal>name</literal> should be the key of the attribute. </para> <para> diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml index 09455611fbae..6dd14d6051e4 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml @@ -2,14 +2,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03"> - <title>Release 21.03 (“Okapi”, 2021.03/??)</title> + xml:id="sec-release-21.05"> + <title>Release 21.05 (“Okapi”, 2021.05/??)</title> <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03-highlights"> + xml:id="sec-release-21.05-highlights"> <title>Highlights</title> <para> @@ -20,7 +20,7 @@ <itemizedlist> <listitem> <para> - Support is planned until the end of October 2021, handing over to 21.09. + Support is planned until the end of December 2021, handing over to 21.11. </para> </listitem> <listitem> @@ -46,7 +46,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03-new-services"> + xml:id="sec-release-21.05-new-services"> <title>New Services</title> <para> @@ -82,7 +82,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03-incompatibilities"> + xml:id="sec-release-21.05-incompatibilities"> <title>Backward Incompatibilities</title> <para> @@ -461,6 +461,39 @@ self: super: mouse section. </para> </listitem> + <listitem> + <para> + ALSA OSS emulation (<varname>sound.enableOSSEmulation</varname>) is now disabled by default. + </para> + </listitem> + <listitem> + <para> + Thinkfan as been updated to <literal>1.2.x</literal>, which comes with a + new YAML based configuration format. For this reason, several NixOS options + of the thinkfan module have been changed to non-backward compatible types. + In addition, a new <xref linkend="opt-services.thinkfan.settings"/> option has + been added. + </para> + <para> + Please read the <link xlink:href="https://github.com/vmatare/thinkfan#readme"> + thinkfan documentation</link> before updating. + </para> + </listitem> + <listitem> + <para> + Adobe Flash Player support has been dropped from the tree. In particular, + the following packages no longer support it: + <itemizedlist> + <listitem><simpara><package>chromium</package></simpara></listitem> + <listitem><simpara><package>firefox</package></simpara></listitem> + <listitem><simpara><package>qt48</package></simpara></listitem> + <listitem><simpara><package>qt5.qtwebkit</package></simpara></listitem> + </itemizedlist> + Additionally, packages <package>flashplayer</package> and + <package>hal-flash</package> were removed along with the + <varname>services.flashpolicyd</varname> module. + </para> + </listitem> </itemizedlist> </section> @@ -468,12 +501,20 @@ self: super: xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03-notable-changes"> + xml:id="sec-release-21.05-notable-changes"> <title>Other Notable Changes</title> <itemizedlist> <listitem> <para> + <literal>stdenv.lib</literal> has been deprecated and will break + eval in 21.11. Please use <literal>pkgs.lib</literal> instead. + See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/108938">#108938</link> + for details. + </para> + </listitem> + <listitem> + <para> The Mailman NixOS module (<literal>services.mailman</literal>) has a new option <xref linkend="opt-services.mailman.enablePostfix" />, defaulting to true, that controls integration with Postfix. @@ -607,6 +648,15 @@ self: super: </listitem> <listitem> <para> + In the ACME module, the data used to build the hash for the account + directory has changed to accomodate new features to reduce account + rate limit issues. This will trigger new account creation on the first + rebuild following this update. No issues are expected to arise from this, + thanks to the new account creation handling. + </para> + </listitem> + <listitem> + <para> <xref linkend="opt-users.users._name_.createHome" /> now always ensures home directory permissions to be <literal>0700</literal>. Permissions had previously been ignored for already existing home directories, possibly leaving them readable by others. The option's description was incorrect regarding ownership management and has been simplified greatly. @@ -639,6 +689,17 @@ self: super: The <varname>platform</varname> grouping of these things never meant anything, and was just a historial/implementation artifact that was overdue removal. </para> </listitem> + <listitem> + <para> + <varname>services.restic</varname> now uses a dedicated cache directory for every backup defined in <varname>services.restic.backups</varname>. The old global cache directory, <literal>/root/.cache/restic</literal>, is now unused and can be removed to free up disk space. + </para> + </listitem> + <listitem> + <para> + <literal>isync</literal>: The <literal>isync</literal> compatibility wrapper was removed and the Master/Slave + terminology has been deprecated and should be replaced with Far/Near in the configuration file. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixpkgs/nixos/lib/make-disk-image.nix b/nixpkgs/nixos/lib/make-disk-image.nix index 3f50bb431c5e..023d0791a5c7 100644 --- a/nixpkgs/nixos/lib/make-disk-image.nix +++ b/nixpkgs/nixos/lib/make-disk-image.nix @@ -257,7 +257,8 @@ let format' = format; in let ''} echo "copying staging root to image..." - cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / + cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / || + (echo >&2 "ERROR: cptofs failed. diskSize might be too small for closure."; exit 1) ''; in pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name diff --git a/nixpkgs/nixos/modules/config/no-x-libs.nix b/nixpkgs/nixos/modules/config/no-x-libs.nix index c3120c2bf30d..14fe180d0bc5 100644 --- a/nixpkgs/nixos/modules/config/no-x-libs.nix +++ b/nixpkgs/nixos/modules/config/no-x-libs.nix @@ -29,6 +29,7 @@ with lib; nixpkgs.overlays = singleton (const (super: { cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; + beam = super.beam_nox; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; diff --git a/nixpkgs/nixos/modules/hardware/i2c.nix b/nixpkgs/nixos/modules/hardware/i2c.nix new file mode 100644 index 000000000000..ff14b4b1c891 --- /dev/null +++ b/nixpkgs/nixos/modules/hardware/i2c.nix @@ -0,0 +1,43 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.hardware.i2c; +in + +{ + options.hardware.i2c = { + enable = mkEnableOption '' + i2c devices support. By default access is granted to users in the "i2c" + group (will be created if non-existent) and any user with a seat, meaning + logged on the computer locally. + ''; + + group = mkOption { + type = types.str; + default = "i2c"; + description = '' + Grant access to i2c devices (/dev/i2c-*) to users in this group. + ''; + }; + }; + + config = mkIf cfg.enable { + + boot.kernelModules = [ "i2c-dev" ]; + + users.groups = mkIf (cfg.group == "i2c") { + i2c = { }; + }; + + services.udev.extraRules = '' + # allow group ${cfg.group} and users with a seat use of i2c devices + ACTION=="add", KERNEL=="i2c-[0-9]*", TAG+="uaccess", GROUP="${cfg.group}", MODE="660" + ''; + + }; + + meta.maintainers = [ maintainers.rnhmjoj ]; + +} diff --git a/nixpkgs/nixos/modules/hardware/network/ath-user-regd.nix b/nixpkgs/nixos/modules/hardware/network/ath-user-regd.nix new file mode 100644 index 000000000000..b5ade5ed5010 --- /dev/null +++ b/nixpkgs/nixos/modules/hardware/network/ath-user-regd.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + kernelVersion = config.boot.kernelPackages.kernel.version; + linuxKernelMinVersion = "5.8"; + kernelPatch = pkgs.kernelPatches.ath_regd_optional // { + extraConfig = '' + ATH_USER_REGD y + ''; + }; +in +{ + options.networking.wireless.athUserRegulatoryDomain = mkOption { + default = false; + type = types.bool; + description = '' + If enabled, sets the ATH_USER_REGD kernel config switch to true to + disable the enforcement of EEPROM regulatory restrictions for ath + drivers. Requires at least Linux ${linuxKernelMinVersion}. + ''; + }; + + config = mkIf config.networking.wireless.athUserRegulatoryDomain { + assertions = singleton { + assertion = lessThan 0 (builtins.compareVersions kernelVersion linuxKernelMinVersion); + message = "ATH_USER_REGD patch for kernels older than ${linuxKernelMinVersion} not ported yet!"; + }; + boot.kernelPatches = [ kernelPatch ]; + }; +} diff --git a/nixpkgs/nixos/modules/hardware/sensor/hddtemp.nix b/nixpkgs/nixos/modules/hardware/sensor/hddtemp.nix new file mode 100644 index 000000000000..df3f75e229a2 --- /dev/null +++ b/nixpkgs/nixos/modules/hardware/sensor/hddtemp.nix @@ -0,0 +1,81 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; + + cfg = config.hardware.sensor.hddtemp; + + wrapper = pkgs.writeShellScript "hddtemp-wrapper" '' + set -eEuo pipefail + + file=/var/lib/hddtemp/hddtemp.db + + drives=(${toString (map (e: ''$(realpath ${lib.escapeShellArg e}) '') cfg.drives)}) + + cp ${pkgs.hddtemp}/share/hddtemp/hddtemp.db $file + ${lib.concatMapStringsSep "\n" (e: "echo ${lib.escapeShellArg e} >> $file") cfg.dbEntries} + + exec ${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \ + --daemon \ + --unit=${cfg.unit} \ + --file=$file \ + ''${drives[@]} + ''; + +in +{ + meta.maintainers = with lib.maintainers; [ peterhoeg ]; + + ###### interface + + options = { + hardware.sensor.hddtemp = { + enable = mkOption { + description = '' + Enable this option to support HDD/SSD temperature sensors. + ''; + type = types.bool; + default = false; + }; + + drives = mkOption { + description = "List of drives to monitor. If you pass /dev/disk/by-path/* entries the symlinks will be resolved as hddtemp doesn't like names with colons."; + type = types.listOf types.str; + }; + + unit = mkOption { + description = "Celcius or Fahrenheit"; + type = types.enum [ "C" "F" ]; + default = "C"; + }; + + dbEntries = mkOption { + description = "Additional DB entries"; + type = types.listOf types.str; + default = [ ]; + }; + + extraArgs = mkOption { + description = "Additional arguments passed to the daemon."; + type = types.listOf types.str; + default = [ ]; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.hddtemp = { + description = "HDD/SSD temperature"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + ExecStart = wrapper; + StateDirectory = "hddtemp"; + PrivateTmp = true; + ProtectHome = "tmpfs"; + ProtectSystem = "strict"; + }; + }; + }; +} diff --git a/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/nixpkgs/nixos/modules/hardware/video/nvidia.nix index d1cf7d05c1b8..97accc7b99a0 100644 --- a/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -5,36 +5,17 @@ with lib; let - - drivers = config.services.xserver.videoDrivers; - - # FIXME: should introduce an option like - # ‘hardware.video.nvidia.package’ for overriding the default NVIDIA - # driver. - nvidiaForKernel = kernelPackages: - if elem "nvidia" drivers then - kernelPackages.nvidia_x11 - else if elem "nvidiaBeta" drivers then - kernelPackages.nvidia_x11_beta - else if elem "nvidiaVulkanBeta" drivers then - kernelPackages.nvidia_x11_vulkan_beta - else if elem "nvidiaLegacy304" drivers then - kernelPackages.nvidia_x11_legacy304 - else if elem "nvidiaLegacy340" drivers then - kernelPackages.nvidia_x11_legacy340 - else if elem "nvidiaLegacy390" drivers then - kernelPackages.nvidia_x11_legacy390 - else null; - - nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; - nvidia_libs32 = - if versionOlder nvidia_x11.version "391" then - ((nvidiaForKernel pkgs.pkgsi686Linux.linuxPackages).override { libsOnly = true; kernel = null; }).out - else - (nvidiaForKernel config.boot.kernelPackages).lib32; + nvidia_x11 = let + drivers = config.services.xserver.videoDrivers; + isDeprecated = str: (hasPrefix "nvidia" str) && (str != "nvidia"); + hasDeprecated = drivers: any isDeprecated drivers; + in if (hasDeprecated drivers) then + throw '' + Selecting an nvidia driver has been modified for NixOS 19.03. The version is now set using `hardware.nvidia.package`. + '' + else if (elem "nvidia" drivers) then cfg.package else null; enabled = nvidia_x11 != null; - cfg = config.hardware.nvidia; pCfg = cfg.prime; @@ -63,6 +44,15 @@ in ''; }; + hardware.nvidia.powerManagement.finegrained = mkOption { + type = types.bool; + default = false; + description = '' + Experimental power management of PRIME offload. For more information, see + the NVIDIA docs, chapter 22. PCI-Express runtime power management. + ''; + }; + hardware.nvidia.modesetting.enable = mkOption { type = types.bool; default = false; @@ -96,6 +86,16 @@ in ''; }; + hardware.nvidia.prime.amdgpuBusId = mkOption { + type = types.str; + default = ""; + example = "PCI:4:0:0"; + description = '' + Bus ID of the AMD APU. You can find it using lspci; for example if lspci + shows the AMD APU at "04:00.0", set this option to "PCI:4:0:0". + ''; + }; + hardware.nvidia.prime.sync.enable = mkOption { type = types.bool; default = false; @@ -151,9 +151,22 @@ in GPUs stay awake even during headless mode. ''; }; + + hardware.nvidia.package = lib.mkOption { + type = lib.types.package; + default = config.boot.kernelPackages.nvidiaPackages.stable; + defaultText = "config.boot.kernelPackages.nvidiaPackages.stable"; + description = '' + The NVIDIA X11 derivation to use. + ''; + example = "config.boot.kernelPackages.nvidiaPackages.legacy340"; + }; }; - config = mkIf enabled { + config = let + igpuDriver = if pCfg.intelBusId != "" then "modesetting" else "amdgpu"; + igpuBusId = if pCfg.intelBusId != "" then pCfg.intelBusId else pCfg.amdgpuBusId; + in mkIf enabled { assertions = [ { assertion = with config.services.xserver.displayManager; gdm.nvidiaWayland -> cfg.modesetting.enable; @@ -161,7 +174,13 @@ in } { - assertion = primeEnabled -> pCfg.nvidiaBusId != "" && pCfg.intelBusId != ""; + assertion = primeEnabled -> pCfg.intelBusId == "" || pCfg.amdgpuBusId == ""; + message = '' + You cannot configure both an Intel iGPU and an AMD APU. Pick the one corresponding to your processor. + ''; + } + { + assertion = primeEnabled -> pCfg.nvidiaBusId != "" && (pCfg.intelBusId != "" || pCfg.amdgpuBusId != ""); message = '' When NVIDIA PRIME is enabled, the GPU bus IDs must configured. ''; @@ -174,6 +193,14 @@ in assertion = !(syncCfg.enable && offloadCfg.enable); message = "Only one NVIDIA PRIME solution may be used at a time."; } + { + assertion = !(syncCfg.enable && cfg.powerManagement.finegrained); + message = "Sync precludes powering down the NVIDIA GPU."; + } + { + assertion = cfg.powerManagement.enable -> offloadCfg.enable; + message = "Fine-grained power management requires offload to be enabled."; + } ]; # If Optimus/PRIME is enabled, we: @@ -183,18 +210,22 @@ in # "nvidia" driver, in order to allow the X server to start without any outputs. # - Add a separate Device section for the Intel GPU, using the "modesetting" # driver and with the configured BusID. + # - OR add a separate Device section for the AMD APU, using the "amdgpu" + # driver and with the configures BusID. # - Reference that Device section from the ServerLayout section as an inactive # device. # - Configure the display manager to run specific `xrandr` commands which will - # configure/enable displays connected to the Intel GPU. + # configure/enable displays connected to the Intel iGPU / AMD APU. services.xserver.useGlamor = mkDefault offloadCfg.enable; - services.xserver.drivers = optional primeEnabled { - name = "modesetting"; + services.xserver.drivers = let + in optional primeEnabled { + name = igpuDriver; display = offloadCfg.enable; + modules = optional (igpuDriver == "amdgpu") [ pkgs.xorg.xf86videoamdgpu ]; deviceSection = '' - BusID "${pCfg.intelBusId}" + BusID "${igpuBusId}" ${optionalString syncCfg.enable ''Option "AccelMethod" "none"''} ''; } ++ singleton { @@ -205,6 +236,7 @@ in '' BusID "${pCfg.nvidiaBusId}" ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""} + ${optionalString cfg.powerManagement.finegrained "Option \"NVreg_DynamicPowerManagement=0x02\""} ''; screenSection = '' @@ -214,14 +246,14 @@ in }; services.xserver.serverLayoutSection = optionalString syncCfg.enable '' - Inactive "Device-modesetting[0]" + Inactive "Device-${igpuDriver}[0]" '' + optionalString offloadCfg.enable '' Option "AllowNVIDIAGPUScreens" ''; services.xserver.displayManager.setupCommands = optionalString syncCfg.enable '' # Added by nvidia configuration module for Optimus/PRIME. - ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0 + ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource ${igpuDriver} NVIDIA-0 ${pkgs.xorg.xrandr}/bin/xrandr --auto ''; @@ -230,9 +262,9 @@ in }; hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out; - hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_libs32; + hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_x11.lib32; hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out; - hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_libs32; + hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; @@ -292,16 +324,37 @@ in boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"; - # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. services.udev.extraRules = '' + # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%n c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" + '' + optionalString cfg.powerManagement.finegrained '' + # Remove NVIDIA USB xHCI Host Controller devices, if present + ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1" + + # Remove NVIDIA USB Type-C UCSI devices, if present + ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{remove}="1" + + # Remove NVIDIA Audio devices, if present + ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{remove}="1" + + # Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind + ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto" + ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto" + + # Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind + ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on" + ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on" ''; + boot.extraModprobeConfig = mkIf cfg.powerManagement.finegrained '' + options nvidia "NVreg_DynamicPowerManagement=0x02" + ''; + boot.blacklistedKernelModules = [ "nouveau" "nvidiafb" ]; services.acpid.enable = true; diff --git a/nixpkgs/nixos/modules/hardware/video/switcheroo-control.nix b/nixpkgs/nixos/modules/hardware/video/switcheroo-control.nix new file mode 100644 index 000000000000..199adb2ad8f5 --- /dev/null +++ b/nixpkgs/nixos/modules/hardware/video/switcheroo-control.nix @@ -0,0 +1,18 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + pkg = [ pkgs.switcheroo-control ]; + cfg = config.services.switcherooControl; +in { + options.services.switcherooControl = { + enable = mkEnableOption "switcheroo-control, a D-Bus service to check the availability of dual-GPU"; + }; + + config = mkIf cfg.enable { + services.dbus.packages = pkg; + environment.systemPackages = pkg; + systemd.packages = pkg; + systemd.targets.multi-user.wants = [ "switcheroo-control.service" ]; + }; +} diff --git a/nixpkgs/nixos/modules/misc/ids.nix b/nixpkgs/nixos/modules/misc/ids.nix index 43779ef53fc9..3185e512a4ae 100644 --- a/nixpkgs/nixos/modules/misc/ids.nix +++ b/nixpkgs/nixos/modules/misc/ids.nix @@ -71,7 +71,7 @@ in #utmp = 29; # unused # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; - #disnix = 33; # unused + #disnix = 33; # module removed osgi = 34; tor = 35; cups = 36; @@ -387,7 +387,7 @@ in utmp = 29; # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; - disnix = 33; + #disnix = 33; # module removed osgi = 34; tor = 35; #cups = 36; # unused diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index cb06c0c027a2..3ddfd6ec196f 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -46,12 +46,15 @@ ./hardware/cpu/intel-microcode.nix ./hardware/digitalbitbox.nix ./hardware/device-tree.nix + ./hardware/i2c.nix + ./hardware/sensor/hddtemp.nix ./hardware/sensor/iio.nix ./hardware/keyboard/zsa.nix ./hardware/ksm.nix ./hardware/ledger.nix ./hardware/logitech.nix ./hardware/mcelog.nix + ./hardware/network/ath-user-regd.nix ./hardware/network/b43.nix ./hardware/network/intel-2200bg.nix ./hardware/nitrokey.nix @@ -175,7 +178,6 @@ ./programs/tsm-client.nix ./programs/udevil.nix ./programs/usbtop.nix - ./programs/venus.nix ./programs/vim.nix ./programs/wavemon.nix ./programs/waybar.nix @@ -349,6 +351,7 @@ ./services/editors/emacs.nix ./services/editors/infinoted.nix ./services/games/factorio.nix + ./services/games/freeciv.nix ./services/games/minecraft-server.nix ./services/games/minetest-server.nix ./services/games/openarena.nix @@ -356,6 +359,7 @@ ./services/games/terraria.nix ./services/hardware/acpid.nix ./services/hardware/actkbd.nix + ./services/hardware/auto-cpufreq.nix ./services/hardware/bluetooth.nix ./services/hardware/bolt.nix ./services/hardware/brltty.nix @@ -371,6 +375,7 @@ ./services/hardware/nvidia-optimus.nix ./services/hardware/pcscd.nix ./services/hardware/pommed.nix + ./services/hardware/power-profiles-daemon.nix ./services/hardware/ratbagd.nix ./services/hardware/sane.nix ./services/hardware/sane_extra_backends/brscan4.nix @@ -451,12 +456,11 @@ ./services/misc/devmon.nix ./services/misc/dictd.nix ./services/misc/dwm-status.nix - ./services/misc/dysnomia.nix - ./services/misc/disnix.nix ./services/misc/docker-registry.nix ./services/misc/domoticz.nix ./services/misc/errbot.nix ./services/misc/etcd.nix + ./services/misc/etebase-server.nix ./services/misc/ethminer.nix ./services/misc/exhibitor.nix ./services/misc/felix.nix @@ -611,6 +615,8 @@ ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix ./services/networking/babeld.nix + ./services/networking/bee.nix + ./services/networking/bee-clef.nix ./services/networking/biboumi.nix ./services/networking/bind.nix ./services/networking/bitcoind.nix @@ -647,7 +653,6 @@ ./services/networking/fireqos.nix ./services/networking/firewall.nix ./services/networking/flannel.nix - ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix ./services/networking/freeradius.nix ./services/networking/gale.nix @@ -728,6 +733,7 @@ ./services/networking/owamp.nix ./services/networking/pdnsd.nix ./services/networking/pixiecore.nix + ./services/networking/pleroma.nix ./services/networking/polipo.nix ./services/networking/powerdns.nix ./services/networking/pdns-recursor.nix @@ -874,10 +880,12 @@ ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix ./services/web-apps/engelsystem.nix + ./services/web-apps/galene.nix ./services/web-apps/gerrit.nix ./services/web-apps/gotify-server.nix ./services/web-apps/grocy.nix ./services/web-apps/hedgedoc.nix + ./services/web-apps/hledger-web.nix ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ihatemoney @@ -885,6 +893,7 @@ ./services/web-apps/jitsi-meet.nix ./services/web-apps/keycloak.nix ./services/web-apps/limesurvey.nix + ./services/web-apps/mastodon.nix ./services/web-apps/mattermost.nix ./services/web-apps/mediawiki.nix ./services/web-apps/miniflux.nix diff --git a/nixpkgs/nixos/modules/profiles/qemu-guest.nix b/nixpkgs/nixos/modules/profiles/qemu-guest.nix index 0ea70107f717..d4335edfcf2d 100644 --- a/nixpkgs/nixos/modules/profiles/qemu-guest.nix +++ b/nixpkgs/nixos/modules/profiles/qemu-guest.nix @@ -1,7 +1,7 @@ # Common configuration for virtual machines running under QEMU (using # virtio). -{ lib, ... }: +{ ... }: { boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; @@ -14,6 +14,4 @@ # to the *boot time* of the host). hwclock -s ''; - - security.rngd.enable = lib.mkDefault false; } diff --git a/nixpkgs/nixos/modules/programs/captive-browser.nix b/nixpkgs/nixos/modules/programs/captive-browser.nix index 4d59ea8d0fd8..1f223e2475ce 100644 --- a/nixpkgs/nixos/modules/programs/captive-browser.nix +++ b/nixpkgs/nixos/modules/programs/captive-browser.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: with lib; - let cfg = config.programs.captive-browser; in @@ -27,15 +26,17 @@ in # the options below are the same as in "captive-browser.toml" browser = mkOption { type = types.str; - default = concatStringsSep " " [ "${pkgs.chromium}/bin/chromium" - "--user-data-dir=\${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive" - ''--proxy-server="socks5://$PROXY"'' - ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' - "--no-first-run" - "--new-window" - "--incognito" - "http://cache.nixos.org/" - ]; + default = concatStringsSep " " [ + ''${pkgs.chromium}/bin/chromium'' + ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' + ''--proxy-server="socks5://$PROXY"'' + ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' + ''--no-first-run'' + ''--new-window'' + ''--incognito'' + ''-no-default-browser-check'' + ''http://cache.nixos.org/'' + ]; description = '' The shell (/bin/sh) command executed once the proxy starts. When browser exits, the proxy exits. An extra env var PROXY is available. @@ -81,42 +82,45 @@ in config = mkIf cfg.enable { - programs.captive-browser.dhcp-dns = mkOptionDefault ( - if config.networking.networkmanager.enable then - "${pkgs.networkmanager}/bin/nmcli dev show ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" - else if config.networking.dhcpcd.enable then - "${pkgs.dhcpcd}/bin/dhcpcd -U ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" - else if config.networking.useNetworkd then - "${cfg.package}/bin/systemd-networkd-dns ${escapeShellArg cfg.interface}" - else - "${config.security.wrapperDir}/udhcpc --quit --now -f -i ${escapeShellArg cfg.interface} -O dns --script ${ - pkgs.writeScript "udhcp-script" '' - #!/bin/sh - if [ "$1" = bound ]; then - echo "$dns" - fi - ''}" - ); + programs.captive-browser.dhcp-dns = + let + iface = prefix: + optionalString cfg.bindInterface (concatStringsSep " " (map escapeShellArg [ prefix cfg.interface ])); + in + mkOptionDefault ( + if config.networking.networkmanager.enable then + "${pkgs.networkmanager}/bin/nmcli dev show ${iface ""} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" + else if config.networking.dhcpcd.enable then + "${pkgs.dhcpcd}/bin/dhcpcd ${iface "-U"} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" + else if config.networking.useNetworkd then + "${cfg.package}/bin/systemd-networkd-dns ${iface ""}" + else + "${config.security.wrapperDir}/udhcpc --quit --now -f ${iface "-i"} -O dns --script ${ + pkgs.writeShellScript "udhcp-script" '' + if [ "$1" = bound ]; then + echo "$dns" + fi + ''}" + ); security.wrappers.udhcpc = { - capabilities = "cap_net_raw+p"; - source = "${pkgs.busybox}/bin/udhcpc"; + capabilities = "cap_net_raw+p"; + source = "${pkgs.busybox}/bin/udhcpc"; }; security.wrappers.captive-browser = { - capabilities = "cap_net_raw+p"; - source = pkgs.writeScript "captive-browser" '' - #!${pkgs.bash}/bin/bash - export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' - browser = """${cfg.browser}""" - dhcp-dns = """${cfg.dhcp-dns}""" - socks5-addr = """${cfg.socks5-addr}""" - ${optionalString cfg.bindInterface '' - bind-device = """${cfg.interface}""" - ''} - ''} - exec ${cfg.package}/bin/captive-browser - ''; + capabilities = "cap_net_raw+p"; + source = pkgs.writeShellScript "captive-browser" '' + export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' + browser = """${cfg.browser}""" + dhcp-dns = """${cfg.dhcp-dns}""" + socks5-addr = """${cfg.socks5-addr}""" + ${optionalString cfg.bindInterface '' + bind-device = """${cfg.interface}""" + ''} + ''} + exec ${cfg.package}/bin/captive-browser + ''; }; }; } diff --git a/nixpkgs/nixos/modules/programs/cdemu.nix b/nixpkgs/nixos/modules/programs/cdemu.nix index a59cd93cadfc..142e29342405 100644 --- a/nixpkgs/nixos/modules/programs/cdemu.nix +++ b/nixpkgs/nixos/modules/programs/cdemu.nix @@ -16,18 +16,21 @@ in { ''; }; group = mkOption { + type = types.str; default = "cdrom"; description = '' Group that users must be in to use <command>cdemu</command>. ''; }; gui = mkOption { + type = types.bool; default = true; description = '' Whether to install the <command>cdemu</command> GUI (gCDEmu). ''; }; image-analyzer = mkOption { + type = types.bool; default = true; description = '' Whether to install the image analyzer. diff --git a/nixpkgs/nixos/modules/programs/venus.nix b/nixpkgs/nixos/modules/programs/venus.nix deleted file mode 100644 index 58faf38777d0..000000000000 --- a/nixpkgs/nixos/modules/programs/venus.nix +++ /dev/null @@ -1,173 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -let - cfg = config.services.venus; - - configFile = pkgs.writeText "venus.ini" - '' - [Planet] - name = ${cfg.name} - link = ${cfg.link} - owner_name = ${cfg.ownerName} - owner_email = ${cfg.ownerEmail} - output_theme = ${cfg.cacheDirectory}/theme - output_dir = ${cfg.outputDirectory} - cache_directory = ${cfg.cacheDirectory} - items_per_page = ${toString cfg.itemsPerPage} - ${(concatStringsSep "\n\n" - (map ({ name, feedUrl, homepageUrl }: - '' - [${feedUrl}] - name = ${name} - link = ${homepageUrl} - '') cfg.feeds))} - ''; - -in -{ - - options = { - services.venus = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Planet Venus is an awesome ‘river of news’ feed reader. It downloads - news feeds published by web sites and aggregates their content - together into a single combined feed, latest news first. - ''; - }; - - dates = mkOption { - default = "*:0/15"; - type = types.str; - description = '' - Specification (in the format described by - <citerefentry><refentrytitle>systemd.time</refentrytitle> - <manvolnum>7</manvolnum></citerefentry>) of the time at - which the Venus will collect feeds. - ''; - }; - - user = mkOption { - default = "root"; - type = types.str; - description = '' - User for running venus script. - ''; - }; - - group = mkOption { - default = "root"; - type = types.str; - description = '' - Group for running venus script. - ''; - }; - - name = mkOption { - default = "NixOS Planet"; - type = types.str; - description = '' - Your planet's name. - ''; - }; - - link = mkOption { - default = "https://planet.nixos.org"; - type = types.str; - description = '' - Link to the main page. - ''; - }; - - ownerName = mkOption { - default = "Rok Garbas"; - type = types.str; - description = '' - Your name. - ''; - }; - - ownerEmail = mkOption { - default = "some@example.com"; - type = types.str; - description = '' - Your e-mail address. - ''; - }; - - outputTheme = mkOption { - default = "${pkgs.venus}/themes/classic_fancy"; - type = types.path; - description = '' - Directory containing a config.ini file which is merged with this one. - This is typically used to specify templating and bill of material - information. - ''; - }; - - outputDirectory = mkOption { - type = types.path; - description = '' - Directory to place output files. - ''; - }; - - cacheDirectory = mkOption { - default = "/var/cache/venus"; - type = types.path; - description = '' - Where cached feeds are stored. - ''; - }; - - itemsPerPage = mkOption { - default = 15; - type = types.int; - description = '' - How many items to put on each page. - ''; - }; - - feeds = mkOption { - default = []; - example = [ - { - name = "Rok Garbas"; - feedUrl= "http://url/to/rss/feed.xml"; - homepageUrl = "http://garbas.si"; - } - ]; - description = '' - List of feeds. - ''; - }; - - }; - }; - - config = mkIf cfg.enable { - - system.activationScripts.venus = - '' - mkdir -p ${cfg.outputDirectory} - chown ${cfg.user}:${cfg.group} ${cfg.outputDirectory} -R - rm -rf ${cfg.cacheDirectory}/theme - mkdir -p ${cfg.cacheDirectory}/theme - cp -R ${cfg.outputTheme}/* ${cfg.cacheDirectory}/theme - chown ${cfg.user}:${cfg.group} ${cfg.cacheDirectory} -R - ''; - - systemd.services.venus = - { description = "Planet Venus Feed Reader"; - path = [ pkgs.venus ]; - script = "exec venus-planet ${configFile}"; - serviceConfig.User = "${cfg.user}"; - serviceConfig.Group = "${cfg.group}"; - startAt = cfg.dates; - }; - - }; -} diff --git a/nixpkgs/nixos/modules/rename.nix b/nixpkgs/nixos/modules/rename.nix index c6f705bb2d6c..2d07e421efe4 100644 --- a/nixpkgs/nixos/modules/rename.nix +++ b/nixpkgs/nixos/modules/rename.nix @@ -70,6 +70,8 @@ with lib; '') (mkRemovedOptionModule [ "services" "seeks" ] "") + (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") # Do NOT add any option renames here, see top of the file ]; diff --git a/nixpkgs/nixos/modules/security/acme.nix b/nixpkgs/nixos/modules/security/acme.nix index 8e646ae1567e..c33a92580d4c 100644 --- a/nixpkgs/nixos/modules/security/acme.nix +++ b/nixpkgs/nixos/modules/security/acme.nix @@ -7,6 +7,11 @@ let numCerts = length (builtins.attrNames cfg.certs); _24hSecs = 60 * 60 * 24; + # Used to make unique paths for each cert/account config set + mkHash = with builtins; val: substring 0 20 (hashString "sha256" val); + mkAccountHash = acmeServer: data: mkHash "${toString acmeServer} ${data.keyType} ${data.email}"; + accountDirRoot = "/var/lib/acme/.lego/accounts/"; + # There are many services required to make cert renewals work. # They all follow a common structure: # - They inherit this commonServiceConfig @@ -19,7 +24,7 @@ let Type = "oneshot"; User = "acme"; Group = mkDefault "acme"; - UMask = 0027; + UMask = 0023; StateDirectoryMode = 750; ProtectSystem = "full"; PrivateTmp = true; @@ -54,23 +59,35 @@ let ''; }; - # Previously, all certs were owned by whatever user was configured in - # config.security.acme.certs.<cert>.user. Now everything is owned by and - # run by the acme user. - userMigrationService = { - description = "Fix owner and group of all ACME certificates"; - - script = with builtins; concatStringsSep "\n" (mapAttrsToList (cert: data: '' - for fixpath in /var/lib/acme/${escapeShellArg cert} /var/lib/acme/.lego/${escapeShellArg cert}; do + # Ensures that directories which are shared across all certs + # exist and have the correct user and group, since group + # is configurable on a per-cert basis. + userMigrationService = let + script = with builtins; '' + chown -R acme .lego/accounts + '' + (concatStringsSep "\n" (mapAttrsToList (cert: data: '' + for fixpath in ${escapeShellArg cert} .lego/${escapeShellArg cert}; do if [ -d "$fixpath" ]; then chmod -R u=rwX,g=rX,o= "$fixpath" chown -R acme:${data.group} "$fixpath" fi done - '') certConfigs); + '') certConfigs)); + in { + description = "Fix owner and group of all ACME certificates"; - # We don't want this to run every time a renewal happens - serviceConfig.RemainAfterExit = true; + serviceConfig = commonServiceConfig // { + # We don't want this to run every time a renewal happens + RemainAfterExit = true; + + # These StateDirectory entries negate the need for tmpfiles + StateDirectory = [ "acme" "acme/.lego" "acme/.lego/accounts" ]; + StateDirectoryMode = 755; + WorkingDirectory = "/var/lib/acme"; + + # Run the start script as root + ExecStart = "+" + (pkgs.writeShellScript "acme-fixperms" script); + }; }; certToConfig = cert: data: let @@ -101,11 +118,10 @@ let ${toString acmeServer} ${toString data.dnsProvider} ${toString data.ocspMustStaple} ${data.keyType} ''; - mkHash = with builtins; val: substring 0 20 (hashString "sha256" val); certDir = mkHash hashData; domainHash = mkHash "${concatStringsSep " " extraDomains} ${data.domain}"; - othersHash = mkHash "${toString acmeServer} ${data.keyType} ${data.email}"; - accountDir = "/var/lib/acme/.lego/accounts/" + othersHash; + accountHash = (mkAccountHash acmeServer data); + accountDir = accountDirRoot + accountHash; protocolOpts = if useDns then ( [ "--dns" data.dnsProvider ] @@ -142,9 +158,8 @@ let ); in { - inherit accountDir selfsignedDeps; + inherit accountHash cert selfsignedDeps; - webroot = data.webroot; group = data.group; renewTimer = { @@ -184,7 +199,10 @@ let StateDirectory = "acme/${cert}"; - BindPaths = "/var/lib/acme/.minica:/tmp/ca /var/lib/acme/${cert}:/tmp/${keyName}"; + BindPaths = [ + "/var/lib/acme/.minica:/tmp/ca" + "/var/lib/acme/${cert}:/tmp/${keyName}" + ]; }; # Working directory will be /tmp @@ -222,16 +240,22 @@ let serviceConfig = commonServiceConfig // { Group = data.group; - # AccountDir dir will be created by tmpfiles to ensure correct permissions - # And to avoid deletion during systemctl clean - # acme/.lego/${cert} is listed so that it is deleted during systemctl clean - StateDirectory = "acme/${cert} acme/.lego/${cert} acme/.lego/${cert}/${certDir}"; + # Keep in mind that these directories will be deleted if the user runs + # systemctl clean --what=state + # acme/.lego/${cert} is listed for this reason. + StateDirectory = [ + "acme/${cert}" + "acme/.lego/${cert}" + "acme/.lego/${cert}/${certDir}" + "acme/.lego/accounts/${accountHash}" + ]; # Needs to be space separated, but can't use a multiline string because that'll include newlines - BindPaths = - "${accountDir}:/tmp/accounts " + - "/var/lib/acme/${cert}:/tmp/out " + - "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates "; + BindPaths = [ + "${accountDir}:/tmp/accounts" + "/var/lib/acme/${cert}:/tmp/out" + "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates" + ]; # Only try loading the credentialsFile if the dns challenge is enabled EnvironmentFile = mkIf useDns data.credentialsFile; @@ -248,13 +272,18 @@ let # Working directory will be /tmp script = '' - set -euo pipefail + set -euxo pipefail + + ${optionalString (data.webroot != null) '' + # Ensure the webroot exists + mkdir -p '${data.webroot}/.well-known/acme-challenge' + chown 'acme:${data.group}' ${data.webroot}/{.well-known,.well-known/acme-challenge} + ''} echo '${domainHash}' > domainhash.txt # Check if we can renew - # Certificates and account credentials must exist - if [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' -a "$(ls -1 accounts)" ]; then + if [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' -a -n "$(ls -1 accounts)" ]; then # When domains are updated, there's no need to do a full # Lego run, but it's likely renew won't work if days is too low. @@ -317,7 +346,7 @@ let webroot = mkOption { type = types.nullOr types.str; default = null; - example = "/var/lib/acme/acme-challenges"; + example = "/var/lib/acme/acme-challenge"; description = '' Where the webroot of the HTTP vhost is located. <filename>.well-known/acme-challenge/</filename> directory @@ -550,12 +579,12 @@ in { example = literalExample '' { "example.com" = { - webroot = "/var/www/challenges/"; + webroot = "/var/lib/acme/acme-challenge/"; email = "foo@example.com"; extraDomainNames = [ "www.example.com" "foo.example.com" ]; }; "bar.example.com" = { - webroot = "/var/www/challenges/"; + webroot = "/var/lib/acme/acme-challenge/"; email = "bar@example.com"; }; } @@ -664,21 +693,33 @@ in { systemd.timers = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewTimer) certConfigs; - # .lego and .lego/accounts specified to fix any incorrect permissions - systemd.tmpfiles.rules = [ - "d /var/lib/acme/.lego - acme acme" - "d /var/lib/acme/.lego/accounts - acme acme" - ] ++ (unique (concatMap (conf: [ - "d ${conf.accountDir} - acme acme" - ] ++ (optional (conf.webroot != null) "d ${conf.webroot}/.well-known/acme-challenge - acme ${conf.group}") - ) (attrValues certConfigs))); - - # Create some targets which can be depended on to be "active" after cert renewals - systemd.targets = mapAttrs' (cert: conf: nameValuePair "acme-finished-${cert}" { - wantedBy = [ "default.target" ]; - requires = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; - after = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; - }) certConfigs; + systemd.targets = let + # Create some targets which can be depended on to be "active" after cert renewals + finishedTargets = mapAttrs' (cert: conf: nameValuePair "acme-finished-${cert}" { + wantedBy = [ "default.target" ]; + requires = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; + after = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; + }) certConfigs; + + # Create targets to limit the number of simultaneous account creations + # How it works: + # - Pick a "leader" cert service, which will be in charge of creating the account, + # and run first (requires + after) + # - Make all other cert services sharing the same account wait for the leader to + # finish before starting (requiredBy + before). + # Using a target here is fine - account creation is a one time event. Even if + # systemd clean --what=state is used to delete the account, so long as the user + # then runs one of the cert services, there won't be any issues. + accountTargets = mapAttrs' (hash: confs: let + leader = "acme-${(builtins.head confs).cert}.service"; + dependantServices = map (conf: "acme-${conf.cert}.service") (builtins.tail confs); + in nameValuePair "acme-account-${hash}" { + requiredBy = dependantServices; + before = dependantServices; + requires = [ leader ]; + after = [ leader ]; + }) (groupBy (conf: conf.accountHash) (attrValues certConfigs)); + in finishedTargets // accountTargets; }) ]; diff --git a/nixpkgs/nixos/modules/security/acme.xml b/nixpkgs/nixos/modules/security/acme.xml index f24811291728..a78ff05f2eaa 100644 --- a/nixpkgs/nixos/modules/security/acme.xml +++ b/nixpkgs/nixos/modules/security/acme.xml @@ -115,15 +115,18 @@ services.nginx = { <programlisting> <xref linkend="opt-security.acme.acceptTerms" /> = true; <xref linkend="opt-security.acme.email" /> = "admin+acme@example.com"; + +# /var/lib/acme/.challenges must be writable by the ACME user +# and readable by the Nginx user. The easiest way to achieve +# this is to add the Nginx user to the ACME group. +<link linkend="opt-users.users._name_.extraGroups">users.users.nginx.extraGroups</link> = [ "acme" ]; + services.nginx = { <link linkend="opt-services.nginx.enable">enable</link> = true; <link linkend="opt-services.nginx.virtualHosts">virtualHosts</link> = { "acmechallenge.example.com" = { # Catchall vhost, will redirect users to HTTPS for all vhosts <link linkend="opt-services.nginx.virtualHosts._name_.serverAliases">serverAliases</link> = [ "*.example.com" ]; - # /var/lib/acme/.challenges must be writable by the ACME user - # and readable by the Nginx user. - # By default, this is the case. locations."/.well-known/acme-challenge" = { <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.root">root</link> = "/var/lib/acme/.challenges"; }; @@ -134,6 +137,7 @@ services.nginx = { }; } # Alternative config for Apache +<link linkend="opt-users.users._name_.extraGroups">users.users.wwwrun.extraGroups</link> = [ "acme" ]; services.httpd = { <link linkend="opt-services.httpd.enable">enable = true;</link> <link linkend="opt-services.httpd.virtualHosts">virtualHosts</link> = { @@ -162,6 +166,9 @@ services.httpd = { <xref linkend="opt-security.acme.certs"/>."foo.example.com" = { <link linkend="opt-security.acme.certs._name_.webroot">webroot</link> = "/var/lib/acme/.challenges"; <link linkend="opt-security.acme.certs._name_.email">email</link> = "foo@example.com"; + # Ensure that the web server you use can read the generated certs + # Take a look at the <link linkend="opt-services.nginx.group">group</link> option for the web server you choose. + <link linkend="opt-security.acme.certs._name_.group">group</link> = "nginx"; # Since we have a wildcard vhost to handle port 80, # we can generate certs for anything! # Just make sure your DNS resolves them. @@ -257,10 +264,11 @@ chmod 400 /var/lib/secrets/certs.secret <para> Should you need to regenerate a particular certificate in a hurry, such as when a vulnerability is found in Let's Encrypt, there is now a convenient - mechanism for doing so. Running <literal>systemctl clean acme-example.com.service</literal> - will remove all certificate files for the given domain, allowing you to then - <literal>systemctl start acme-example.com.service</literal> to generate fresh - ones. + mechanism for doing so. Running + <literal>systemctl clean --what=state acme-example.com.service</literal> + will remove all certificate files and the account data for the given domain, + allowing you to then <literal>systemctl start acme-example.com.service</literal> + to generate fresh ones. </para> </section> <section xml:id="module-security-acme-fix-jws"> diff --git a/nixpkgs/nixos/modules/security/wrappers/default.nix b/nixpkgs/nixos/modules/security/wrappers/default.nix index de6213714ac3..3cbf22fea7a9 100644 --- a/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/nixpkgs/nixos/modules/security/wrappers/default.nix @@ -10,16 +10,8 @@ let (n: v: (if v ? program then v else v // {program=n;})) wrappers); - securityWrapper = pkgs.stdenv.mkDerivation { - name = "security-wrapper"; - phases = [ "installPhase" "fixupPhase" ]; - buildInputs = [ pkgs.libcap pkgs.libcap_ng pkgs.linuxHeaders ]; - hardeningEnable = [ "pie" ]; - installPhase = '' - mkdir -p $out/bin - $CC -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \ - -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper - ''; + securityWrapper = pkgs.callPackage ./wrapper.nix { + inherit parentWrapperDir; }; ###### Activation script for the setcap wrappers diff --git a/nixpkgs/nixos/modules/security/wrappers/wrapper.c b/nixpkgs/nixos/modules/security/wrappers/wrapper.c index 494e9e93ac22..529669facda8 100644 --- a/nixpkgs/nixos/modules/security/wrappers/wrapper.c +++ b/nixpkgs/nixos/modules/security/wrappers/wrapper.c @@ -4,15 +4,17 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/xattr.h> #include <fcntl.h> #include <dirent.h> #include <assert.h> #include <errno.h> #include <linux/capability.h> -#include <sys/capability.h> #include <sys/prctl.h> #include <limits.h> -#include <cap-ng.h> +#include <stdint.h> +#include <syscall.h> +#include <byteswap.h> // Make sure assertions are not compiled out, we use them to codify // invariants about this program and we want it to fail fast and @@ -23,182 +25,172 @@ extern char **environ; // The WRAPPER_DIR macro is supplied at compile time so that it cannot // be changed at runtime -static char * wrapperDir = WRAPPER_DIR; +static char *wrapper_dir = WRAPPER_DIR; // Wrapper debug variable name -static char * wrapperDebug = "WRAPPER_DEBUG"; - -// Update the capabilities of the running process to include the given -// capability in the Ambient set. -static void set_ambient_cap(cap_value_t cap) -{ - capng_get_caps_process(); - - if (capng_update(CAPNG_ADD, CAPNG_INHERITABLE, (unsigned long) cap)) - { - perror("cannot raise the capability into the Inheritable set\n"); - exit(1); +static char *wrapper_debug = "WRAPPER_DEBUG"; + +#define CAP_SETPCAP 8 + +#if __BYTE_ORDER == __BIG_ENDIAN +#define LE32_TO_H(x) bswap_32(x) +#else +#define LE32_TO_H(x) (x) +#endif + +int get_last_cap(unsigned *last_cap) { + FILE* file = fopen("/proc/sys/kernel/cap_last_cap", "r"); + if (file == NULL) { + int saved_errno = errno; + fprintf(stderr, "failed to open /proc/sys/kernel/cap_last_cap: %s\n", strerror(errno)); + return -saved_errno; } - - capng_apply(CAPNG_SELECT_CAPS); - - if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, (unsigned long) cap, 0, 0)) - { - perror("cannot raise the capability into the Ambient set\n"); - exit(1); + int res = fscanf(file, "%u", last_cap); + if (res == EOF) { + int saved_errno = errno; + fprintf(stderr, "could not read number from /proc/sys/kernel/cap_last_cap: %s\n", strerror(errno)); + return -saved_errno; } + fclose(file); + return 0; } // Given the path to this program, fetch its configured capability set // (as set by `setcap ... /path/to/file`) and raise those capabilities // into the Ambient set. -static int make_caps_ambient(const char *selfPath) -{ - cap_t caps = cap_get_file(selfPath); +static int make_caps_ambient(const char *self_path) { + struct vfs_ns_cap_data data = {}; + int r = getxattr(self_path, "security.capability", &data, sizeof(data)); + + if (r < 0) { + if (errno == ENODATA) { + // no capabilities set + return 0; + } + fprintf(stderr, "cannot get capabilities for %s: %s", self_path, strerror(errno)); + return 1; + } - if(!caps) - { - if(getenv(wrapperDebug)) - fprintf(stderr, "no caps set or could not retrieve the caps for this file, not doing anything..."); + size_t size; + uint32_t version = LE32_TO_H(data.magic_etc) & VFS_CAP_REVISION_MASK; + switch (version) { + case VFS_CAP_REVISION_1: + size = VFS_CAP_U32_1; + break; + case VFS_CAP_REVISION_2: + case VFS_CAP_REVISION_3: + size = VFS_CAP_U32_3; + break; + default: + fprintf(stderr, "BUG! Unsupported capability version 0x%x on %s. Report to NixOS bugtracker\n", version, self_path); + return 1; + } - return 1; + const struct __user_cap_header_struct header = { + .version = _LINUX_CAPABILITY_VERSION_3, + .pid = getpid(), + }; + struct __user_cap_data_struct user_data[2] = {}; + + for (size_t i = 0; i < size; i++) { + // merge inheritable & permitted into one + user_data[i].permitted = user_data[i].inheritable = + LE32_TO_H(data.data[i].inheritable) | LE32_TO_H(data.data[i].permitted); } - // We use `cap_to_text` and iteration over the tokenized result - // string because, as of libcap's current release, there is no - // facility for retrieving an array of `cap_value_t`'s that can be - // given to `prctl` in order to lift that capability into the - // Ambient set. - // - // Some discussion was had around shot-gunning all of the - // capabilities we know about into the Ambient set but that has a - // security smell and I deemed the risk of the current - // implementation crashing the program to be lower than the risk - // of a privilege escalation security hole being introduced by - // raising all capabilities, even ones we didn't intend for the - // program, into the Ambient set. - // - // `cap_t` which is returned by `cap_get_*` is an opaque type and - // even if we could retrieve the bitmasks (which, as far as I can - // tell we cannot) in order to get the `cap_value_t` - // representation for each capability we would have to take the - // total number of capabilities supported and iterate over the - // sequence of integers up-to that maximum total, testing each one - // against the bitmask ((bitmask >> n) & 1) to see if it's set and - // aggregating each "capability integer n" that is set in the - // bitmask. - // - // That, combined with the fact that we can't easily get the - // bitmask anyway seemed much more brittle than fetching the - // `cap_t`, transforming it into a textual representation, - // tokenizing the string, and using `cap_from_name` on the token - // to get the `cap_value_t` that we need for `prctl`. There is - // indeed risk involved if the output string format of - // `cap_to_text` ever changes but at this time the combination of - // factors involving the below list have led me to the conclusion - // that the best implementation at this time is reading then - // parsing with *lots of documentation* about why we're doing it - // this way. - // - // 1. No explicit API for fetching an array of `cap_value_t`'s or - // for transforming a `cap_t` into such a representation - // 2. The risk of a crash is lower than lifting all capabilities - // into the Ambient set - // 3. libcap is depended on heavily in the Linux ecosystem so - // there is a high chance that the output representation of - // `cap_to_text` will not change which reduces our risk that - // this parsing step will cause a crash - // - // The preferred method, should it ever be available in the - // future, would be to use libcap API's to transform the result - // from a `cap_get_*` into an array of `cap_value_t`'s that can - // then be given to prctl. - // - // - Parnell - ssize_t capLen; - char* capstr = cap_to_text(caps, &capLen); - cap_free(caps); - - // TODO: For now, we assume that cap_to_text always starts its - // result string with " =" and that the first capability is listed - // immediately after that. We should verify this. - assert(capLen >= 2); - capstr += 2; - - char* saveptr = NULL; - for(char* tok = strtok_r(capstr, ",", &saveptr); tok; tok = strtok_r(NULL, ",", &saveptr)) - { - cap_value_t capnum; - if (cap_from_name(tok, &capnum)) - { - if(getenv(wrapperDebug)) - fprintf(stderr, "cap_from_name failed, skipping: %s", tok); - } - else if (capnum == CAP_SETPCAP) - { - // Check for the cap_setpcap capability, we set this on the - // wrapper so it can elevate the capabilities to the Ambient - // set but we do not want to propagate it down into the - // wrapped program. - // - // TODO: what happens if that's the behavior you want - // though???? I'm preferring a strict vs. loose policy here. - if(getenv(wrapperDebug)) - fprintf(stderr, "cap_setpcap in set, skipping it\n"); - } - else - { - set_ambient_cap(capnum); - - if(getenv(wrapperDebug)) - fprintf(stderr, "raised %s into the Ambient capability set\n", tok); - } + if (syscall(SYS_capset, &header, &user_data) < 0) { + fprintf(stderr, "failed to inherit capabilities: %s", strerror(errno)); + return 1; + } + unsigned last_cap; + r = get_last_cap(&last_cap); + if (r < 0) { + return 1; + } + uint64_t set = user_data[0].permitted | (uint64_t)user_data[1].permitted << 32; + for (unsigned cap = 0; cap < last_cap; cap++) { + if (!(set & (1ULL << cap))) { + continue; + } + + // Check for the cap_setpcap capability, we set this on the + // wrapper so it can elevate the capabilities to the Ambient + // set but we do not want to propagate it down into the + // wrapped program. + // + // TODO: what happens if that's the behavior you want + // though???? I'm preferring a strict vs. loose policy here. + if (cap == CAP_SETPCAP) { + if(getenv(wrapper_debug)) { + fprintf(stderr, "cap_setpcap in set, skipping it\n"); + } + continue; + } + if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, (unsigned long) cap, 0, 0)) { + fprintf(stderr, "cannot raise the capability %d into the ambient set: %s\n", cap, strerror(errno)); + return 1; + } + if (getenv(wrapper_debug)) { + fprintf(stderr, "raised %d into the ambient capability set\n", cap); + } } - cap_free(capstr); return 0; } -int main(int argc, char * * argv) -{ - // I *think* it's safe to assume that a path from a symbolic link - // should safely fit within the PATH_MAX system limit. Though I'm - // not positive it's safe... - char selfPath[PATH_MAX]; - int selfPathSize = readlink("/proc/self/exe", selfPath, sizeof(selfPath)); - - assert(selfPathSize > 0); - - // Assert we have room for the zero byte, this ensures the path - // isn't being truncated because it's too big for the buffer. - // - // A better way to handle this might be to use something like the - // whereami library (https://github.com/gpakosz/whereami) or a - // loop that resizes the buffer and re-reads the link if the - // contents are being truncated. - assert(selfPathSize < sizeof(selfPath)); +int readlink_malloc(const char *p, char **ret) { + size_t l = FILENAME_MAX+1; + int r; + + for (;;) { + char *c = calloc(l, sizeof(char)); + if (!c) { + return -ENOMEM; + } + + ssize_t n = readlink(p, c, l-1); + if (n < 0) { + r = -errno; + free(c); + return r; + } + + if ((size_t) n < l-1) { + c[n] = 0; + *ret = c; + return 0; + } + + free(c); + l *= 2; + } +} - // Set the zero byte since readlink doesn't do that for us. - selfPath[selfPathSize] = '\0'; +int main(int argc, char **argv) { + char *self_path = NULL; + int self_path_size = readlink_malloc("/proc/self/exe", &self_path); + if (self_path_size < 0) { + fprintf(stderr, "cannot readlink /proc/self/exe: %s", strerror(-self_path_size)); + } // Make sure that we are being executed from the right location, - // i.e., `safeWrapperDir'. This is to prevent someone from creating + // i.e., `safe_wrapper_dir'. This is to prevent someone from creating // hard link `X' from some other location, along with a false // `X.real' file, to allow arbitrary programs from being executed // with elevated capabilities. - int len = strlen(wrapperDir); - if (len > 0 && '/' == wrapperDir[len - 1]) + int len = strlen(wrapper_dir); + if (len > 0 && '/' == wrapper_dir[len - 1]) --len; - assert(!strncmp(selfPath, wrapperDir, len)); - assert('/' == wrapperDir[0]); - assert('/' == selfPath[len]); + assert(!strncmp(self_path, wrapper_dir, len)); + assert('/' == wrapper_dir[0]); + assert('/' == self_path[len]); // Make *really* *really* sure that we were executed as - // `selfPath', and not, say, as some other setuid program. That + // `self_path', and not, say, as some other setuid program. That // is, our effective uid/gid should match the uid/gid of - // `selfPath'. + // `self_path'. struct stat st; - assert(lstat(selfPath, &st) != -1); + assert(lstat(self_path, &st) != -1); assert(!(st.st_mode & S_ISUID) || (st.st_uid == geteuid())); assert(!(st.st_mode & S_ISGID) || (st.st_gid == getegid())); @@ -207,33 +199,35 @@ int main(int argc, char * * argv) assert(!(st.st_mode & (S_IWGRP | S_IWOTH))); // Read the path of the real (wrapped) program from <self>.real. - char realFN[PATH_MAX + 10]; - int realFNSize = snprintf (realFN, sizeof(realFN), "%s.real", selfPath); - assert (realFNSize < sizeof(realFN)); + char real_fn[PATH_MAX + 10]; + int real_fn_size = snprintf(real_fn, sizeof(real_fn), "%s.real", self_path); + assert(real_fn_size < sizeof(real_fn)); - int fdSelf = open(realFN, O_RDONLY); - assert (fdSelf != -1); + int fd_self = open(real_fn, O_RDONLY); + assert(fd_self != -1); - char sourceProg[PATH_MAX]; - len = read(fdSelf, sourceProg, PATH_MAX); - assert (len != -1); - assert (len < sizeof(sourceProg)); - assert (len > 0); - sourceProg[len] = 0; + char source_prog[PATH_MAX]; + len = read(fd_self, source_prog, PATH_MAX); + assert(len != -1); + assert(len < sizeof(source_prog)); + assert(len > 0); + source_prog[len] = 0; - close(fdSelf); + close(fd_self); // Read the capabilities set on the wrapper and raise them in to - // the Ambient set so the program we're wrapping receives the + // the ambient set so the program we're wrapping receives the // capabilities too! - make_caps_ambient(selfPath); + if (make_caps_ambient(self_path) != 0) { + free(self_path); + return 1; + } + free(self_path); - execve(sourceProg, argv, environ); + execve(source_prog, argv, environ); fprintf(stderr, "%s: cannot run `%s': %s\n", - argv[0], sourceProg, strerror(errno)); + argv[0], source_prog, strerror(errno)); - exit(1); + return 1; } - - diff --git a/nixpkgs/nixos/modules/security/wrappers/wrapper.nix b/nixpkgs/nixos/modules/security/wrappers/wrapper.nix new file mode 100644 index 000000000000..e3620fb222d2 --- /dev/null +++ b/nixpkgs/nixos/modules/security/wrappers/wrapper.nix @@ -0,0 +1,21 @@ +{ stdenv, linuxHeaders, parentWrapperDir, debug ? false }: +# For testing: +# $ nix-build -E 'with import <nixpkgs> {}; pkgs.callPackage ./wrapper.nix { parentWrapperDir = "/run/wrappers"; debug = true; }' +stdenv.mkDerivation { + name = "security-wrapper"; + buildInputs = [ linuxHeaders ]; + dontUnpack = true; + hardeningEnable = [ "pie" ]; + CFLAGS = [ + ''-DWRAPPER_DIR="${parentWrapperDir}"'' + ] ++ (if debug then [ + "-Werror" "-Og" "-g" + ] else [ + "-Wall" "-O2" + ]); + dontStrip = debug; + installPhase = '' + mkdir -p $out/bin + $CC $CFLAGS ${./wrapper.c} -o $out/bin/security-wrapper + ''; +} diff --git a/nixpkgs/nixos/modules/services/audio/alsa.nix b/nixpkgs/nixos/modules/services/audio/alsa.nix index 3fe76a165401..aff3fe2ba42d 100644 --- a/nixpkgs/nixos/modules/services/audio/alsa.nix +++ b/nixpkgs/nixos/modules/services/audio/alsa.nix @@ -32,7 +32,7 @@ in enableOSSEmulation = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether to enable ALSA OSS emulation (with certain cards sound mixing may not work!). ''; diff --git a/nixpkgs/nixos/modules/services/audio/snapserver.nix b/nixpkgs/nixos/modules/services/audio/snapserver.nix index f614f0ba3e10..a261b8760780 100644 --- a/nixpkgs/nixos/modules/services/audio/snapserver.nix +++ b/nixpkgs/nixos/modules/services/audio/snapserver.nix @@ -48,8 +48,8 @@ let ++ [ "--stream.port ${toString cfg.port}" ] ++ optionalNull cfg.sampleFormat "--stream.sampleformat ${cfg.sampleFormat}" ++ optionalNull cfg.codec "--stream.codec ${cfg.codec}" - ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${cfg.streamBuffer}" - ++ optionalNull cfg.buffer "--stream.buffer ${cfg.buffer}" + ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${toString cfg.streamBuffer}" + ++ optionalNull cfg.buffer "--stream.buffer ${toString cfg.buffer}" ++ optional cfg.sendToMuted "--stream.send_to_muted" # tcp json rpc ++ [ "--tcp.enabled ${toString cfg.tcp.enable}" ] @@ -198,13 +198,14 @@ in { type = with types; attrsOf (submodule { options = { location = mkOption { - type = types.path; + type = types.oneOf [ types.path types.str ]; description = '' - The location of the pipe. + The location of the pipe, file, Librespot/Airplay/process binary, or a TCP address. + Use an empty string for alsa. ''; }; type = mkOption { - type = types.enum [ "pipe" "file" "process" "spotify" "airplay" ]; + type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" ]; default = "pipe"; description = '' The type of input stream. @@ -219,13 +220,21 @@ in { example = literalExample '' # for type == "pipe": { - mode = "listen"; + mode = "create"; }; # for type == "process": { params = "--param1 --param2"; logStderr = "true"; }; + # for type == "tcp": + { + mode = "client"; + } + # for type == "alsa": + { + device = "hw:0,0"; + } ''; }; inherit sampleFormat; @@ -255,6 +264,11 @@ in { config = mkIf cfg.enable { + # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85 + warnings = filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then '' + services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead. + '' else "") cfg.streams); + systemd.services.snapserver = { after = [ "network.target" ]; description = "Snapserver"; @@ -272,7 +286,7 @@ in { ProtectKernelTunables = true; ProtectControlGroups = true; ProtectKernelModules = true; - RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX"; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK"; RestrictNamespaces = true; RuntimeDirectory = name; StateDirectory = name; diff --git a/nixpkgs/nixos/modules/services/backup/bacula.nix b/nixpkgs/nixos/modules/services/backup/bacula.nix index b485602aab8c..cc8b77cbfbe8 100644 --- a/nixpkgs/nixos/modules/services/backup/bacula.nix +++ b/nixpkgs/nixos/modules/services/backup/bacula.nix @@ -1,5 +1,6 @@ { config, lib, pkgs, ... }: + # TODO: test configuration when building nixexpr (use -t parameter) # TODO: support sqlite3 (it's deprecate?) and mysql @@ -111,6 +112,7 @@ let { options = { password = mkOption { + type = types.str; # TODO: required? description = '' Specifies the password that must be supplied for the default Bacula @@ -130,6 +132,7 @@ let }; monitor = mkOption { + type = types.enum [ "no" "yes" ]; default = "no"; example = "yes"; description = '' @@ -150,6 +153,7 @@ let { options = { changerDevice = mkOption { + type = types.str; description = '' The specified name-string must be the generic SCSI device name of the autochanger that corresponds to the normal read/write Archive Device @@ -168,6 +172,7 @@ let }; changerCommand = mkOption { + type = types.str; description = '' The name-string specifies an external program to be called that will automatically change volumes as required by Bacula. Normally, this @@ -191,10 +196,12 @@ let devices = mkOption { description = ""; + type = types.listOf types.str; }; extraAutochangerConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Autochanger directive. ''; @@ -211,6 +218,7 @@ let options = { archiveDevice = mkOption { # TODO: required? + type = types.str; description = '' The specified name-string gives the system file name of the storage device managed by this storage daemon. This will usually be the @@ -227,6 +235,7 @@ let mediaType = mkOption { # TODO: required? + type = types.str; description = '' The specified name-string names the type of media supported by this device, for example, <literal>DLT7000</literal>. Media type names are @@ -264,6 +273,7 @@ let extraDeviceConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Device directive. ''; @@ -292,6 +302,7 @@ in { name = mkOption { default = "${config.networking.hostName}-fd"; + type = types.str; description = '' The client name that must be used by the Director when connecting. Generally, it is a good idea to use a name related to the machine so @@ -320,6 +331,7 @@ in { extraClientConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Client directive. ''; @@ -331,6 +343,7 @@ in { extraMessagesConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Messages directive. ''; @@ -351,6 +364,7 @@ in { name = mkOption { default = "${config.networking.hostName}-sd"; + type = types.str; description = '' Specifies the Name of the Storage daemon. ''; @@ -391,6 +405,7 @@ in { extraStorageConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Storage directive. ''; @@ -402,6 +417,7 @@ in { extraMessagesConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Messages directive. ''; @@ -423,6 +439,7 @@ in { name = mkOption { default = "${config.networking.hostName}-dir"; + type = types.str; description = '' The director name used by the system administrator. This directive is required. @@ -444,6 +461,7 @@ in { password = mkOption { # TODO: required? + type = types.str; description = '' Specifies the password that must be supplied for a Director. ''; @@ -451,6 +469,7 @@ in { extraMessagesConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Messages directive. ''; @@ -461,6 +480,7 @@ in { extraDirectorConfig = mkOption { default = ""; + type = types.lines; description = '' Extra configuration to be passed in Director directive. ''; diff --git a/nixpkgs/nixos/modules/services/backup/mysql-backup.nix b/nixpkgs/nixos/modules/services/backup/mysql-backup.nix index 31d606b141a8..506ded5e9e8c 100644 --- a/nixpkgs/nixos/modules/services/backup/mysql-backup.nix +++ b/nixpkgs/nixos/modules/services/backup/mysql-backup.nix @@ -48,6 +48,7 @@ in }; user = mkOption { + type = types.str; default = defaultUser; description = '' User to be used to perform backup. @@ -56,12 +57,14 @@ in databases = mkOption { default = []; + type = types.listOf types.str; description = '' List of database names to dump. ''; }; location = mkOption { + type = types.path; default = "/var/backup/mysql"; description = '' Location to put the gzipped MySQL database dumps. @@ -70,6 +73,7 @@ in singleTransaction = mkOption { default = false; + type = types.bool; description = '' Whether to create database dump in a single transaction ''; diff --git a/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix b/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix index 428861a7598a..f4bd3aa447e5 100644 --- a/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix @@ -48,6 +48,7 @@ in { startAt = mkOption { default = "*-*-* 01:15:00"; + type = types.str; description = '' This option defines (see <literal>systemd.time</literal> for format) when the databases should be dumped. @@ -70,6 +71,7 @@ in { databases = mkOption { default = []; + type = types.listOf types.str; description = '' List of database names to dump. ''; @@ -77,6 +79,7 @@ in { location = mkOption { default = "/var/backup/postgresql"; + type = types.path; description = '' Location to put the gzipped PostgreSQL database dumps. ''; diff --git a/nixpkgs/nixos/modules/services/backup/restic.nix b/nixpkgs/nixos/modules/services/backup/restic.nix index d869835bf07e..573f0efa9da4 100644 --- a/nixpkgs/nixos/modules/services/backup/restic.nix +++ b/nixpkgs/nixos/modules/services/backup/restic.nix @@ -243,9 +243,11 @@ in restartIfChanged = false; serviceConfig = { Type = "oneshot"; - ExecStart = [ "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ] ++ pruneCmd; + ExecStart = [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ] ++ pruneCmd; User = backup.user; RuntimeDirectory = "restic-backups-${name}"; + CacheDirectory = "restic-backups-${name}"; + CacheDirectoryMode = "0700"; } // optionalAttrs (backup.s3CredentialsFile != null) { EnvironmentFile = backup.s3CredentialsFile; }; diff --git a/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix b/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix index 171d4aced651..41ac46e538e3 100644 --- a/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix @@ -7,6 +7,7 @@ with lib; options.services.hadoop = { coreSite = mkOption { default = {}; + type = types.attrsOf types.anything; example = literalExample '' { "fs.defaultFS" = "hdfs://localhost"; @@ -17,6 +18,7 @@ with lib; hdfsSite = mkOption { default = {}; + type = types.attrsOf types.anything; example = literalExample '' { "dfs.nameservices" = "namenode1"; @@ -27,6 +29,7 @@ with lib; mapredSite = mkOption { default = {}; + type = types.attrsOf types.anything; example = literalExample '' { "mapreduce.map.cpu.vcores" = "1"; @@ -37,6 +40,7 @@ with lib; yarnSite = mkOption { default = {}; + type = types.attrsOf types.anything; example = literalExample '' { "yarn.resourcemanager.ha.id" = "resourcemanager1"; diff --git a/nixpkgs/nixos/modules/services/cluster/k3s/default.nix b/nixpkgs/nixos/modules/services/cluster/k3s/default.nix index f0317fdbd160..e62fbc94415c 100644 --- a/nixpkgs/nixos/modules/services/cluster/k3s/default.nix +++ b/nixpkgs/nixos/modules/services/cluster/k3s/default.nix @@ -47,6 +47,7 @@ in extraFlags = mkOption { description = "Extra flags to pass to the k3s command."; + type = types.str; default = ""; example = "--no-deploy traefik --cluster-cidr 10.24.0.0/16"; }; diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index 2b6e45ba1b90..479027f1b270 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -241,7 +241,17 @@ in description = "Kubernetes Kubelet Service"; wantedBy = [ "kubernetes.target" ]; after = [ "network.target" "docker.service" "kube-apiserver.service" ]; - path = with pkgs; [ gitMinimal openssh docker util-linux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path; + path = with pkgs; [ + gitMinimal + openssh + docker + util-linux + iproute + ethtool + thin-provisioning-tools + iptables + socat + ] ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package ++ top.path; preStart = '' ${concatMapStrings (img: '' echo "Seeding docker image: ${img}" diff --git a/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix index d30d94c53cc3..a49f5f8100dc 100644 --- a/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -223,7 +223,7 @@ in { }; pythonPackages = mkOption { - type = types.listOf types.package; + type = types.functionTo (types.listOf types.package); default = pythonPackages: with pythonPackages; [ ]; defaultText = "pythonPackages: with pythonPackages; [ ]"; description = "Packages to add the to the PYTHONPATH of the buildbot process."; @@ -283,5 +283,5 @@ in { '') ]; - meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; + meta.maintainers = with lib.maintainers; [ nand0p mic92 lopsided98 ]; } diff --git a/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix index c358a5db77c2..2c6d9530a6b8 100644 --- a/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -66,10 +66,10 @@ let ++ optional service.debugTraceDisabled "--debug-trace-disabled" ++ map (e: "--env ${escapeShellArg e}") (mapAttrsToList (name: value: "${name}=${value}") service.environmentVariables) - ++ optionals (service.executor == "docker") ( + ++ optionals (hasPrefix "docker" service.executor) ( assert ( assertMsg (service.dockerImage != null) - "dockerImage option is required for docker executor (${name})"); + "dockerImage option is required for ${service.executor} executor (${name})"); [ "--docker-image ${service.dockerImage}" ] ++ optional service.dockerDisableCache "--docker-disable-cache" diff --git a/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 2e9e1c94857a..8cae08bf1fa0 100644 --- a/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -90,6 +90,7 @@ in { }; startupOptions = mkOption { + type = types.listOf types.str; default = [ "-Xms${cfg.initialJavaHeapSize}" "-Xmx${cfg.maxJavaHeapMemory}" @@ -105,6 +106,7 @@ in { extraOptions = mkOption { default = [ ]; + type = types.listOf types.str; example = [ "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006" diff --git a/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix index 4fa41ac49edf..4c829664a0a5 100644 --- a/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -27,6 +27,7 @@ in { extraGroups = mkOption { default = [ ]; + type = types.listOf types.str; example = [ "wheel" "docker" ]; description = '' List of extra groups that the "gocd-server" user should be a part of. @@ -92,6 +93,7 @@ in { }; startupOptions = mkOption { + type = types.listOf types.str; default = [ "-Xms${cfg.initialJavaHeapSize}" "-Xmx${cfg.maxJavaHeapMemory}" @@ -113,6 +115,7 @@ in { extraOptions = mkOption { default = [ ]; + type = types.listOf types.str; example = [ "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" diff --git a/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix index 4aed493c0fb0..9f9b86ee61cb 100644 --- a/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix +++ b/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -7,14 +7,21 @@ Platform-specific code is in the respective default.nix files. */ { config, lib, options, pkgs, ... }: - let - inherit (lib) mkOption mkIf types filterAttrs literalExample mkRenamedOptionModule; + inherit (lib) + filterAttrs + literalExample + mkIf + mkOption + mkRemovedOptionModule + mkRenamedOptionModule + types + ; cfg = config.services.hercules-ci-agent; - format = pkgs.formats.toml {}; + format = pkgs.formats.toml { }; settingsModule = { config, ... }: { freeformType = format.type; @@ -28,10 +35,14 @@ let }; concurrentTasks = mkOption { description = '' - Number of tasks to perform simultaneously, such as evaluations, derivations. + Number of tasks to perform simultaneously. + + A task is a single derivation build or an evaluation. + At minimum, you need 2 concurrent tasks for <literal>x86_64-linux</literal> + in your cluster, to allow for import from derivation. - You must have a total capacity across agents of at least 2 concurrent tasks on <literal>x86_64-linux</literal> - to allow for import from derivation. + <literal>concurrentTasks</literal> can be around the CPU core count or lower if memory is + the bottleneck. ''; type = types.int; default = 4; @@ -77,61 +88,39 @@ let }; }; + # TODO (roberth, >=2022) remove checkNix = if !cfg.checkNix then "" - else if lib.versionAtLeast config.nix.package.version "2.4.0" + else if lib.versionAtLeast config.nix.package.version "2.3.10" then "" - else pkgs.stdenv.mkDerivation { - name = "hercules-ci-check-system-nix-src"; - inherit (config.nix.package) src patches; - configurePhase = ":"; - buildPhase = '' - echo "Checking in-memory pathInfoCache expiry" - if ! grep 'struct PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then - cat 1>&2 <<EOF - - You are deploying Hercules CI Agent on a system with an incompatible - nix-daemon. Please - - either upgrade Nix to version 2.4.0 (when released), - - or set option services.hercules-ci-agent.patchNix = true; - - or set option nix.package to a build of Nix 2.3 with this patch applied: - https://github.com/NixOS/nix/pull/3405 - - The patch is required for Nix-daemon clients that expect a change in binary - cache contents while running, like the agent's evaluator. Without it, import - from derivation will fail if your cluster has more than one machine. - We are conservative with changes to the overall system, which is why we - keep changes to a minimum and why we ask for confirmation in the form of - services.hercules-ci-agent.patchNix = true before applying. - - EOF - exit 1 - fi - ''; - installPhase = "touch $out"; - }; + else + pkgs.stdenv.mkDerivation { + name = "hercules-ci-check-system-nix-src"; + inherit (config.nix.package) src patches; + configurePhase = ":"; + buildPhase = '' + echo "Checking in-memory pathInfoCache expiry" + if ! grep 'PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then + cat 1>&2 <<EOF + + You are deploying Hercules CI Agent on a system with an incompatible + nix-daemon. Please make sure nix.package is set to a Nix version of at + least 2.3.10 or a master version more recent than Mar 12, 2020. + EOF + exit 1 + fi + ''; + installPhase = "touch $out"; + }; - patchedNix = lib.mkIf (!lib.versionAtLeast pkgs.nix.version "2.4.0") ( - if lib.versionAtLeast pkgs.nix.version "2.4pre" - then lib.warn "Hercules CI Agent module will not patch 2.4 pre-release. Make sure it includes (equivalently) PR #3043, commit d048577909 or is no older than 2020-03-13." pkgs.nix - else pkgs.nix.overrideAttrs ( - o: { - patches = (o.patches or []) ++ [ backportNix3398 ]; - } - ) - ); - - backportNix3398 = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/hercules-ci/hercules-ci-agent/hercules-ci-agent-0.7.3/for-upstream/issue-3398-path-info-cache-ttls-backport-2.3.patch"; - sha256 = "0jfckqjir9il2il7904yc1qyadw366y7xqzg81sp9sl3f1pw70ib"; - }; in { imports = [ - (mkRenamedOptionModule ["services" "hercules-ci-agent" "extraOptions"] ["services" "hercules-ci-agent" "settings"]) - (mkRenamedOptionModule ["services" "hercules-ci-agent" "baseDirectory"] ["services" "hercules-ci-agent" "settings" "baseDirectory"]) - (mkRenamedOptionModule ["services" "hercules-ci-agent" "concurrentTasks"] ["services" "hercules-ci-agent" "settings" "concurrentTasks"]) + (mkRenamedOptionModule [ "services" "hercules-ci-agent" "extraOptions" ] [ "services" "hercules-ci-agent" "settings" ]) + (mkRenamedOptionModule [ "services" "hercules-ci-agent" "baseDirectory" ] [ "services" "hercules-ci-agent" "settings" "baseDirectory" ]) + (mkRenamedOptionModule [ "services" "hercules-ci-agent" "concurrentTasks" ] [ "services" "hercules-ci-agent" "settings" "concurrentTasks" ]) + (mkRemovedOptionModule [ "services" "hercules-ci-agent" "patchNix" ] "Nix versions packaged in this version of Nixpkgs don't need a patched nix-daemon to work correctly in Hercules CI Agent clusters.") ]; options.services.hercules-ci-agent = { @@ -147,15 +136,6 @@ in Support is available at <link xlink:href="mailto:help@hercules-ci.com">help@hercules-ci.com</link>. ''; }; - patchNix = mkOption { - type = types.bool; - default = false; - description = '' - Fix Nix 2.3 cache path metadata caching behavior. Has the effect of <literal>nix.package = patch pkgs.nix;</literal> - - This option will be removed when Hercules CI Agent moves to Nix 2.4 (upcoming Nix release). - ''; - }; checkNix = mkOption { type = types.bool; default = true; @@ -206,7 +186,6 @@ in # even shortly after the previous lookup. This *also* applies to the daemon. narinfo-cache-negative-ttl = 0 ''; - nix.package = mkIf cfg.patchNix patchedNix; services.hercules-ci-agent.tomlFile = format.generate "hercules-ci-agent.toml" cfg.settings; }; diff --git a/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix index 79d1ce580545..e8a42e59de0d 100644 --- a/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix +++ b/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix @@ -7,9 +7,7 @@ Code that is shared with nix-darwin goes in common.nix. */ { pkgs, config, lib, ... }: - let - inherit (lib) mkIf mkDefault; cfg = config.services.hercules-ci-agent; @@ -21,7 +19,7 @@ in { imports = [ ./common.nix - (lib.mkRenamedOptionModule ["services" "hercules-ci-agent" "user"] ["systemd" "services" "hercules-ci-agent" "serviceConfig" "User"]) + (lib.mkRenamedOptionModule [ "services" "hercules-ci-agent" "user" ] [ "systemd" "services" "hercules-ci-agent" "serviceConfig" "User" ]) ]; config = mkIf cfg.enable { @@ -80,6 +78,8 @@ in isSystemUser = true; }; - users.groups.hercules-ci-agent = {}; + users.groups.hercules-ci-agent = { }; }; + + meta.maintainers = [ lib.maintainers.roberth ]; } diff --git a/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix b/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix index 252ca17006da..887a0cbf9a7a 100644 --- a/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix @@ -231,7 +231,7 @@ in users.users.hydra = { description = "Hydra"; group = "hydra"; - createHome = true; + # We don't enable `createHome` here because the creation of the home directory is handled by the hydra-init service below. home = baseDir; useDefaultShell = true; uid = config.ids.uids.hydra; diff --git a/nixpkgs/nixos/modules/services/development/hoogle.nix b/nixpkgs/nixos/modules/services/development/hoogle.nix index a661e3acae3e..6d6c88b9b2aa 100644 --- a/nixpkgs/nixos/modules/services/development/hoogle.nix +++ b/nixpkgs/nixos/modules/services/development/hoogle.nix @@ -25,6 +25,7 @@ in { }; packages = mkOption { + type = types.functionTo (types.listOf types.package); default = hp: []; defaultText = "hp: []"; example = "hp: with hp; [ text lens ]"; diff --git a/nixpkgs/nixos/modules/services/games/freeciv.nix b/nixpkgs/nixos/modules/services/games/freeciv.nix new file mode 100644 index 000000000000..4923891a6179 --- /dev/null +++ b/nixpkgs/nixos/modules/services/games/freeciv.nix @@ -0,0 +1,187 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.freeciv; + inherit (config.users) groups; + rootDir = "/run/freeciv"; + argsFormat = { + type = with lib.types; let + valueType = nullOr (oneOf [ + bool int float str + (listOf valueType) + ]) // { + description = "freeciv-server params"; + }; + in valueType; + generate = name: value: + let mkParam = k: v: + if v == null then [] + else if isBool v then if v then [("--"+k)] else [] + else [("--"+k) v]; + mkParams = k: v: map (mkParam k) (if isList v then v else [v]); + in escapeShellArgs (concatLists (concatLists (mapAttrsToList mkParams value))); + }; +in +{ + options = { + services.freeciv = { + enable = mkEnableOption ''freeciv''; + settings = mkOption { + description = '' + Parameters of freeciv-server. + ''; + default = {}; + type = types.submodule { + freeformType = argsFormat.type; + options.Announce = mkOption { + type = types.enum ["IPv4" "IPv6" "none"]; + default = "none"; + description = "Announce game in LAN using given protocol."; + }; + options.auth = mkEnableOption "server authentication"; + options.Database = mkOption { + type = types.nullOr types.str; + apply = pkgs.writeText "auth.conf"; + default = '' + [fcdb] + backend="sqlite" + database="/var/lib/freeciv/auth.sqlite" + ''; + description = "Enable database connection with given configuration."; + }; + options.debug = mkOption { + type = types.ints.between 0 3; + default = 0; + description = "Set debug log level."; + }; + options.exit-on-end = mkEnableOption "exit instead of restarting when a game ends."; + options.Guests = mkEnableOption "guests to login if auth is enabled"; + options.Newusers = mkEnableOption "new users to login if auth is enabled"; + options.port = mkOption { + type = types.port; + default = 5556; + description = "Listen for clients on given port"; + }; + options.quitidle = mkOption { + type = types.nullOr types.int; + default = null; + description = "Quit if no players for given time in seconds."; + }; + options.read = mkOption { + type = types.lines; + apply = v: pkgs.writeTextDir "read.serv" v + "/read"; + default = '' + /fcdb lua sqlite_createdb() + ''; + description = "Startup script."; + }; + options.saves = mkOption { + type = types.nullOr types.str; + default = "/var/lib/freeciv/saves/"; + description = '' + Save games to given directory, + a sub-directory named after the starting date of the service + will me inserted to preserve older saves. + ''; + }; + }; + }; + openFirewall = mkEnableOption "opening the firewall for the port listening for clients"; + }; + }; + config = mkIf cfg.enable { + users.groups.freeciv = {}; + # Use with: + # journalctl -u freeciv.service -f -o cat & + # cat >/run/freeciv.stdin + # load saves/2020-11-14_05-22-27/freeciv-T0005-Y-3750-interrupted.sav.bz2 + systemd.sockets.freeciv = { + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenFIFO = "/run/freeciv.stdin"; + SocketGroup = groups.freeciv.name; + SocketMode = "660"; + RemoveOnStop = true; + }; + }; + systemd.services.freeciv = { + description = "Freeciv Service"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment.HOME = "/var/lib/freeciv"; + serviceConfig = { + Restart = "on-failure"; + RestartSec = "5s"; + StandardInput = "fd:freeciv.socket"; + StandardOutput = "journal"; + StandardError = "journal"; + ExecStart = pkgs.writeShellScript "freeciv-server" ('' + set -eux + savedir=$(date +%Y-%m-%d_%H-%M-%S) + '' + "${pkgs.freeciv}/bin/freeciv-server" + + " " + optionalString (cfg.settings.saves != null) + (concatStringsSep " " [ "--saves" "${escapeShellArg cfg.settings.saves}/$savedir" ]) + + " " + argsFormat.generate "freeciv-server" (cfg.settings // { saves = null; })); + DynamicUser = true; + # Create rootDir in the host's mount namespace. + RuntimeDirectory = [(baseNameOf rootDir)]; + RuntimeDirectoryMode = "755"; + StateDirectory = [ "freeciv" ]; + WorkingDirectory = "/var/lib/freeciv"; + # Avoid mounting rootDir in the own rootDir of ExecStart='s mount namespace. + InaccessiblePaths = ["-+${rootDir}"]; + # This is for BindPaths= and BindReadOnlyPaths= + # to allow traversal of directories they create in RootDirectory=. + UMask = "0066"; + RootDirectory = rootDir; + RootDirectoryStartOnly = true; + MountAPIVFS = true; + BindReadOnlyPaths = [ + builtins.storeDir + "/etc" + "/run" + ]; + # The following options are only for optimizing: + # systemd-analyze security freeciv + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = mkDefault false; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallFilter = [ + "@system-service" + # Groups in @system-service which do not contain a syscall listed by: + # perf stat -x, 2>perf.log -e 'syscalls:sys_enter_*' freeciv-server + # in tests, and seem likely not necessary for freeciv-server. + "~@aio" "~@chown" "~@ipc" "~@keyring" "~@memlock" + "~@resources" "~@setuid" "~@sync" "~@timer" + ]; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + }; + }; + networking.firewall = mkIf cfg.openFirewall + { allowedTCPPorts = [ cfg.settings.port ]; }; + }; + meta.maintainers = with lib.maintainers; [ julm ]; +} diff --git a/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix b/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix new file mode 100644 index 000000000000..72c4eccaff72 --- /dev/null +++ b/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.auto-cpufreq; +in { + options = { + services.auto-cpufreq = { + enable = mkEnableOption "auto-cpufreq daemon"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.auto-cpufreq ]; + + systemd.packages = [ pkgs.auto-cpufreq ]; + systemd.services.auto-cpufreq.path = with pkgs; [ bash coreutils ]; + }; +} diff --git a/nixpkgs/nixos/modules/services/hardware/power-profiles-daemon.nix b/nixpkgs/nixos/modules/services/hardware/power-profiles-daemon.nix new file mode 100644 index 000000000000..70b7a72b8bae --- /dev/null +++ b/nixpkgs/nixos/modules/services/hardware/power-profiles-daemon.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.power-profiles-daemon; + package = pkgs.power-profiles-daemon; +in + +{ + + ###### interface + + options = { + + services.power-profiles-daemon = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable power-profiles-daemon, a DBus daemon that allows + changing system behavior based upon user-selected power profiles. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + assertions = [ + { assertion = !config.services.tlp.enable; + message = '' + You have set services.power-profiles-daemon.enable = true; + which conflicts with services.tlp.enable = true; + ''; + } + ]; + + services.dbus.packages = [ package ]; + + services.udev.packages = [ package ]; + + systemd.packages = [ package ]; + + }; + +} diff --git a/nixpkgs/nixos/modules/services/hardware/thinkfan.nix b/nixpkgs/nixos/modules/services/hardware/thinkfan.nix index 3bda61ed1a93..7a5a7e1c41ce 100644 --- a/nixpkgs/nixos/modules/services/hardware/thinkfan.nix +++ b/nixpkgs/nixos/modules/services/hardware/thinkfan.nix @@ -5,49 +5,95 @@ with lib; let cfg = config.services.thinkfan; - configFile = pkgs.writeText "thinkfan.conf" '' - # ATTENTION: There is only very basic sanity checking on the configuration. - # That means you can set your temperature limits as insane as you like. You - # can do anything stupid, e.g. turn off your fan when your CPU reaches 70°C. - # - # That's why this program is called THINKfan: You gotta think for yourself. - # - ###################################################################### - # - # IBM/Lenovo Thinkpads (thinkpad_acpi, /proc/acpi/ibm) - # ==================================================== - # - # IMPORTANT: - # - # To keep your HD from overheating, you have to specify a correction value for - # the sensor that has the HD's temperature. You need to do this because - # thinkfan uses only the highest temperature it can find in the system, and - # that'll most likely never be your HD, as most HDs are already out of spec - # when they reach 55 °C. - # Correction values are applied from left to right in the same order as the - # temperatures are read from the file. - # - # For example: - # tp_thermal /proc/acpi/ibm/thermal (0, 0, 10) - # will add a fixed value of 10 °C the 3rd value read from that file. Check out - # http://www.thinkwiki.org/wiki/Thermal_Sensors to find out how much you may - # want to add to certain temperatures. - - ${cfg.fan} - ${cfg.sensors} - - # Syntax: - # (LEVEL, LOW, HIGH) - # LEVEL is the fan level to use (0-7 with thinkpad_acpi) - # LOW is the temperature at which to step down to the previous level - # HIGH is the temperature at which to step up to the next level - # All numbers are integers. - # - - ${cfg.levels} - ''; + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "thinkfan.yaml" cfg.settings; + thinkfan = pkgs.thinkfan.override { inherit (cfg) smartSupport; }; + + # fan-speed and temperature levels + levelType = with types; + let + tuple = ts: mkOptionType { + name = "tuple"; + merge = mergeOneOption; + check = xs: all id (zipListsWith (t: x: t.check x) ts xs); + description = "tuple of" + concatMapStrings (t: " (${t.description})") ts; + }; + level = ints.unsigned; + special = enum [ "level auto" "level full-speed" "level disengage" ]; + in + tuple [ (either level special) level level ]; + + # sensor or fan config + sensorType = name: types.submodule { + freeformType = types.attrsOf settingsFormat.type; + options = { + type = mkOption { + type = types.enum [ "hwmon" "atasmart" "tpacpi" "nvml" ]; + description = '' + The ${name} type, can be + <literal>hwmon</literal> for standard ${name}s, - thinkfan = pkgs.thinkfan.override { smartSupport = cfg.smartSupport; }; + <literal>atasmart</literal> to read the temperature via + S.M.A.R.T (requires smartSupport to be enabled), + + <literal>tpacpi</literal> for the legacy thinkpac_acpi driver, or + + <literal>nvml</literal> for the (proprietary) nVidia driver. + ''; + }; + query = mkOption { + type = types.str; + description = '' + The query string used to match one or more ${name}s: can be + a fullpath to the temperature file (single ${name}) or a fullpath + to a driver directory (multiple ${name}s). + + <note><para> + When multiple ${name}s match, the query can be restricted using the + <option>name</option> or <option>indices</option> options. + </para></note> + ''; + }; + indices = mkOption { + type = with types; nullOr (listOf ints.unsigned); + default = null; + description = '' + A list of ${name}s to pick in case multiple ${name}s match the query. + + <note><para>Indices start from 0.</para></note> + ''; + }; + } // optionalAttrs (name == "sensor") { + correction = mkOption { + type = with types; nullOr (listOf int); + default = null; + description = '' + A list of values to be added to the temperature of each sensor, + can be used to equalize small discrepancies in temperature ratings. + ''; + }; + }; + }; + + # removes NixOS special and unused attributes + sensorToConf = { type, query, ... }@args: + (filterAttrs (k: v: v != null && !(elem k ["type" "query"])) args) + // { "${type}" = query; }; + + syntaxNote = name: '' + <note><para> + This section slightly departs from the thinkfan.conf syntax. + The type and path must be specified like this: + <literal> + type = "tpacpi"; + query = "/proc/acpi/ibm/${name}"; + </literal> + instead of a single declaration like: + <literal> + - tpacpi: /proc/acpi/ibm/${name} + </literal> + </para></note> + ''; in { @@ -59,76 +105,93 @@ in { type = types.bool; default = false; description = '' - Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads. + Whether to enable thinkfan, a fan control program. + + <note><para> + This module targets IBM/Lenovo thinkpads by default, for + other hardware you will have configure it more carefully. + </para></note> ''; + relatedPackages = [ "thinkfan" ]; }; smartSupport = mkOption { type = types.bool; default = false; description = '' - Whether to build thinkfan with SMART support to read temperatures + Whether to build thinkfan with S.M.A.R.T. support to read temperatures directly from hard disks. ''; }; sensors = mkOption { - type = types.lines; - default = '' - tp_thermal /proc/acpi/ibm/thermal (0,0,10) - ''; - description ='' - thinkfan can read temperatures from three possible sources: - - /proc/acpi/ibm/thermal - Which is provided by the thinkpad_acpi kernel - module (keyword tp_thermal) - - /sys/class/hwmon/*/temp*_input - Which may be provided by any hwmon drivers (keyword - hwmon) - - S.M.A.R.T. (requires smartSupport to be enabled) - Which reads the temperature directly from the hard - disk using libatasmart (keyword atasmart) - - Multiple sensors may be added, in which case they will be - numbered in their order of appearance. - ''; + type = types.listOf (sensorType "sensor"); + default = [ + { type = "tpacpi"; + query = "/proc/acpi/ibm/thermal"; + } + ]; + description = '' + List of temperature sensors thinkfan will monitor. + '' + syntaxNote "thermal"; }; - fan = mkOption { - type = types.str; - default = "tp_fan /proc/acpi/ibm/fan"; - description ='' - Specifies the fan we want to use. - On anything other than a Thinkpad you'll probably - use some PWM control file in /sys/class/hwmon. - A sysfs fan would be specified like this: - pwm_fan /sys/class/hwmon/hwmon2/device/pwm1 - ''; + fans = mkOption { + type = types.listOf (sensorType "fan"); + default = [ + { type = "tpacpi"; + query = "/proc/acpi/ibm/fan"; + } + ]; + description = '' + List of fans thinkfan will control. + '' + syntaxNote "fan"; }; levels = mkOption { - type = types.lines; - default = '' - (0, 0, 55) - (1, 48, 60) - (2, 50, 61) - (3, 52, 63) - (6, 56, 65) - (7, 60, 85) - (127, 80, 32767) - ''; + type = types.listOf levelType; + default = [ + [0 0 55] + [1 48 60] + [2 50 61] + [3 52 63] + [6 56 65] + [7 60 85] + ["level auto" 80 32767] + ]; description = '' - (LEVEL, LOW, HIGH) - LEVEL is the fan level to use (0-7 with thinkpad_acpi). + [LEVEL LOW HIGH] + + LEVEL is the fan level to use: it can be an integer (0-7 with thinkpad_acpi), + "level auto" (to keep the default firmware behavior), "level full-speed" or + "level disengage" (to run the fan as fast as possible). LOW is the temperature at which to step down to the previous level. HIGH is the temperature at which to step up to the next level. All numbers are integers. ''; }; + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "-b" "0" ]; + description = '' + A list of extra command line arguments to pass to thinkfan. + Check the thinkfan(1) manpage for available arguments. + ''; + }; + + settings = mkOption { + type = types.attrsOf settingsFormat.type; + default = { }; + description = '' + Thinkfan settings. Use this option to configure thinkfan + settings not exposed in a NixOS option or to bypass one. + Before changing this, read the <literal>thinkfan.conf(5)</literal> + manpage and take a look at the example config file at + <link xlink:href="https://github.com/vmatare/thinkfan/blob/master/examples/thinkfan.yaml"/> + ''; + }; }; @@ -138,12 +201,21 @@ in { environment.systemPackages = [ thinkfan ]; - systemd.services.thinkfan = { - description = "Thinkfan"; - after = [ "basic.target" ]; - wantedBy = [ "multi-user.target" ]; - path = [ thinkfan ]; - serviceConfig.ExecStart = "${thinkfan}/bin/thinkfan -n -c ${configFile}"; + services.thinkfan.settings = mapAttrs (k: v: mkDefault v) { + sensors = map sensorToConf cfg.sensors; + fans = map sensorToConf cfg.fans; + levels = cfg.levels; + }; + + systemd.packages = [ thinkfan ]; + + systemd.services = { + thinkfan.environment.THINKFAN_ARGS = escapeShellArgs ([ "-c" configFile ] ++ cfg.extraArgs); + + # must be added manually, see issue #81138 + thinkfan.wantedBy = [ "multi-user.target" ]; + thinkfan-wakeup.wantedBy = [ "sleep.target" ]; + thinkfan-sleep.wantedBy = [ "sleep.target" ]; }; boot.extraModprobeConfig = "options thinkpad_acpi experimental=1 fan_control=1"; diff --git a/nixpkgs/nixos/modules/services/mail/dovecot.nix b/nixpkgs/nixos/modules/services/mail/dovecot.nix index 03e7e40e388e..a2298152b023 100644 --- a/nixpkgs/nixos/modules/services/mail/dovecot.nix +++ b/nixpkgs/nixos/modules/services/mail/dovecot.nix @@ -463,7 +463,7 @@ in environment.systemPackages = [ dovecotPkg ]; warnings = mkIf (any isList options.services.dovecot2.mailboxes.definitions) [ - "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03! See the release notes for more info for migration." + "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.05! See the release notes for more info for migration." ]; assertions = [ diff --git a/nixpkgs/nixos/modules/services/mail/postfix.nix b/nixpkgs/nixos/modules/services/mail/postfix.nix index 1dcdcab8d481..63c0961b7568 100644 --- a/nixpkgs/nixos/modules/services/mail/postfix.nix +++ b/nixpkgs/nixos/modules/services/mail/postfix.nix @@ -560,6 +560,7 @@ in transport = mkOption { default = ""; + type = types.lines; description = " Entries for the transport map, cf. man-page transport(8). "; @@ -573,6 +574,7 @@ in dnsBlacklistOverrides = mkOption { default = ""; + type = types.lines; description = "contents of check_client_access for overriding dnsBlacklists"; }; diff --git a/nixpkgs/nixos/modules/services/misc/cgminer.nix b/nixpkgs/nixos/modules/services/misc/cgminer.nix index b80a4746fd1e..662570f9451f 100644 --- a/nixpkgs/nixos/modules/services/misc/cgminer.nix +++ b/nixpkgs/nixos/modules/services/misc/cgminer.nix @@ -41,12 +41,14 @@ in }; user = mkOption { + type = types.str; default = "cgminer"; description = "User account under which cgminer runs"; }; pools = mkOption { default = []; # Run benchmark + type = types.listOf (types.attrsOf types.str); description = "List of pools where to mine"; example = [{ url = "http://p2pool.org:9332"; @@ -57,6 +59,7 @@ in hardware = mkOption { default = []; # Run without options + type = types.listOf (types.attrsOf (types.either types.str types.int)); description= "List of config options for every GPU"; example = [ { @@ -83,6 +86,7 @@ in config = mkOption { default = {}; + type = (types.either types.bool types.int); description = "Additional config"; example = { auto-fan = true; diff --git a/nixpkgs/nixos/modules/services/misc/disnix.nix b/nixpkgs/nixos/modules/services/misc/disnix.nix deleted file mode 100644 index 41483d80a2dd..000000000000 --- a/nixpkgs/nixos/modules/services/misc/disnix.nix +++ /dev/null @@ -1,98 +0,0 @@ -# Disnix server -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.disnix; - -in - -{ - - ###### interface - - options = { - - services.disnix = { - - enable = mkEnableOption "Disnix"; - - enableMultiUser = mkOption { - type = types.bool; - default = true; - description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; - }; - - useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat"; - - package = mkOption { - type = types.path; - description = "The Disnix package"; - default = pkgs.disnix; - defaultText = "pkgs.disnix"; - }; - - enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH"; - - profiles = mkOption { - type = types.listOf types.string; - default = [ "default" ]; - example = [ "default" ]; - description = "Names of the Disnix profiles to expose in the system's PATH"; - }; - }; - - }; - - ###### implementation - - config = mkIf cfg.enable { - dysnomia.enable = true; - - environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; - environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles); - - services.dbus.enable = true; - services.dbus.packages = [ pkgs.disnix ]; - - services.tomcat.enable = cfg.useWebServiceInterface; - services.tomcat.extraGroups = [ "disnix" ]; - services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} "; - services.tomcat.sharedLibs = optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar" - ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar"; - services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService; - - users.groups.disnix.gid = config.ids.gids.disnix; - - systemd.services = { - disnix = mkIf cfg.enableMultiUser { - description = "Disnix server"; - wants = [ "dysnomia.target" ]; - wantedBy = [ "multi-user.target" ]; - after = [ "dbus.service" ] - ++ optional config.services.httpd.enable "httpd.service" - ++ optional config.services.mysql.enable "mysql.service" - ++ optional config.services.postgresql.enable "postgresql.service" - ++ optional config.services.tomcat.enable "tomcat.service" - ++ optional config.services.svnserve.enable "svnserve.service" - ++ optional config.services.mongodb.enable "mongodb.service" - ++ optional config.services.influxdb.enable "influxdb.service"; - - restartIfChanged = false; - - path = [ config.nix.package cfg.package config.dysnomia.package "/run/current-system/sw" ]; - - environment = { - HOME = "/root"; - } - // (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {}) - // (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {}); - - serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service"; - }; - - }; - }; -} diff --git a/nixpkgs/nixos/modules/services/misc/dysnomia.nix b/nixpkgs/nixos/modules/services/misc/dysnomia.nix deleted file mode 100644 index eb94791fbbff..000000000000 --- a/nixpkgs/nixos/modules/services/misc/dysnomia.nix +++ /dev/null @@ -1,257 +0,0 @@ -{pkgs, lib, config, ...}: - -with lib; - -let - cfg = config.dysnomia; - - printProperties = properties: - concatMapStrings (propertyName: - let - property = properties.${propertyName}; - in - if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties.${propertyName})})\n" - else "${propertyName}=\"${toString property}\"\n" - ) (builtins.attrNames properties); - - properties = pkgs.stdenv.mkDerivation { - name = "dysnomia-properties"; - buildCommand = '' - cat > $out << "EOF" - ${printProperties cfg.properties} - EOF - ''; - }; - - containersDir = pkgs.stdenv.mkDerivation { - name = "dysnomia-containers"; - buildCommand = '' - mkdir -p $out - cd $out - - ${concatMapStrings (containerName: - let - containerProperties = cfg.containers.${containerName}; - in - '' - cat > ${containerName} <<EOF - ${printProperties containerProperties} - type=${containerName} - EOF - '' - ) (builtins.attrNames cfg.containers)} - ''; - }; - - linkMutableComponents = {containerName}: - '' - mkdir ${containerName} - - ${concatMapStrings (componentName: - let - component = cfg.components.${containerName}.${componentName}; - in - "ln -s ${component} ${containerName}/${componentName}\n" - ) (builtins.attrNames (cfg.components.${containerName} or {}))} - ''; - - componentsDir = pkgs.stdenv.mkDerivation { - name = "dysnomia-components"; - buildCommand = '' - mkdir -p $out - cd $out - - ${concatMapStrings (containerName: - linkMutableComponents { inherit containerName; } - ) (builtins.attrNames cfg.components)} - ''; - }; - - dysnomiaFlags = { - enableApacheWebApplication = config.services.httpd.enable; - enableAxis2WebService = config.services.tomcat.axis2.enable; - enableDockerContainer = config.virtualisation.docker.enable; - enableEjabberdDump = config.services.ejabberd.enable; - enableMySQLDatabase = config.services.mysql.enable; - enablePostgreSQLDatabase = config.services.postgresql.enable; - enableTomcatWebApplication = config.services.tomcat.enable; - enableMongoDatabase = config.services.mongodb.enable; - enableSubversionRepository = config.services.svnserve.enable; - enableInfluxDatabase = config.services.influxdb.enable; - }; -in -{ - options = { - dysnomia = { - - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable Dysnomia"; - }; - - enableAuthentication = mkOption { - type = types.bool; - default = false; - description = "Whether to publish privacy-sensitive authentication credentials"; - }; - - package = mkOption { - type = types.path; - description = "The Dysnomia package"; - }; - - properties = mkOption { - description = "An attribute set in which each attribute represents a machine property. Optionally, these values can be shell substitutions."; - default = {}; - }; - - containers = mkOption { - description = "An attribute set in which each key represents a container and each value an attribute set providing its configuration properties"; - default = {}; - }; - - components = mkOption { - description = "An atttribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state"; - default = {}; - }; - - extraContainerProperties = mkOption { - description = "An attribute set providing additional container settings in addition to the default properties"; - default = {}; - }; - - extraContainerPaths = mkOption { - description = "A list of paths containing additional container configurations that are added to the search folders"; - default = []; - }; - - extraModulePaths = mkOption { - description = "A list of paths containing additional modules that are added to the search folders"; - default = []; - }; - - enableLegacyModules = mkOption { - type = types.bool; - default = true; - description = "Whether to enable Dysnomia legacy process and wrapper modules"; - }; - }; - }; - - config = mkIf cfg.enable { - - environment.etc = { - "dysnomia/containers" = { - source = containersDir; - }; - "dysnomia/components" = { - source = componentsDir; - }; - "dysnomia/properties" = { - source = properties; - }; - }; - - environment.variables = { - DYSNOMIA_STATEDIR = "/var/state/dysnomia-nixos"; - DYSNOMIA_CONTAINERS_PATH = "${lib.concatMapStrings (containerPath: "${containerPath}:") cfg.extraContainerPaths}/etc/dysnomia/containers"; - DYSNOMIA_MODULES_PATH = "${lib.concatMapStrings (modulePath: "${modulePath}:") cfg.extraModulePaths}/etc/dysnomia/modules"; - }; - - environment.systemPackages = [ cfg.package ]; - - dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) { - enableLegacy = builtins.trace '' - WARNING: Dysnomia has been configured to use the legacy 'process' and 'wrapper' - modules for compatibility reasons! If you rely on these modules, consider - migrating to better alternatives. - - More information: https://raw.githubusercontent.com/svanderburg/dysnomia/f65a9a84827bcc4024d6b16527098b33b02e4054/README-legacy.md - - If you have migrated already or don't rely on these Dysnomia modules, you can - disable legacy mode with the following NixOS configuration option: - - dysnomia.enableLegacyModules = false; - - In a future version of Dysnomia (and NixOS) the legacy option will go away! - '' true; - }); - - dysnomia.properties = { - hostname = config.networking.hostName; - inherit (config.nixpkgs.localSystem) system; - - supportedTypes = [ - "echo" - "fileset" - "process" - "wrapper" - - # These are not base modules, but they are still enabled because they work with technology that are always enabled in NixOS - "systemd-unit" - "sysvinit-script" - "nixos-configuration" - ] - ++ optional (dysnomiaFlags.enableApacheWebApplication) "apache-webapplication" - ++ optional (dysnomiaFlags.enableAxis2WebService) "axis2-webservice" - ++ optional (dysnomiaFlags.enableDockerContainer) "docker-container" - ++ optional (dysnomiaFlags.enableEjabberdDump) "ejabberd-dump" - ++ optional (dysnomiaFlags.enableInfluxDatabase) "influx-database" - ++ optional (dysnomiaFlags.enableMySQLDatabase) "mysql-database" - ++ optional (dysnomiaFlags.enablePostgreSQLDatabase) "postgresql-database" - ++ optional (dysnomiaFlags.enableTomcatWebApplication) "tomcat-webapplication" - ++ optional (dysnomiaFlags.enableMongoDatabase) "mongo-database" - ++ optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository"; - }; - - dysnomia.containers = lib.recursiveUpdate ({ - process = {}; - wrapper = {}; - } - // lib.optionalAttrs (config.services.httpd.enable) { apache-webapplication = { - documentRoot = config.services.httpd.virtualHosts.localhost.documentRoot; - }; } - // lib.optionalAttrs (config.services.tomcat.axis2.enable) { axis2-webservice = {}; } - // lib.optionalAttrs (config.services.ejabberd.enable) { ejabberd-dump = { - ejabberdUser = config.services.ejabberd.user; - }; } - // lib.optionalAttrs (config.services.mysql.enable) { mysql-database = { - mysqlPort = config.services.mysql.port; - mysqlSocket = "/run/mysqld/mysqld.sock"; - } // lib.optionalAttrs cfg.enableAuthentication { - mysqlUsername = "root"; - }; - } - // lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = { - } // lib.optionalAttrs (cfg.enableAuthentication) { - postgresqlUsername = "postgres"; - }; - } - // lib.optionalAttrs (config.services.tomcat.enable) { tomcat-webapplication = { - tomcatPort = 8080; - }; } - // lib.optionalAttrs (config.services.mongodb.enable) { mongo-database = {}; } - // lib.optionalAttrs (config.services.influxdb.enable) { - influx-database = { - influxdbUsername = config.services.influxdb.user; - influxdbDataDir = "${config.services.influxdb.dataDir}/data"; - influxdbMetaDir = "${config.services.influxdb.dataDir}/meta"; - }; - } - // lib.optionalAttrs (config.services.svnserve.enable) { subversion-repository = { - svnBaseDir = config.services.svnserve.svnBaseDir; - }; }) cfg.extraContainerProperties; - - system.activationScripts.dysnomia = '' - mkdir -p /etc/systemd-mutable/system - if [ ! -f /etc/systemd-mutable/system/dysnomia.target ] - then - ( echo "[Unit]" - echo "Description=Services that are activated and deactivated by Dysnomia" - echo "After=final.target" - ) > /etc/systemd-mutable/system/dysnomia.target - fi - ''; - }; -} diff --git a/nixpkgs/nixos/modules/services/misc/etebase-server.nix b/nixpkgs/nixos/modules/services/misc/etebase-server.nix new file mode 100644 index 000000000000..d9d12698d79d --- /dev/null +++ b/nixpkgs/nixos/modules/services/misc/etebase-server.nix @@ -0,0 +1,205 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.etebase-server; + + pythonEnv = pkgs.python3.withPackages (ps: with ps; + [ etebase-server daphne ]); + + dbConfig = { + sqlite3 = '' + engine = django.db.backends.sqlite3 + name = ${cfg.dataDir}/db.sqlite3 + ''; + }; + + defaultConfigIni = toString (pkgs.writeText "etebase-server.ini" '' + [global] + debug = false + secret_file = ${if cfg.secretFile != null then cfg.secretFile else ""} + media_root = ${cfg.dataDir}/media + + [allowed_hosts] + allowed_host1 = ${cfg.host} + + [database] + ${dbConfig."${cfg.database.type}"} + ''); + + configIni = if cfg.customIni != null then cfg.customIni else defaultConfigIni; + + defaultUser = "etebase-server"; +in +{ + options = { + services.etebase-server = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to enable the Etebase server. + + Once enabled you need to create an admin user using the + shell command <literal>etebase-server createsuperuser</literal>. + Then you can login and create accounts on your-etebase-server.com/admin + ''; + }; + + secretFile = mkOption { + default = null; + type = with types; nullOr str; + description = '' + The path to a file containing the secret + used as django's SECRET_KEY. + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/etebase-server"; + description = "Directory to store the Etebase server data."; + }; + + port = mkOption { + type = with types; nullOr port; + default = 8001; + description = "Port to listen on."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open ports in the firewall for the server. + ''; + }; + + host = mkOption { + type = types.str; + default = "0.0.0.0"; + example = "localhost"; + description = '' + Host to listen on. + ''; + }; + + unixSocket = mkOption { + type = with types; nullOr str; + default = null; + description = "The path to the socket to bind to."; + example = "/run/etebase-server/etebase-server.sock"; + }; + + database = { + type = mkOption { + type = types.enum [ "sqlite3" ]; + default = "sqlite3"; + description = '' + Database engine to use. + Currently only sqlite3 is supported. + Other options can be configured using <literal>extraConfig</literal>. + ''; + }; + }; + + customIni = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Custom etebase-server.ini. + + See <literal>etebase-src/etebase-server.ini.example</literal> for available options. + + Setting this option overrides the default config which is generated from the options + <literal>secretFile</literal>, <literal>host</literal> and <literal>database</literal>. + ''; + example = literalExample '' + [global] + debug = false + secret_file = /path/to/secret + media_root = /path/to/media + + [allowed_hosts] + allowed_host1 = example.com + + [database] + engine = django.db.backends.sqlite3 + name = db.sqlite3 + ''; + }; + + user = mkOption { + type = types.str; + default = defaultUser; + description = "User under which Etebase server runs."; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = with pkgs; [ + (runCommand "etebase-server" { + buildInputs = [ makeWrapper ]; + } '' + makeWrapper ${pythonEnv}/bin/etebase-server \ + $out/bin/etebase-server \ + --run "cd ${cfg.dataDir}" \ + --prefix ETEBASE_EASY_CONFIG_PATH : "${configIni}" + '') + ]; + + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -" + ]; + + systemd.services.etebase-server = { + description = "An Etebase (EteSync 2.0) server"; + after = [ "network.target" "systemd-tmpfiles-setup.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = cfg.user; + Restart = "always"; + WorkingDirectory = cfg.dataDir; + }; + environment = { + PYTHONPATH="${pythonEnv}/${pkgs.python3.sitePackages}"; + ETEBASE_EASY_CONFIG_PATH="${configIni}"; + }; + preStart = '' + # Auto-migrate on first run or if the package has changed + versionFile="${cfg.dataDir}/src-version" + if [[ $(cat "$versionFile" 2>/dev/null) != ${pkgs.etebase-server} ]]; then + ${pythonEnv}/bin/etebase-server migrate + echo ${pkgs.etebase-server} > "$versionFile" + fi + ''; + script = + let + networking = if cfg.unixSocket != null + then "-u ${cfg.unixSocket}" + else "-b 0.0.0.0 -p ${toString cfg.port}"; + in '' + cd "${pythonEnv}/lib/etebase-server"; + ${pythonEnv}/bin/daphne ${networking} \ + etebase_server.asgi:application + ''; + }; + + users = optionalAttrs (cfg.user == defaultUser) { + users.${defaultUser} = { + group = defaultUser; + home = cfg.dataDir; + }; + + groups.${defaultUser} = {}; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/misc/felix.nix b/nixpkgs/nixos/modules/services/misc/felix.nix index 21740c8c0b72..8d438bb9eb19 100644 --- a/nixpkgs/nixos/modules/services/misc/felix.nix +++ b/nixpkgs/nixos/modules/services/misc/felix.nix @@ -27,11 +27,13 @@ in }; user = mkOption { + type = types.str; default = "osgi"; description = "User account under which Apache Felix runs."; }; group = mkOption { + type = types.str; default = "osgi"; description = "Group account under which Apache Felix runs."; }; diff --git a/nixpkgs/nixos/modules/services/misc/gitit.nix b/nixpkgs/nixos/modules/services/misc/gitit.nix index 1ec030549f98..f09565283f3c 100644 --- a/nixpkgs/nixos/modules/services/misc/gitit.nix +++ b/nixpkgs/nixos/modules/services/misc/gitit.nix @@ -42,6 +42,7 @@ let }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' haskellPackages: [ diff --git a/nixpkgs/nixos/modules/services/misc/ihaskell.nix b/nixpkgs/nixos/modules/services/misc/ihaskell.nix index 684a242d7385..c7332b87803a 100644 --- a/nixpkgs/nixos/modules/services/misc/ihaskell.nix +++ b/nixpkgs/nixos/modules/services/misc/ihaskell.nix @@ -21,6 +21,7 @@ in }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' haskellPackages: [ diff --git a/nixpkgs/nixos/modules/services/misc/octoprint.nix b/nixpkgs/nixos/modules/services/misc/octoprint.nix index a69e65073050..5a64946f9f63 100644 --- a/nixpkgs/nixos/modules/services/misc/octoprint.nix +++ b/nixpkgs/nixos/modules/services/misc/octoprint.nix @@ -66,6 +66,7 @@ in }; plugins = mkOption { + type = types.functionTo (types.listOf types.package); default = plugins: []; defaultText = "plugins: []"; example = literalExample "plugins: with plugins; [ themeify stlviewer ]"; diff --git a/nixpkgs/nixos/modules/services/misc/pykms.nix b/nixpkgs/nixos/modules/services/misc/pykms.nix index d6aeae48ccb6..2f752bcc7ed6 100644 --- a/nixpkgs/nixos/modules/services/misc/pykms.nix +++ b/nixpkgs/nixos/modules/services/misc/pykms.nix @@ -1,12 +1,12 @@ { config, lib, pkgs, ... }: with lib; - let cfg = config.services.pykms; libDir = "/var/lib/pykms"; -in { +in +{ meta.maintainers = with lib.maintainers; [ peterhoeg ]; imports = [ @@ -46,14 +46,14 @@ in { }; logLevel = mkOption { - type = types.enum [ "CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG" "MINI" ]; + type = types.enum [ "CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG" "MININFO" ]; default = "INFO"; description = "How much to log"; }; extraArgs = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; description = "Additional arguments"; }; }; @@ -74,8 +74,9 @@ in { ExecStartPre = "${getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db"; ExecStart = lib.concatStringsSep " " ([ "${getBin pykms}/bin/server" - "--logfile STDOUT" - "--loglevel ${cfg.logLevel}" + "--logfile=STDOUT" + "--loglevel=${cfg.logLevel}" + "--sqlite=${libDir}/clients.db" ] ++ cfg.extraArgs ++ [ cfg.listenAddress (toString cfg.port) diff --git a/nixpkgs/nixos/modules/services/misc/rippled.nix b/nixpkgs/nixos/modules/services/misc/rippled.nix index ef34e3a779f0..2fce3b9dc94c 100644 --- a/nixpkgs/nixos/modules/services/misc/rippled.nix +++ b/nixpkgs/nixos/modules/services/misc/rippled.nix @@ -389,6 +389,7 @@ in extraConfig = mkOption { default = ""; + type = types.lines; description = '' Extra lines to be added verbatim to the rippled.cfg configuration file. ''; diff --git a/nixpkgs/nixos/modules/services/misc/svnserve.nix b/nixpkgs/nixos/modules/services/misc/svnserve.nix index f70e3ca7fef0..5fa262ca3b94 100644 --- a/nixpkgs/nixos/modules/services/misc/svnserve.nix +++ b/nixpkgs/nixos/modules/services/misc/svnserve.nix @@ -24,6 +24,7 @@ in }; svnBaseDir = mkOption { + type = types.str; default = "/repos"; description = "Base directory from which Subversion repositories are accessed."; }; diff --git a/nixpkgs/nixos/modules/services/misc/synergy.nix b/nixpkgs/nixos/modules/services/misc/synergy.nix index 5b7cf3ac46c3..7990a9f6f4ce 100644 --- a/nixpkgs/nixos/modules/services/misc/synergy.nix +++ b/nixpkgs/nixos/modules/services/misc/synergy.nix @@ -23,12 +23,14 @@ in screenName = mkOption { default = ""; + type = types.str; description = '' Use the given name instead of the hostname to identify ourselves to the server. ''; }; serverAddress = mkOption { + type = types.str; description = '' The server address is of the form: [hostname][:port]. The hostname must be the address or hostname of the server. The @@ -46,10 +48,12 @@ in enable = mkEnableOption "the Synergy server (send keyboard and mouse events)"; configFile = mkOption { + type = types.path; default = "/etc/synergy-server.conf"; description = "The Synergy server configuration file."; }; screenName = mkOption { + type = types.str; default = ""; description = '' Use the given name instead of the hostname to identify @@ -57,6 +61,7 @@ in ''; }; address = mkOption { + type = types.str; default = ""; description = "Address on which to listen for clients."; }; diff --git a/nixpkgs/nixos/modules/services/misc/weechat.nix b/nixpkgs/nixos/modules/services/misc/weechat.nix index c6ff540ea12f..b71250f62e0f 100644 --- a/nixpkgs/nixos/modules/services/misc/weechat.nix +++ b/nixpkgs/nixos/modules/services/misc/weechat.nix @@ -20,6 +20,7 @@ in type = types.str; }; binary = mkOption { + type = types.path; description = "Binary to execute (by default \${weechat}/bin/weechat)."; example = literalExample '' ''${pkgs.weechat}/bin/weechat-headless diff --git a/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/nixpkgs/nixos/modules/services/monitoring/netdata.nix index db51fdbd2c61..d5b679097b30 100644 --- a/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -77,6 +77,7 @@ in { ''; }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = ps: []; defaultText = "ps: []"; example = literalExample '' diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index 1fd85c66f843..940f28189371 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -56,6 +56,7 @@ let "unifi-poller" "varnish" "wireguard" + "flow" ] (name: import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; } ); @@ -238,9 +239,6 @@ in services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey; })] ++ [(mkIf config.services.prometheus.exporters.rtl_433.enable { hardware.rtl-sdr.enable = mkDefault true; - })] ++ [(mkIf config.services.nginx.enable { - systemd.services.prometheus-nginx-exporter.after = [ "nginx.service" ]; - systemd.services.prometheus-nginx-exporter.requires = [ "nginx.service" ]; })] ++ [(mkIf config.services.postfix.enable { services.prometheus.exporters.postfix.group = mkDefault config.services.postfix.setgidGroup; })] ++ (mapAttrsToList (name: conf: diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix new file mode 100644 index 000000000000..6a35f46308fe --- /dev/null +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.flow; +in { + port = 9590; + extraOpts = { + brokers = mkOption { + type = types.listOf types.str; + example = literalExample ''[ "kafka.example.org:19092" ]''; + description = "List of Kafka brokers to connect to."; + }; + + asn = mkOption { + type = types.ints.positive; + example = 65542; + description = "The ASN being monitored."; + }; + + partitions = mkOption { + type = types.listOf types.int; + default = []; + description = '' + The number of the partitions to consume, none means all. + ''; + }; + + topic = mkOption { + type = types.str; + example = "pmacct.acct"; + description = "The Kafka topic to consume from."; + }; + }; + + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-flow-exporter}/bin/flow-exporter \ + -asn ${toString cfg.asn} \ + -topic ${cfg.topic} \ + -brokers ${concatStringsSep "," cfg.brokers} \ + ${optionalString (cfg.partitions != []) "-partitions ${concatStringsSep "," cfg.partitions}"} \ + -addr ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index 56cddfc55b71..5ee8c346be1d 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -42,7 +42,7 @@ in ''; }; }; - serviceOpts = { + serviceOpts = mkMerge ([{ serviceConfig = { ExecStart = '' ${pkgs.prometheus-nginx-exporter}/bin/nginx-prometheus-exporter \ @@ -54,7 +54,10 @@ in ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; - }; + }] ++ [(mkIf config.services.nginx.enable { + after = [ "nginx.service" ]; + requires = [ "nginx.service" ]; + })]); imports = [ (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ]) (mkRemovedOptionModule [ "insecure" ] '' diff --git a/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix b/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix index ca9d32311f5f..33e851210bc6 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix @@ -46,6 +46,7 @@ in enable = mkEnableOption "the Netatalk AFP fileserver"; port = mkOption { + type = types.port; default = 548; description = "TCP port to be used for AFP."; }; @@ -68,6 +69,7 @@ in }; path = mkOption { + type = types.str; default = ""; example = "afp-data"; description = "Share not the whole user home but this subdirectory path."; @@ -75,6 +77,7 @@ in basedirRegex = mkOption { example = "/home"; + type = types.str; description = "Regex which matches the parent directory of the user homes."; }; diff --git a/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix b/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix index d782f7821656..4fce650b0133 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix @@ -61,6 +61,7 @@ in { }; advertisedAddresses = mkOption { + type = types.listOf types.str; default = []; description = "List of IP addresses this server is advertised under. See NetInfo(5)"; }; diff --git a/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix b/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix index 9f1263ddff56..edac86eb0e30 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix @@ -46,6 +46,13 @@ in { ''; }; + socketActivated = mkOption { + default = false; + type = types.bool; + description = + "If enabled Rsync will be socket-activated rather than run persistently."; + }; + }; }; @@ -63,12 +70,55 @@ in { services.rsyncd.settings.global.port = toString cfg.port; - systemd.services.rsyncd = { - description = "Rsync daemon"; - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = - "${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}"; + systemd = let + serviceConfigSecurity = { + ProtectSystem = "full"; + PrivateDevices = "on"; + NoNewPrivileges = "on"; + }; + in { + services.rsync = { + enable = !cfg.socketActivated; + aliases = [ "rsyncd" ]; + + description = "fast remote file copy program daemon"; + after = [ "network.target" ]; + documentation = [ "man:rsync(1)" "man:rsyncd.conf(5)" ]; + + serviceConfig = serviceConfigSecurity // { + ExecStart = + "${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}"; + RestartSec = 1; + }; + + wantedBy = [ "multi-user.target" ]; + }; + + services."rsync@" = { + description = "fast remote file copy program daemon"; + after = [ "network.target" ]; + + serviceConfig = serviceConfigSecurity // { + ExecStart = "${pkgs.rsync}/bin/rsync --daemon --config=${configFile}"; + StandardInput = "socket"; + StandardOutput = "inherit"; + StandardError = "journal"; + }; + }; + + sockets.rsync = { + enable = cfg.socketActivated; + + description = "socket for fast remote file copy program daemon"; + conflicts = [ "rsync.service" ]; + + listenStreams = [ (toString cfg.port) ]; + socketConfig.Accept = true; + + wantedBy = [ "sockets.target" ]; + }; }; + }; meta.maintainers = with lib.maintainers; [ ehmry ]; diff --git a/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix index 27a9fe847c58..6cc8a05ee00b 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -92,6 +92,7 @@ in enable = mkEnableOption "XtreemFS"; homeDir = mkOption { + type = types.path; default = "/var/lib/xtreemfs"; description = '' XtreemFS home dir for the xtreemfs user. @@ -109,6 +110,7 @@ in uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40"; + type = types.str; description = '' Must be set to a unique identifier, preferably a UUID according to RFC 4122. UUIDs can be generated with `uuidgen` command, found in @@ -117,11 +119,13 @@ in }; port = mkOption { default = 32638; + type = types.port; description = '' The port to listen on for incoming connections (TCP). ''; }; address = mkOption { + type = types.str; example = "127.0.0.1"; default = ""; description = '' @@ -131,12 +135,14 @@ in }; httpPort = mkOption { default = 30638; + type = types.port; description = '' Specifies the listen port for the HTTP service that returns the status page. ''; }; syncMode = mkOption { + type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "ASYNC" ]; default = "FSYNC"; example = "FDATASYNC"; description = '' @@ -229,6 +235,7 @@ in uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41"; + type = types.str; description = '' Must be set to a unique identifier, preferably a UUID according to RFC 4122. UUIDs can be generated with `uuidgen` command, found in @@ -237,12 +244,14 @@ in }; port = mkOption { default = 32636; + type = types.port; description = '' The port to listen on for incoming connections (TCP). ''; }; address = mkOption { example = "127.0.0.1"; + type = types.str; default = ""; description = '' If specified, it defines the interface to listen on. If not @@ -251,6 +260,7 @@ in }; httpPort = mkOption { default = 30636; + type = types.port; description = '' Specifies the listen port for the HTTP service that returns the status page. @@ -258,6 +268,7 @@ in }; syncMode = mkOption { default = "FSYNC"; + type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "ASYNC" ]; example = "FDATASYNC"; description = '' The sync mode influences how operations are committed to the disk @@ -367,6 +378,7 @@ in uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42"; + type = types.str; description = '' Must be set to a unique identifier, preferably a UUID according to RFC 4122. UUIDs can be generated with `uuidgen` command, found in @@ -375,12 +387,14 @@ in }; port = mkOption { default = 32640; + type = types.port; description = '' The port to listen on for incoming connections (TCP and UDP). ''; }; address = mkOption { example = "127.0.0.1"; + type = types.str; default = ""; description = '' If specified, it defines the interface to listen on. If not @@ -389,6 +403,7 @@ in }; httpPort = mkOption { default = 30640; + type = types.port; description = '' Specifies the listen port for the HTTP service that returns the status page. diff --git a/nixpkgs/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixpkgs/nixos/modules/services/network-filesystems/yandex-disk.nix index cc73f13bf77a..a5b1f9d4ab63 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -46,12 +46,14 @@ in user = mkOption { default = null; + type = types.nullOr types.str; description = '' The user the yandex-disk daemon should run as. ''; }; directory = mkOption { + type = types.path; default = "/home/Yandex.Disk"; description = "The directory to use for Yandex.Disk storage"; }; diff --git a/nixpkgs/nixos/modules/services/networking/babeld.nix b/nixpkgs/nixos/modules/services/networking/babeld.nix index 90395dbd3c54..272c58ecd7ff 100644 --- a/nixpkgs/nixos/modules/services/networking/babeld.nix +++ b/nixpkgs/nixos/modules/services/networking/babeld.nix @@ -69,6 +69,7 @@ in extraConfig = mkOption { default = ""; + type = types.lines; description = '' Options that will be copied to babeld.conf. See <citerefentry><refentrytitle>babeld</refentrytitle><manvolnum>8</manvolnum></citerefentry> for details. diff --git a/nixpkgs/nixos/modules/services/networking/bee-clef.nix b/nixpkgs/nixos/modules/services/networking/bee-clef.nix new file mode 100644 index 000000000000..719714b28982 --- /dev/null +++ b/nixpkgs/nixos/modules/services/networking/bee-clef.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +# NOTE for now nothing is installed into /etc/bee-clef/. the config files are used as read-only from the nix store. + +with lib; +let + cfg = config.services.bee-clef; +in { + meta = { + maintainers = with maintainers; [ attila-lendvai ]; + }; + + ### interface + + options = { + services.bee-clef = { + enable = mkEnableOption "clef external signer instance for Ethereum Swarm Bee"; + + dataDir = mkOption { + type = types.nullOr types.str; + default = "/var/lib/bee-clef"; + description = '' + Data dir for bee-clef. Beware that some helper scripts may not work when changed! + The service itself should work fine, though. + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.str; + default = "/var/lib/bee-clef/password"; + description = "Password file for bee-clef."; + }; + + user = mkOption { + type = types.str; + default = "bee-clef"; + description = '' + User the bee-clef daemon should execute under. + ''; + }; + + group = mkOption { + type = types.str; + default = "bee-clef"; + description = '' + Group the bee-clef daemon should execute under. + ''; + }; + }; + }; + + ### implementation + + config = mkIf cfg.enable { + # if we ever want to have rules.js under /etc/bee-clef/ + # environment.etc."bee-clef/rules.js".source = ${pkgs.bee-clef}/rules.js + + systemd.packages = [ pkgs.bee-clef ]; # include the upstream bee-clef.service file + + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}/' 0750 ${cfg.user} ${cfg.group}" + "d '${cfg.dataDir}/keystore' 0700 ${cfg.user} ${cfg.group}" + ]; + + systemd.services.bee-clef = { + path = [ + # these are needed for the ensure-clef-account script + pkgs.coreutils + pkgs.gnused + pkgs.gawk + ]; + + wantedBy = [ "bee.service" "multi-user.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStartPre = ''${pkgs.bee-clef}/share/bee-clef/ensure-clef-account "${cfg.dataDir}" "${pkgs.bee-clef}/share/bee-clef/"''; + ExecStart = [ + "" # this hides/overrides what's in the original entry + "${pkgs.bee-clef}/share/bee-clef/bee-clef-service start" + ]; + ExecStop = [ + "" # this hides/overrides what's in the original entry + "${pkgs.bee-clef}/share/bee-clef/bee-clef-service stop" + ]; + Environment = [ + "CONFIGDIR=${cfg.dataDir}" + "PASSWORD_FILE=${cfg.passwordFile}" + ]; + }; + }; + + users.users = optionalAttrs (cfg.user == "bee-clef") { + bee-clef = { + group = cfg.group; + home = cfg.dataDir; + isSystemUser = true; + description = "Daemon user for the bee-clef service"; + }; + }; + + users.groups = optionalAttrs (cfg.group == "bee-clef") { + bee-clef = {}; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/networking/bee.nix b/nixpkgs/nixos/modules/services/networking/bee.nix new file mode 100644 index 000000000000..8a77ce23ab4d --- /dev/null +++ b/nixpkgs/nixos/modules/services/networking/bee.nix @@ -0,0 +1,149 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.bee; + format = pkgs.formats.yaml {}; + configFile = format.generate "bee.yaml" cfg.settings; +in { + meta = { + # doc = ./bee.xml; + maintainers = with maintainers; [ attila-lendvai ]; + }; + + ### interface + + options = { + services.bee = { + enable = mkEnableOption "Ethereum Swarm Bee"; + + package = mkOption { + type = types.package; + default = pkgs.bee; + defaultText = "pkgs.bee"; + example = "pkgs.bee-unstable"; + description = "The package providing the bee binary for the service."; + }; + + settings = mkOption { + type = format.type; + description = '' + Ethereum Swarm Bee configuration. Refer to + <link xlink:href="https://gateway.ethswarm.org/bzz/docs.swarm.eth/docs/installation/configuration/"/> + for details on supported values. + ''; + }; + + daemonNiceLevel = mkOption { + type = types.int; + default = 0; + description = '' + Daemon process priority for bee. + 0 is the default Unix process priority, 19 is the lowest. + ''; + }; + + user = mkOption { + type = types.str; + default = "bee"; + description = '' + User the bee binary should execute under. + ''; + }; + + group = mkOption { + type = types.str; + default = "bee"; + description = '' + Group the bee binary should execute under. + ''; + }; + }; + }; + + ### implementation + + config = mkIf cfg.enable { + assertions = [ + { assertion = (hasAttr "password" cfg.settings) != true; + message = '' + `services.bee.settings.password` is insecure. Use `services.bee.settings.password-file` or `systemd.services.bee.serviceConfig.EnvironmentFile` instead. + ''; + } + { assertion = (hasAttr "swap-endpoint" cfg.settings) || (cfg.settings.swap-enable or true == false); + message = '' + In a swap-enabled network a working Ethereum blockchain node is required. You must specify one using `services.bee.settings.swap-endpoint`, or disable `services.bee.settings.swap-enable` = false. + ''; + } + ]; + + warnings = optional (! config.services.bee-clef.enable) "The bee service requires an external signer. Consider setting `config.services.bee-clef.enable` = true"; + + services.bee.settings = { + data-dir = lib.mkDefault "/var/lib/bee"; + password-file = lib.mkDefault "/var/lib/bee/password"; + clef-signer-enable = lib.mkDefault true; + clef-signer-endpoint = lib.mkDefault "/var/lib/bee-clef/clef.ipc"; + swap-endpoint = lib.mkDefault "https://rpc.slock.it/goerli"; + }; + + systemd.packages = [ cfg.package ]; # include the upstream bee.service file + + systemd.tmpfiles.rules = [ + "d '${cfg.settings.data-dir}' 0750 ${cfg.user} ${cfg.group}" + ]; + + systemd.services.bee = { + requires = optional config.services.bee-clef.enable + "bee-clef.service"; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Nice = cfg.daemonNiceLevel; + User = cfg.user; + Group = cfg.group; + ExecStart = [ + "" # this hides/overrides what's in the original entry + "${cfg.package}/bin/bee --config=${configFile} start" + ]; + }; + + preStart = with cfg.settings; '' + if ! test -f ${password-file}; then + < /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 > ${password-file} + chmod 0600 ${password-file} + echo "Initialized ${password-file} from /dev/urandom" + fi + if [ ! -f ${data-dir}/keys/libp2p.key ]; then + ${cfg.package}/bin/bee init --config=${configFile} >/dev/null + echo " +Logs: journalctl -f -u bee.service + +Bee has SWAP enabled by default and it needs ethereum endpoint to operate. +It is recommended to use external signer with bee. +Check documentation for more info: +- SWAP https://docs.ethswarm.org/docs/installation/manual#swap-bandwidth-incentives +- External signer https://docs.ethswarm.org/docs/installation/bee-clef + +After you finish configuration run 'sudo bee-get-addr'." + fi + ''; + }; + + users.users = optionalAttrs (cfg.user == "bee") { + bee = { + group = cfg.group; + home = cfg.settings.data-dir; + isSystemUser = true; + description = "Daemon user for Ethereum Swarm Bee"; + extraGroups = optional config.services.bee-clef.enable + config.services.bee-clef.group; + }; + }; + + users.groups = optionalAttrs (cfg.group == "bee") { + bee = {}; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/networking/bind.nix b/nixpkgs/nixos/modules/services/networking/bind.nix index faad88635759..e507e8ce9eeb 100644 --- a/nixpkgs/nixos/modules/services/networking/bind.nix +++ b/nixpkgs/nixos/modules/services/networking/bind.nix @@ -8,6 +8,35 @@ let bindUser = "named"; + bindZoneOptions = { + name = mkOption { + type = types.str; + description = "Name of the zone."; + }; + master = mkOption { + description = "Master=false means slave server"; + type = types.bool; + }; + file = mkOption { + type = types.either types.str types.path; + description = "Zone file resource records contain columns of data, separated by whitespace, that define the record."; + }; + masters = mkOption { + type = types.listOf types.str; + description = "List of servers for inclusion in stub and secondary zones."; + }; + slaves = mkOption { + type = types.listOf types.str; + description = "Addresses who may request zone transfers."; + default = []; + }; + extraConfig = mkOption { + type = types.str; + description = "Extra zone config to be appended at the end of the zone section."; + default = ""; + }; + }; + confFile = pkgs.writeText "named.conf" '' include "/etc/bind/rndc.key"; @@ -72,6 +101,7 @@ in cacheNetworks = mkOption { default = ["127.0.0.0/24"]; + type = types.listOf types.str; description = " What networks are allowed to use us as a resolver. Note that this is for recursive queries -- all networks are @@ -83,6 +113,7 @@ in blockedNetworks = mkOption { default = []; + type = types.listOf types.str; description = " What networks are just blocked. "; @@ -90,6 +121,7 @@ in ipv4Only = mkOption { default = false; + type = types.bool; description = " Only use ipv4, even if the host supports ipv6. "; @@ -97,6 +129,7 @@ in forwarders = mkOption { default = config.networking.nameservers; + type = types.listOf types.str; description = " List of servers we should forward requests to. "; @@ -120,10 +153,9 @@ in zones = mkOption { default = []; + type = types.listOf (types.submodule [ { options = bindZoneOptions; } ]); description = " List of zones we claim authority over. - master=false means slave server; slaves means addresses - who may request zone transfer. "; example = [{ name = "example.com"; diff --git a/nixpkgs/nixos/modules/services/networking/cntlm.nix b/nixpkgs/nixos/modules/services/networking/cntlm.nix index c8e08fdefaa4..eea28e12ce0e 100644 --- a/nixpkgs/nixos/modules/services/networking/cntlm.nix +++ b/nixpkgs/nixos/modules/services/networking/cntlm.nix @@ -36,12 +36,14 @@ in enable = mkEnableOption "cntlm, which starts a local proxy"; username = mkOption { + type = types.str; description = '' Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally). ''; }; domain = mkOption { + type = types.str; description = "Proxy account domain/workgroup name."; }; @@ -60,6 +62,7 @@ in }; proxy = mkOption { + type = types.listOf types.str; description = '' A list of NTLM/NTLMv2 authenticating HTTP proxies. @@ -75,11 +78,13 @@ in A list of domains where the proxy is skipped. ''; default = []; + type = types.listOf types.str; example = [ "*.example.com" "example.com" ]; }; port = mkOption { default = [3128]; + type = types.listOf types.port; description = "Specifies on which ports the cntlm daemon listens."; }; diff --git a/nixpkgs/nixos/modules/services/networking/consul.nix b/nixpkgs/nixos/modules/services/networking/consul.nix index f7d2afead06c..bfaea4e167c2 100644 --- a/nixpkgs/nixos/modules/services/networking/consul.nix +++ b/nixpkgs/nixos/modules/services/networking/consul.nix @@ -99,6 +99,7 @@ in extraConfig = mkOption { default = { }; + type = types.attrsOf types.anything; description = '' Extra configuration options which are serialized to json and added to the config.json file. diff --git a/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix index ff8a2ab30774..afc2a6d1c757 100644 --- a/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -87,6 +87,7 @@ in NoNewPrivileges = true; NonBlocking = true; PrivateDevices = true; + ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; ProtectHostname = true; @@ -107,8 +108,13 @@ in SystemCallFilter = [ "@system-service" "@chown" + "~@aio" + "~@keyring" + "~@memlock" "~@resources" - "@privileged" + "~@setuid" + "~@sync" + "~@timer" ]; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/epmd.nix b/nixpkgs/nixos/modules/services/networking/epmd.nix index 692b75e4f086..f7cdc0fe79c0 100644 --- a/nixpkgs/nixos/modules/services/networking/epmd.nix +++ b/nixpkgs/nixos/modules/services/networking/epmd.nix @@ -53,4 +53,6 @@ in }; }; }; + + meta.maintainers = teams.beam.members; } diff --git a/nixpkgs/nixos/modules/services/networking/flashpolicyd.nix b/nixpkgs/nixos/modules/services/networking/flashpolicyd.nix deleted file mode 100644 index 7f25083307c7..000000000000 --- a/nixpkgs/nixos/modules/services/networking/flashpolicyd.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.flashpolicyd; - - flashpolicyd = pkgs.stdenv.mkDerivation { - name = "flashpolicyd-0.6"; - - src = pkgs.fetchurl { - name = "flashpolicyd_v0.6.zip"; - url = "https://download.adobe.com/pub/adobe/devnet/flashplayer/articles/socket_policy_files/flashpolicyd_v0.6.zip"; - sha256 = "16zk237233npwfq1m4ksy4g5lzy1z9fp95w7pz0cdlpmv0fv9sm3"; - }; - - buildInputs = [ pkgs.unzip pkgs.perl ]; - - installPhase = "mkdir $out; cp -pr * $out/; chmod +x $out/*/*.pl"; - }; - - flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd" - '' - #! ${pkgs.runtimeShell} - exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \ - --file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \ - 2> /dev/null - ''; - -in - -{ - - ###### interface - - options = { - - services.flashpolicyd = { - - enable = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to enable the Flash Policy server. This is - necessary if you want Flash applications to make - connections to your server. - ''; - }; - - policy = mkOption { - default = - '' - <?xml version="1.0"?> - <!DOCTYPE cross-domain-policy SYSTEM "/xml/dtds/cross-domain-policy.dtd"> - <cross-domain-policy> - <site-control permitted-cross-domain-policies="master-only"/> - <allow-access-from domain="*" to-ports="*" /> - </cross-domain-policy> - ''; - description = "The policy to be served. The default is to allow connections from any domain to any port."; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - services.xinetd.enable = true; - - services.xinetd.services = singleton - { name = "flashpolicy"; - port = 843; - unlisted = true; - server = "${flashpolicydWrapper}/bin/flashpolicyd"; - }; - - }; - -} diff --git a/nixpkgs/nixos/modules/services/networking/gogoclient.nix b/nixpkgs/nixos/modules/services/networking/gogoclient.nix index 99455b183144..1205321818b9 100644 --- a/nixpkgs/nixos/modules/services/networking/gogoclient.nix +++ b/nixpkgs/nixos/modules/services/networking/gogoclient.nix @@ -28,6 +28,7 @@ in username = mkOption { default = ""; + type = types.str; description = '' Your Gateway6 login name, if any. ''; @@ -42,6 +43,7 @@ in }; server = mkOption { + type = types.str; default = "anonymous.freenet6.net"; example = "broker.freenet6.net"; description = "The Gateway6 server to be used."; diff --git a/nixpkgs/nixos/modules/services/networking/gvpe.nix b/nixpkgs/nixos/modules/services/networking/gvpe.nix index 92e87cd4640d..b851facf1e32 100644 --- a/nixpkgs/nixos/modules/services/networking/gvpe.nix +++ b/nixpkgs/nixos/modules/services/networking/gvpe.nix @@ -3,7 +3,7 @@ {config, pkgs, lib, ...}: let - inherit (lib) mkOption mkIf; + inherit (lib) mkOption mkIf types; cfg = config.services.gvpe; @@ -46,12 +46,14 @@ in nodename = mkOption { default = null; + type = types.nullOr types.str; description ='' GVPE node name ''; }; configText = mkOption { default = null; + type = types.nullOr types.lines; example = '' tcp-port = 655 udp-port = 655 @@ -72,6 +74,7 @@ in }; configFile = mkOption { default = null; + type = types.nullOr types.path; example = "/root/my-gvpe-conf"; description = '' GVPE config file, if already present @@ -79,12 +82,14 @@ in }; ipAddress = mkOption { default = null; + type = types.nullOr types.str; description = '' IP address to assign to GVPE interface ''; }; subnet = mkOption { default = null; + type = types.nullOr types.str; example = "10.0.0.0/8"; description = '' IP subnet assigned to GVPE network @@ -92,6 +97,7 @@ in }; customIFSetup = mkOption { default = ""; + type = types.lines; description = '' Additional commands to apply in ifup script ''; diff --git a/nixpkgs/nixos/modules/services/networking/hostapd.nix b/nixpkgs/nixos/modules/services/networking/hostapd.nix index e9569b2ba6b9..f719ff59cc7f 100644 --- a/nixpkgs/nixos/modules/services/networking/hostapd.nix +++ b/nixpkgs/nixos/modules/services/networking/hostapd.nix @@ -68,6 +68,7 @@ in interface = mkOption { default = ""; example = "wlp2s0"; + type = types.str; description = '' The interfaces <command>hostapd</command> will use. ''; diff --git a/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix index 91d0bf437d69..0781159b6ee7 100644 --- a/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -40,6 +40,7 @@ in serverName = mkOption { default = "hades.arpa"; + type = types.str; description = " IRCD server name. "; @@ -47,6 +48,7 @@ in sid = mkOption { default = "0NL"; + type = types.str; description = " IRCD server unique ID in a net of servers. "; @@ -54,6 +56,7 @@ in description = mkOption { default = "Hybrid-7 IRC server."; + type = types.str; description = " IRCD server description. "; @@ -62,6 +65,7 @@ in rsaKey = mkOption { default = null; example = literalExample "/root/certificates/irc.key"; + type = types.nullOr types.path; description = " IRCD server RSA key. "; @@ -70,6 +74,7 @@ in certificate = mkOption { default = null; example = literalExample "/root/certificates/irc.pem"; + type = types.nullOr types.path; description = " IRCD server SSL certificate. There are some limitations - read manual. "; @@ -77,6 +82,7 @@ in adminEmail = mkOption { default = "<bit-bucket@example.com>"; + type = types.str; example = "<name@domain.tld>"; description = " IRCD server administrator e-mail. @@ -86,6 +92,7 @@ in extraIPs = mkOption { default = []; example = ["127.0.0.1"]; + type = types.listOf types.str; description = " Extra IP's to bind. "; @@ -93,6 +100,7 @@ in extraPort = mkOption { default = "7117"; + type = types.str; description = " Extra port to avoid filtering. "; diff --git a/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix b/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix index 5482e997a401..80f35d56e2db 100644 --- a/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix +++ b/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix @@ -191,6 +191,16 @@ in Whether to open ports in the firewall for the videobridge. ''; }; + + apis = mkOption { + type = with types; listOf str; + description = '' + What is passed as --apis= parameter. If this is empty, "none" is passed. + Needed for monitoring jitsi. + ''; + default = []; + example = literalExample "[ \"colibri\" \"rest\" ]"; + }; }; config = mkIf cfg.enable { @@ -221,7 +231,7 @@ in "export ${toVarName name}=$(cat ${xmppConfig.passwordFile})\n" ) cfg.xmppConfigs)) + '' - ${pkgs.jitsi-videobridge}/bin/jitsi-videobridge --apis=none + ${pkgs.jitsi-videobridge}/bin/jitsi-videobridge --apis=${if (cfg.apis == []) then "none" else concatStringsSep "," cfg.apis} ''; serviceConfig = { diff --git a/nixpkgs/nixos/modules/services/networking/kresd.nix b/nixpkgs/nixos/modules/services/networking/kresd.nix index 074830fc3521..4131ff8be5d0 100644 --- a/nixpkgs/nixos/modules/services/networking/kresd.nix +++ b/nixpkgs/nixos/modules/services/networking/kresd.nix @@ -140,7 +140,7 @@ in { # Try cleaning up the previously default location of cache file. # Note that /var/cache/* should always be safe to remove. - # TODO: remove later, probably between 20.09 and 21.03 + # TODO: remove later, probably between 20.09 and 21.05 systemd.tmpfiles.rules = [ "R /var/cache/kresd" ]; }; } diff --git a/nixpkgs/nixos/modules/services/networking/mailpile.nix b/nixpkgs/nixos/modules/services/networking/mailpile.nix index b79ee11d17db..4673a2580b60 100644 --- a/nixpkgs/nixos/modules/services/networking/mailpile.nix +++ b/nixpkgs/nixos/modules/services/networking/mailpile.nix @@ -21,11 +21,13 @@ in enable = mkEnableOption "Mailpile the mail client"; hostname = mkOption { + type = types.str; default = "localhost"; description = "Listen to this hostname or ip."; }; port = mkOption { - default = "33411"; + type = types.port; + default = 33411; description = "Listen on this port."; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/pleroma.nix b/nixpkgs/nixos/modules/services/networking/pleroma.nix new file mode 100644 index 000000000000..9b2bf9f61244 --- /dev/null +++ b/nixpkgs/nixos/modules/services/networking/pleroma.nix @@ -0,0 +1,140 @@ +{ config, options, lib, pkgs, stdenv, ... }: +let + cfg = config.services.pleroma; +in { + options = { + services.pleroma = with lib; { + enable = mkEnableOption "pleroma"; + + package = mkOption { + type = types.package; + default = pkgs.pleroma-otp; + description = "Pleroma package to use."; + }; + + user = mkOption { + type = types.str; + default = "pleroma"; + description = "User account under which pleroma runs."; + }; + + group = mkOption { + type = types.str; + default = "pleroma"; + description = "Group account under which pleroma runs."; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/lib/pleroma"; + readOnly = true; + description = "Directory where the pleroma service will save the uploads and static files."; + }; + + configs = mkOption { + type = with types; listOf str; + description = '' + Pleroma public configuration. + + This list gets appended from left to + right into /etc/pleroma/config.exs. Elixir evaluates its + configuration imperatively, meaning you can override a + setting by appending a new str to this NixOS option list. + + <emphasis>DO NOT STORE ANY PLEROMA SECRET + HERE</emphasis>, use + <link linkend="opt-services.pleroma.secretConfigFile">services.pleroma.secretConfigFile</link> + instead. + + This setting is going to be stored in a file part of + the Nix store. The Nix store being world-readable, it's not + the right place to store any secret + + Have a look to Pleroma section in the NixOS manual for more + informations. + ''; + }; + + secretConfigFile = mkOption { + type = types.str; + default = "/var/lib/pleroma/secrets.exs"; + description = '' + Path to the file containing your secret pleroma configuration. + + <emphasis>DO NOT POINT THIS OPTION TO THE NIX + STORE</emphasis>, the store being world-readable, it'll + compromise all your secrets. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + users = { + users."${cfg.user}" = { + description = "Pleroma user"; + home = cfg.stateDir; + extraGroups = [ cfg.group ]; + }; + groups."${cfg.group}" = {}; + }; + + environment.systemPackages = [ cfg.package ]; + + environment.etc."/pleroma/config.exs".text = '' + ${lib.concatMapStrings (x: "${x}") cfg.configs} + + # The lau/tzdata library is trying to download the latest + # timezone database in the OTP priv directory by default. + # This directory being in the store, it's read-only. + # Setting that up to a more appropriate location. + config :tzdata, :data_dir, "/var/lib/pleroma/elixir_tzdata_data" + + import_config "${cfg.secretConfigFile}" + ''; + + systemd.services.pleroma = { + description = "Pleroma social network"; + after = [ "network-online.target" "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Type = "exec"; + WorkingDirectory = "~"; + StateDirectory = "pleroma pleroma/static pleroma/uploads"; + StateDirectoryMode = "700"; + + # Checking the conf file is there then running the database + # migration before each service start, just in case there are + # some pending ones. + # + # It's sub-optimal as we'll always run this, even if pleroma + # has not been updated. But the no-op process is pretty fast. + # Better be safe than sorry migration-wise. + ExecStartPre = + let preScript = pkgs.writers.writeBashBin "pleromaStartPre" + "${cfg.package}/bin/pleroma_ctl migrate"; + in "${preScript}/bin/pleromaStartPre"; + + ExecStart = "${cfg.package}/bin/pleroma start"; + ExecStop = "${cfg.package}/bin/pleroma stop"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + + # Systemd sandboxing directives. + # Taken from the upstream contrib systemd service at + # pleroma/installation/pleroma.service + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "full"; + PrivateDevices = false; + NoNewPrivileges = true; + CapabilityBoundingSet = "~CAP_SYS_ADMIN"; + }; + }; + + }; + meta.maintainers = with lib.maintainers; [ ninjatrappeur ]; + meta.doc = ./pleroma.xml; +} diff --git a/nixpkgs/nixos/modules/services/networking/pleroma.xml b/nixpkgs/nixos/modules/services/networking/pleroma.xml new file mode 100644 index 000000000000..9ab0be3d947c --- /dev/null +++ b/nixpkgs/nixos/modules/services/networking/pleroma.xml @@ -0,0 +1,132 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="module-services-pleroma"> + <title>Pleroma</title> + <para><link xlink:href="https://pleroma.social/">Pleroma</link> is a lightweight activity pub server.</para> + <section xml:id="module-services-pleroma-getting-started"> + <title>Quick Start</title> + <para>To get quickly started, you can use this sample NixOS configuration and adapt it to your use case.</para> + <para><programlisting> + { + security.acme = { + email = "root@tld"; + acceptTerms = true; + certs = { + "social.tld.com" = { + webroot = "/var/www/social.tld.com"; + email = "root@tld"; + group = "nginx"; + }; + }; + }; + services = { + pleroma = { + enable = true; + secretConfigFile = "/var/lib/pleroma/secrets.exs"; + configs = [ + '' + import Config + + config :pleroma, Pleroma.Web.Endpoint, + url: [host: "social.tld.com", scheme: "https", port: 443], + http: [ip: {127, 0, 0, 1}, port: 4000] + + config :pleroma, :instance, + name: "NixOS test pleroma server", + email: "pleroma@social.tld.com", + notify_email: "pleroma@social.tld.com", + limit: 5000, + registrations_open: true + + config :pleroma, :media_proxy, + enabled: false, + redirect_on_failure: true + #base_url: "https://cache.pleroma.social" + + config :pleroma, Pleroma.Repo, + adapter: Ecto.Adapters.Postgres, + username: "pleroma", + password: "${test-db-passwd}", + database: "pleroma", + hostname: "localhost", + pool_size: 10, + prepare: :named, + parameters: [ + plan_cache_mode: "force_custom_plan" + ] + + config :pleroma, :database, rum_enabled: false + config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" + config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" + config :pleroma, configurable_from_database: false + '' + ]; + }; + postgresql = { + enable = true; + package = pkgs.postgresql_12; + }; + nginx = { + enable = true; + addSSL = true; + sslCertificate = "/var/lib/acme/social.tld.com/fullchain.pem"; + sslCertificateKey = "/var/lib/acme/social.tld.com/key.pem"; + root = "/var/www/social.tld.com"; + # ACME endpoint + locations."/.well-known/acme-challenge" = { + root = "/var/www/social.tld.com/"; + }; + virtualHosts."social.tld.com" = { + addSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:4000"; + extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; + add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; + if ($request_method = OPTIONS) { + return 204; + } + add_header X-XSS-Protection "1; mode=block"; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header Referrer-Policy same-origin; + add_header X-Download-Options noopen; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + client_max_body_size 16m; + ''; + }; + }; + }; + }; + }; + </programlisting></para> + <para>Note that you'll need to seed your database and upload your pleroma secrets to the path pointed by <literal>config.pleroma.secretConfigFile</literal>. You can find more informations about how to do that in the <link linkend="module-services-pleroma-generate-config">next</link> section.</para> + </section> + <section xml:id="module-services-pleroma-generate-config"> + <title>Generating the Pleroma Config and Seed the Database</title> + + <para>Before using this service, you'll need to generate your +server configuration and its associated database seed. The +<literal>pleroma_ctl</literal> CLI utility can help you with that. You +can start with <literal>pleroma_ctl instance gen --output config.exs +--output-psql setup.psql</literal>, this will prompt you some +questions and will generate both your config file and database initial +migration. </para> +<para>For more details about this configuration format, please have a look at the <link xlink:href="https://docs-develop.pleroma.social/backend/configuration/cheatsheet/">upstream documentation</link>.</para> +<para>To seed your database, you can use the <literal>setup.psql</literal> file you just generated by running +<programlisting> + sudo -u postgres psql -f setup.psql +</programlisting></para> + <para>In regard of the pleroma service configuration you also just generated, you'll need to split it in two parts. The "public" part, which do not contain any secrets and thus can be safely stored in the Nix store and its "private" counterpart containing some secrets (database password, endpoint secret key, salts, etc.).</para> + + <para>The public part will live in your NixOS machine configuration in the <link linkend="opt-services.pleroma.configs">services.pleroma.configs</link> option. However, it's up to you to upload the secret pleroma configuration to the path pointed by <link linkend="opt-services.pleroma.secretConfigFile">services.pleroma.secretConfigFile</link>. You can do that manually or rely on a third party tool such as <link xlink:href="https://github.com/DBCDK/morph">Morph</link> or <link xlink:href="https://github.com/NixOS/nixops">NixOps</link>.</para> + </section> +</chapter> diff --git a/nixpkgs/nixos/modules/services/networking/prayer.nix b/nixpkgs/nixos/modules/services/networking/prayer.nix index f04dac01d9b8..ae9258b27122 100644 --- a/nixpkgs/nixos/modules/services/networking/prayer.nix +++ b/nixpkgs/nixos/modules/services/networking/prayer.nix @@ -44,7 +44,8 @@ in enable = mkEnableOption "the prayer webmail http server"; port = mkOption { - default = "2080"; + default = 2080; + type = types.port; description = '' Port the prayer http server is listening to. ''; diff --git a/nixpkgs/nixos/modules/services/networking/quassel.nix b/nixpkgs/nixos/modules/services/networking/quassel.nix index 2958fb9a8b33..bfbd3b46ab4d 100644 --- a/nixpkgs/nixos/modules/services/networking/quassel.nix +++ b/nixpkgs/nixos/modules/services/networking/quassel.nix @@ -45,6 +45,7 @@ in }; interfaces = mkOption { + type = types.listOf types.str; default = [ "127.0.0.1" ]; description = '' The interfaces the Quassel daemon will be listening to. If `[ 127.0.0.1 ]', @@ -54,6 +55,7 @@ in }; portNumber = mkOption { + type = types.port; default = 4242; description = '' The port number the Quassel daemon will be listening to. @@ -62,6 +64,7 @@ in dataDir = mkOption { default = "/home/${user}/.config/quassel-irc.org"; + type = types.str; description = '' The directory holding configuration files, the SQlite database and the SSL Cert. ''; @@ -69,6 +72,7 @@ in user = mkOption { default = null; + type = types.nullOr types.str; description = '' The existing user the Quassel daemon should run as. If left empty, a default "quassel" user will be created. ''; diff --git a/nixpkgs/nixos/modules/services/networking/radvd.nix b/nixpkgs/nixos/modules/services/networking/radvd.nix index f4b00c9b356e..53fac4b7b72d 100644 --- a/nixpkgs/nixos/modules/services/networking/radvd.nix +++ b/nixpkgs/nixos/modules/services/networking/radvd.nix @@ -33,6 +33,7 @@ in }; services.radvd.config = mkOption { + type = types.lines; example = '' interface eth0 { diff --git a/nixpkgs/nixos/modules/services/networking/resilio.nix b/nixpkgs/nixos/modules/services/networking/resilio.nix index 6193d7340fc4..4701b0e8143d 100644 --- a/nixpkgs/nixos/modules/services/networking/resilio.nix +++ b/nixpkgs/nixos/modules/services/networking/resilio.nix @@ -183,6 +183,7 @@ in sharedFolders = mkOption { default = []; + type = types.listOf (types.attrsOf types.anything); example = [ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y"; directory = "/home/user/sync_test"; diff --git a/nixpkgs/nixos/modules/services/networking/sabnzbd.nix b/nixpkgs/nixos/modules/services/networking/sabnzbd.nix index ff5aef7d1cb4..43566dfd25c5 100644 --- a/nixpkgs/nixos/modules/services/networking/sabnzbd.nix +++ b/nixpkgs/nixos/modules/services/networking/sabnzbd.nix @@ -18,16 +18,19 @@ in enable = mkEnableOption "the sabnzbd server"; configFile = mkOption { + type = types.path; default = "/var/lib/sabnzbd/sabnzbd.ini"; description = "Path to config file."; }; user = mkOption { default = "sabnzbd"; + type = types.str; description = "User to run the service as"; }; group = mkOption { + type = types.str; default = "sabnzbd"; description = "Group to run the service as"; }; diff --git a/nixpkgs/nixos/modules/services/networking/shairport-sync.nix b/nixpkgs/nixos/modules/services/networking/shairport-sync.nix index b4b86a2d55be..ac526c0e9f6f 100644 --- a/nixpkgs/nixos/modules/services/networking/shairport-sync.nix +++ b/nixpkgs/nixos/modules/services/networking/shairport-sync.nix @@ -28,6 +28,7 @@ in }; arguments = mkOption { + type = types.str; default = "-v -o pa"; description = '' Arguments to pass to the daemon. Defaults to a local pulseaudio @@ -36,6 +37,7 @@ in }; user = mkOption { + type = types.str; default = "shairport"; description = '' User account name under which to run shairport-sync. The account diff --git a/nixpkgs/nixos/modules/services/networking/smokeping.nix b/nixpkgs/nixos/modules/services/networking/smokeping.nix index 0747ff6dd5a9..4470c18fd533 100644 --- a/nixpkgs/nixos/modules/services/networking/smokeping.nix +++ b/nixpkgs/nixos/modules/services/networking/smokeping.nix @@ -124,7 +124,8 @@ in }; hostName = mkOption { type = types.str; - default = config.networking.hostName; + default = config.networking.fqdn; + defaultText = "\${config.networking.fqdn}"; example = "somewhere.example.com"; description = "DNS name for the urls generated in the cgi."; }; @@ -156,6 +157,7 @@ in ownerEmail = mkOption { type = types.str; default = "no-reply@${cfg.hostName}"; + defaultText = "no-reply@\${hostName}"; example = "no-reply@yourdomain.com"; description = "Email contact for owner"; }; @@ -239,18 +241,18 @@ in targetConfig = mkOption { type = types.lines; default = '' - probe = FPing - menu = Top - title = Network Latency Grapher - remark = Welcome to the SmokePing website of xxx Company. \ - Here you will learn all about the latency of our network. - + Local - menu = Local - title = Local Network - ++ LocalMachine - menu = Local Machine - title = This host - host = localhost + probe = FPing + menu = Top + title = Network Latency Grapher + remark = Welcome to the SmokePing website of xxx Company. \ + Here you will learn all about the latency of our network. + + Local + menu = Local + title = Local Network + ++ LocalMachine + menu = Local Machine + title = This host + host = localhost ''; description = "Target configuration"; }; diff --git a/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix b/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix index e46d62bf1e82..862ff7df0540 100644 --- a/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix @@ -29,6 +29,7 @@ in portNumber = mkOption { default = 22; + type = types.port; description = '' The port on which to listen for connections. ''; @@ -36,6 +37,7 @@ in interfaces = mkOption { default = []; + type = types.listOf types.str; description = '' List of network interfaces where listening for connections. When providing the empty list, `[]', lshd listens on all @@ -46,6 +48,7 @@ in hostKey = mkOption { default = "/etc/lsh/host-key"; + type = types.str; description = '' Path to the server's private key. Note that this key must have been created, e.g., using "lsh-keygen --server | @@ -79,6 +82,7 @@ in loginShell = mkOption { default = null; + type = types.nullOr types.str; description = '' If non-null, override the default login shell with the specified value. @@ -88,6 +92,7 @@ in srpKeyExchange = mkOption { default = false; + type = types.bool; description = '' Whether to enable SRP key exchange and user authentication. ''; @@ -106,6 +111,7 @@ in }; subsystems = mkOption { + type = types.listOf types.path; description = '' List of subsystem-path pairs, where the head of the pair denotes the subsystem name, and the tail denotes the path to diff --git a/nixpkgs/nixos/modules/services/networking/supybot.nix b/nixpkgs/nixos/modules/services/networking/supybot.nix index 864c3319c547..332c3ced06f0 100644 --- a/nixpkgs/nixos/modules/services/networking/supybot.nix +++ b/nixpkgs/nixos/modules/services/networking/supybot.nix @@ -64,6 +64,7 @@ in }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = p: []; description = '' Extra Python packages available to supybot plugins. The diff --git a/nixpkgs/nixos/modules/services/search/elasticsearch-curator.nix b/nixpkgs/nixos/modules/services/search/elasticsearch-curator.nix index 9620c3e0b6d4..bb2612322bba 100644 --- a/nixpkgs/nixos/modules/services/search/elasticsearch-curator.nix +++ b/nixpkgs/nixos/modules/services/search/elasticsearch-curator.nix @@ -55,6 +55,7 @@ in { }; actionYAML = mkOption { description = "curator action.yaml file contents, alternatively use curator-cli which takes a simple action command"; + type = types.lines; example = '' --- actions: diff --git a/nixpkgs/nixos/modules/services/security/fprot.nix b/nixpkgs/nixos/modules/services/security/fprot.nix index 3a0b08b3c6d8..df60d553e85b 100644 --- a/nixpkgs/nixos/modules/services/security/fprot.nix +++ b/nixpkgs/nixos/modules/services/security/fprot.nix @@ -16,16 +16,19 @@ in { description = '' product.data file. Defaults to the one supplied with installation package. ''; + type = types.path; }; frequency = mkOption { default = 30; + type = types.int; description = '' Update virus definitions every X minutes. ''; }; licenseKeyfile = mkOption { + type = types.path; description = '' License keyfile. Defaults to the one supplied with installation package. ''; diff --git a/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix b/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix index 486f3ab05386..77c579279abe 100644 --- a/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix @@ -538,6 +538,7 @@ in extraConfig = mkOption { default = {}; + type = types.attrsOf types.anything; description = '' Extra config to pass to oauth2-proxy. ''; diff --git a/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix index be6734f439f3..553638ad4965 100644 --- a/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix +++ b/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix @@ -31,7 +31,7 @@ in proxyPass = cfg.proxy; extraConfig = '' proxy_set_header X-Scheme $scheme; - proxy_set_header X-Auth-Request-Redirect $request_uri; + proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri; ''; }; locations."/oauth2/auth" = { diff --git a/nixpkgs/nixos/modules/services/torrent/deluge.nix b/nixpkgs/nixos/modules/services/torrent/deluge.nix index 45398cb26138..7ca4fdcf64d4 100644 --- a/nixpkgs/nixos/modules/services/torrent/deluge.nix +++ b/nixpkgs/nixos/modules/services/torrent/deluge.nix @@ -41,6 +41,7 @@ in { openFilesLimit = mkOption { default = openFilesLimit; + type = types.either types.int types.str; description = '' Number of files to allow deluged to open. ''; diff --git a/nixpkgs/nixos/modules/services/web-apps/galene.nix b/nixpkgs/nixos/modules/services/web-apps/galene.nix new file mode 100644 index 000000000000..769490e915ac --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-apps/galene.nix @@ -0,0 +1,178 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.galene; + defaultstateDir = "/var/lib/galene"; + defaultrecordingsDir = "${cfg.stateDir}/recordings"; + defaultgroupsDir = "${cfg.stateDir}/groups"; + defaultdataDir = "${cfg.stateDir}/data"; +in +{ + options = { + services.galene = { + enable = mkEnableOption "Galene Service."; + + stateDir = mkOption { + default = defaultstateDir; + type = types.str; + description = '' + The directory where Galene stores its internal state. If left as the default + value this directory will automatically be created before the Galene server + starts, otherwise the sysadmin is responsible for ensuring the directory + exists with appropriate ownership and permissions. + ''; + }; + + user = mkOption { + type = types.str; + default = "galene"; + description = "User account under which galene runs."; + }; + + group = mkOption { + type = types.str; + default = "galene"; + description = "Group under which galene runs."; + }; + + insecure = mkOption { + type = types.bool; + default = false; + description = '' + Whether Galene should listen in http or in https. If left as the default + value (false), Galene needs to be fed a private key and a certificate. + ''; + }; + + certFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/path/to/your/cert.pem"; + description = '' + Path to the server's certificate. The file is copied at runtime to + Galene's data directory where it needs to reside. + ''; + }; + + keyFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/path/to/your/key.pem"; + description = '' + Path to the server's private key. The file is copied at runtime to + Galene's data directory where it needs to reside. + ''; + }; + + httpAddress = mkOption { + type = types.str; + default = ""; + description = "HTTP listen address for galene."; + }; + + httpPort = mkOption { + type = types.port; + default = 8443; + description = "HTTP listen port."; + }; + + staticDir = mkOption { + type = types.str; + default = "${cfg.package.static}/static"; + example = "/var/lib/galene/static"; + description = "Web server directory."; + }; + + recordingsDir = mkOption { + type = types.str; + default = defaultrecordingsDir; + example = "/var/lib/galene/recordings"; + description = "Recordings directory."; + }; + + dataDir = mkOption { + type = types.str; + default = defaultdataDir; + example = "/var/lib/galene/data"; + description = "Data directory."; + }; + + groupsDir = mkOption { + type = types.str; + default = defaultgroupsDir; + example = "/var/lib/galene/groups"; + description = "Web server directory."; + }; + + package = mkOption { + default = pkgs.galene; + defaultText = "pkgs.galene"; + type = types.package; + description = '' + Package for running Galene. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.insecure || (cfg.certFile != null && cfg.keyFile != null); + message = '' + Galene needs both certFile and keyFile defined for encryption, or + the insecure flag. + ''; + } + ]; + + systemd.services.galene = { + description = "galene"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem + install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem + ''; + + serviceConfig = mkMerge [ + { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.stateDir; + ExecStart = ''${cfg.package}/bin/galene \ + ${optionalString (cfg.insecure) "-insecure"} \ + -data ${cfg.dataDir} \ + -groups ${cfg.groupsDir} \ + -recordings ${cfg.recordingsDir} \ + -static ${cfg.staticDir}''; + Restart = "always"; + # Upstream Requirements + LimitNOFILE = 65536; + StateDirectory = [ ] ++ + optional (cfg.stateDir == defaultstateDir) "galene" ++ + optional (cfg.dataDir == defaultdataDir) "galene/data" ++ + optional (cfg.groupsDir == defaultgroupsDir) "galene/groups" ++ + optional (cfg.recordingsDir == defaultrecordingsDir) "galene/recordings"; + } + ]; + }; + + users.users = mkIf (cfg.user == "galene") + { + galene = { + description = "galene Service"; + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = mkIf (cfg.group == "galene") { + galene = { }; + }; + }; + meta.maintainers = with lib.maintainers; [ rgrunbla ]; +} diff --git a/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix b/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix index 3f646d7db0cd..d940f3d3daec 100644 --- a/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix @@ -5,6 +5,10 @@ with lib; let cfg = config.services.hedgedoc; + # 21.03 will not be an official release - it was instead 21.05. This + # versionAtLeast statement remains set to 21.03 for backwards compatibility. + # See https://github.com/NixOS/nixpkgs/pull/108899 and + # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md. name = if versionAtLeast config.system.stateVersion "21.03" then "hedgedoc" else "codimd"; diff --git a/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix b/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix new file mode 100644 index 000000000000..43fc4daa177f --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix @@ -0,0 +1,77 @@ +{ lib, pkgs, config, ... }: +with lib; +let + cfg = config.services.hledger-web; +in { + options.services.hledger-web = { + + enable = mkEnableOption "hledger-web service"; + + serveApi = mkEnableOption "Serve only the JSON web API, without the web UI."; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Address to listen on. + ''; + }; + + port = mkOption { + type = types.port; + default = 5000; + example = "80"; + description = '' + Port to listen on. + ''; + }; + + capabilities = mkOption { + type = types.commas; + default = "view"; + description = '' + Enable the view, add, and/or manage capabilities. E.g. view,add + ''; + }; + + journalFile = mkOption { + type = types.path; + example = "/home/hledger/.hledger.journal"; + description = '' + Input journal file. + ''; + }; + + baseUrl = mkOption { + type = with types; nullOr str; + default = null; + example = "https://example.org"; + description = '' + Base URL, when sharing over a network. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.hledger-web = { + description = "hledger-web - web-app for the hledger accounting tool."; + documentation = [ https://hledger.org/hledger-web.html ]; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + serviceConfig = { + ExecStart = '' + ${pkgs.hledger-web}/bin/hledger-web \ + --host=${cfg.host} \ + --port=${toString cfg.port} \ + --file=${cfg.journalFile} \ + "--capabilities=${cfg.capabilities}" \ + ${optionalString (cfg.baseUrl != null) "--base-url=${cfg.baseUrl}"} \ + ${optionalString (cfg.serveApi) "--serve-api"} + ''; + Restart = "always"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ marijanp ]; +} diff --git a/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/nixpkgs/nixos/modules/services/web-apps/mastodon.nix new file mode 100644 index 000000000000..92b1be963bf7 --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-apps/mastodon.nix @@ -0,0 +1,542 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.mastodon; + # We only want to create a database if we're actually going to connect to it. + databaseActuallyCreateLocally = cfg.database.createLocally && cfg.database.host == "/run/postgresql"; + + env = { + RAILS_ENV = "production"; + NODE_ENV = "production"; + + DB_USER = cfg.database.user; + + REDIS_HOST = cfg.redis.host; + REDIS_PORT = toString(cfg.redis.port); + DB_HOST = cfg.database.host; + DB_PORT = toString(cfg.database.port); + DB_NAME = cfg.database.name; + LOCAL_DOMAIN = cfg.localDomain; + SMTP_SERVER = cfg.smtp.host; + SMTP_PORT = toString(cfg.smtp.port); + SMTP_FROM_ADDRESS = cfg.smtp.fromAddress; + PAPERCLIP_ROOT_PATH = "/var/lib/mastodon/public-system"; + PAPERCLIP_ROOT_URL = "/system"; + ES_ENABLED = if (cfg.elasticsearch.host != null) then "true" else "false"; + ES_HOST = cfg.elasticsearch.host; + ES_PORT = toString(cfg.elasticsearch.port); + } + // (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {}) + // cfg.extraConfig; + + envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") ( + (lib.concatLists (lib.mapAttrsToList (name: value: + if value != null then [ + "${name}=\"${toString value}\"" + ] else [] + ) env)))); + + mastodonEnv = pkgs.writeShellScriptBin "mastodon-env" '' + set -a + source "${envFile}" + source /var/lib/mastodon/.secrets_env + eval -- "\$@" + ''; + +in { + + options = { + services.mastodon = { + enable = lib.mkEnableOption "Mastodon, a federated social network server"; + + configureNginx = lib.mkOption { + description = '' + Configure nginx as a reverse proxy for mastodon. + Note that this makes some assumptions on your setup, and sets settings that will + affect other virtualHosts running on your nginx instance, if any. + Alternatively you can configure a reverse-proxy of your choice to serve these paths: + + <code>/ -> $(nix-instantiate --eval '<nixpkgs>' -A mastodon.outPath)/public</code> + + <code>/ -> 127.0.0.1:{{ webPort }} </code>(If there was no file in the directory above.) + + <code>/system/ -> /var/lib/mastodon/public-system/</code> + + <code>/api/v1/streaming/ -> 127.0.0.1:{{ streamingPort }}</code> + + Make sure that websockets are forwarded properly. You might want to set up caching + of some requests. Take a look at mastodon's provided nginx configuration at + <code>https://github.com/tootsuite/mastodon/blob/master/dist/nginx.conf</code>. + ''; + type = lib.types.bool; + default = false; + }; + + user = lib.mkOption { + description = '' + User under which mastodon runs. If it is set to "mastodon", + that user will be created, otherwise it should be set to the + name of a user created elsewhere. In both cases, + <package>mastodon</package> and a package containing only + the shell script <code>mastodon-env</code> will be added to + the user's package set. To run a command from + <package>mastodon</package> such as <code>tootctl</code> + with the environment configured by this module use + <code>mastodon-env</code>, as in: + + <code>mastodon-env tootctl accounts create newuser --email newuser@example.com</code> + ''; + type = lib.types.str; + default = "mastodon"; + }; + + group = lib.mkOption { + description = '' + Group under which mastodon runs. + If it is set to "mastodon", a group will be created. + ''; + type = lib.types.str; + default = "mastodon"; + }; + + streamingPort = lib.mkOption { + description = "TCP port used by the mastodon-streaming service."; + type = lib.types.port; + default = 55000; + }; + + webPort = lib.mkOption { + description = "TCP port used by the mastodon-web service."; + type = lib.types.port; + default = 55001; + }; + + sidekiqPort = lib.mkOption { + description = "TCP port used by the mastodon-sidekiq service"; + type = lib.types.port; + default = 55002; + }; + + vapidPublicKeyFile = lib.mkOption { + description = '' + Path to file containing the public key used for Web Push + Voluntary Application Server Identification. A new keypair can + be generated by running: + + <code>nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys</code> + + If <option>mastodon.vapidPrivateKeyFile</option>does not + exist, it and this file will be created with a new keypair. + ''; + default = "/var/lib/mastodon/secrets/vapid-public-key"; + type = lib.types.str; + }; + + localDomain = lib.mkOption { + description = "The domain serving your Mastodon instance."; + example = "social.example.org"; + type = lib.types.str; + }; + + secretKeyBaseFile = lib.mkOption { + description = '' + Path to file containing the secret key base. + A new secret key base can be generated by running: + + <code>nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret</code> + + If this file does not exist, it will be created with a new secret key base. + ''; + default = "/var/lib/mastodon/secrets/secret-key-base"; + type = lib.types.str; + }; + + otpSecretFile = lib.mkOption { + description = '' + Path to file containing the OTP secret. + A new OTP secret can be generated by running: + + <code>nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret</code> + + If this file does not exist, it will be created with a new OTP secret. + ''; + default = "/var/lib/mastodon/secrets/otp-secret"; + type = lib.types.str; + }; + + vapidPrivateKeyFile = lib.mkOption { + description = '' + Path to file containing the private key used for Web Push + Voluntary Application Server Identification. A new keypair can + be generated by running: + + <code>nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys</code> + + If this file does not exist, it will be created with a new + private key. + ''; + default = "/var/lib/mastodon/secrets/vapid-private-key"; + type = lib.types.str; + }; + + redis = { + createLocally = lib.mkOption { + description = "Configure local Redis server for Mastodon."; + type = lib.types.bool; + default = true; + }; + + host = lib.mkOption { + description = "Redis host."; + type = lib.types.str; + default = "127.0.0.1"; + }; + + port = lib.mkOption { + description = "Redis port."; + type = lib.types.port; + default = 6379; + }; + }; + + database = { + createLocally = lib.mkOption { + description = "Configure local PostgreSQL database server for Mastodon."; + type = lib.types.bool; + default = true; + }; + + host = lib.mkOption { + type = lib.types.str; + default = "/run/postgresql"; + example = "192.168.23.42"; + description = "Database host address or unix socket."; + }; + + port = lib.mkOption { + type = lib.types.int; + default = 5432; + description = "Database host port."; + }; + + name = lib.mkOption { + type = lib.types.str; + default = "mastodon"; + description = "Database name."; + }; + + user = lib.mkOption { + type = lib.types.str; + default = "mastodon"; + description = "Database user."; + }; + + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = "/var/lib/mastodon/secrets/db-password"; + example = "/run/keys/mastodon-db-password"; + description = '' + A file containing the password corresponding to + <option>database.user</option>. + ''; + }; + }; + + smtp = { + createLocally = lib.mkOption { + description = "Configure local Postfix SMTP server for Mastodon."; + type = lib.types.bool; + default = true; + }; + + authenticate = lib.mkOption { + description = "Authenticate with the SMTP server using username and password."; + type = lib.types.bool; + default = true; + }; + + host = lib.mkOption { + description = "SMTP host used when sending emails to users."; + type = lib.types.str; + default = "127.0.0.1"; + }; + + port = lib.mkOption { + description = "SMTP port used when sending emails to users."; + type = lib.types.port; + default = 25; + }; + + fromAddress = lib.mkOption { + description = ''"From" address used when sending Emails to users.''; + type = lib.types.str; + }; + + user = lib.mkOption { + description = "SMTP login name."; + type = lib.types.str; + }; + + passwordFile = lib.mkOption { + description = '' + Path to file containing the SMTP password. + ''; + default = "/var/lib/mastodon/secrets/smtp-password"; + example = "/run/keys/mastodon-smtp-password"; + type = lib.types.str; + }; + }; + + elasticsearch = { + host = lib.mkOption { + description = '' + Elasticsearch host. + If it is not null, Elasticsearch full text search will be enabled. + ''; + type = lib.types.nullOr lib.types.str; + default = null; + }; + + port = lib.mkOption { + description = "Elasticsearch port."; + type = lib.types.port; + default = 9200; + }; + }; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.mastodon; + defaultText = "pkgs.mastodon"; + description = "Mastodon package to use."; + }; + + extraConfig = lib.mkOption { + type = lib.types.attrs; + default = {}; + description = '' + Extra environment variables to pass to all mastodon services. + ''; + }; + + automaticMigrations = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Do automatic database migrations. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.database.user); + message = ''For local automatic database provisioning (services.mastodon.database.createLocally == true) with peer authentication (services.mastodon.database.host == "/run/postgresql") to work services.mastodon.user and services.mastodon.database.user must be identical.''; + } + ]; + + systemd.services.mastodon-init-dirs = { + script = '' + umask 077 + + if ! test -f ${cfg.secretKeyBaseFile}; then + mkdir -p $(dirname ${cfg.secretKeyBaseFile}) + bin/rake secret > ${cfg.secretKeyBaseFile} + fi + if ! test -f ${cfg.otpSecretFile}; then + mkdir -p $(dirname ${cfg.otpSecretFile}) + bin/rake secret > ${cfg.otpSecretFile} + fi + if ! test -f ${cfg.vapidPrivateKeyFile}; then + mkdir -p $(dirname ${cfg.vapidPrivateKeyFile}) $(dirname ${cfg.vapidPublicKeyFile}) + keypair=$(bin/rake webpush:generate_keys) + echo $keypair | grep --only-matching "Private -> [^ ]\+" | sed 's/^Private -> //' > ${cfg.vapidPrivateKeyFile} + echo $keypair | grep --only-matching "Public -> [^ ]\+" | sed 's/^Public -> //' > ${cfg.vapidPublicKeyFile} + fi + + cat > /var/lib/mastodon/.secrets_env <<EOF + SECRET_KEY_BASE="$(cat ${cfg.secretKeyBaseFile})" + OTP_SECRET="$(cat ${cfg.otpSecretFile})" + VAPID_PRIVATE_KEY="$(cat ${cfg.vapidPrivateKeyFile})" + VAPID_PUBLIC_KEY="$(cat ${cfg.vapidPublicKeyFile})" + DB_PASS="$(cat ${cfg.database.passwordFile})" + '' + (if cfg.smtp.authenticate then '' + SMTP_PASSWORD="$(cat ${cfg.smtp.passwordFile})" + '' else "") + '' + EOF + ''; + environment = env; + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.package; + LogsDirectory = "mastodon"; + StateDirectory = "mastodon"; + }; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + }; + + systemd.services.mastodon-init-db = lib.mkIf cfg.automaticMigrations { + script = '' + if [ `psql mastodon -c \ + "select count(*) from pg_class c \ + join pg_namespace s on s.oid = c.relnamespace \ + where s.nspname not in ('pg_catalog', 'pg_toast', 'information_schema') \ + and s.nspname not like 'pg_temp%';" | sed -n 3p` -eq 0 ]; then + SAFETY_ASSURED=1 rake db:schema:load + rake db:seed + else + rake db:migrate + fi + ''; + path = [ cfg.package pkgs.postgresql ]; + environment = env; + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + Group = cfg.group; + EnvironmentFile = "/var/lib/mastodon/.secrets_env"; + PrivateTmp = true; + LogsDirectory = "mastodon"; + StateDirectory = "mastodon"; + WorkingDirectory = cfg.package; + }; + after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []); + wantedBy = [ "multi-user.target" ]; + }; + + systemd.services.mastodon-streaming = { + after = [ "network.target" ] + ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []) + ++ (if cfg.automaticMigrations then [ "mastodon-init-db.service" ] else [ "mastodon-init-dirs.service" ]); + description = "Mastodon streaming"; + wantedBy = [ "multi-user.target" ]; + environment = env // { + PORT = toString(cfg.streamingPort); + }; + serviceConfig = { + ExecStart = "${pkgs.nodejs-slim}/bin/node streaming"; + Restart = "always"; + RestartSec = 20; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.package; + EnvironmentFile = "/var/lib/mastodon/.secrets_env"; + PrivateTmp = true; + LogsDirectory = "mastodon"; + StateDirectory = "mastodon"; + }; + }; + + systemd.services.mastodon-web = { + after = [ "network.target" ] + ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []) + ++ (if cfg.automaticMigrations then [ "mastodon-init-db.service" ] else [ "mastodon-init-dirs.service" ]); + description = "Mastodon web"; + wantedBy = [ "multi-user.target" ]; + environment = env // { + PORT = toString(cfg.webPort); + }; + serviceConfig = { + ExecStart = "${cfg.package}/bin/puma -C config/puma.rb"; + Restart = "always"; + RestartSec = 20; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.package; + EnvironmentFile = "/var/lib/mastodon/.secrets_env"; + PrivateTmp = true; + LogsDirectory = "mastodon"; + StateDirectory = "mastodon"; + }; + path = with pkgs; [ file imagemagick ffmpeg ]; + }; + + systemd.services.mastodon-sidekiq = { + after = [ "network.target" ] + ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []) + ++ (if cfg.automaticMigrations then [ "mastodon-init-db.service" ] else [ "mastodon-init-dirs.service" ]); + description = "Mastodon sidekiq"; + wantedBy = [ "multi-user.target" ]; + environment = env // { + PORT = toString(cfg.sidekiqPort); + }; + serviceConfig = { + ExecStart = "${cfg.package}/bin/sidekiq -c 25 -r ${cfg.package}"; + Restart = "always"; + RestartSec = 20; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.package; + EnvironmentFile = "/var/lib/mastodon/.secrets_env"; + PrivateTmp = true; + LogsDirectory = "mastodon"; + StateDirectory = "mastodon"; + }; + path = with pkgs; [ file imagemagick ffmpeg ]; + }; + + services.nginx = lib.mkIf cfg.configureNginx { + enable = true; + recommendedProxySettings = true; # required for redirections to work + virtualHosts."${cfg.localDomain}" = { + root = "${cfg.package}/public/"; + forceSSL = true; # mastodon only supports https + enableACME = true; + + locations."/system/".alias = "/var/lib/mastodon/public-system/"; + + locations."/" = { + tryFiles = "$uri @proxy"; + }; + + locations."@proxy" = { + proxyPass = "http://127.0.0.1:${toString(cfg.webPort)}"; + proxyWebsockets = true; + }; + + locations."/api/v1/streaming/" = { + proxyPass = "http://127.0.0.1:${toString(cfg.streamingPort)}/"; + proxyWebsockets = true; + }; + }; + }; + + services.postfix = lib.mkIf (cfg.smtp.createLocally && cfg.smtp.host == "127.0.0.1") { + enable = true; + }; + services.redis = lib.mkIf (cfg.redis.createLocally && cfg.redis.host == "127.0.0.1") { + enable = true; + }; + services.postgresql = lib.mkIf databaseActuallyCreateLocally { + enable = true; + ensureUsers = [ + { + name = cfg.database.user; + ensurePermissions."DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; + } + ]; + ensureDatabases = [ cfg.database.name ]; + }; + + users.users = lib.mkMerge [ + (lib.mkIf (cfg.user == "mastodon") { + mastodon = { + isSystemUser = true; + home = cfg.package; + inherit (cfg) group; + }; + }) + (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package mastodonEnv ]) + ]; + + users.groups.mastodon = lib.mkIf (cfg.group == "mastodon") { }; + }; + + meta.maintainers = with lib.maintainers; [ happy-river erictapen ]; + +} diff --git a/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix b/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix index 0a5b6047bb58..1db1652022a3 100644 --- a/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix @@ -180,6 +180,7 @@ in }; name = mkOption { + type = types.str; default = "MediaWiki"; example = "Foobar Wiki"; description = "Name of the wiki."; diff --git a/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index da019aa25079..60d403553352 100644 --- a/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -6,17 +6,19 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; - phpPackage = - let - base = pkgs.php74; - in - base.buildEnv { - extensions = { enabled, all }: with all; - enabled ++ [ - apcu redis memcached imagick - ]; - extraConfig = phpOptionsStr; - }; + phpPackage = pkgs.php74.buildEnv { + extensions = { enabled, all }: + (with all; + enabled + ++ [ imagick ] # Always enabled + # Optionally enabled depending on caching settings + ++ optional cfg.caching.apcu apcu + ++ optional cfg.caching.redis redis + ++ optional cfg.caching.memcached memcached + ) + ++ cfg.phpExtraExtensions all; # Enabled by user + extraConfig = toKeyValue phpOptions; + }; toKeyValue = generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault {} " = "; @@ -27,7 +29,6 @@ let post_max_size = cfg.maxUploadSize; memory_limit = cfg.maxUploadSize; } // cfg.phpOptions; - phpOptionsStr = toKeyValue phpOptions; occ = pkgs.writeScriptBin "nextcloud-occ" '' #! ${pkgs.runtimeShell} @@ -116,6 +117,21 @@ in { ''; }; + phpExtraExtensions = mkOption { + type = with types; functionTo (listOf package); + default = all: []; + defaultText = "all: []"; + description = '' + Additional PHP extensions to use for nextcloud. + By default, only extensions necessary for a vanilla nextcloud installation are enabled, + but you may choose from the list of available extensions and add further ones. + This is sometimes necessary to be able to install a certain nextcloud app that has additional requirements. + ''; + example = literalExample '' + all: [ all.pdlib all.bz2 ] + ''; + }; + phpOptions = mkOption { type = types.attrsOf types.str; default = { @@ -228,7 +244,8 @@ in { type = types.nullOr types.str; default = null; description = '' - The full path to a file that contains the admin's password. + The full path to a file that contains the admin's password. Must be + readable by user <literal>nextcloud</literal>. ''; }; @@ -351,7 +368,7 @@ in { '') ++ (optional (versionOlder cfg.package.version "18") (upgradeWarning 17 "20.03")) ++ (optional (versionOlder cfg.package.version "19") (upgradeWarning 18 "20.09")) - ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.03")); + ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05")); services.nextcloud.package = with pkgs; mkDefault ( @@ -363,6 +380,10 @@ in { '' else if versionOlder stateVersion "20.03" then nextcloud17 else if versionOlder stateVersion "20.09" then nextcloud18 + # 21.03 will not be an official release - it was instead 21.05. + # This versionOlder statement remains set to 21.03 for backwards compatibility. + # See https://github.com/NixOS/nixpkgs/pull/108899 and + # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md. else if versionOlder stateVersion "21.03" then nextcloud19 else nextcloud20 ); @@ -466,6 +487,28 @@ in { path = [ occ ]; script = '' chmod og+x ${cfg.home} + + ${optionalString (c.dbpassFile != null) '' + if [ ! -r "${c.dbpassFile}" ]; then + echo "dbpassFile ${c.dbpassFile} is not readable by nextcloud:nextcloud! Aborting..." + exit 1 + fi + if [ -z "$(<${c.dbpassFile})" ]; then + echo "dbpassFile ${c.dbpassFile} is empty!" + exit 1 + fi + ''} + ${optionalString (c.adminpassFile != null) '' + if [ ! -r "${c.adminpassFile}" ]; then + echo "adminpassFile ${c.adminpassFile} is not readable by nextcloud:nextcloud! Aborting..." + exit 1 + fi + if [ -z "$(<${c.adminpassFile})" ]; then + echo "adminpassFile ${c.adminpassFile} is empty!" + exit 1 + fi + ''} + ln -sf ${cfg.package}/apps ${cfg.home}/ # create nextcloud directories. @@ -511,7 +554,6 @@ in { pools.nextcloud = { user = "nextcloud"; group = "nextcloud"; - phpOptions = phpOptionsStr; phpPackage = phpPackage; phpEnv = { NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; diff --git a/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml b/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml index f71c8df6c6d4..6cbfda118c4f 100644 --- a/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml @@ -182,6 +182,17 @@ </para> </section> + <section xml:id="installing-apps-php-extensions-nextcloud"> + <title>Installing Apps and PHP extensions</title> + + <para> + Nextcloud apps are installed statefully through the web interface. + + Some apps may require extra PHP extensions to be installed. + This can be configured with the <xref linkend="opt-services.nextcloud.phpExtraExtensions" /> setting. + </para> + </section> + <section xml:id="module-services-nextcloud-maintainer-info"> <title>Maintainer information</title> diff --git a/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix index de3c7d693d47..7f50b8fd8d44 100644 --- a/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -126,10 +126,14 @@ let </IfModule> ''; - luaSetPaths = '' + luaSetPaths = let + # support both lua and lua.withPackages derivations + luaversion = cfg.package.lua5.lua.luaversion or cfg.package.lua5.luaversion; + in + '' <IfModule mod_lua.c> - LuaPackageCPath ${cfg.package.lua5}/lib/lua/${cfg.package.lua5.lua.luaversion}/?.so - LuaPackagePath ${cfg.package.lua5}/share/lua/${cfg.package.lua5.lua.luaversion}/?.lua + LuaPackageCPath ${cfg.package.lua5}/lib/lua/${luaversion}/?.so + LuaPackagePath ${cfg.package.lua5}/share/lua/${luaversion}/?.lua </IfModule> ''; @@ -333,7 +337,7 @@ let ${sslConf} - ${if cfg.package.luaSupport then luaSetPaths else ""} + ${optionalString cfg.package.luaSupport luaSetPaths} # Fascist default - deny access to everything. <Directory /> diff --git a/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index 173c0f8561c0..394f9a305546 100644 --- a/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -112,7 +112,7 @@ in acmeRoot = mkOption { type = types.str; - default = "/var/lib/acme/acme-challenges"; + default = "/var/lib/acme/acme-challenge"; description = "Directory for the acme challenge which is PUBLIC, don't put certs or keys in here"; }; diff --git a/nixpkgs/nixos/modules/services/web-servers/caddy.nix b/nixpkgs/nixos/modules/services/web-servers/caddy.nix index 297b73273392..6ecfc113ca26 100644 --- a/nixpkgs/nixos/modules/services/web-servers/caddy.nix +++ b/nixpkgs/nixos/modules/services/web-servers/caddy.nix @@ -20,8 +20,24 @@ let --config ${configFile} --adapter ${cfg.adapter} > $out ''; tlsJSON = pkgs.writeText "tls.json" (builtins.toJSON tlsConfig); - configJSON = pkgs.runCommand "caddy-config.json" { } '' - ${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${adaptedConfig} ${tlsJSON} > $out + + # merge the TLS config options we expose with the ones originating in the Caddyfile + configJSON = + let tlsConfigMerge = '' + {"apps": + {"tls": + {"automation": + {"policies": + (if .[0].apps.tls.automation.policies == .[1]?.apps.tls.automation.policies + then .[0].apps.tls.automation.policies + else (.[0].apps.tls.automation.policies + .[1]?.apps.tls.automation.policies) + end) + } + } + } + }''; + in pkgs.runCommand "caddy-config.json" { } '' + ${pkgs.jq}/bin/jq -s '.[0] * ${tlsConfigMerge}' ${adaptedConfig} ${tlsJSON} > $out ''; in { imports = [ diff --git a/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index d6f463be9e81..fa8614e8ec17 100644 --- a/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -79,6 +79,8 @@ let include ${pkgs.mailcap}/etc/nginx/mime.types; include ${cfg.package}/conf/fastcgi.conf; include ${cfg.package}/conf/uwsgi_params; + + default_type application/octet-stream; ''; configFile = pkgs.writers.writeNginxConfig "nginx.conf" '' @@ -404,6 +406,7 @@ in logError = mkOption { default = "stderr"; + type = types.str; description = " Configures logging. The first parameter defines a file that will store the log. The diff --git a/nixpkgs/nixos/modules/services/web-servers/nginx/location-options.nix b/nixpkgs/nixos/modules/services/web-servers/nginx/location-options.nix index 5a7f5188b6cf..d8c976f202fd 100644 --- a/nixpkgs/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixpkgs/nixos/modules/services/web-servers/nginx/location-options.nix @@ -52,7 +52,7 @@ with lib; default = false; example = true; description = '' - Whether to supporty proxying websocket connections with HTTP/1.1. + Whether to support proxying websocket connections with HTTP/1.1. ''; }; diff --git a/nixpkgs/nixos/modules/services/web-servers/unit/default.nix b/nixpkgs/nixos/modules/services/web-servers/unit/default.nix index 894271d1e55e..2a264bf2e9a6 100644 --- a/nixpkgs/nixos/modules/services/web-servers/unit/default.nix +++ b/nixpkgs/nixos/modules/services/web-servers/unit/default.nix @@ -28,10 +28,12 @@ in { description = "Group account under which unit runs."; }; stateDir = mkOption { + type = types.path; default = "/var/spool/unit"; description = "Unit data directory."; }; logDir = mkOption { + type = types.path; default = "/var/log/unit"; description = "Unit log directory."; }; diff --git a/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix b/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix index ef4bc860a8f0..86c18ad791b4 100644 --- a/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix @@ -216,6 +216,7 @@ in { KillSignal = "SIGQUIT"; AmbientCapabilities = cfg.capabilities; CapabilityBoundingSet = cfg.capabilities; + RuntimeDirectory = mkIf (cfg.runDir == "/run/uwsgi") "uwsgi"; }; }; diff --git a/nixpkgs/nixos/modules/services/x11/clight.nix b/nixpkgs/nixos/modules/services/x11/clight.nix index 4daf6d8d9db7..873f425fb8be 100644 --- a/nixpkgs/nixos/modules/services/x11/clight.nix +++ b/nixpkgs/nixos/modules/services/x11/clight.nix @@ -11,14 +11,21 @@ let else if isBool v then boolToString v else if isString v then ''"${escape [''"''] v}"'' else if isList v then "[ " + concatMapStringsSep ", " toConf v + " ]" + else if isAttrs v then "\n{\n" + convertAttrs v + "\n}" else abort "clight.toConf: unexpected type (v = ${v})"; - clightConf = pkgs.writeText "clight.conf" - (concatStringsSep "\n" (mapAttrsToList - (name: value: "${toString name} = ${toConf value};") - (filterAttrs - (_: value: value != null) - cfg.settings))); + getSep = v: + if isAttrs v then ":" + else "="; + + convertAttrs = attrs: concatStringsSep "\n" (mapAttrsToList + (name: value: "${toString name} ${getSep value} ${toConf value};") + attrs); + + clightConf = pkgs.writeText "clight.conf" (convertAttrs + (filterAttrs + (_: value: value != null) + cfg.settings)); in { options.services.clight = { enable = mkOption { @@ -49,9 +56,10 @@ in { }; settings = let - validConfigTypes = with types; either int (either str (either bool float)); + validConfigTypes = with types; oneOf [ int str bool float ]; + collectionTypes = with types; oneOf [ validConfigTypes (listOf validConfigTypes) ]; in mkOption { - type = with types; attrsOf (nullOr (either validConfigTypes (listOf validConfigTypes))); + type = with types; attrsOf (nullOr (either collectionTypes (attrsOf collectionTypes))); default = {}; example = { captures = 20; gamma_long_transition = true; ac_capture_timeouts = [ 120 300 60 ]; }; description = '' @@ -69,10 +77,10 @@ in { services.upower.enable = true; services.clight.settings = { - gamma_temp = with cfg.temperature; mkDefault [ day night ]; + gamma.temp = with cfg.temperature; mkDefault [ day night ]; } // (optionalAttrs (config.location.provider == "manual") { - latitude = mkDefault config.location.latitude; - longitude = mkDefault config.location.longitude; + daytime.latitude = mkDefault config.location.latitude; + daytime.longitude = mkDefault config.location.longitude; }); services.geoclue2.appConfig.clightc = { diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a404143a03d4..14dcf009a7d1 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -25,6 +25,7 @@ in sessionPath = mkOption { default = []; + type = types.listOf types.package; example = literalExample "[ pkgs.gnome3.gpaste ]"; description = '' Additional list of packages to be added to the session search path. diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix index a36a47d376b6..671301246a8c 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -118,6 +118,7 @@ in sessionPath = mkOption { default = []; + type = types.listOf types.package; example = literalExample "[ pkgs.gnome3.gpaste ]"; description = '' Additional list of packages to be added to the session search path. diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index cf02a71248b1..195da75e7443 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -42,6 +42,7 @@ in sessionPath = mkOption { default = []; + type = types.listOf types.package; example = literalExample "[ pkgs.gnome3.gpaste ]"; description = '' Additional list of packages to be added to the session search path. diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index 6945a241f92f..9fdbe753dad5 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/default.nix @@ -444,8 +444,8 @@ in in # We will generate every possible pair of WM and DM. concatLists ( - crossLists - (dm: wm: let + builtins.map + ({dm, wm}: let sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}"; script = xsession dm wm; desktopNames = if dm ? desktopNames @@ -472,7 +472,7 @@ in providedSessions = [ sessionName ]; }) ) - [dms wms] + (cartesianProductOfSets { dm = dms; wm = wms; }) ); # Make xsessions and wayland sessions available in XDG_DATA_DIRS diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index de932e6e840a..9c1dc1d1c12d 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -88,6 +88,7 @@ in cursorTheme = { package = mkOption { + type = types.package; default = pkgs.gnome3.adwaita-icon-theme; defaultText = "pkgs.gnome3.adwaita-icon-theme"; description = '' diff --git a/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix index 3e97d28d83b5..4b707d398496 100644 --- a/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix @@ -21,6 +21,7 @@ in enable = mkEnableOption "exwm"; loadScript = mkOption { default = "(require 'exwm)"; + type = types.lines; example = literalExample '' (require 'exwm) (exwm-enable) @@ -37,6 +38,7 @@ in description = "Enable an uncustomised exwm configuration."; }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' epkgs: [ diff --git a/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix index e3ea61cb9a6b..548097a412d2 100644 --- a/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix +++ b/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix @@ -11,6 +11,15 @@ in services.xserver.windowManager.herbstluftwm = { enable = mkEnableOption "herbstluftwm"; + package = mkOption { + type = types.package; + default = pkgs.herbstluftwm; + defaultText = "pkgs.herbstluftwm"; + description = '' + Herbstluftwm package to use. + ''; + }; + configFile = mkOption { default = null; type = with types; nullOr path; @@ -31,8 +40,8 @@ in (cfg.configFile != null) ''-c "${cfg.configFile}"'' ; - in "${pkgs.herbstluftwm}/bin/herbstluftwm ${configFileClause}"; + in "${cfg.package}/bin/herbstluftwm ${configFileClause}"; }; - environment.systemPackages = [ pkgs.herbstluftwm ]; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix b/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix index 2bb4827be9d5..fe8ed3812511 100644 --- a/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix @@ -53,6 +53,7 @@ in { }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; defaultText = "self: []"; example = literalExample '' diff --git a/nixpkgs/nixos/modules/services/x11/xserver.nix b/nixpkgs/nixos/modules/services/x11/xserver.nix index eb8c4c17e987..8858559d8f27 100644 --- a/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -441,6 +441,7 @@ in serverFlagsSection = mkOption { default = ""; + type = types.lines; example = '' Option "BlankTime" "0" @@ -649,7 +650,7 @@ in xorg.xprop xorg.xauth pkgs.xterm - pkgs.xdg_utils + pkgs.xdg-utils xorg.xf86inputevdev.out # get evdev.4 man page ] ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; diff --git a/nixpkgs/nixos/modules/system/boot/binfmt.nix b/nixpkgs/nixos/modules/system/boot/binfmt.nix index 5bcc95be324a..cbdf581d73a7 100644 --- a/nixpkgs/nixos/modules/system/boot/binfmt.nix +++ b/nixpkgs/nixos/modules/system/boot/binfmt.nix @@ -23,7 +23,7 @@ let activationSnippet = name: { interpreter, ... }: '' rm -f /run/binfmt/${name} cat > /run/binfmt/${name} << 'EOF' - #!/usr/bin/env sh + #!${pkgs.bash}/bin/sh exec -- ${interpreter} "$@" EOF chmod +x /run/binfmt/${name} @@ -266,7 +266,7 @@ in { extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")} ''; nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != []) - ([ "/run/binfmt" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems)); + ([ "/run/binfmt" "${pkgs.bash}" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems)); environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); diff --git a/nixpkgs/nixos/modules/system/boot/kernel.nix b/nixpkgs/nixos/modules/system/boot/kernel.nix index ed7226331d70..363d8e47a0ff 100644 --- a/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -156,6 +156,16 @@ in description = "List of modules that are always loaded by the initrd."; }; + boot.initrd.includeDefaultModules = mkOption { + type = types.bool; + default = true; + description = '' + This option, if set, adds a collection of default kernel modules + to <option>boot.initrd.availableKernelModules</option> and + <option>boot.initrd.kernelModules</option>. + ''; + }; + system.modulesTree = mkOption { type = types.listOf types.path; internal = true; @@ -195,7 +205,8 @@ in config = mkMerge [ (mkIf config.boot.initrd.enable { boot.initrd.availableKernelModules = - [ # Note: most of these (especially the SATA/PATA modules) + optionals config.boot.initrd.includeDefaultModules ([ + # Note: most of these (especially the SATA/PATA modules) # shouldn't be included by default since nixos-generate-config # detects them, but I'm keeping them for now for backwards # compatibility. @@ -235,10 +246,11 @@ in # x86 RTC needed by the stage 2 init script. "rtc_cmos" - ]; + ]); boot.initrd.kernelModules = - [ # For LVM. + optionals config.boot.initrd.includeDefaultModules [ + # For LVM. "dm_mod" ]; }) diff --git a/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index fee567a510ba..1437ab387700 100644 --- a/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -12,9 +12,6 @@ let inherit (config.boot.loader.generationsDir) copyKernels; }; - # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk - inherit (pkgs.stdenv.hostPlatform) platform; - in { @@ -59,7 +56,7 @@ in system.build.installBootLoader = generationsDirBuilder; system.boot.loader.id = "generationsDir"; - system.boot.loader.kernelFile = linux-kernel.target; + system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target; }; } diff --git a/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix index 7eb52e3d021f..64e106036abd 100644 --- a/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix +++ b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix @@ -1,10 +1,9 @@ -{ pkgs, configTxt }: +{ pkgs, configTxt, firmware ? pkgs.raspberrypifw }: pkgs.substituteAll { src = ./raspberrypi-builder.sh; isExecutable = true; inherit (pkgs) bash; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; - firmware = pkgs.raspberrypifw; - inherit configTxt; + inherit firmware configTxt; } diff --git a/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 061f2967350e..1023361f0b1f 100644 --- a/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -5,8 +5,6 @@ with lib; let cfg = config.boot.loader.raspberryPi; - inherit (pkgs.stdenv.hostPlatform) platform; - builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; }; builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; }; @@ -102,6 +100,6 @@ in system.build.installBootLoader = builder; system.boot.loader.id = "raspberrypi"; - system.boot.loader.kernelFile = linux-kernel.target; + system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target; }; } diff --git a/nixpkgs/nixos/modules/system/boot/stage-1-init.sh b/nixpkgs/nixos/modules/system/boot/stage-1-init.sh index abc1a0af48a6..5b39f34200cd 100644 --- a/nixpkgs/nixos/modules/system/boot/stage-1-init.sh +++ b/nixpkgs/nixos/modules/system/boot/stage-1-init.sh @@ -2,6 +2,13 @@ targetRoot=/mnt-root console=tty1 +verbose="@verbose@" + +info() { + if [[ -n "$verbose" ]]; then + echo "$@" + fi +} extraUtils="@extraUtils@" export LD_LIBRARY_PATH=@extraUtils@/lib @@ -55,7 +62,7 @@ EOF echo "Rebooting..." reboot -f else - echo "Continuing..." + info "Continuing..." fi } @@ -63,9 +70,9 @@ trap 'fail' 0 # Print a greeting. -echo -echo "[1;32m<<< NixOS Stage 1 >>>[0m" -echo +info +info "[1;32m<<< NixOS Stage 1 >>>[0m" +info # Make several required directories. mkdir -p /etc/udev @@ -210,14 +217,14 @@ ln -s @modulesClosure@/lib/modules /lib/modules ln -s @modulesClosure@/lib/firmware /lib/firmware echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe for i in @kernelModules@; do - echo "loading module $(basename $i)..." + info "loading module $(basename $i)..." modprobe $i done # Create device nodes in /dev. @preDeviceCommands@ -echo "running udev..." +info "running udev..." ln -sfn /proc/self/fd /dev/fd ln -sfn /proc/self/fd/0 /dev/stdin ln -sfn /proc/self/fd/1 /dev/stdout @@ -235,8 +242,7 @@ udevadm settle # XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered @preLVMCommands@ - -echo "starting device mapper and LVM..." +info "starting device mapper and LVM..." lvm vgchange -ay if test -n "$debug1devices"; then fail; fi @@ -379,7 +385,7 @@ mountFS() { done fi - echo "mounting $device on $mountPoint..." + info "mounting $device on $mountPoint..." mkdir -p "/mnt-root$mountPoint" diff --git a/nixpkgs/nixos/modules/system/boot/stage-1.nix b/nixpkgs/nixos/modules/system/boot/stage-1.nix index cb9735ae04f7..44287f3cf09b 100644 --- a/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -280,7 +280,7 @@ let inherit (config.system.build) earlyMountScript; - inherit (config.boot.initrd) checkJournalingFS + inherit (config.boot.initrd) checkJournalingFS verbose preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules; resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") @@ -565,6 +565,23 @@ in description = "Names of supported filesystem types in the initial ramdisk."; }; + boot.initrd.verbose = mkOption { + default = true; + type = types.bool; + description = + '' + Verbosity of the initrd. Please note that disabling verbosity removes + only the mandatory messages generated by the NixOS scripts. For a + completely silent boot, you might also want to set the two following + configuration options: + + <itemizedlist> + <listitem><para><literal>boot.consoleLogLevel = 0;</literal></para></listitem> + <listitem><para><literal>boot.kernelParams = [ "quiet" "udev.log_priority=3" ];</literal></para></listitem> + </itemizedlist> + ''; + }; + boot.loader.supportsInitrdSecrets = mkOption { internal = true; default = false; diff --git a/nixpkgs/nixos/modules/system/boot/systemd-lib.nix b/nixpkgs/nixos/modules/system/boot/systemd-lib.nix index fa109394fedb..2dbf15031a08 100644 --- a/nixpkgs/nixos/modules/system/boot/systemd-lib.nix +++ b/nixpkgs/nixos/modules/system/boot/systemd-lib.nix @@ -92,10 +92,12 @@ in rec { checkUnitConfig = group: checks: attrs: let # We're applied at the top-level type (attrsOf unitOption), so the actual - # unit options might contain attributes from mkOverride that we need to + # unit options might contain attributes from mkOverride and mkIf that we need to # convert into single values before checking them. defs = mapAttrs (const (v: - if v._type or "" == "override" then v.content else v + if v._type or "" == "override" then v.content + else if v._type or "" == "if" then v.content + else v )) attrs; errors = concatMap (c: c group defs) checks; in if errors == [] then true diff --git a/nixpkgs/nixos/modules/tasks/filesystems.nix b/nixpkgs/nixos/modules/tasks/filesystems.nix index a055072f9c96..a9b5b134d889 100644 --- a/nixpkgs/nixos/modules/tasks/filesystems.nix +++ b/nixpkgs/nixos/modules/tasks/filesystems.nix @@ -7,8 +7,9 @@ let addCheckDesc = desc: elemType: check: types.addCheck elemType check // { description = "${elemType.description} (with check: ${desc})"; }; - nonEmptyStr = addCheckDesc "non-empty" types.str - (x: x != "" && ! (all (c: c == " " || c == "\t") (stringToCharacters x))); + + isNonEmpty = s: (builtins.match "[ \t\n]*" s) == null; + nonEmptyStr = addCheckDesc "non-empty" types.str isNonEmpty; fileSystems' = toposort fsBefore (attrValues config.fileSystems); @@ -28,10 +29,10 @@ let coreFileSystemOpts = { name, config, ... }: { options = { - mountPoint = mkOption { example = "/mnt/usb"; - type = nonEmptyStr; + type = addCheckDesc "non-empty without trailing slash" types.str + (s: isNonEmpty s && (builtins.match ".+/" s) == null); description = "Location of the mounted the file system."; }; diff --git a/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index 16ba0b746789..59676e996785 100644 --- a/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -17,20 +17,8 @@ let inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems; inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems; - enableZfs = inInitrd || inSystem; - - kernel = config.boot.kernelPackages; - - packages = if config.boot.zfs.enableUnstable then { - zfs = kernel.zfsUnstable; - zfsUser = pkgs.zfsUnstable; - } else { - zfs = kernel.zfs; - zfsUser = pkgs.zfs; - }; - autosnapPkg = pkgs.zfstools.override { - zfs = packages.zfsUser; + zfs = cfgZfs.package; }; zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot"; @@ -111,6 +99,20 @@ in options = { boot.zfs = { + package = mkOption { + readOnly = true; + type = types.package; + default = if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs; + description = "Configured ZFS userland tools package."; + }; + + enabled = mkOption { + readOnly = true; + type = types.bool; + default = inInitrd || inSystem; + description = "True if ZFS filesystem support is enabled"; + }; + enableUnstable = mkOption { type = types.bool; default = false; @@ -324,39 +326,53 @@ in }; }; - services.zfs.zed.settings = mkOption { - type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); - example = literalExample '' - { - ZED_DEBUG_LOG = "/tmp/zed.debug.log"; + services.zfs.zed = { + enableMail = mkEnableOption "ZED's ability to send emails" // { + default = cfgZfs.package.enableMail; + }; - ZED_EMAIL_ADDR = [ "root" ]; - ZED_EMAIL_PROG = "mail"; - ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@"; + settings = mkOption { + type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); + example = literalExample '' + { + ZED_DEBUG_LOG = "/tmp/zed.debug.log"; - ZED_NOTIFY_INTERVAL_SECS = 3600; - ZED_NOTIFY_VERBOSE = false; + ZED_EMAIL_ADDR = [ "root" ]; + ZED_EMAIL_PROG = "mail"; + ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@"; - ZED_USE_ENCLOSURE_LEDS = true; - ZED_SCRUB_AFTER_RESILVER = false; - } - ''; - description = '' - ZFS Event Daemon /etc/zfs/zed.d/zed.rc content - - See - <citerefentry><refentrytitle>zed</refentrytitle><manvolnum>8</manvolnum></citerefentry> - for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables - ''; + ZED_NOTIFY_INTERVAL_SECS = 3600; + ZED_NOTIFY_VERBOSE = false; + + ZED_USE_ENCLOSURE_LEDS = true; + ZED_SCRUB_AFTER_RESILVER = false; + } + ''; + description = '' + ZFS Event Daemon /etc/zfs/zed.d/zed.rc content + + See + <citerefentry><refentrytitle>zed</refentrytitle><manvolnum>8</manvolnum></citerefentry> + for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables + ''; + }; }; }; ###### implementation config = mkMerge [ - (mkIf enableZfs { + (mkIf cfgZfs.enabled { assertions = [ { + assertion = cfgZED.enableMail -> cfgZfs.package.enableMail; + message = '' + To allow ZED to send emails, ZFS needs to be configured to enable + this. To do so, one must override the `zfs` package and set + `enableMail` to true. + ''; + } + { assertion = config.networking.hostId != null; message = "ZFS requires networking.hostId to be set"; } @@ -366,20 +382,24 @@ in } ]; - virtualisation.lxd.zfsSupport = true; - boot = { kernelModules = [ "zfs" ]; - extraModulePackages = with packages; [ zfs ]; + + extraModulePackages = [ + (if config.boot.zfs.enableUnstable then + config.boot.kernelPackages.zfsUnstable + else + config.boot.kernelPackages.zfs) + ]; }; boot.initrd = mkIf inInitrd { kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; extraUtilsCommands = '' - copy_bin_and_libs ${packages.zfsUser}/sbin/zfs - copy_bin_and_libs ${packages.zfsUser}/sbin/zdb - copy_bin_and_libs ${packages.zfsUser}/sbin/zpool + copy_bin_and_libs ${cfgZfs.package}/sbin/zfs + copy_bin_and_libs ${cfgZfs.package}/sbin/zdb + copy_bin_and_libs ${cfgZfs.package}/sbin/zpool ''; extraUtilsCommandsTest = mkIf inInitrd '' @@ -431,9 +451,9 @@ in }; services.zfs.zed.settings = { - ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail"; + ZED_EMAIL_PROG = mkIf cfgZED.enableMail (mkDefault "${pkgs.mailutils}/bin/mail"); PATH = lib.makeBinPath [ - packages.zfsUser + cfgZfs.package pkgs.coreutils pkgs.curl pkgs.gawk @@ -461,18 +481,18 @@ in "vdev_clear-led.sh" ] ) - (file: { source = "${packages.zfsUser}/etc/${file}"; }) + (file: { source = "${cfgZfs.package}/etc/${file}"; }) // { "zfs/zed.d/zed.rc".text = zedConf; - "zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/"; + "zfs/zpool.d".source = "${cfgZfs.package}/etc/zfs/zpool.d/"; }; - system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck - environment.systemPackages = [ packages.zfsUser ] + system.fsPackages = [ cfgZfs.package ]; # XXX: needed? zfs doesn't have (need) a fsck + environment.systemPackages = [ cfgZfs.package ] ++ optional cfgSnapshots.enable autosnapPkg; # so the user can run the command to see flags - services.udev.packages = [ packages.zfsUser ]; # to hook zvol naming, etc. - systemd.packages = [ packages.zfsUser ]; + services.udev.packages = [ cfgZfs.package ]; # to hook zvol naming, etc. + systemd.packages = [ cfgZfs.package ]; systemd.services = let getPoolFilesystems = pool: @@ -506,8 +526,8 @@ in environment.ZFS_FORCE = optionalString cfgZfs.forceImportAll "-f"; script = (importLib { # See comments at importLib definition. - zpoolCmd="${packages.zfsUser}/sbin/zpool"; - awkCmd="${pkgs.gawk}/bin/awk"; + zpoolCmd = "${cfgZfs.package}/sbin/zpool"; + awkCmd = "${pkgs.gawk}/bin/awk"; inherit cfgZfs; }) + '' poolImported "${pool}" && exit @@ -522,7 +542,7 @@ in ${optionalString (if isBool cfgZfs.requestEncryptionCredentials then cfgZfs.requestEncryptionCredentials else cfgZfs.requestEncryptionCredentials != []) '' - ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do + ${cfgZfs.package}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do (${optionalString (!isBool cfgZfs.requestEncryptionCredentials) '' if ! echo '${concatStringsSep "\n" cfgZfs.requestEncryptionCredentials}' | grep -qFx "$ds"; then continue @@ -532,10 +552,10 @@ in none ) ;; prompt ) - ${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${packages.zfsUser}/sbin/zfs load-key "$ds" + ${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" ;; * ) - ${packages.zfsUser}/sbin/zfs load-key "$ds" + ${cfgZfs.package}/sbin/zfs load-key "$ds" ;; esac) < /dev/null # To protect while read ds kl in case anything reads stdin done @@ -561,7 +581,7 @@ in RemainAfterExit = true; }; script = '' - ${packages.zfsUser}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}" + ${cfgZfs.package}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}" ''; }; createZfsService = serv: @@ -587,7 +607,7 @@ in systemd.targets.zfs.wantedBy = [ "multi-user.target" ]; }) - (mkIf (enableZfs && cfgSnapshots.enable) { + (mkIf (cfgZfs.enabled && cfgSnapshots.enable) { systemd.services = let descr = name: if name == "frequent" then "15 mins" else if name == "hourly" then "hour" @@ -625,7 +645,7 @@ in }) snapshotNames); }) - (mkIf (enableZfs && cfgScrub.enable) { + (mkIf (cfgZfs.enabled && cfgScrub.enable) { systemd.services.zfs-scrub = { description = "ZFS pools scrubbing"; after = [ "zfs-import.target" ]; @@ -633,11 +653,11 @@ in Type = "oneshot"; }; script = '' - ${packages.zfsUser}/bin/zpool scrub ${ + ${cfgZfs.package}/bin/zpool scrub ${ if cfgScrub.pools != [] then (concatStringsSep " " cfgScrub.pools) else - "$(${packages.zfsUser}/bin/zpool list -H -o name)" + "$(${cfgZfs.package}/bin/zpool list -H -o name)" } ''; }; @@ -652,11 +672,11 @@ in }; }) - (mkIf (enableZfs && cfgTrim.enable) { + (mkIf (cfgZfs.enabled && cfgTrim.enable) { systemd.services.zpool-trim = { description = "ZFS pools trim"; after = [ "zfs-import.target" ]; - path = [ packages.zfsUser ]; + path = [ cfgZfs.package ]; startAt = cfgTrim.interval; # By default we ignore errors returned by the trim command, in case: # - HDDs are mixed with SSDs diff --git a/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/nixpkgs/nixos/modules/tasks/network-interfaces.nix index afb9c5404169..f730ec82bdf5 100644 --- a/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -398,6 +398,24 @@ in ''; }; + networking.fqdn = mkOption { + readOnly = true; + type = types.str; + default = if (cfg.hostName != "" && cfg.domain != null) + then "${cfg.hostName}.${cfg.domain}" + else throw '' + The FQDN is required but cannot be determined. Please make sure that + both networking.hostName and networking.domain are set properly. + ''; + defaultText = literalExample ''''${networking.hostName}.''${networking.domain}''; + description = '' + The fully qualified domain name (FQDN) of this host. It is the result + of combining networking.hostName and networking.domain. Using this + option will result in an evaluation error if the hostname is empty or + no domain is specified. + ''; + }; + networking.hostId = mkOption { default = null; example = "4e98920d"; diff --git a/nixpkgs/nixos/modules/testing/service-runner.nix b/nixpkgs/nixos/modules/testing/service-runner.nix index 99a9f979068d..76e9d4a68c41 100644 --- a/nixpkgs/nixos/modules/testing/service-runner.nix +++ b/nixpkgs/nixos/modules/testing/service-runner.nix @@ -52,7 +52,7 @@ let # Run the ExecStartPre program. FIXME: this could be a list. my $preStart = <<END_CMD; - ${service.serviceConfig.ExecStartPre or ""} + ${concatStringsSep "\n" (service.serviceConfig.ExecStartPre or [])} END_CMD if (defined $preStart && $preStart ne "\n") { print STDERR "running ExecStartPre: $preStart\n"; @@ -79,7 +79,7 @@ let # Run the ExecStartPost program. my $postStart = <<END_CMD; - ${service.serviceConfig.ExecStartPost or ""} + ${concatStringsSep "\n" (service.serviceConfig.ExecStartPost or [])} END_CMD if (defined $postStart && $postStart ne "\n") { print STDERR "running ExecStartPost: $postStart\n"; diff --git a/nixpkgs/nixos/modules/virtualisation/cri-o.nix b/nixpkgs/nixos/modules/virtualisation/cri-o.nix index aa416e7990a8..8d352e36ef99 100644 --- a/nixpkgs/nixos/modules/virtualisation/cri-o.nix +++ b/nixpkgs/nixos/modules/virtualisation/cri-o.nix @@ -103,7 +103,10 @@ in cgroup_manager = "systemd" log_level = "${cfg.logLevel}" pinns_path = "${cfg.package}/bin/pinns" - hooks_dir = [] + hooks_dir = [ + ${lib.optionalString config.virtualisation.containers.ociSeccompBpfHook.enable + ''"${config.boot.kernelPackages.oci-seccomp-bpf-hook}",''} + ] ${optionalString (cfg.runtime != null) '' default_runtime = "${cfg.runtime}" diff --git a/nixpkgs/nixos/modules/virtualisation/docker.nix b/nixpkgs/nixos/modules/virtualisation/docker.nix index 689f664b676d..b1415bf021dd 100644 --- a/nixpkgs/nixos/modules/virtualisation/docker.nix +++ b/nixpkgs/nixos/modules/virtualisation/docker.nix @@ -157,6 +157,7 @@ in systemd.services.docker = { wantedBy = optional cfg.enableOnBoot "multi-user.target"; + requires = [ "docker.socket" ]; environment = proxy_env; serviceConfig = { Type = "notify"; diff --git a/nixpkgs/nixos/modules/virtualisation/lxd.nix b/nixpkgs/nixos/modules/virtualisation/lxd.nix index 103e689abae8..4b2adf4cc699 100644 --- a/nixpkgs/nixos/modules/virtualisation/lxd.nix +++ b/nixpkgs/nixos/modules/virtualisation/lxd.nix @@ -5,13 +5,12 @@ with lib; let - cfg = config.virtualisation.lxd; - zfsCfg = config.boot.zfs; - -in +in { + imports = [ + (mkRemovedOptionModule [ "virtualisation" "lxd" "zfsPackage" ] "Override zfs in an overlay instead to override it globally") + ]; -{ ###### interface options = { @@ -51,18 +50,10 @@ in ''; }; - zfsPackage = mkOption { - type = types.package; - default = with pkgs; if zfsCfg.enableUnstable then zfsUnstable else zfs; - defaultText = "pkgs.zfs"; - description = '' - The ZFS package to use with LXD. - ''; - }; - zfsSupport = mkOption { type = types.bool; - default = false; + default = config.boot.zfs.enabled; + defaultText = "config.boot.zfs.enabled"; description = '' Enables lxd to use zfs as a storage for containers. @@ -87,7 +78,6 @@ in }; ###### implementation - config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; @@ -110,7 +100,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "systemd-udev-settle.service" ]; - path = lib.optional cfg.zfsSupport cfg.zfsPackage; + path = lib.optional config.boot.zfs.enabled config.boot.zfs.package; preStart = '' mkdir -m 0755 -p /var/lib/lxc/rootfs diff --git a/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix index 7bec1b1ff26e..f06977f88fc1 100644 --- a/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix @@ -463,21 +463,15 @@ in { config, options, name, ... }: { options = { - config = mkOption { description = '' A specification of the desired configuration of this container, as a NixOS module. ''; - type = let - confPkgs = if config.pkgs == null then pkgs else config.pkgs; - in lib.mkOptionType { + type = lib.mkOptionType { name = "Toplevel NixOS config"; - merge = loc: defs: (import (confPkgs.path + "/nixos/lib/eval-config.nix") { + merge = loc: defs: (import "${toString config.nixpkgs}/nixos/lib/eval-config.nix" { inherit system; - pkgs = confPkgs; - baseModules = import (confPkgs.path + "/nixos/modules/module-list.nix"); - inherit (confPkgs) lib; modules = let extraConfig = { @@ -526,12 +520,18 @@ in ''; }; - pkgs = mkOption { - type = types.nullOr types.attrs; - default = null; - example = literalExample "pkgs"; + nixpkgs = mkOption { + type = types.path; + default = pkgs.path; + defaultText = "pkgs.path"; description = '' - Customise which nixpkgs to use for this container. + A path to the nixpkgs that provide the modules, pkgs and lib for evaluating the container. + + To only change the <literal>pkgs</literal> argument used inside the container modules, + set the <literal>nixpkgs.*</literal> options in the container <option>config</option>. + Setting <literal>config.nixpkgs.pkgs = pkgs</literal> speeds up the container evaluation + by reusing the system pkgs, but the <literal>nixpkgs.config</literal> option in the + container config is ignored in this case. ''; }; @@ -672,14 +672,31 @@ in ''; }; + # Removed option. See `checkAssertion` below for the accompanying error message. + pkgs = mkOption { visible = false; }; } // networkOptions; - config = mkMerge - [ - (mkIf options.config.isDefined { - path = config.config.system.build.toplevel; - }) - ]; + config = let + # Throw an error when removed option `pkgs` is used. + # Because this is a submodule we cannot use `mkRemovedOptionModule` or option `assertions`. + optionPath = "containers.${name}.pkgs"; + files = showFiles options.pkgs.files; + checkAssertion = if options.pkgs.isDefined then throw '' + The option definition `${optionPath}' in ${files} no longer has any effect; please remove it. + + Alternatively, you can use the following options: + - containers.${name}.nixpkgs + This sets the nixpkgs (and thereby the modules, pkgs and lib) that + are used for evaluating the container. + + - containers.${name}.config.nixpkgs.pkgs + This only sets the `pkgs` argument used inside the container modules. + '' + else null; + in { + path = builtins.seq checkAssertion + mkIf options.config.isDefined config.config.system.build.toplevel; + }; })); default = {}; diff --git a/nixpkgs/nixos/modules/virtualisation/oci-containers.nix b/nixpkgs/nixos/modules/virtualisation/oci-containers.nix index ee9fe62187d3..2dd15e3aba45 100644 --- a/nixpkgs/nixos/modules/virtualisation/oci-containers.nix +++ b/nixpkgs/nixos/modules/virtualisation/oci-containers.nix @@ -217,7 +217,7 @@ let environment = proxy_env; path = - if cfg.backend == "docker" then [ pkgs.docker ] + if cfg.backend == "docker" then [ config.virtualisation.docker.package ] else if cfg.backend == "podman" then [ config.virtualisation.podman.package ] else throw "Unhandled backend: ${cfg.backend}"; @@ -227,29 +227,30 @@ let ${cfg.backend} load -i ${container.imageFile} ''} ''; + + script = concatStringsSep " \\\n " ([ + "exec ${cfg.backend} run" + "--rm" + "--name=${escapeShellArg name}" + "--log-driver=${container.log-driver}" + ] ++ optional (container.entrypoint != null) + "--entrypoint=${escapeShellArg container.entrypoint}" + ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) + ++ map (p: "-p ${escapeShellArg p}") container.ports + ++ optional (container.user != null) "-u ${escapeShellArg container.user}" + ++ map (v: "-v ${escapeShellArg v}") container.volumes + ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" + ++ map escapeShellArg container.extraOptions + ++ [container.image] + ++ map escapeShellArg container.cmd + ); + + preStop = "[ $SERVICE_RESULT = success ] || ${cfg.backend} stop ${name}"; postStop = "${cfg.backend} rm -f ${name} || true"; serviceConfig = { StandardOutput = "null"; StandardError = "null"; - ExecStart = concatStringsSep " \\\n " ([ - "${config.system.path}/bin/${cfg.backend} run" - "--rm" - "--name=${name}" - "--log-driver=${container.log-driver}" - ] ++ optional (container.entrypoint != null) - "--entrypoint=${escapeShellArg container.entrypoint}" - ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) - ++ map (p: "-p ${escapeShellArg p}") container.ports - ++ optional (container.user != null) "-u ${escapeShellArg container.user}" - ++ map (v: "-v ${escapeShellArg v}") container.volumes - ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" - ++ map escapeShellArg container.extraOptions - ++ [container.image] - ++ map escapeShellArg container.cmd - ); - - ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || ${cfg.backend} stop ${name}"''; ### There is no generalized way of supporting `reload` for docker ### containers. Some containers may respond well to SIGHUP sent to their diff --git a/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix b/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix index 5ad647769bbd..5b57ca860da2 100644 --- a/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix @@ -57,7 +57,8 @@ in virtualisation.xen.bootParams = mkOption { - default = ""; + default = []; + type = types.listOf types.str; description = '' Parameters passed to the Xen hypervisor at boot time. @@ -68,6 +69,7 @@ in mkOption { default = 0; example = 512; + type = types.addCheck types.int (n: n >= 0); description = '' Amount of memory (in MiB) allocated to Domain 0 on boot. @@ -78,6 +80,7 @@ in virtualisation.xen.bridge = { name = mkOption { default = "xenbr0"; + type = types.str; description = '' Name of bridge the Xen domUs connect to. ''; diff --git a/nixpkgs/nixos/tests/acme.nix b/nixpkgs/nixos/tests/acme.nix index eb152cf51a6a..c6d393d91963 100644 --- a/nixpkgs/nixos/tests/acme.nix +++ b/nixpkgs/nixos/tests/acme.nix @@ -77,6 +77,27 @@ in import ./make-test-python.nix ({ lib, ... }: { after = [ "acme-a.example.test.service" "nginx-config-reload.service" ]; }; + # Test that account creation is collated into one service + specialisation.account-creation.configuration = { nodes, pkgs, lib, ... }: let + email = "newhostmaster@example.test"; + caDomain = nodes.acme.config.test-support.acme.caDomain; + # Exit 99 to make it easier to track if this is the reason a renew failed + testScript = '' + test -e accounts/${caDomain}/${email}/account.json || exit 99 + ''; + in { + security.acme.email = lib.mkForce email; + systemd.services."b.example.test".preStart = testScript; + systemd.services."c.example.test".preStart = testScript; + + services.nginx.virtualHosts."b.example.test" = (vhostBase pkgs) // { + enableACME = true; + }; + services.nginx.virtualHosts."c.example.test" = (vhostBase pkgs) // { + enableACME = true; + }; + }; + # Cert config changes will not cause the nginx configuration to change. # This tests that the reload service is correctly triggered. # It also tests that postRun is exec'd as root @@ -289,7 +310,7 @@ in import ./make-test-python.nix ({ lib, ... }: { acme.start() webserver.start() - acme.wait_for_unit("default.target") + acme.wait_for_unit("network-online.target") acme.wait_for_unit("pebble.service") client.succeed("curl https://${caDomain}:15000/roots/0 > /tmp/ca.crt") @@ -314,6 +335,15 @@ in import ./make-test-python.nix ({ lib, ... }: { check_issuer(webserver, "a.example.test", "pebble") check_connection(client, "a.example.test") + with subtest("Runs 1 cert for account creation before others"): + switch_to(webserver, "account-creation") + webserver.wait_for_unit("acme-finished-a.example.test.target") + check_connection(client, "a.example.test") + webserver.wait_for_unit("acme-finished-b.example.test.target") + webserver.wait_for_unit("acme-finished-c.example.test.target") + check_connection(client, "b.example.test") + check_connection(client, "c.example.test") + with subtest("Can reload web server when cert configuration changes"): switch_to(webserver, "cert-change") webserver.wait_for_unit("acme-finished-a.example.test.target") diff --git a/nixpkgs/nixos/tests/agda.nix b/nixpkgs/nixos/tests/agda.nix index bbdeb7395aa7..3773907cff55 100644 --- a/nixpkgs/nixos/tests/agda.nix +++ b/nixpkgs/nixos/tests/agda.nix @@ -23,6 +23,13 @@ in }; testScript = '' + assert ( + "${pkgs.agdaPackages.lib.interfaceFile "Everything.agda"}" == "Everything.agdai" + ), "wrong interface file for Everything.agda" + assert ( + "${pkgs.agdaPackages.lib.interfaceFile "tmp/Everything.agda.md"}" == "tmp/Everything.agdai" + ), "wrong interface file for tmp/Everything.agda.md" + # Minimal script that typechecks machine.succeed("touch TestEmpty.agda") machine.succeed("agda TestEmpty.agda") @@ -36,6 +43,10 @@ in "cp ${hello-world} HelloWorld.agda" ) machine.succeed("agda -l standard-library -i . -c HelloWorld.agda") + # Check execution + assert "Hello World!" in machine.succeed( + "./HelloWorld" + ), "HelloWorld does not run properly" ''; } ) diff --git a/nixpkgs/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix index 246ad7548276..444580bc0bed 100644 --- a/nixpkgs/nixos/tests/all-tests.nix +++ b/nixpkgs/nixos/tests/all-tests.nix @@ -155,6 +155,7 @@ in # not on other platforms. hibernate = handleTestOn ["x86_64-linux"] ./hibernate.nix {}; hitch = handleTest ./hitch {}; + hledger-web = handleTest ./hledger-web.nix {}; hocker-fetchdocker = handleTest ./hocker-fetchdocker {}; home-assistant = handleTest ./home-assistant.nix {}; hostname = handleTest ./hostname.nix {}; @@ -188,6 +189,7 @@ in kernel-latest = handleTest ./kernel-latest.nix {}; kernel-lts = handleTest ./kernel-lts.nix {}; kernel-testing = handleTest ./kernel-testing.nix {}; + kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {}; keycloak = discoverTests (import ./keycloak.nix); keymap = handleTest ./keymap.nix {}; knot = handleTest ./knot.nix {}; @@ -302,6 +304,7 @@ in php = handleTest ./php {}; pinnwand = handleTest ./pinnwand.nix {}; plasma5 = handleTest ./plasma5.nix {}; + pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {}; plotinus = handleTest ./plotinus.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; postfix = handleTest ./postfix.nix {}; @@ -342,7 +345,6 @@ in sanoid = handleTest ./sanoid.nix {}; sbt = handleTest ./sbt.nix {}; sbt-extras = handleTest ./sbt-extras.nix {}; - scala = handleTest ./scala.nix {}; sddm = handleTest ./sddm.nix {}; searx = handleTest ./searx.nix {}; service-runner = handleTest ./service-runner.nix {}; @@ -411,6 +413,7 @@ in vector = handleTest ./vector.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; + vscodium = handleTest ./vscodium.nix {}; wasabibackend = handleTest ./wasabibackend.nix {}; wireguard = handleTest ./wireguard {}; wordpress = handleTest ./wordpress.nix {}; diff --git a/nixpkgs/nixos/tests/containers-custom-pkgs.nix b/nixpkgs/nixos/tests/containers-custom-pkgs.nix index 397a4a905e6d..1412c32bfb5f 100644 --- a/nixpkgs/nixos/tests/containers-custom-pkgs.nix +++ b/nixpkgs/nixos/tests/containers-custom-pkgs.nix @@ -1,42 +1,34 @@ -# Test for NixOS' container support. - import ./make-test-python.nix ({ pkgs, lib, ...} : let - customPkgs = pkgs // { - hello = pkgs.hello.overrideAttrs(old: { - name = "custom-hello"; + customPkgs = pkgs.appendOverlays [ (self: super: { + hello = super.hello.overrideAttrs (old: { + name = "custom-hello"; }); - }; + }) ]; in { - name = "containers-hosts"; + name = "containers-custom-pkgs"; meta = with lib.maintainers; { - maintainers = [ adisbladis ]; + maintainers = [ adisbladis earvstedt ]; }; - machine = - { ... }: - { - virtualisation.memorySize = 256; - virtualisation.vlans = []; + machine = { config, ... }: { + assertions = let + helloName = (builtins.head config.containers.test.config.system.extraDependencies).name; + in [ { + assertion = helloName == "custom-hello"; + message = "Unexpected value: ${helloName}"; + } ]; - containers.simple = { - autoStart = true; - pkgs = customPkgs; - config = {pkgs, config, ... }: { - environment.systemPackages = [ - pkgs.hello - ]; - }; + containers.test = { + autoStart = true; + config = { pkgs, config, ... }: { + nixpkgs.pkgs = customPkgs; + system.extraDependencies = [ pkgs.hello ]; }; - }; + }; - testScript = '' - start_all() - machine.wait_for_unit("default.target") - machine.succeed( - "test $(nixos-container run simple -- readlink -f /run/current-system/sw/bin/hello) = ${customPkgs.hello}/bin/hello" - ) - ''; + # This test only consists of evaluating the test machine + testScript = ""; }) diff --git a/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix b/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix index d5c09172308c..1bdd064e1130 100644 --- a/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix +++ b/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix @@ -31,6 +31,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { client = { lib, ... }: { services.dnscrypt-proxy2.enable = true; + services.dnscrypt-proxy2.upstreamDefaults = false; services.dnscrypt-proxy2.settings = { server_names = [ "server" ]; static.server.stamp = "sdns://AQAAAAAAAAAAEDE5Mi4xNjguMS4xOjUzNTMgFEHYOv0SCKSuqR5CDYa7-58cCBuXO2_5uTSVU9wNQF0WMi5kbnNjcnlwdC1jZXJ0LnNlcnZlcg"; diff --git a/nixpkgs/nixos/tests/hledger-web.nix b/nixpkgs/nixos/tests/hledger-web.nix new file mode 100644 index 000000000000..378d819437db --- /dev/null +++ b/nixpkgs/nixos/tests/hledger-web.nix @@ -0,0 +1,53 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + journal = pkgs.writeText "test.journal" '' + 2010/01/10 Loan + assets:cash 500$ + income:loan -500$ + 2010/01/10 NixOS Foundation donation + expenses:donation 250$ + assets:cash -250$ + ''; +in +rec { + name = "hledger-web"; + meta.maintainers = with lib.maintainers; [ marijanp ]; + + nodes = { + server = { config, pkgs, ... }: rec { + services.hledger-web = { + host = "127.0.0.1"; + port = 5000; + enable = true; + journalFile = journal; + }; + networking.firewall.allowedTCPPorts = [ services.hledger-web.port ]; + }; + apiserver = { config, pkgs, ... }: rec { + services.hledger-web = { + host = "127.0.0.1"; + port = 5000; + enable = true; + serveApi = true; + journalFile = journal; + }; + networking.firewall.allowedTCPPorts = [ services.hledger-web.port ]; + }; + }; + + testScript = '' + start_all() + + server.wait_for_unit("hledger-web.service") + server.wait_for_open_port(5000) + with subtest("Check if web UI is accessible"): + page = server.succeed("curl -L http://127.0.0.1:5000") + assert "test.journal" in page + + apiserver.wait_for_unit("hledger-web.service") + apiserver.wait_for_open_port(5000) + with subtest("Check if the JSON API is served"): + transactions = apiserver.succeed("curl -L http://127.0.0.1:5000/transactions") + assert "NixOS Foundation donation" in transactions + ''; +}) diff --git a/nixpkgs/nixos/tests/hostname.nix b/nixpkgs/nixos/tests/hostname.nix index e598549ef1d2..2e92b4259a6a 100644 --- a/nixpkgs/nixos/tests/hostname.nix +++ b/nixpkgs/nixos/tests/hostname.nix @@ -7,9 +7,12 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; let - makeHostNameTest = hostName: domain: + makeHostNameTest = hostName: domain: fqdnOrNull: let fqdn = hostName + (optionalString (domain != null) ".${domain}"); + getStr = str: # maybeString2String + let res = builtins.tryEval str; + in if (res.success && res.value != null) then res.value else "null"; in makeTest { name = "hostname-${fqdn}"; @@ -26,13 +29,16 @@ let ]; }; - testScript = '' + testScript = { nodes, ... }: '' start_all() machine = ${hostName} machine.wait_for_unit("network-online.target") + # Test if NixOS computes the correct FQDN (either a FQDN or an error/null): + assert "${getStr nodes.machine.config.networking.fqdn}" == "${getStr fqdnOrNull}" + # The FQDN, domain name, and hostname detection should work as expected: assert "${fqdn}" == machine.succeed("hostname --fqdn").strip() assert "${optionalString (domain != null) domain}" == machine.succeed("dnsdomainname").strip() @@ -60,7 +66,7 @@ let in { - noExplicitDomain = makeHostNameTest "ahost" null; + noExplicitDomain = makeHostNameTest "ahost" null null; - explicitDomain = makeHostNameTest "ahost" "adomain"; + explicitDomain = makeHostNameTest "ahost" "adomain" "ahost.adomain"; } diff --git a/nixpkgs/nixos/tests/installer.nix b/nixpkgs/nixos/tests/installer.nix index 5fa4704d02b6..789add331b79 100644 --- a/nixpkgs/nixos/tests/installer.nix +++ b/nixpkgs/nixos/tests/installer.nix @@ -76,8 +76,8 @@ let def assemble_qemu_flags(): flags = "-cpu max" ${if system == "x86_64-linux" - then ''flags += " -m 768"'' - else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"'' + then ''flags += " -m 1024"'' + else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"'' } return flags diff --git a/nixpkgs/nixos/tests/kernel-latest-ath-user-regd.nix b/nixpkgs/nixos/tests/kernel-latest-ath-user-regd.nix new file mode 100644 index 000000000000..11a3959e692e --- /dev/null +++ b/nixpkgs/nixos/tests/kernel-latest-ath-user-regd.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "kernel-latest-ath-user-regd"; + meta = with pkgs.lib.maintainers; { + maintainers = [ veehaitch ]; + }; + + machine = { pkgs, ... }: + { + boot.kernelPackages = pkgs.linuxPackages_latest; + networking.wireless.athUserRegulatoryDomain = true; + }; + + testScript = + '' + assert "CONFIG_ATH_USER_REGD=y" in machine.succeed("zcat /proc/config.gz") + ''; +}) diff --git a/nixpkgs/nixos/tests/nextcloud/basic.nix b/nixpkgs/nixos/tests/nextcloud/basic.nix index 78142d379664..900504470427 100644 --- a/nixpkgs/nixos/tests/nextcloud/basic.nix +++ b/nixpkgs/nixos/tests/nextcloud/basic.nix @@ -42,6 +42,7 @@ in { enable = true; startAt = "20:00"; }; + phpExtraExtensions = all: [ all.bz2 ]; }; environment.systemPackages = [ cfg.services.nextcloud.occ ]; diff --git a/nixpkgs/nixos/tests/pleroma.nix b/nixpkgs/nixos/tests/pleroma.nix new file mode 100644 index 000000000000..797cac44f956 --- /dev/null +++ b/nixpkgs/nixos/tests/pleroma.nix @@ -0,0 +1,265 @@ +/* + Pleroma E2E VM test. + + Abstract: + ========= + Using pleroma, postgresql, a local CA cert, a nginx reverse proxy + and a toot-based client, we're going to: + + 1. Provision a pleroma service from scratch (pleroma config + postgres db). + 2. Create a "jamy" admin user. + 3. Send a toot from this user. + 4. Send a upload from this user. + 5. Check the toot is part of the server public timeline + + Notes: + - We need a fully functional TLS setup without having any access to + the internet. We do that by issuing a self-signed cert, add this + self-cert to the hosts pki trust store and finally spoof the + hostnames using /etc/hosts. + - For this NixOS test, we *had* to store some DB-related and + pleroma-related secrets to the store. Keep in mind the store is + world-readable, it's the worst place possible to store *any* + secret. **DO NOT DO THIS IN A REAL WORLD DEPLOYMENT**. +*/ + +import ./make-test-python.nix ({ pkgs, ... }: + let + send-toot = pkgs.writeScriptBin "send-toot" '' + set -eux + # toot is using the requests library internally. This library + # sadly embed its own certificate store instead of relying on the + # system one. Overriding this pretty bad default behaviour. + export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt + + export TOOT_LOGIN_CLI_PASSWORD="jamy-password" + toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" + echo "Login OK" + + # Send a toot then verify it's part of the public timeline + echo "y" | toot post "hello world Jamy here" + echo "Send toot OK" + echo "y" | toot timeline | grep -c "hello world Jamy here" + echo "Get toot from timeline OK" + + # Test file upload + echo "y" | toot upload ${db-seed} | grep -c "https://pleroma.nixos.test/media" + echo "File upload OK" + + echo "=====================================================" + echo "= SUCCESS =" + echo "= =" + echo "= We were able to sent a toot + a upload and =" + echo "= retrieve both of them in the public timeline. =" + echo "=====================================================" + ''; + + provision-db = pkgs.writeScriptBin "provision-db" '' + set -eux + sudo -u postgres psql -f ${db-seed} + ''; + + test-db-passwd = "SccZOvTGM//BMrpoQj68JJkjDkMGb4pHv2cECWiI+XhVe3uGJTLI0vFV/gDlZ5jJ"; + + /* For this NixOS test, we *had* to store this secret to the store. + Keep in mind the store is world-readable, it's the worst place + possible to store *any* secret. **DO NOT DO THIS IN A REAL WORLD + DEPLOYMENT**.*/ + db-seed = pkgs.writeText "provision.psql" '' + CREATE USER pleroma WITH ENCRYPTED PASSWORD '${test-db-passwd}'; + CREATE DATABASE pleroma OWNER pleroma; + \c pleroma; + --Extensions made by ecto.migrate that need superuser access + CREATE EXTENSION IF NOT EXISTS citext; + CREATE EXTENSION IF NOT EXISTS pg_trgm; + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + ''; + + pleroma-conf = '' + import Config + + config :pleroma, Pleroma.Web.Endpoint, + url: [host: "pleroma.nixos.test", scheme: "https", port: 443], + http: [ip: {127, 0, 0, 1}, port: 4000] + + config :pleroma, :instance, + name: "NixOS test pleroma server", + email: "pleroma@nixos.test", + notify_email: "pleroma@nixos.test", + limit: 5000, + registrations_open: true + + config :pleroma, :media_proxy, + enabled: false, + redirect_on_failure: true + #base_url: "https://cache.pleroma.social" + + config :pleroma, Pleroma.Repo, + adapter: Ecto.Adapters.Postgres, + username: "pleroma", + password: "${test-db-passwd}", + database: "pleroma", + hostname: "localhost", + pool_size: 10, + prepare: :named, + parameters: [ + plan_cache_mode: "force_custom_plan" + ] + + config :pleroma, :database, rum_enabled: false + config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" + config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" + config :pleroma, configurable_from_database: false + ''; + + /* For this NixOS test, we *had* to store this secret to the store. + Keep in mind the store is world-readable, it's the worst place + possible to store *any* secret. **DO NOT DO THIS IN A REAL WORLD + DEPLOYMENT**. + In a real-word deployment, you'd handle this either by: + - manually upload your pleroma secrets to /var/lib/pleroma/secrets.exs + - use a deployment tool such as morph or NixOps to deploy your secrets. + */ + pleroma-conf-secret = pkgs.writeText "secrets.exs" '' + import Config + + config :joken, default_signer: "PS69/wMW7X6FIQPABt9lwvlZvgrJIncfiAMrK9J5mjVus/7/NJJi1DsDA1OghBE5" + + config :pleroma, Pleroma.Web.Endpoint, + secret_key_base: "NvfmU7lYaQrmmxt4NACm0AaAfN9t6WxsrX0NCB4awkGHvr1S7jyshlEmrjaPFhhq", + signing_salt: "3L41+BuJ" + + config :web_push_encryption, :vapid_details, + subject: "mailto:pleroma@nixos.test", + public_key: "BKjfNX9-UqAcncaNqERQtF7n9pKrB0-MO-juv6U5E5XQr_Tg5D-f8AlRjduAguDpyAngeDzG8MdrTejMSL4VF30", + private_key: "k7o9onKMQrgMjMb6l4fsxSaXO0BTNAer5MVSje3q60k" + ''; + + /* For this NixOS test, we *had* to store this secret to the store. + Keep in mind the store is world-readable, it's the worst place + possible to store *any* secret. **DO NOT DO THIS IN A REAL WORLD + DEPLOYMENT**. + In a real-word deployment, you'd handle this either by: + - manually upload your pleroma secrets to /var/lib/pleroma/secrets.exs + - use a deployment tool such as morph or NixOps to deploy your secrets. + */ + provision-secrets = pkgs.writeScriptBin "provision-secrets" '' + set -eux + cp "${pleroma-conf-secret}" "/var/lib/pleroma/secrets.exs" + chown pleroma:pleroma /var/lib/pleroma/secrets.exs + ''; + + /* For this NixOS test, we *had* to store this secret to the store. + Keep in mind the store is world-readable, it's the worst place + possible to store *any* secret. **DO NOT DO THIS IN A REAL WORLD + DEPLOYMENT**. + */ + provision-user = pkgs.writeScriptBin "provision-user" '' + set -eux + + # Waiting for pleroma to be up. + timeout 5m bash -c 'while [[ "$(curl -s -o /dev/null -w '%{http_code}' https://pleroma.nixos.test/api/v1/instance)" != "200" ]]; do sleep 2; done' + pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y + ''; + + tls-cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' + mkdir -p $out + cp key.pem cert.pem $out + ''; + + /* Toot is preventing users from feeding login_cli a password non + interactively. While it makes sense most of the times, it's + preventing us to login in this non-interactive test. This patch + introduce a TOOT_LOGIN_CLI_PASSWORD env variable allowing us to + provide a password to toot login_cli + + If https://github.com/ihabunek/toot/pull/180 gets merged at some + point, feel free to remove this patch. */ + custom-toot = pkgs.toot.overrideAttrs(old:{ + patches = [ (pkgs.fetchpatch { + url = "https://github.com/NinjaTrappeur/toot/commit/b4a4c30f41c0cb7e336714c2c4af9bc9bfa0c9f2.patch"; + sha256 = "sha256-0xxNwjR/fStLjjUUhwzCCfrghRVts+fc+fvVJqVcaFg="; + }) ]; + }); + + hosts = nodes: '' + ${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test + ${nodes.client.config.networking.primaryIPAddress} client.nixos.test + ''; + in { + name = "pleroma"; + nodes = { + client = { nodes, pkgs, config, ... }: { + security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; + networking.extraHosts = hosts nodes; + environment.systemPackages = with pkgs; [ + custom-toot + send-toot + ]; + }; + pleroma = { nodes, pkgs, config, ... }: { + security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; + networking.extraHosts = hosts nodes; + networking.firewall.enable = false; + environment.systemPackages = with pkgs; [ + provision-db + provision-secrets + provision-user + ]; + services = { + pleroma = { + enable = true; + configs = [ + pleroma-conf + ]; + }; + postgresql = { + enable = true; + package = pkgs.postgresql_12; + }; + nginx = { + enable = true; + virtualHosts."pleroma.nixos.test" = { + addSSL = true; + sslCertificate = "${tls-cert}/cert.pem"; + sslCertificateKey = "${tls-cert}/key.pem"; + locations."/" = { + proxyPass = "http://127.0.0.1:4000"; + extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; + add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; + if ($request_method = OPTIONS) { + return 204; + } + add_header X-XSS-Protection "1; mode=block"; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header Referrer-Policy same-origin; + add_header X-Download-Options noopen; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + client_max_body_size 16m; + ''; + }; + }; + }; + }; + }; + }; + + testScript = { nodes, ... }: '' + pleroma.wait_for_unit("postgresql.service") + pleroma.succeed("provision-db") + pleroma.succeed("provision-secrets") + pleroma.systemctl("restart pleroma.service") + pleroma.wait_for_unit("pleroma.service") + pleroma.succeed("provision-user") + client.succeed("send-toot") + ''; +}) diff --git a/nixpkgs/nixos/tests/power-profiles-daemon.nix b/nixpkgs/nixos/tests/power-profiles-daemon.nix new file mode 100644 index 000000000000..e073677bee9d --- /dev/null +++ b/nixpkgs/nixos/tests/power-profiles-daemon.nix @@ -0,0 +1,45 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "power-profiles-daemon"; + meta = with pkgs.lib.maintainers; { + maintainers = [ mvnetbiz ]; + }; + machine = { pkgs, ... }: { + services.power-profiles-daemon.enable = true; + environment.systemPackages = [ pkgs.glib ]; + }; + + testScript = '' + def get_profile(): + return machine.succeed( + """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \ + --method org.freedesktop.DBus.Properties.Get 'net.hadess.PowerProfiles' 'ActiveProfile' + """ + ) + + + def set_profile(profile): + return machine.succeed( + """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \ + --method org.freedesktop.DBus.Properties.Set 'net.hadess.PowerProfiles' 'ActiveProfile' "<'{profile}'>" + """.format( + profile=profile + ) + ) + + + machine.wait_for_unit("multi-user.target") + + set_profile("power-saver") + profile = get_profile() + if not "power-saver" in profile: + raise Exception("Unable to set power-saver profile") + + + set_profile("balanced") + profile = get_profile() + if not "balanced" in profile: + raise Exception("Unable to set balanced profile") + ''; +}) diff --git a/nixpkgs/nixos/tests/predictable-interface-names.nix b/nixpkgs/nixos/tests/predictable-interface-names.nix index bab091d57acf..c0b472638a14 100644 --- a/nixpkgs/nixos/tests/predictable-interface-names.nix +++ b/nixpkgs/nixos/tests/predictable-interface-names.nix @@ -5,7 +5,11 @@ let inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; -in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { + testCombinations = pkgs.lib.cartesianProductOfSets { + predictable = [true false]; + withNetworkd = [true false]; + }; +in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: { name = pkgs.lib.optionalString (!predictable) "un" + "predictable" + pkgs.lib.optionalString withNetworkd "Networkd"; value = makeTest { @@ -30,4 +34,4 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { machine.${if predictable then "fail" else "succeed"}("ip link show eth0") ''; }; -}) [[true false] [true false]]) +}) testCombinations) diff --git a/nixpkgs/nixos/tests/rsyncd.nix b/nixpkgs/nixos/tests/rsyncd.nix index 3639320f645d..44464e42f28d 100644 --- a/nixpkgs/nixos/tests/rsyncd.nix +++ b/nixpkgs/nixos/tests/rsyncd.nix @@ -2,24 +2,35 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "rsyncd"; meta.maintainers = with pkgs.lib.maintainers; [ ehmry ]; - nodes.machine.services.rsyncd = { - enable = true; - settings = { - global = { - "reverse lookup" = false; - "forward lookup" = false; + nodes = let + mkNode = socketActivated: + { config, ... }: { + networking.firewall.allowedTCPPorts = [ config.services.rsyncd.port ]; + services.rsyncd = { + enable = true; + inherit socketActivated; + settings = { + global = { + "reverse lookup" = false; + "forward lookup" = false; + }; + tmp = { + path = "/nix/store"; + comment = "test module"; + }; + }; + }; }; - tmp = { - path = "/nix/store"; - comment = "test module"; - }; - - }; + in { + a = mkNode false; + b = mkNode true; }; testScript = '' start_all() - machine.wait_for_unit("rsyncd") - machine.succeed("rsync localhost::") + a.wait_for_unit("rsync") + b.wait_for_unit("sockets.target") + b.succeed("rsync a::") + a.succeed("rsync b::") ''; }) diff --git a/nixpkgs/nixos/tests/scala.nix b/nixpkgs/nixos/tests/scala.nix deleted file mode 100644 index 4fc3f8aa7b0a..000000000000 --- a/nixpkgs/nixos/tests/scala.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../.. { inherit system config; } -}: - -with pkgs.lib; - -let - common = name: package: (import ./make-test-python.nix ({ - inherit name; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = { - scala = { ... }: { - environment.systemPackages = [ package ]; - }; - }; - - testScript = '' - start_all() - - scala.succeed("scalac -version 2>&1 | grep '^Scala compiler version ${package.version}'") - ''; - }) { inherit system; }); - -in with pkgs; { - scala_2_10 = common "scala_2_10" scala_2_10; - scala_2_11 = common "scala_2_11" scala_2_11; - scala_2_12 = common "scala_2_12" scala_2_12; - scala_2_13 = common "scala_2_13" scala_2_13; -} diff --git a/nixpkgs/nixos/tests/searx.nix b/nixpkgs/nixos/tests/searx.nix index 22c1967b8160..7c28eea30d20 100644 --- a/nixpkgs/nixos/tests/searx.nix +++ b/nixpkgs/nixos/tests/searx.nix @@ -81,8 +81,9 @@ import ./make-test-python.nix ({ pkgs, ...} : base.wait_for_unit("searx-init") base.wait_for_file("/run/searx/settings.yml") output = base.succeed( - "${pkgs.yq-go}/bin/yq r /run/searx/settings.yml" - " 'engines.(name==startpage).shortcut'" + "${pkgs.yq-go}/bin/yq eval" + " '.engines[] | select(.name==\"startpage\") | .shortcut'" + " /run/searx/settings.yml" ).strip() assert output == "start", "Settings not merged" diff --git a/nixpkgs/nixos/tests/smokeping.nix b/nixpkgs/nixos/tests/smokeping.nix index 4ac672b814bd..ccacf60cfe4b 100644 --- a/nixpkgs/nixos/tests/smokeping.nix +++ b/nixpkgs/nixos/tests/smokeping.nix @@ -8,6 +8,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { sm = { ... }: { + networking.domain = "example.com"; # FQDN: sm.example.com services.smokeping = { enable = true; port = 8081; diff --git a/nixpkgs/nixos/tests/snapcast.nix b/nixpkgs/nixos/tests/snapcast.nix index a69b7afe99da..2fef63625140 100644 --- a/nixpkgs/nixos/tests/snapcast.nix +++ b/nixpkgs/nixos/tests/snapcast.nix @@ -4,6 +4,8 @@ let port = 10004; tcpPort = 10005; httpPort = 10080; + tcpStreamPort = 10006; + bufferSize = 742; in { name = "snapcast"; meta = with pkgs.lib.maintainers; { @@ -17,18 +19,27 @@ in { port = port; tcp.port = tcpPort; http.port = httpPort; + buffer = bufferSize; streams = { mpd = { type = "pipe"; location = "/run/snapserver/mpd"; + query.mode = "create"; }; bluetooth = { type = "pipe"; location = "/run/snapserver/bluetooth"; }; + tcp = { + type = "tcp"; + location = "127.0.0.1:${toString tcpStreamPort}"; + }; }; }; }; + client = { + environment.systemPackages = [ pkgs.snapcast ]; + }; }; testScript = '' @@ -42,6 +53,7 @@ in { server.wait_until_succeeds("ss -ntl | grep -q ${toString port}") server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpPort}") server.wait_until_succeeds("ss -ntl | grep -q ${toString httpPort}") + server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpStreamPort}") with subtest("check that pipes are created"): server.succeed("test -p /run/snapserver/mpd") @@ -54,5 +66,12 @@ in { server.succeed( "curl --fail http://localhost:${toString httpPort}/jsonrpc -d '{json.dumps(get_rpc_version)}'" ) + + with subtest("test a connection"): + client.execute("systemd-run snapclient -h server -p ${toString port}") + server.wait_until_succeeds( + "journalctl -o cat -u snapserver.service | grep -q 'Hello from'" + ) + client.wait_until_succeeds("journalctl -o cat -u run-\* | grep -q ${toString bufferSize}") ''; }) diff --git a/nixpkgs/nixos/tests/vault-postgresql.nix b/nixpkgs/nixos/tests/vault-postgresql.nix index daa719763388..a563aead22a3 100644 --- a/nixpkgs/nixos/tests/vault-postgresql.nix +++ b/nixpkgs/nixos/tests/vault-postgresql.nix @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "vault-postgresql"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 roberth ]; }; machine = { lib, pkgs, ... }: { diff --git a/nixpkgs/nixos/tests/vscodium.nix b/nixpkgs/nixos/tests/vscodium.nix new file mode 100644 index 000000000000..ca75da35b1e1 --- /dev/null +++ b/nixpkgs/nixos/tests/vscodium.nix @@ -0,0 +1,47 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +{ + name = "vscodium"; + meta = with pkgs.lib.maintainers; { + maintainers = [ turion ]; + }; + + machine = { ... }: + + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + virtualisation.memorySize = 2047; + services.xserver.enable = true; + test-support.displayManager.auto.user = "alice"; + environment.systemPackages = with pkgs; [ + vscodium + ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + # Start up X + start_all() + machine.wait_for_x() + + # Start VSCodium with a file that doesn't exist yet + machine.fail("ls /home/alice/foo.txt") + machine.succeed("su - alice -c 'codium foo.txt' &") + + # Wait for the window to appear + machine.wait_for_text("VSCodium") + + # Save file + machine.send_key("ctrl-s") + + # Wait until the file has been saved + machine.wait_for_file("/home/alice/foo.txt") + + machine.screenshot("VSCodium") + ''; +}) diff --git a/nixpkgs/nixos/tests/xmpp/prosody.nix b/nixpkgs/nixos/tests/xmpp/prosody.nix index e7755e24bab4..2eb06d88287f 100644 --- a/nixpkgs/nixos/tests/xmpp/prosody.nix +++ b/nixpkgs/nixos/tests/xmpp/prosody.nix @@ -85,7 +85,7 @@ in import ../make-test-python.nix { server.succeed('prosodyctl status | grep "Prosody is running"') server.succeed("create-prosody-users") - client.succeed('send-message 2>&1 | grep "XMPP SCRIPT TEST SUCCESS"') + client.succeed("send-message") server.succeed("delete-prosody-users") ''; } diff --git a/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix b/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix index 30945e68300a..47a77f524c6a 100644 --- a/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -23,8 +23,26 @@ class CthonTest(ClientXMPP): def __init__(self, jid, password): ClientXMPP.__init__(self, jid, password) self.add_event_handler("session_start", self.session_start) + self.test_succeeded = False async def session_start(self, event): + try: + # Exceptions in event handlers are printed to stderr but not + # propagated, they do not make the script terminate with a non-zero + # exit code. We use the `test_succeeded` flag as a workaround and + # check it later at the end of the script to exit with a proper + # exit code. + # Additionally, this flag ensures that this event handler has been + # actually run by ClientXMPP, which may well not be the case. + await self.test_xmpp_server() + self.test_succeeded = True + finally: + # Even if an exception happens in `test_xmpp_server()`, we still + # need to disconnect explicitly, otherwise the process will hang + # forever. + self.disconnect(wait=True) + + async def test_xmpp_server(self): log = logging.getLogger(__name__) self.send_presence() self.get_roster() @@ -42,11 +60,12 @@ class CthonTest(ClientXMPP): log.error("ERROR: Cannot run upload command. XEP_0363 seems broken") sys.exit(1) log.info('Upload success!') + # Test MUC - self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98', wait=True) + # TODO: use join_muc_wait() after slixmpp 1.8.0 is released. + self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98') log.info('MUC join success!') log.info('XMPP SCRIPT TEST SUCCESS') - self.disconnect(wait=True) if __name__ == '__main__': @@ -62,4 +81,7 @@ if __name__ == '__main__': ct.register_plugin('xep_0045') ct.connect(("server", 5222)) ct.process(forever=False) + + if not ct.test_succeeded: + sys.exit(1) '' diff --git a/nixpkgs/pkgs/applications/accessibility/contrast/default.nix b/nixpkgs/pkgs/applications/accessibility/contrast/default.nix index 2899d4ea6efa..689ad2735752 100644 --- a/nixpkgs/pkgs/applications/accessibility/contrast/default.nix +++ b/nixpkgs/pkgs/applications/accessibility/contrast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , cairo , dbus diff --git a/nixpkgs/pkgs/applications/audio/apple-music-electron/default.nix b/nixpkgs/pkgs/applications/audio/apple-music-electron/default.nix new file mode 100644 index 000000000000..1c6180ac2119 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/apple-music-electron/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, lib, fetchurl }: +let + pname = "apple-music-electron"; + version = "1.5.2"; + name = "Apple.Music-${version}"; + + src = fetchurl { + url = "https://github.com/iiFir3z/Apple-Music-Electron/releases/download/${version}/${name}.AppImage"; + sha256 = "1jl0wgwy6ajmfkzygwb7cm9m49nkhp3x6vd8kwmh6ccs3jy4ayp5"; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=$out/bin/apple-music-electron' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Unofficial Apple Music application without having to bother with a Web Browser or iTunes"; + homepage = "https://github.com/iiFir3z/Apple-Music-Electron"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/ario/default.nix b/nixpkgs/pkgs/applications/audio/ario/default.nix index 896f93619478..68b74821ec3f 100644 --- a/nixpkgs/pkgs/applications/audio/ario/default.nix +++ b/nixpkgs/pkgs/applications/audio/ario/default.nix @@ -1,11 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, intltool, - wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib, - libsoup, avahi, taglib - }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, avahi +, curl +, dbus-glib +, gettext +, gtk3 +, libmpdclient +, libsoup +, libxml2 +, taglib +, wrapGAppsHook +}: stdenv.mkDerivation rec { - version = "1.6"; pname = "ario"; + version = "1.6"; src = fetchurl { url = "mirror://sourceforge/ario-player/${pname}-${version}.tar.gz"; @@ -14,14 +26,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ]; buildInputs = [ - gtk3 libxml2 curl mpd_clientlib dbus-glib libsoup avahi taglib + avahi + curl + dbus-glib + gtk3 + libmpdclient + libsoup + libxml2 + taglib ]; - meta = { + meta = with lib; { description = "GTK client for MPD (Music player daemon)"; homepage = "http://ario-player.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.garrison ]; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = [ maintainers.garrison ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/audio/artyFX/default.nix b/nixpkgs/pkgs/applications/audio/artyFX/default.nix index 84914e3e798a..2bf6b2a8046f 100644 --- a/nixpkgs/pkgs/applications/audio/artyFX/default.nix +++ b/nixpkgs/pkgs/applications/audio/artyFX/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-ArtyFX"; - rev = "492587461b50d140455aa3c98d915eb8673bebf0"; + rev = "8c542627d936a01b1d97825e7f26a8e95633f7aa"; sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail"; }; diff --git a/nixpkgs/pkgs/applications/audio/ashuffle/default.nix b/nixpkgs/pkgs/applications/audio/ashuffle/default.nix index f21cb9e3907f..cf3321e241f0 100644 --- a/nixpkgs/pkgs/applications/audio/ashuffle/default.nix +++ b/nixpkgs/pkgs/applications/audio/ashuffle/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, meson +, ninja +, libmpdclient +}: stdenv.mkDerivation rec { pname = "ashuffle"; @@ -14,7 +22,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake pkg-config meson ninja ]; - buildInputs = [ mpd_clientlib ]; + buildInputs = [ libmpdclient ]; meta = with lib; { homepage = "https://github.com/joshkunz/ashuffle"; diff --git a/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index 592b0fb07300..5d89813216dc 100644 --- a/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -1,50 +1,45 @@ { mkDerivation -, lib, stdenv +, lib +, stdenv , fetchFromGitHub , qmake -, qtbase +, pkg-config , qttools -, alsaSupport ? stdenv.hostPlatform.isLinux -, alsaLib -, pulseSupport ? stdenv.hostPlatform.isLinux -, libpulseaudio -, jackSupport ? stdenv.hostPlatform.isUnix -, libjack2 +, qtbase +, rtaudio +, rtmidi }: -let - inherit (lib) optional optionals; - -in mkDerivation rec { pname = "bambootracker"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "rerrahkr"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0ibi0sykxf6cp5la2c4pgxf5gvy56yv259fbmdwdrdyv6vlddf42"; + sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc"; }; - sourceRoot = "source/BambooTracker"; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace BambooTracker/BambooTracker.pro \ + --replace '# Temporary known-error downgrades here' 'CPP_WARNING_FLAGS += -Wno-missing-braces' + ''; + + nativeBuildInputs = [ qmake qttools pkg-config ]; - nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase rtaudio rtmidi ]; - buildInputs = [ qtbase ] - ++ optional alsaSupport alsaLib - ++ optional pulseSupport libpulseaudio - ++ optional jackSupport libjack2; + qmakeFlags = [ "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; - qmakeFlags = [ "CONFIG+=release" "CONFIG-=debug" ] - ++ optional pulseSupport "CONFIG+=use_pulse" - ++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ]; + postConfigure = "make qmake_all"; meta = with lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; - homepage = "https://github.com/rerrahkr/BambooTracker"; + homepage = "https://rerrahkr.github.io/BambooTracker"; license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 97c27d4ad9af..fca3eaf223e9 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -3,7 +3,7 @@ , libbsd, libjack2, libpng, ffmpeg_3 , libxkbcommon , makeWrapper, pixman, autoPatchelfHook -, xdg_utils, zenity, zlib }: +, xdg-utils, zenity, zlib }: stdenv.mkDerivation rec { pname = "bitwig-studio"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg_utils zenity ffmpeg_3 + xdg-utils zenity ffmpeg_3 ]; installPhase = '' diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 31086b3674d9..9644182861d0 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, alsaLib, cairo, dpkg, freetype , gdk-pixbuf, glib, gtk3, lib, xorg , libglvnd, libjack2, ffmpeg_3 -, libxkbcommon, xdg_utils, zlib, pulseaudio +, libxkbcommon, xdg-utils, zlib, pulseaudio , wrapGAppsHook, makeWrapper }: stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "0f7xysk0cl48q7i28m25hasmrp30grgm3kah0s7xmkjgm33887pi"; + sha256 = "sha256-R1e+eTheS9KqPIHw1QoMJgpSB1ss0gwTUGAojdJM0Zw="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg_utils ffmpeg_3 + xdg-utils ffmpeg_3 ]; ldLibraryPath = lib.strings.makeLibraryPath buildInputs; diff --git a/nixpkgs/pkgs/applications/audio/cadence/default.nix b/nixpkgs/pkgs/applications/audio/cadence/default.nix index d71420d07227..2d3ac0c314ea 100644 --- a/nixpkgs/pkgs/applications/audio/cadence/default.nix +++ b/nixpkgs/pkgs/applications/audio/cadence/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , a2jmidid , coreutils -, lib , libjack2 , fetchpatch , fetchzip diff --git a/nixpkgs/pkgs/applications/audio/callaudiod/default.nix b/nixpkgs/pkgs/applications/audio/callaudiod/default.nix new file mode 100644 index 000000000000..d742961939f6 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/callaudiod/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, glib +, alsaLib +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "callaudiod"; + version = "0.0.4"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "mobian1"; + repo = pname; + rev = version; + sha256 = "07k7xp5a9c4d4lq7amaj6cg6b3gsd77x9wvf7nzcf4vpaph4yiyj"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + alsaLib + libpulseaudio + glib + ]; + + meta = with lib; { + description = "Daemon for dealing with audio routing during phone calls"; + homepage = "https://gitlab.com/mobian1/callaudiod"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pacman99 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/carla/default.nix b/nixpkgs/pkgs/applications/audio/carla/default.nix index a4b68707ee7c..40fb0cfda596 100644 --- a/nixpkgs/pkgs/applications/audio/carla/default.nix +++ b/nixpkgs/pkgs/applications/audio/carla/default.nix @@ -34,11 +34,12 @@ stdenv.mkDerivation rec { buildInputs = [ file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile - ] ++ pythonPath - ++ optional withQt qtbase + ] ++ optional withQt qtbase ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3; + propagatedBuildInputs = pythonPath; + enableParallelBuilding = true; installFlags = [ "PREFIX=$(out)" ]; @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { patchPythonScript "$f" done patchPythonScript "$out/share/carla/carla_settings.py" + patchPythonScript "$out/share/carla/carla_database.py" for program in $out/bin/*; do wrapQtApp "$program" \ diff --git a/nixpkgs/pkgs/applications/audio/clementine/default.nix b/nixpkgs/pkgs/applications/audio/clementine/default.nix index 12aec0d4cbbc..be0f2f72529c 100644 --- a/nixpkgs/pkgs/applications/audio/clementine/default.nix +++ b/nixpkgs/pkgs/applications/audio/clementine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm , qtbase, qtx11extras , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf diff --git a/nixpkgs/pkgs/applications/audio/cmus/default.nix b/nixpkgs/pkgs/applications/audio/cmus/default.nix index 2193b359e688..bfa8317c9f90 100644 --- a/nixpkgs/pkgs/applications/audio/cmus/default.nix +++ b/nixpkgs/pkgs/applications/audio/cmus/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config -, libiconv, CoreAudio +, libiconv, CoreAudio, AudioUnit , alsaSupport ? stdenv.isLinux, alsaLib ? null # simple fallback for everyone else @@ -102,13 +102,13 @@ in stdenv.mkDerivation rec { pname = "cmus"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "cmus"; repo = "cmus"; rev = "v${version}"; - sha256 = "sha256-eSKF3xacJptAYdm0Qf1AEWLa+lKUWz6C8nKyTHAl5QI="; + sha256 = "sha256-HEiEnEWf/MzhPO19VKTLYzhylpEvyzy1Jxs6EW2NU34="; }; patches = [ ./option-debugging.patch ]; @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optional stdenv.cc.isClang clangGCC - ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit ] ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix b/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix index e78e50877d37..bcad36e2da98 100644 --- a/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , ninja , meson , pkg-config diff --git a/nixpkgs/pkgs/applications/audio/curseradio/default.nix b/nixpkgs/pkgs/applications/audio/curseradio/default.nix index 82f3b130e6ea..94059e06e546 100644 --- a/nixpkgs/pkgs/applications/audio/curseradio/default.nix +++ b/nixpkgs/pkgs/applications/audio/curseradio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, python3Packages, mpv }: +{ lib, fetchFromGitHub, substituteAll, python3Packages, mpv }: python3Packages.buildPythonApplication rec { version = "0.2"; diff --git a/nixpkgs/pkgs/applications/audio/dfasma/default.nix b/nixpkgs/pkgs/applications/audio/dfasma/default.nix index 20a1044fe24d..3d4e5e5e5b9a 100644 --- a/nixpkgs/pkgs/applications/audio/dfasma/default.nix +++ b/nixpkgs/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: +{ mkDerivation, lib, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: let diff --git a/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix b/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix index 92e6eb2b3236..80b2cff3ce03 100644 --- a/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, pkgs }: +{ lib, fetchFromGitHub, python3Packages, pkgs }: python3Packages.buildPythonApplication rec { pname = "dr14_tmeter"; diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2firefox.nix b/nixpkgs/pkgs/applications/audio/faust/faust2firefox.nix index b2cc6f464575..c718aa06806a 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2firefox.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2firefox.nix @@ -1,5 +1,5 @@ { faust -, xdg_utils +, xdg-utils }: # This just runs faust2svg, then attempts to open a browser using @@ -9,6 +9,6 @@ faust.wrap { baseName = "faust2firefox"; - runtimeInputs = [ xdg_utils ]; + runtimeInputs = [ xdg-utils ]; } diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2jackrust.nix b/nixpkgs/pkgs/applications/audio/faust/faust2jackrust.nix index 77335da2ce79..a93251c8d2d2 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2jackrust.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2jackrust.nix @@ -1,5 +1,4 @@ -{ stdenv -, faust +{ faust , libjack2 , cargo , binutils diff --git a/nixpkgs/pkgs/applications/audio/fmit/default.nix b/nixpkgs/pkgs/applications/audio/fmit/default.nix index e22067c38fc7..b91c72a5c754 100644 --- a/nixpkgs/pkgs/applications/audio/fmit/default.nix +++ b/nixpkgs/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook +{ lib, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: diff --git a/nixpkgs/pkgs/applications/audio/fomp/default.nix b/nixpkgs/pkgs/applications/audio/fomp/default.nix index ece8dc8d1ea5..f9f57b1ed55b 100644 --- a/nixpkgs/pkgs/applications/audio/fomp/default.nix +++ b/nixpkgs/pkgs/applications/audio/fomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fomp"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "01ld6yjrqrki6zwac8lmwmqkr5rv0sdham4pfbfkjwck4hi1gqqw"; + sha256 = "sha256-xnGijydiO3B7BjSlryFuH1j/OPio9hCYbniq2IXp2W8="; }; nativeBuildInputs = [ pkg-config wafHook ]; diff --git a/nixpkgs/pkgs/applications/audio/gjay/default.nix b/nixpkgs/pkgs/applications/audio/gjay/default.nix index 32c61380dca6..4bd9c6dcd8f8 100644 --- a/nixpkgs/pkgs/applications/audio/gjay/default.nix +++ b/nixpkgs/pkgs/applications/audio/gjay/default.nix @@ -1,24 +1,41 @@ -{ lib, stdenv, fetchurl, pkg-config, mpd_clientlib, dbus-glib, audacious, gtk2, gsl -, libaudclient }: +{ lib +, stdenv +, fetchurl +, pkg-config +, dbus-glib +, audacious +, gtk2 +, gsl +, libaudclient +, libmpdclient +}: -stdenv.mkDerivation { - name = "gjay-0.3.2"; +stdenv.mkDerivation rec { + pname = "gjay"; + version = "0.3.2"; src = fetchurl { - url = "mirror://sourceforge/project/gjay/gjay-0.3.2.tar.gz"; + url = "mirror://sourceforge/project/gjay/${pname}-${version}.tar.gz"; sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; + buildInputs = [ + libmpdclient + dbus-glib + audacious + gtk2 + gsl + libaudclient + ]; hardeningDisable = [ "format" ]; meta = with lib; { description = "Generates playlists such that each song sounds good following the previous song"; homepage = "http://gjay.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; }; diff --git a/nixpkgs/pkgs/applications/audio/gmpc/default.nix b/nixpkgs/pkgs/applications/audio/gmpc/default.nix index 11187015df03..4c93fad511ae 100644 --- a/nixpkgs/pkgs/applications/audio/gmpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/gmpc/default.nix @@ -1,6 +1,22 @@ -{ lib, stdenv, fetchurl, libtool, intltool, pkg-config, glib -, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique -, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook +{ lib +, stdenv +, fetchurl +, libtool +, intltool +, pkg-config +, glib +, gtk2 +, curl +, libmpdclient +, libsoup +, gob2 +, vala +, libunique +, libSM +, libICE +, sqlite +, hicolor-icon-theme +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -26,8 +42,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ - glib gtk2 curl mpd_clientlib libsoup - libunique libmpd libSM libICE sqlite hicolor-icon-theme + glib + gtk2 + curl + libmpdclient + libsoup + libunique + libmpd + libSM + libICE + sqlite + hicolor-icon-theme ]; meta = with lib; { @@ -38,3 +63,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } +# TODO: what is this libmpd derivation embedded above? diff --git a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index ed51304b2256..1733aef41775 100644 --- a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitLab , fetchpatch diff --git a/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/nixpkgs/pkgs/applications/audio/gpodder/default.nix index dea1f5fe7bcf..229050654cd5 100644 --- a/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, python3Packages, intltool +{ lib, fetchFromGitHub, python3, python3Packages, intltool , glibcLocales, gnome3, gtk3, wrapGAppsHook , gobject-introspection }: diff --git a/nixpkgs/pkgs/applications/audio/greg/default.nix b/nixpkgs/pkgs/applications/audio/greg/default.nix index 46e1baed07d3..95f3bf9988cd 100644 --- a/nixpkgs/pkgs/applications/audio/greg/default.nix +++ b/nixpkgs/pkgs/applications/audio/greg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: with pythonPackages; buildPythonApplication rec { pname = "greg"; diff --git a/nixpkgs/pkgs/applications/audio/gtklick/default.nix b/nixpkgs/pkgs/applications/audio/gtklick/default.nix index ddd09ce44522..b3b95ca057e5 100644 --- a/nixpkgs/pkgs/applications/audio/gtklick/default.nix +++ b/nixpkgs/pkgs/applications/audio/gtklick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, gettext, klick}: +{ lib, fetchurl, pythonPackages, gettext, klick}: pythonPackages.buildPythonApplication rec { pname = "gtklick"; diff --git a/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/nixpkgs/pkgs/applications/audio/guitarix/default.nix index 69e427dd96cb..7f41fa6c5f95 100644 --- a/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -17,7 +17,6 @@ , hicolor-icon-theme , intltool , ladspaH -, libav , libjack2 , libsndfile , lilv @@ -74,7 +73,6 @@ stdenv.mkDerivation rec { gtk3 gtkmm3 ladspaH - libav libjack2 libsndfile lilv diff --git a/nixpkgs/pkgs/applications/audio/jalv/default.nix b/nixpkgs/pkgs/applications/audio/jalv/default.nix index 5d322eeca934..611956089ed3 100644 --- a/nixpkgs/pkgs/applications/audio/jalv/default.nix +++ b/nixpkgs/pkgs/applications/audio/jalv/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jalv"; - version = "1.6.4"; + version = "1.6.6"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2"; + sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY="; }; nativeBuildInputs = [ pkg-config wafHook ]; diff --git a/nixpkgs/pkgs/applications/audio/jamulus/default.nix b/nixpkgs/pkgs/applications/audio/jamulus/default.nix index c6510f5469c0..13b488ce7d78 100644 --- a/nixpkgs/pkgs/applications/audio/jamulus/default.nix +++ b/nixpkgs/pkgs/applications/audio/jamulus/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2 +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2 }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix b/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix index d6e96d908344..62db3d796908 100644 --- a/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, libav, libkeyfinder }: +{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder }: stdenv.mkDerivation rec { pname = "keyfinder-cli"; - version = "2015-09-13"; + version = "1.1.1"; src = fetchFromGitHub { repo = "keyfinder-cli"; owner = "EvanPurkhiser"; - rev = "8579282f15ab3ebad937fed398ec5c88843be03d"; - sha256 = "0jylykigxmsqvdny265k58vpxa4cqs1hq2f7mph1nl3apfx2shrh"; + rev = "v${version}"; + sha256 = "1mlcygbj3gqii3cz8jd6ks1lz612i4jp0343qjg293xm39fg47ns"; }; - buildInputs = [ libav libkeyfinder ]; + buildInputs = [ ffmpeg libkeyfinder ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/applications/audio/keyfinder/default.nix b/nixpkgs/pkgs/applications/audio/keyfinder/default.nix index 187d3a58b171..80cd8f4d9a0f 100644 --- a/nixpkgs/pkgs/applications/audio/keyfinder/default.nix +++ b/nixpkgs/pkgs/applications/audio/keyfinder/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: +{ lib, mkDerivation, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "keyfinder"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { - sha256 = "0vjszk1h8vj2qycgbffzy6k7amg75jlvlnzwaqhz9nll2pcvw0zl"; - rev = version; + sha256 = "11yhdwan7bz8nn8vxr54drckyrnlxynhx5s981i475bbccg8g7ls"; + rev = "530034d6fe86d185f6a68b817f8db5f552f065d7"; # tag is missing repo = "is_KeyFinder"; owner = "ibsh"; }; @@ -16,13 +16,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace is_KeyFinder.pro \ - --replace "keyfinder.0" "keyfinder" \ --replace "-stdlib=libc++" "" \ --replace "\$\$[QT_INSTALL_PREFIX]" "$out" ''; - enableParallelBuilding = true; - meta = with lib; { description = "Musical key detection for digital audio (graphical UI)"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/audio/kid3/default.nix b/nixpkgs/pkgs/applications/audio/kid3/default.nix index 340a661a9502..99f7cec98af4 100644 --- a/nixpkgs/pkgs/applications/audio/kid3/default.nix +++ b/nixpkgs/pkgs/applications/audio/kid3/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.8.4"; + version = "3.8.5"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-WYuEOqMu2VMOv6mkVCRXnmInFER/DWfPNqYuaTJ3vAc="; + sha256 = "sha256-DEZ5J1QendgXJ1gBZ3h0LwsVTLL1vPznJ7Nc+97jFB8="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/audio/librespot/default.nix b/nixpkgs/pkgs/applications/audio/librespot/default.nix index 7ba47be686ee..13aa4fe5bc27 100644 --- a/nixpkgs/pkgs/applications/audio/librespot/default.nix +++ b/nixpkgs/pkgs/applications/audio/librespot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true , withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null }: diff --git a/nixpkgs/pkgs/applications/audio/linuxband/default.nix b/nixpkgs/pkgs/applications/audio/linuxband/default.nix index 057d45c85e99..118b54ad8587 100644 --- a/nixpkgs/pkgs/applications/audio/linuxband/default.nix +++ b/nixpkgs/pkgs/applications/audio/linuxband/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "linuxband"; src = fetchurl { - url = "http://linuxband.org/assets/sources/${pname}-${version}.tar.gz"; + url = "https://linuxband.org/assets/sources/${pname}-${version}.tar.gz"; sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = { description = "A GUI front-end for MMA: Type in the chords, choose the groove and it will play an accompaniment"; - homepage = "http://linuxband.org/"; + homepage = "https://linuxband.org/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/lmms/default.nix b/nixpkgs/pkgs/applications/audio/lmms/default.nix index 4d52a286aba9..11a7d0cf3c6f 100644 --- a/nixpkgs/pkgs/applications/audio/lmms/default.nix +++ b/nixpkgs/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13 +{ lib, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13 , fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: diff --git a/nixpkgs/pkgs/applications/audio/m4acut/default.nix b/nixpkgs/pkgs/applications/audio/m4acut/default.nix new file mode 100644 index 000000000000..f3ceee9227c4 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/m4acut/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, autoreconfHook, fetchFromGitHub, l-smash }: + +stdenv.mkDerivation rec { + pname = "m4acut"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "nu774"; + repo = "m4acut"; + rev = "v${version}"; + sha256 = "1hzf9f1fzmlpnxjaxhs2w22wzb28vd87ycaddnix1mmhvh3nvzkd"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ l-smash ]; + + meta = with lib; { + description = "Losslessly & gaplessly cut m4a (AAC in MP4) files."; + homepage = "https://github.com/nu774/m4acut"; + license = with licenses; [ bsdOriginal zlib ]; + maintainers = [ maintainers.chkno ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mimms/default.nix b/nixpkgs/pkgs/applications/audio/mimms/default.nix index 793ee3d263ab..9811998c3685 100644 --- a/nixpkgs/pkgs/applications/audio/mimms/default.nix +++ b/nixpkgs/pkgs/applications/audio/mimms/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pythonPackages, libmms }: +{ fetchurl, lib, pythonPackages, libmms }: pythonPackages.buildPythonApplication rec { pname = "mimms"; diff --git a/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/nixpkgs/pkgs/applications/audio/mixxx/default.nix index 70e6616482f9..7af4b585adfa 100644 --- a/nixpkgs/pkgs/applications/audio/mixxx/default.nix +++ b/nixpkgs/pkgs/applications/audio/mixxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, fetchFromGitHub, chromaprint +{ lib, mkDerivation, fetchurl, fetchFromGitHub, chromaprint , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile diff --git a/nixpkgs/pkgs/applications/audio/mmtc/default.nix b/nixpkgs/pkgs/applications/audio/mmtc/default.nix new file mode 100644 index 000000000000..0d1d2c5684f7 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/mmtc/default.nix @@ -0,0 +1,23 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "mmtc"; + version = "0.2.12"; + + src = fetchFromGitHub { + owner = "figsoda"; + repo = pname; + rev = "v${version}"; + sha256 = "1chcnv8wql6v2vckpzvq6sxgpss7mnxaj008jdm8xalhw9d496s4"; + }; + + cargoSha256 = "06b0hag3s5irvi57n0hc97agfw4sw783lkkl1b26iap6mfbvrqma"; + + meta = with lib; { + description = "Minimal mpd terminal client that aims to be simple yet highly configurable"; + homepage = "https://github.com/figsoda/mmtc"; + changelog = "https://github.com/figsoda/mmtc/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/nixpkgs/pkgs/applications/audio/mopidy/default.nix index f4d4e416de40..2c19afb16a22 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/default.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/default.nix @@ -41,6 +41,8 @@ let mopidy-tunein = callPackage ./tunein.nix { }; mopidy-youtube = callPackage ./youtube.nix { }; + + mopidy-subidy = callPackage ./subidy.nix { }; }; in self diff --git a/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix b/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix index 54af3bc68f1e..6e76d6af87d3 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-gmusic"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 05827b0bb565..c2171d4cecc4 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/moped.nix b/nixpkgs/pkgs/applications/audio/mopidy/moped.nix index 8daaef7d45d9..c191eba4c4d9 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/moped.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/moped.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, mopidy, glibcLocales }: +{ lib, pythonPackages, mopidy, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Moped"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/mopify.nix b/nixpkgs/pkgs/applications/audio/mopidy/mopify.nix index 17e68c165394..670b1a9c5091 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/mopify.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/mopify.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, mopidy }: +{ lib, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Mopify"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/mpd.nix b/nixpkgs/pkgs/applications/audio/mopidy/mpd.nix index 8d6d7a1528b9..d686d4928989 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/mpd.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/mpd.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/mpris.nix b/nixpkgs/pkgs/applications/audio/mopidy/mpris.nix index 868dbaf30358..6327ba020bf9 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/mpris.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/mpris.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-mpris"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/scrobbler.nix b/nixpkgs/pkgs/applications/audio/mopidy/scrobbler.nix index be38c6a7040d..621ced53646a 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/scrobbler.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/scrobbler.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Scrobbler"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix b/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix index afa46726db7e..0637731dcb57 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-somafm"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/soundcloud.nix b/nixpkgs/pkgs/applications/audio/mopidy/soundcloud.nix index bdc3523652c0..d8a244b51467 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/soundcloud.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/soundcloud.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ lib, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-soundcloud"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/nixpkgs/pkgs/applications/audio/mopidy/spotify-tunigo.nix index 8fafab0970f8..70d076190cda 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/spotify-tunigo.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/spotify-tunigo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: +{ lib, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify-tunigo"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix b/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix index 57ba6ea1f615..e44b9f35daaf 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, mopidy }: +{ lib, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/subidy.nix b/nixpkgs/pkgs/applications/audio/mopidy/subidy.nix new file mode 100644 index 000000000000..98d69816b73f --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/mopidy/subidy.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + pname = "mopidy-subidy"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Prior99"; + repo = pname; + rev = version; + sha256 = "0c5ghhhrj5v3yp4zmll9ari6r5c6ha8c1izwqshvadn40b02q7xz"; + }; + + propagatedBuildInputs = [ mopidy pythonPackages.py-sonic ]; + + checkInputs = with pythonPackages; [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://www.mopidy.com/"; + description = "Mopidy extension for playing music from a Subsonic-compatible Music Server"; + license = licenses.bsd3; + maintainers = with maintainers; [ wenngle ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix b/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix index d8a6d6eacca6..4a3edd2a4344 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-tunein"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix b/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix index 35a85b958018..b84a756c2ce1 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; diff --git a/nixpkgs/pkgs/applications/audio/mpc/default.nix b/nixpkgs/pkgs/applications/audio/mpc/default.nix index c1b88e47e87e..e4ecc9202476 100644 --- a/nixpkgs/pkgs/applications/audio/mpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/mpc/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, mpd_clientlib, sphinx, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, libmpdclient +, sphinx +, libiconv +}: stdenv.mkDerivation rec { pname = "mpc"; @@ -11,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1qbi0i9cq54rj8z2kapk8x8g1jkw2jz781niwb9i7kw4xfhvy5zx"; }; - buildInputs = [ mpd_clientlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ libmpdclient ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; nativeBuildInputs = [ meson ninja pkg-config sphinx ]; diff --git a/nixpkgs/pkgs/applications/audio/munt/default.nix b/nixpkgs/pkgs/applications/audio/munt/default.nix index 6d010c6cd956..0efe034034ac 100644 --- a/nixpkgs/pkgs/applications/audio/munt/default.nix +++ b/nixpkgs/pkgs/applications/audio/munt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: let desktopItem = makeDesktopItem rec { diff --git a/nixpkgs/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix index ff39e62e7290..47f8e5a22e62 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkg-config +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , qtquickcontrols2, qtscript, qtsvg, qttools diff --git a/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/nixpkgs/pkgs/applications/audio/musikcube/default.nix index 882fbaf3477e..4a80ea09878c 100644 --- a/nixpkgs/pkgs/applications/audio/musikcube/default.nix +++ b/nixpkgs/pkgs/applications/audio/musikcube/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.96.2"; + version = "0.96.5"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "1vvc8295yadprfqpmk9i43ghymgsqxsg8zfx3p5i86a8xrdhd9vn"; + sha256 = "sha256-GxMQPP8i/NWvduf10f+xVyuG666pChj9RsiF4jfygyY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/musly/default.nix b/nixpkgs/pkgs/applications/audio/musly/default.nix index 1e8d29d37707..0d10b55d3296 100644 --- a/nixpkgs/pkgs/applications/audio/musly/default.nix +++ b/nixpkgs/pkgs/applications/audio/musly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, libav }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg }: stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ]; + buildInputs = [ eigen ffmpeg ]; fixupPhase = if stdenv.isDarwin then '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly diff --git a/nixpkgs/pkgs/applications/audio/mympd/default.nix b/nixpkgs/pkgs/applications/audio/mympd/default.nix index 876677c3bea9..bd00a692b7f0 100644 --- a/nixpkgs/pkgs/applications/audio/mympd/default.nix +++ b/nixpkgs/pkgs/applications/audio/mympd/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , pkg-config -, mpd_clientlib +, libmpdclient , openssl , lua5_3 , libid3tag @@ -21,12 +22,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-QGJti1tKKJlumLgABPmROplF0UVGMWMnyRXLb2cEieQ="; }; - nativeBuildInputs = [ - pkg-config - cmake - ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - mpd_clientlib + libmpdclient openssl lua5_3 libid3tag diff --git a/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index 59b17d9c811d..a4a32be41dbb 100644 --- a/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -1,7 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, ncurses -, mpd_clientlib, gettext, boost -, pcreSupport ? false -, pcre ? null +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, glib +, ncurses +, libmpdclient +, gettext +, boost +, pcreSupport ? false, pcre ? null }: with lib; @@ -10,16 +18,16 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.42"; + version = "0.44"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1c21sbdm6pp3kwhnzc7c6ksna7madvsmfa7j91as2g8485symqv2"; + sha256 = "sha256-Qu41TL8KSKC9L25D6Z8bEbJUJQ9QI08grTGZ+0qGdUQ="; }; - buildInputs = [ glib ncurses mpd_clientlib boost ] + buildInputs = [ glib ncurses libmpdclient boost ] ++ optional pcreSupport pcre; nativeBuildInputs = [ meson ninja pkg-config gettext ]; diff --git a/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix b/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix index 64ca6823b912..c0fa2722878f 100644 --- a/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkg-config, readline -, libiconv, icu, curl +{ lib +, stdenv +, fetchurl +, boost +, libmpdclient +, ncurses +, pkg-config +, readline +, libiconv +, icu +, curl , outputsSupport ? true # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen , clockSupport ? true # clock screen @@ -12,11 +21,11 @@ assert taglibSupport -> (taglib != null); with lib; stdenv.mkDerivation rec { pname = "ncmpcpp"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2"; - sha256 = "0x35nd4v31sma8fliqdbn1nxpjyi8hv472318sfb3xbmr4wlm0fb"; + sha256 = "sha256-+qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs="; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] @@ -27,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu curl ] + buildInputs = [ boost libmpdclient ncurses readline libiconv icu curl ] ++ optional visualizerSupport fftw ++ optional taglibSupport taglib; diff --git a/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix b/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix index 70acc81404e5..aca96ef5da35 100644 --- a/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }: stdenv.mkDerivation rec { - pname = "ncpamixer"; version = "1.3.3.1"; @@ -12,15 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1v3bz0vpgh18257hdnz3yvbnl51779g1h5b265zgc21ks7m1jw5z"; }; - buildInputs = [ ncurses libpulseaudio ]; nativeBuildInputs = [ cmake pkg-config ]; - configurePhase = '' - make PREFIX=$out build/Makefile - ''; + buildInputs = [ ncurses libpulseaudio ]; - buildPhase = '' - make build + configurePhase = '' + make PREFIX=$out USE_WIDE=1 RELEASE=1 build/Makefile ''; meta = with lib; { @@ -28,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ StijnDW ]; + maintainers = with maintainers; [ StijnDW SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/nixpkgs/pkgs/applications/audio/ncspot/default.nix index 9cc96bd03a70..e78eaca54909 100644 --- a/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "1dfq6ickx24cq8zhhm0a8x5ycd0iygw065qd2blcgl0fim350zw9"; + sha256 = "sha256-4V0LG9mDvezeLHHTAmfAXdssOAOlZs30b8IejKEKN4g="; }; - cargoSha256 = "0z4af575rx6ggjxsw1q18kwsb4cvyy1kzfkp32v9n74krmy0fk8p"; + cargoSha256 = "sha256-POvIkoxLAXVBTsB37aAEUKhk6DRF9IfvfTcrP5PLFEQ="; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/nixpkgs/pkgs/applications/audio/noisetorch/default.nix b/nixpkgs/pkgs/applications/audio/noisetorch/default.nix index bb22b3cec221..fea6e097de7a 100644 --- a/nixpkgs/pkgs/applications/audio/noisetorch/default.nix +++ b/nixpkgs/pkgs/applications/audio/noisetorch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, rnnoise-plugin }: +{ lib, buildGoModule, fetchFromGitHub, rnnoise-plugin }: buildGoModule rec { pname = "NoiseTorch"; diff --git a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix index 5a610284c21e..8e6113a716d2 100644 --- a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix +++ b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.4"; + version = "0.5.5"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "0h7gpjx1221jwsq3k91p8zhf1h77qaxyasakc88s3g57vawhckgk"; + sha256 = "sha256-8eAUg+vxpoDZ7AMMmvIPXypawPHgZCwYvVWTz6qc62s="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/audio/padthv1/default.nix b/nixpkgs/pkgs/applications/audio/padthv1/default.nix index 1d84aed8b2e7..f238a6876099 100644 --- a/nixpkgs/pkgs/applications/audio/padthv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/padthv1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: +{ lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: mkDerivation rec { pname = "padthv1"; diff --git a/nixpkgs/pkgs/applications/audio/picard/default.nix b/nixpkgs/pkgs/applications/audio/picard/default.nix index 733cb702c7e5..200e457c5685 100644 --- a/nixpkgs/pkgs/applications/audio/picard/default.nix +++ b/nixpkgs/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 +{ lib, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 , enablePlayback ? true , gst_all_1 }: diff --git a/nixpkgs/pkgs/applications/audio/pifi/Gemfile b/nixpkgs/pkgs/applications/audio/pifi/Gemfile new file mode 100644 index 000000000000..da7d26e3760f --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/pifi/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'pifi' diff --git a/nixpkgs/pkgs/applications/audio/pifi/Gemfile.lock b/nixpkgs/pkgs/applications/audio/pifi/Gemfile.lock new file mode 100644 index 000000000000..ddcdb537e6a4 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/pifi/Gemfile.lock @@ -0,0 +1,39 @@ +GEM + remote: https://rubygems.org/ + specs: + daemons (1.3.1) + eventmachine (1.2.7) + json (2.5.1) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + optimist (3.0.1) + pifi (0.4.11) + json (~> 2.2) + optimist (~> 3.0) + ruby-mpd (~> 0.3) + sinatra (~> 2.0) + thin (~> 1.7) + rack (2.2.3) + rack-protection (2.1.0) + rack + ruby-mpd (0.3.3) + ruby2_keywords (0.0.4) + sinatra (2.1.0) + mustermann (~> 1.0) + rack (~> 2.2) + rack-protection (= 2.1.0) + tilt (~> 2.0) + thin (1.8.0) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + tilt (2.0.10) + +PLATFORMS + ruby + +DEPENDENCIES + pifi + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/applications/audio/pifi/default.nix b/nixpkgs/pkgs/applications/audio/pifi/default.nix new file mode 100644 index 000000000000..856807608d7d --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/pifi/default.nix @@ -0,0 +1,18 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + pname = "pifi"; + + version = (import ./gemset.nix).pifi.version; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemdir = ./.; + + meta = with lib; { + description = "MPD web client to listen to radio, written in React and Sinatra"; + homepage = "https://github.com/rccavalcanti/pifi-radio"; + license = with licenses; gpl3Only; + maintainers = with maintainers; [ kmein ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/pifi/gemset.nix b/nixpkgs/pkgs/applications/audio/pifi/gemset.nix new file mode 100644 index 000000000000..77dd8c55289e --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/pifi/gemset.nix @@ -0,0 +1,137 @@ +{ + daemons = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; + type = "gem"; + }; + version = "1.3.1"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + type = "gem"; + }; + version = "2.5.1"; + }; + mustermann = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + type = "gem"; + }; + version = "1.1.1"; + }; + optimist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + type = "gem"; + }; + version = "3.0.1"; + }; + pifi = { + dependencies = ["json" "optimist" "ruby-mpd" "sinatra" "thin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xwjaql852m0p7himc3pak1ibc8lfxi29bbgic153wp713xc2cga"; + type = "gem"; + }; + version = "0.4.11"; + }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rack-protection = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; + type = "gem"; + }; + version = "2.1.0"; + }; + ruby-mpd = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l80gbnma009pfcqgz4azbngkr5jn9nm46fflx5p7c4vz4kwshpc"; + type = "gem"; + }; + version = "0.3.3"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; + }; + sinatra = { + dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; + type = "gem"; + }; + version = "2.1.0"; + }; + thin = { + dependencies = ["daemons" "eventmachine" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5"; + type = "gem"; + }; + version = "1.8.0"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + version = "2.0.10"; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/pithos/default.nix b/nixpkgs/pkgs/applications/audio/pithos/default.nix index c64371f091c2..939b53c44fb1 100644 --- a/nixpkgs/pkgs/applications/audio/pithos/default.nix +++ b/nixpkgs/pkgs/applications/audio/pithos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib +{ lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib , wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection , libnotify, libsecret, gst_all_1 }: diff --git a/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/nixpkgs/pkgs/applications/audio/plexamp/default.nix index 2c33584e3621..c484f6e19247 100644 --- a/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.3.1"; + version = "3.4.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha256 = "6/asP8VR+rJ52lKKds46gSw1or9suUEmyR75pjdWHIQ="; + sha256 = "Vv+e1q5ThuXDPX8baSU+7/U63p6/dvh0ZvScO1Loj+U="; }; appimageContents = appimageTools.extractType2 { diff --git a/nixpkgs/pkgs/applications/audio/polyphone/default.nix b/nixpkgs/pkgs/applications/audio/polyphone/default.nix index 05800c360fae..a331952aa81d 100644 --- a/nixpkgs/pkgs/applications/audio/polyphone/default.nix +++ b/nixpkgs/pkgs/applications/audio/polyphone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: mkDerivation rec { version = "2.2.0"; diff --git a/nixpkgs/pkgs/applications/audio/puddletag/default.nix b/nixpkgs/pkgs/applications/audio/puddletag/default.nix index 94a571df2944..efa1d9436100 100644 --- a/nixpkgs/pkgs/applications/audio/puddletag/default.nix +++ b/nixpkgs/pkgs/applications/audio/puddletag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: python3Packages.buildPythonApplication rec { pname = "puddletag"; diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix index a19a03d4bd2a..83de192c6b31 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pythonPackages +{ fetchFromGitHub, lib, pythonPackages , mp3Support ? true, lame ? null , opusSupport ? true, opusTools ? null , faacSupport ? false, faac ? null diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix index 0e3eeac984a2..d4f3306697d7 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ifaddr diff --git a/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix b/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix new file mode 100644 index 000000000000..fad17ac71fde --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix @@ -0,0 +1,115 @@ +{ lib, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, itstool +, python3 +, libxml2 +, desktop-file-utils +, wrapGAppsHook +, gst_all_1 +, pulseaudio +, gtk3 +, glib +, glibmm +, gtkmm3 +, lilv +, lv2 +, serd +, sord +, sratom +, libbs2b +, libsamplerate +, libsndfile +, libebur128 +, rnnoise +, boost +, dbus +, fftwFloat +, calf +, zita-convolver +, zam-plugins +, rubberband +, lsp-plugins +}: + +let + lv2Plugins = [ + calf # limiter, compressor exciter, bass enhancer and others + lsp-plugins # delay + ]; + ladspaPlugins = [ + rubberband # pitch shifting + zam-plugins # maximizer + ]; +in stdenv.mkDerivation rec { + pname = "pulseeffects"; + version = "4.8.4"; + + src = fetchFromGitHub { + owner = "wwmm"; + repo = "pulseeffects"; + rev = "v${version}"; + sha256 = "19sndxvszafbd1l2033g2irpx2jrwi5bpbx8r35047wi0z7djiag"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + libxml2 + itstool + python3 + desktop-file-utils + wrapGAppsHook + ]; + + buildInputs = [ + pulseaudio + glib + glibmm + gtk3 + gtkmm3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base # gst-fft + gst_all_1.gst-plugins-good # pulsesrc + gst_all_1.gst-plugins-bad + lilv lv2 serd sord sratom + libbs2b + libebur128 + libsamplerate + libsndfile + rnnoise + boost + dbus + fftwFloat + zita-convolver + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}" + --set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}" + ) + ''; + + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + + meta = with lib; { + description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; + homepage = "https://github.com/wwmm/pulseeffects"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index fca498bd8975..0ba926fab4f9 100644 --- a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -9,7 +9,7 @@ , desktop-file-utils , wrapGAppsHook , gst_all_1 -, pulseaudio +, pipewire , gtk3 , glib , glibmm @@ -45,13 +45,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.8.4"; + version = "5.0.0"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "19sndxvszafbd1l2033g2irpx2jrwi5bpbx8r35047wi0z7djiag"; + sha256 = "1zs13bivxlgcb24lz1pgmgy2chcjxnmn4lz7g1n0ygiaaj4c30xj"; }; nativeBuildInputs = [ @@ -66,14 +66,14 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - pulseaudio + pipewire glib glibmm gtk3 gtkmm3 gst_all_1.gstreamer gst_all_1.gst-plugins-base # gst-fft - gst_all_1.gst-plugins-good # pulsesrc + gst_all_1.gst-plugins-good # spectrum plugin gst_all_1.gst-plugins-bad lilv lv2 serd sord sratom libbs2b @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; homepage = "https://github.com/wwmm/pulseeffects"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; badPlatforms = [ "aarch64-linux" ]; diff --git a/nixpkgs/pkgs/applications/audio/qjackctl/default.nix b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix index 719ddd28e2ad..586dfeae7331 100644 --- a/nixpkgs/pkgs/applications/audio/qjackctl/default.nix +++ b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras # Enable jack session support , jackSession ? false diff --git a/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/nixpkgs/pkgs/applications/audio/qmmp/default.nix index 950e16cedc8b..b75af645bb38 100644 --- a/nixpkgs/pkgs/applications/audio/qmmp/default.nix +++ b/nixpkgs/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper +{ lib, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper , qtbase, qttools, qtmultimedia, qtx11extras # transports , curl, libmms @@ -12,7 +12,7 @@ }: # Additional plugins that can be added: -# wavpack (http://www.wavpack.com/) +# wavpack (https://www.wavpack.com/) # gme (Game music support) # Ogg Opus support # BS2B effect plugin (http://bs2b.sourceforge.net/) diff --git a/nixpkgs/pkgs/applications/audio/qsampler/default.nix b/nixpkgs/pkgs/applications/audio/qsampler/default.nix index 03f519d3816e..bb40e0b3eebc 100644 --- a/nixpkgs/pkgs/applications/audio/qsampler/default.nix +++ b/nixpkgs/pkgs/applications/audio/qsampler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, qttools +{ lib, fetchurl, autoconf, automake, libtool, pkg-config, qttools , liblscp, libgig, qtbase, mkDerivation }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/nixpkgs/pkgs/applications/audio/qsynth/default.nix index 4b712bf1d254..f708207cce91 100644 --- a/nixpkgs/pkgs/applications/audio/qsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config +{ lib, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config , mkDerivation, qtbase, qttools, qtx11extras }: diff --git a/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/nixpkgs/pkgs/applications/audio/qtractor/default.nix index 493a99f6b71b..f19d0f70fdf4 100644 --- a/nixpkgs/pkgs/applications/audio/qtractor/default.nix +++ b/nixpkgs/pkgs/applications/audio/qtractor/default.nix @@ -24,7 +24,7 @@ , serd , sord , sratom -, lib, stdenv +, lib , suil }: diff --git a/nixpkgs/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix index 4d3ac1d1f2df..212b4c716ffa 100644 --- a/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -1,7 +1,16 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper -, alsaLib, xorg, libjack2 -, gtk3, pango, gdk-pixbuf, cairo, glib, freetype -, libpulseaudio, xdg_utils +{ config, lib, stdenv +, fetchurl +, autoPatchelfHook +, makeWrapper + +, alsaLib +, gtk3 +, lame +, ffmpeg +, vlc + +, jackSupport ? true, libjack2 +, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio }: stdenv.mkDerivation rec { @@ -17,22 +26,15 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib - - xorg.libX11 - xorg.libXi - - gdk-pixbuf - pango - cairo - glib - freetype - - xdg_utils + stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 + gtk3 ]; runtimeDependencies = [ - gtk3 - ]; + gtk3 # libSwell needs libgdk-3.so.0 + ] + ++ lib.optional jackSupport libjack2 + ++ lib.optional pulseaudioSupport libpulseaudio; dontBuild = true; @@ -42,8 +44,15 @@ stdenv.mkDerivation rec { --integrate-user-desktop rm $out/opt/REAPER/uninstall-reaper.sh + # Dynamic loading of plugin dependencies does not adhere to rpath of + # reaper executable that gets modified with runtimeDependencies. + # Patching each plugin with DT_NEEDED is cumbersome and requires + # hardcoding of API versions of each dependency. + # Setting the rpath of the plugin shared object files does not + # seem to have an effect for some plugins. + # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpulseaudio libjack2 ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ lame ffmpeg vlc ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/nixpkgs/pkgs/applications/audio/shortwave/default.nix b/nixpkgs/pkgs/applications/audio/shortwave/default.nix index 2cc8c53f6072..a503d3b344cb 100644 --- a/nixpkgs/pkgs/applications/audio/shortwave/default.nix +++ b/nixpkgs/pkgs/applications/audio/shortwave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , cargo , dbus diff --git a/nixpkgs/pkgs/applications/audio/snapcast/default.nix b/nixpkgs/pkgs/applications/audio/snapcast/default.nix index 84695730db67..681601c7d884 100644 --- a/nixpkgs/pkgs/applications/audio/snapcast/default.nix +++ b/nixpkgs/pkgs/applications/audio/snapcast/default.nix @@ -20,8 +20,8 @@ let aixlog = dependency { name = "aixlog"; - version = "1.2.1"; - sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; + version = "1.4.0"; + sha256 = "0f2bs5j1jjajcpa251dslnwkgglaam3b0cm6wdx5l7mbwvnmib2g"; }; popl = dependency { @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.20.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls"; + sha256 = "0183hhghzn0fhw2qzc1s009q7miabpcf0pxaqjdscsl8iivxqknd"; }; nativeBuildInputs = [ cmake pkg-config boost170.dev ]; diff --git a/nixpkgs/pkgs/applications/audio/sonata/default.nix b/nixpkgs/pkgs/applications/audio/sonata/default.nix index bc098cedaf40..83af7985dbe2 100644 --- a/nixpkgs/pkgs/applications/audio/sonata/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, wrapGAppsHook, gettext +{ lib, fetchFromGitHub, wrapGAppsHook, gettext , python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let diff --git a/nixpkgs/pkgs/applications/audio/spotify-cli-linux/default.nix b/nixpkgs/pkgs/applications/audio/spotify-cli-linux/default.nix index 593ad9468eba..e473d97ce56c 100644 --- a/nixpkgs/pkgs/applications/audio/spotify-cli-linux/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotify-cli-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, dbus }: +{ lib, python3Packages, dbus }: python3Packages.buildPythonApplication rec { pname = "spotify-cli-linux"; version = "1.6.0"; diff --git a/nixpkgs/pkgs/applications/audio/synthv1/default.nix b/nixpkgs/pkgs/applications/audio/synthv1/default.nix index 8097ee909305..50e16c355e2b 100644 --- a/nixpkgs/pkgs/applications/audio/synthv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/synthv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: +{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: mkDerivation rec { pname = "synthv1"; diff --git a/nixpkgs/pkgs/applications/audio/tageditor/default.nix b/nixpkgs/pkgs/applications/audio/tageditor/default.nix new file mode 100644 index 000000000000..02e23084cf53 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/tageditor/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, pkgs +, fetchFromGitHub +, pkg-config +, cmake + +, cpp-utilities +, qtutilities +, mp4v2 +, libid3tag +, qtbase +, qttools +, qtwebengine +, qtx11extras +, tagparser +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "tageditor"; + version = "3.3.10"; + + src = fetchFromGitHub { + owner = "martchus"; + repo = "tageditor"; + rev = "v${version}"; + sha256 = "16cmq7dyalcwc8gx1y9acngw5imjh8ydp4prxy7qpzk4fj3kpsak"; + }; + + nativeBuildInputs = [ + pkg-config + cmake + wrapQtAppsHook + ]; + buildInputs = [ + mp4v2 + libid3tag + pkg-config + qtbase + qttools + qtx11extras + qtwebengine + cpp-utilities + qtutilities + tagparser + ]; + + enableParallelBuilding = true; + + meta = with pkgs.lib; { + homepage = "https://github.com/Martchus/tageditor"; + description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; + }; +} + diff --git a/nixpkgs/pkgs/applications/audio/traverso/default.nix b/nixpkgs/pkgs/applications/audio/traverso/default.nix index 1cb9795005c1..71a91dc3105e 100644 --- a/nixpkgs/pkgs/applications/audio/traverso/default.nix +++ b/nixpkgs/pkgs/applications/audio/traverso/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config +{ mkDerivation, lib, fetchurl, cmake, pkg-config , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: diff --git a/nixpkgs/pkgs/applications/audio/vimpc/default.nix b/nixpkgs/pkgs/applications/audio/vimpc/default.nix index e38fc8386670..a576898128ec 100644 --- a/nixpkgs/pkgs/applications/audio/vimpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/vimpc/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkg-config -, taglib, curl }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libmpdclient +, ncurses +, pcre +, pkg-config +, taglib +, curl +}: stdenv.mkDerivation rec { version = "0.09.2"; @@ -13,7 +22,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ mpd_clientlib ncurses pcre taglib curl ]; + buildInputs = [ libmpdclient ncurses pcre taglib curl ]; postInstall = '' mkdir -p $out/etc diff --git a/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix b/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix index 894bed1715f5..865d82a73562 100644 --- a/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix +++ b/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkg-config, curl -, speex, flac }: +{ lib, stdenv, fetchurl, libogg, libvorbis, libao, pkg-config, curl +, speex, flac +, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "vorbis-tools"; + version = "1.4.2"; -let - debPatch = fetchzip { - url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-11.debian.tar.xz"; - sha256 = "0kvmd5nslyqplkdb7pnmqj47ir3y5lmaxd12wmrnqh679a8jhcyi"; - }; -in -stdenv.mkDerivation { - name = "vorbis-tools-1.4.0"; src = fetchurl { - url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz"; - sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3"; + url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${version}.tar.gz"; + sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv"; }; - postPatch = '' - for patch in $(ls "${debPatch}"/patches/*.{diff,patch} | grep -v debian_subdir) - do patch -p1 < "$patch" - done - ''; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/audio/whipper/default.nix b/nixpkgs/pkgs/applications/audio/whipper/default.nix index 8a46a06efcee..97d42eb9c69f 100644 --- a/nixpkgs/pkgs/applications/audio/whipper/default.nix +++ b/nixpkgs/pkgs/applications/audio/whipper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac +{ lib, fetchFromGitHub, python3, cdparanoia, cdrdao, flac , sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }: python3.pkgs.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/applications/audio/yams/default.nix b/nixpkgs/pkgs/applications/audio/yams/default.nix new file mode 100644 index 000000000000..96c1ab27b72c --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/yams/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "yams"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "Berulacks"; + repo = "yams"; + rev = version; + sha256 = "1zkhcys9i0s6jkaz24an690rvnkv1r84jxpaa84sf46abi59ijh8"; + }; + + propagatedBuildInputs = with python3Packages; [ + pyyaml + psutil + mpd2 + requests + ]; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/Berulacks/yams"; + description = "Last.FM scrobbler for MPD"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ccellado ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/ympd/default.nix b/nixpkgs/pkgs/applications/audio/ympd/default.nix index c12c060864db..38c05276be4b 100644 --- a/nixpkgs/pkgs/applications/audio/ympd/default.nix +++ b/nixpkgs/pkgs/applications/audio/ympd/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libmpdclient +, openssl +}: stdenv.mkDerivation rec { pname = "ympd"; @@ -12,13 +19,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ mpd_clientlib openssl ]; + buildInputs = [ libmpdclient openssl ]; - meta = { + meta = with lib; { homepage = "https://www.ympd.org"; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; - maintainers = [ lib.maintainers.siddharthist ]; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2; + maintainers = [ maintainers.siddharthist ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/applications/backup/vorta/default.nix b/nixpkgs/pkgs/applications/backup/vorta/default.nix index fc7e6c0fc359..a1b5944a51e1 100644 --- a/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -1,26 +1,27 @@ -{ buildPythonApplication, fetchFromGitHub, lib, paramiko, peewee, pyqt5 -, python-dateutil, APScheduler, psutil, qdarkstyle, secretstorage -, appdirs, setuptools, qt5 +{ lib +, python3 +, fetchFromGitHub +, wrapQtAppsHook }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "069fq5gv324l2ap3g6m6i12lhq1iqm27dsmaagyc3sva945j0gxw"; + sha256 = "1amq0fz3xrnxplzd6ih2azx6b4k1w496kcr7f8agfp617f5rkwa5"; }; postPatch = '' sed -i -e '/setuptools_git/d' -e '/pytest-runner/d' setup.cfg ''; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle secretstorage appdirs setuptools ]; @@ -33,7 +34,7 @@ buildPythonApplication rec { ''; meta = with lib; { - license = licenses.gpl3; + license = licenses.gpl3Only; homepage = "https://vorta.borgbase.com/"; maintainers = with maintainers; [ ma27 ]; description = "Desktop Backup Client for Borg"; diff --git a/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix index 796c48a7c58a..bd1c9611d561 100644 --- a/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; - version = "1.3.8"; + version = "1.3.8uahf"; src = fetchFromGitHub { owner = "bitcoinclassic"; repo = "bitcoinclassic"; rev = "v${version}"; - sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh"; + sha256 = "sha256-V1cOB5FLotGS5jup/aVaiDiyr/v2KJ2SLcIu/Hrjuwk="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/applications/blockchains/clightning.nix b/nixpkgs/pkgs/applications/blockchains/clightning.nix index ef351d0843fd..745ac349975c 100644 --- a/nixpkgs/pkgs/applications/blockchains/clightning.nix +++ b/nixpkgs/pkgs/applications/blockchains/clightning.nix @@ -1,28 +1,35 @@ -{ lib, stdenv, python3, pkg-config, which, libtool, autoconf, automake, - autogen, sqlite, gmp, zlib, fetchurl, unzip, fetchpatch, gettext }: - -with lib; +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, autogen +, gettext +, libtool +, pkg-config +, unzip +, which +, gmp +, libsodium +, python3 +, sqlite +, zlib +}: +let + py3 = python3.withPackages (p: [ p.Mako ]); +in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "022fw6rbn0chg0432h9q05w8qnys0hd9hf1qm2qlnnmamxw4dyfy"; + sha256 = "b4563921ed8bccd59d32b031f81825dc57fbe90882f0ecd5da89e48b59ff18b2"; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ autoconf autogen automake libtool pkg-config which unzip gettext ]; - buildInputs = - let py3 = python3.withPackages (p: [ p.Mako ]); - in [ sqlite gmp zlib py3 ]; - - makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; + nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ]; - configurePhase = '' - ./configure --prefix=$out --disable-developer --disable-valgrind - ''; + buildInputs = [ gmp libsodium sqlite zlib ]; postPatch = '' patchShebangs \ @@ -32,18 +39,24 @@ stdenv.mkDerivation rec { devtools/sql-rewrite.py ''; - doCheck = false; + configurePhase = '' + ./configure --prefix=$out --disable-developer --disable-valgrind + ''; + + makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; + + enableParallelBuilding = true; - meta = { + meta = with lib; { description = "A Bitcoin Lightning Network implementation in C"; - longDescription= '' + longDescription = '' c-lightning is a standard compliant implementation of the Lightning Network protocol. The Lightning Network is a scalability solution for Bitcoin, enabling secure and instant transfer of funds between any two parties for any amount. ''; homepage = "https://github.com/ElementsProject/lightning"; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 prusnak ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix b/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix index 779e7135618a..2266a1e4c260 100644 --- a/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix +++ b/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dcrwallet"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "decred"; repo = "dcrwallet"; rev = "refs/tags/v${version}"; - sha256 = "0ij2mwvdxg78p9qbdf9wm7aaphfg4j8lqgrjyjsj3kyi1l458ds9"; + sha256 = "sha256-WUfmv+laOwR/fc4osAFzPKqHQR+wOtSdLEsysICnuvg="; }; - vendorSha256 = "0qrrr92cad399xwr64qa9h41wqqaj0dy5mw248g5v53zars541w7"; + vendorSha256 = "sha256-9IRNlULvARIZu6dWaKrvx6fiDJ80SBLINhK/9tW9k/0="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/blockchains/electrs.nix b/nixpkgs/pkgs/applications/blockchains/electrs.nix index 0b0da5913ab9..b43a6edc5e51 100644 --- a/nixpkgs/pkgs/applications/blockchains/electrs.nix +++ b/nixpkgs/pkgs/applications/blockchains/electrs.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "0nnblxz4xr8k083wy3whx8qxqmdzbxsh5gd91161mrnvidganvgb"; + sha256 = "101prhxg7dr701gwm4s15maxb7cf65hf85hc7ai53b404v39vm71"; }; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - cargoSha256 = "11xwjcfc3kqjyp94qzmyb26xwynf4f1q3ac3rp7l7qq1njly07gr"; + cargoSha256 = "12ypx0rkpbjl4awzx8ga30qhiqqd56a24q4jwlxxnfpw9ks1z252"; meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; diff --git a/nixpkgs/pkgs/applications/blockchains/ethabi.nix b/nixpkgs/pkgs/applications/blockchains/ethabi.nix index ec142cc723ef..8cf3295ccab3 100644 --- a/nixpkgs/pkgs/applications/blockchains/ethabi.nix +++ b/nixpkgs/pkgs/applications/blockchains/ethabi.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "ethabi"; diff --git a/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 54805f2512fe..d130b3d04541 100644 --- a/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }: +{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }: let pname = "ledger-live-desktop"; - version = "2.19.0"; + version = "2.21.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "13z4v64z58b8fxph3rgjqy1z1y2agmarfr8cihlkf0ndssicasdl"; + sha256 = "11r6gwzg5qym7h40d8mrpw8c6zbdi534c2y7ghy2k0a4k3ybk8x1"; }; appimageContents = appimageTools.extractType2 { diff --git a/nixpkgs/pkgs/applications/blockchains/lnd.nix b/nixpkgs/pkgs/applications/blockchains/lnd.nix index 831195f06f0d..f5c1329090f5 100644 --- a/nixpkgs/pkgs/applications/blockchains/lnd.nix +++ b/nixpkgs/pkgs/applications/blockchains/lnd.nix @@ -1,21 +1,21 @@ -{ buildGoModule, fetchFromGitHub, lib +{ buildGoModule +, fetchFromGitHub +, lib , tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" ] }: buildGoModule rec { pname = "lnd"; - version = "0.11.0-beta"; + version = "0.12.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "1r1hwz8ka5mnmrvj9zcd78kn68g8fg3d4bdx9i0xy4sc2hh1dcpj"; + sha256 = "0mjfmmi5d5d2hny3938rxxdgar3qyk6x909l25fvjr4q3l4sz4x0"; }; - vendorSha256 = "090b9sxvdwh787w0rhrcbky9pbx64qgqx1pvk9ysk3886nxdhf7k"; - - doCheck = false; + vendorSha256 = "00q8dydskzg4rhxnnpzpbmmvc3q4wzm8z3dps2bv0nx3fk0fmrl3"; subPackages = ["cmd/lncli" "cmd/lnd"]; @@ -34,7 +34,7 @@ buildGoModule rec { meta = with lib; { description = "Lightning Network Daemon"; homepage = "https://github.com/lightningnetwork/lnd"; - license = lib.licenses.mit; - maintainers = with maintainers; [ cypherpunk2140 ]; + license = licenses.mit; + maintainers = with maintainers; [ cypherpunk2140 prusnak ]; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix b/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix index 2c17b3446645..feced9eecb01 100644 --- a/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix +++ b/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix @@ -17,11 +17,11 @@ with lib; stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.19.1.1"; + version = "0.19.2.3"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl"; + sha256 = "sha256-nAsQvYWUejSu/4MMIwZhlV5Gjza/Da4jcp6/01lppvg="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 84bb42fabf8c..9a5a1faac5ac 100644 --- a/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.27"; + version = "0.8.28-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "1zkqmsclhnv14s4mxz7h49kfx8wyi3lyi0dik6jn1fh6w8zr962c"; + sha256 = "sha256-a+w/909PZuHsgIQEtO2IWQijsERfAKJUZ8K30+PhD3k="; }; - cargoSha256 = "1j0pr09y5pc43a4rz1zq3h9vmd874zz6z0wd279lpm6p2m0077cs"; + cargoSha256 = "sha256-Zz844XDx5qj2hQlf99uvHV6e5wmDAlYh3zBvcpdoiIo="; nativeBuildInputs = [ clang ]; diff --git a/nixpkgs/pkgs/applications/blockchains/quorum.nix b/nixpkgs/pkgs/applications/blockchains/quorum.nix index 499e2a77c6f6..1424ddc9516f 100644 --- a/nixpkgs/pkgs/applications/blockchains/quorum.nix +++ b/nixpkgs/pkgs/applications/blockchains/quorum.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: +{ lib, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: buildGoPackage rec { pname = "quorum"; diff --git a/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix new file mode 100644 index 000000000000..098a948c8455 --- /dev/null +++ b/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -0,0 +1,53 @@ +{ lib +, fetchurl +, appimageTools +, tor +, trezord +}: + +let + pname = "trezor-suite"; + version = "21.2.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-linux-x86_64.AppImage"; + sha256 = "0dj3azx9jvxchrpm02w6nkcis6wlnc6df04z7xc6f66fwn6r3kkw"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in + +appimageTools.wrapType2 rec { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources + + cp -a ${appimageContents}/locales/ $out/share/${pname} + cp -a ${appimageContents}/resources/app*.* $out/share/${pname}/resources + cp -a ${appimageContents}/resources/images/ $out/share/${pname}/resources + + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png + install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png + substituteInPlace $out/share/applications/trezor-suite.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + + # symlink system binaries instead bundled ones + mkdir -p $out/share/${pname}/resources/bin/{bridge,tor} + ln -sf ${trezord}/bin/trezord-go $out/share/${pname}/resources/bin/bridge/trezord + ln -sf ${tor}/bin/tor $out/share/${pname}/resources/bin/tor/tor + ''; + + meta = with lib; { + description = "Trezor Suite - Desktop App for managing crypto"; + homepage = "https://suite.trezor.io"; + license = licenses.unfree; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix b/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix index 79a1eda3495a..3c56e0bbb2be 100644 --- a/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix +++ b/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "turbo-geth"; - version = "2021.01.01"; + version = "2021.02.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0a570570cmyngbz645728jdd0d2xmnyrnln2gbxnngiv4v62dxls"; + sha256 = "sha256-9z0Hogu/VgGxvgQMKIImv+qyTqTmR40JS4NNIOk5EZI="; }; - vendorSha256 = "1x3mhfc16slaamp51rbscfwll25qj6ama1xkysidy7rscmmsj392"; + vendorSha256 = "sha256-Ho68+SzYELQN4DE57LNSXeHIu43zAOb7HK/jx7PFdXk="; runVend = true; subPackages = [ diff --git a/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 0ce0a37d876f..1c3c4aade5ff 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -35,6 +35,7 @@ , libXrender , libXtst , makeWrapper +, ncurses5 , nspr , nss , pciutils @@ -72,6 +73,9 @@ let cp -r . $out wrapProgram $out/bin/studio.sh \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ + --set JAVA_HOME "$out/jre" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set FONTCONFIG_FILE ${fontsConf} \ --prefix PATH : "${lib.makeBinPath [ # Checked in studio.sh @@ -138,12 +142,19 @@ let gnome_vfs glib GConf - ]}" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ - --set FONTCONFIG_FILE ${fontsConf} + ]}" + + # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH + wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + ncurses5 + zlib + ]}" ''; }; + # Causes the shebangs in interpreter scripts deployed to mobile devices to be patched, which Android does not understand + dontPatchShebangs = true; + desktopItem = makeDesktopItem { name = drvName; exec = pname; @@ -161,7 +172,7 @@ let fhsEnv = buildFHSUserEnv { name = "${drvName}-fhs-env"; multiPkgs = pkgs: [ - pkgs.ncurses5 + ncurses5 # Flutter can only search for certs Fedora-way. (runCommand "fedoracert" {} diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index cbc5198f2f3a..1dc8b9ca7ff4 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -14,13 +14,13 @@ let sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9"; }; betaVersion = { - version = "4.2.0.19"; # "Android Studio 4.2 Beta 3" - build = "202.7033425"; - sha256Hash = "037r99hn16y0fy6z6k90qf6yx5a4vvx6bl9rdyagdm16ry4bpiw4"; + version = "4.2.0.20"; # "Android Studio 4.2 Beta 4" + build = "202.7094744"; + sha256Hash = "10c4qfq6d9ggs88s8h3pryhlnzw17m60qci78rjbh32wmm02sciz"; }; latestVersion = { # canary & dev - version = "2020.3.1.4"; # "Android Studio Arctic Fox Canary 4" - sha256Hash = "05drh4grq0b37qg5nspf2c6vmvcc9x71al3xwc2ddjhmyj0f9sk4"; + version = "2020.3.1.5"; # "Android Studio Arctic Fox (2020.3.1) Canary 5" + sha256Hash = "0x749sbg7qa5ncwwaywcldlhyyyyfh05bms2czz1rv6h7zgq16vq"; }; in { # Attributes are named by their corresponding release channels diff --git a/nixpkgs/pkgs/applications/editors/bluej/default.nix b/nixpkgs/pkgs/applications/editors/bluej/default.nix index af333e00961e..c0ca16a284a5 100644 --- a/nixpkgs/pkgs/applications/editors/bluej/default.nix +++ b/nixpkgs/pkgs/applications/editors/bluej/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bluej"; - version = "4.2.2"; + version = "5.0.0"; 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"; + sha256 = "sha256-U81FIf67Qm/86+hA9iUCHt61dxiZsTkkequlVjft6/0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/editors/ed/default.nix b/nixpkgs/pkgs/applications/editors/ed/default.nix index 3ceb037583a2..a6ab483a7b07 100644 --- a/nixpkgs/pkgs/applications/editors/ed/default.nix +++ b/nixpkgs/pkgs/applications/editors/ed/default.nix @@ -7,12 +7,12 @@ # files. stdenv.mkDerivation (rec { - name = "ed-${version}"; - version = "1.16"; + pname = "ed"; + version = "1.17"; src = fetchurl { - url = "mirror://gnu/ed/${name}.tar.lz"; - sha256 = "0b4b1lwizvng9bvpcjnmpj2i80xz9xw2w8nfff27b2h4mca7mh6g"; + url = "mirror://gnu/ed/${pname}-${version}.tar.lz"; + sha256 = "0m2yrkfjjraakxr98nsiakqrn351h99n706x9asgmdi57j43kpki"; }; nativeBuildInputs = [ lzip ]; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 9334a16d22d6..62979b4226dd 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -610,7 +610,7 @@ let }; # Deprecated legacy aliases for backwards compat - aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.03, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { + aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.05, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { "auto-complete-clang-async" = "emacsClangCompleteAsync"; "vterm" = "emacs-libvterm"; "0xc" = "_0xc"; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix index dd553fc19980..ea871ccf414f 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, trivialBuild }: +{ fetchurl, lib, trivialBuild }: trivialBuild { pname = "sv-kalender"; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix index bd965c8f1285..4c321065445c 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,7 +1,7 @@ let pkgs = import ../../../.. {}; - emacsEnv = pkgs.emacs.withPackages (epkgs: let + emacsEnv = pkgs.emacs.pkgs.withPackages (epkgs: let promise = epkgs.trivialBuild { pname = "promise"; diff --git a/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/nixpkgs/pkgs/applications/editors/emacs/generic.nix index 377079969196..9377d3ba89c9 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -19,6 +19,7 @@ , withGTK2 ? false, gtk2-x11 ? null , withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null +, withMotif ? false, motif ? null , withCsrc ? true , srcRepo ? false, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el @@ -27,6 +28,7 @@ , toolkit ? ( if withGTK2 then "gtk2" else if withGTK3 then "gtk3" + else if withMotif then "motif" else "lucid") }: @@ -107,6 +109,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] + ++ lib.optional (withX && withMotif) motif ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ] ++ lib.optionals nativeComp [ libgccjit ] diff --git a/nixpkgs/pkgs/applications/editors/featherpad/default.nix b/nixpkgs/pkgs/applications/editors/featherpad/default.nix index 059d49151d86..c73238ce3661 100644 --- a/nixpkgs/pkgs/applications/editors/featherpad/default.nix +++ b/nixpkgs/pkgs/applications/editors/featherpad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: +{ lib, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: mkDerivation rec { pname = "featherpad"; version = "0.10.0"; diff --git a/nixpkgs/pkgs/applications/editors/focuswriter/default.nix b/nixpkgs/pkgs/applications/editors/focuswriter/default.nix index 31a7026106eb..d47c315f613a 100644 --- a/nixpkgs/pkgs/applications/editors/focuswriter/default.nix +++ b/nixpkgs/pkgs/applications/editors/focuswriter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: +{ lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: mkDerivation rec { pname = "focuswriter"; diff --git a/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix b/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix index f0ae7ef5f3ea..23a81c9cb00a 100644 --- a/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix +++ b/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.0.0-rc3"; + version = "2.0.0-rc4"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - sha256 = "sha256-Ag97iE++f3nG2zlwqn0qxSL9RpF8O3XWH9NtQ5kFuWg="; + sha256 = "07547503a209hc0fcg902w3x0s1m899c10nj3gqz3hak0cmrasi3"; }; nativeBuildInputs = [ qmake pkg-config qttools ]; diff --git a/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index 198185e469d9..67cb0028ae58 100644 --- a/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06wcyfrwcjyj2vcqyw0z3sy1r4qxpcdpwqq1qmpsaphpz8acycjn"; + sha256 = "jFNco64yoZC1TZbTIHGVf+wBYYQHo2JRiMZFHngzYTs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/gobby/default.nix b/nixpkgs/pkgs/applications/editors/gobby/default.nix index 0e2671846c06..27047f8e95a8 100644 --- a/nixpkgs/pkgs/applications/editors/gobby/default.nix +++ b/nixpkgs/pkgs/applications/editors/gobby/default.nix @@ -4,13 +4,15 @@ let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; -in stdenv.mkDerivation { - name = "gobby-unstable-2018-04-03"; +in stdenv.mkDerivation rec { + pname = "gobby"; + version = "0.6.0"; + src = fetchFromGitHub { owner = "gobby"; repo = "gobby"; - rev = "ea4df27c9b6b885434797b0071ce198b23f9f63b"; - sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; + rev = "v${version}"; + sha256 = "06cbc2y4xkw89jaa0ayhgh7fxr5p2nv3jjs8h2xcbbbgwaw08lk0"; }; nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/editors/hecate/default.nix b/nixpkgs/pkgs/applications/editors/hecate/default.nix index a0fdcfbb3f66..5429497d209e 100644 --- a/nixpkgs/pkgs/applications/editors/hecate/default.nix +++ b/nixpkgs/pkgs/applications/editors/hecate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "0.0.1"; diff --git a/nixpkgs/pkgs/applications/editors/hexdino/default.nix b/nixpkgs/pkgs/applications/editors/hexdino/default.nix index 5d782aa1abcb..f92a4557ac7a 100644 --- a/nixpkgs/pkgs/applications/editors/hexdino/default.nix +++ b/nixpkgs/pkgs/applications/editors/hexdino/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, ncurses }: +{ lib, fetchFromGitHub, rustPlatform, ncurses }: rustPlatform.buildRustPackage { pname = "hexdino"; diff --git a/nixpkgs/pkgs/applications/editors/ht/default.nix b/nixpkgs/pkgs/applications/editors/ht/default.nix index 096b69a5e82a..2f1ea40359d5 100644 --- a/nixpkgs/pkgs/applications/editors/ht/default.nix +++ b/nixpkgs/pkgs/applications/editors/ht/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./gcc7.patch ]; + NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + meta = with lib; { description = "File editor/viewer/analyzer for executables"; homepage = "http://hte.sourceforge.net"; diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 3c1224b91e79..c2415cf4f21b 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -308,12 +308,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0am4h8w1dmjl08iphqy78ivb91vkrvskg95dgm24zcj0n8rwmaq6"; /* updated by script */ + sha256 = "0zkjmvi27b69xrkn4s6f5788n5yn044phgf48kamfqfs37q4xf1d"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -321,12 +321,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1kwz0aq4b664awppakj4syppk218nynwxv4ngc7pa3k9v4g2sdah"; /* updated by script */ + sha256 = "1vac21d9p52z4k1dl903rc2dbbcf873xbg8rx1fp9nsaaphnc9lq"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -334,12 +334,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz"; - sha256 = "1wd3d8pc155m54y5p2056p0x93v2nv9457i7la53ibbs7rj1j7kw"; /* updated by script */ + url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz"; + sha256 = "0dr1z2sxarz1xif4swxx28hpzsyjd86m0c3xdaw5lmpqwqlzvc5h"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -412,12 +412,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1bfq3xwnfz6f04d0lq584q7pg775a8y35b1b62w81dbfh43l4fj0"; /* updated by script */ + sha256 = "1jpa4gfy0xmmscjqca4pvvwvh4h3lg02nbf1m5wcsjdcywbk9y40"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/nixpkgs/pkgs/applications/editors/kakoune/default.nix index 93a9e1a05a6b..1f3b2685feeb 100644 --- a/nixpkgs/pkgs/applications/editors/kakoune/default.nix +++ b/nixpkgs/pkgs/applications/editors/kakoune/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { export version="v${version}" ''; + enableParallelBuilding = true; + doInstallCheck = true; installCheckPhase = '' $out/bin/kak -ui json -e "kill 0" diff --git a/nixpkgs/pkgs/applications/editors/kibi/default.nix b/nixpkgs/pkgs/applications/editors/kibi/default.nix index 07454d331c6f..71833be33002 100644 --- a/nixpkgs/pkgs/applications/editors/kibi/default.nix +++ b/nixpkgs/pkgs/applications/editors/kibi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform }: diff --git a/nixpkgs/pkgs/applications/editors/manuskript/default.nix b/nixpkgs/pkgs/applications/editors/manuskript/default.nix index cc39da90c237..49dafe8fc1a3 100644 --- a/nixpkgs/pkgs/applications/editors/manuskript/default.nix +++ b/nixpkgs/pkgs/applications/editors/manuskript/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonApplication rec { pname = "manuskript"; diff --git a/nixpkgs/pkgs/applications/editors/mindforger/default.nix b/nixpkgs/pkgs/applications/editors/mindforger/default.nix index a8e60cddfbb8..512e0f124411 100644 --- a/nixpkgs/pkgs/applications/editors/mindforger/default.nix +++ b/nixpkgs/pkgs/applications/editors/mindforger/default.nix @@ -4,7 +4,7 @@ , qmake , qtbase , qtwebkit -, lib, stdenv +, lib , wrapGAppsHook }: diff --git a/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix b/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix index f1d56584e499..208339c2e38d 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }: +{ lib, rustPlatform, fetchFromGitHub, gtk, webkitgtk }: rustPlatform.buildRustPackage rec { pname = "gnvim-unwrapped"; diff --git a/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix b/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix index 1d82e70f5c4d..867e22751284 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: with lib; diff --git a/nixpkgs/pkgs/applications/editors/okteta/default.nix b/nixpkgs/pkgs/applications/editors/okteta/default.nix index d51f46b9e0a4..296a1eb2ad89 100644 --- a/nixpkgs/pkgs/applications/editors/okteta/default.nix +++ b/nixpkgs/pkgs/applications/editors/okteta/default.nix @@ -1,14 +1,14 @@ -{ mkDerivation, lib, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig +{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig , kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts , qca-qt5, shared-mime-info }: mkDerivation rec { pname = "okteta"; - version = "0.26.4"; + version = "0.26.5"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "00qgzm5mqx0j8f0fznhnw76l9pjyw3lxirvy8ssq59nqqjbb08pg"; + sha256 = "sha256-n8ft//c+ewWDr1QLDAUvkiHKPxHqP8NgTCvO2wnCmpc="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/nixpkgs/pkgs/applications/editors/ox/default.nix b/nixpkgs/pkgs/applications/editors/ox/default.nix new file mode 100644 index 000000000000..aa3f22a26261 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/ox/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "ox"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "curlpipe"; + repo = pname; + rev = version; + sha256 = "18iffnmvax6mbnhypf7yma98y5q2zlsyp9q18f92fdwz426r33p0"; + }; + + cargoSha256 = "0v0a1dl9rq5qyy9xwnb59w62qr9db3y3zlmnp60wafvj70zi9zxs"; + + meta = with lib; { + description = "An independent Rust text editor that runs in your terminal"; + homepage = "https://github.com/curlpipe/ox"; + changelog = "https://github.com/curlpipe/ox/releases/tag/${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/retext/default.nix b/nixpkgs/pkgs/applications/editors/retext/default.nix index 99f7340f7536..19cc7bc29708 100644 --- a/nixpkgs/pkgs/applications/editors/retext/default.nix +++ b/nixpkgs/pkgs/applications/editors/retext/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts +{ lib, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries # available. , enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] @@ -6,30 +6,10 @@ let version = "7.0.4"; - python = let - packageOverrides = self: super: { - markdown = super.markdown.overridePythonAttrs(old: { - src = super.fetchPypi { - version = "3.0.1"; - pname = "Markdown"; - sha256 = "d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"; - }; - }); - - chardet = super.chardet.overridePythonAttrs(old: { - src = super.fetchPypi { - version = "2.3.0"; - pname = "chardet"; - sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"; - }; - patches = []; - }); - }; - in python3.override { inherit packageOverrides; }; - pythonEnv = python.withPackages (ps: with ps; [ + pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 docutils pyenchant Markups markdown pygments chardet ]); -in python.pkgs.buildPythonApplication { +in python3.pkgs.buildPythonApplication { inherit version; pname = "retext"; diff --git a/nixpkgs/pkgs/applications/editors/sigil/default.nix b/nixpkgs/pkgs/applications/editors/sigil/default.nix index 1094c3c75535..b34441d100c3 100644 --- a/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper , boost, xercesc, hunspell, zlib, pcre16 , qtbase, qttools, qtwebengine, qtxmlpatterns , python3Packages diff --git a/nixpkgs/pkgs/applications/editors/standardnotes/default.nix b/nixpkgs/pkgs/applications/editors/standardnotes/default.nix index e472df44a604..e66febbf7fc2 100644 --- a/nixpkgs/pkgs/applications/editors/standardnotes/default.nix +++ b/nixpkgs/pkgs/applications/editors/standardnotes/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils - , fetchurl, runtimeShell }: +, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }: let - version = "3.5.11"; + version = "3.5.18"; pname = "standardnotes"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ let sha256 = { i386-linux = "009fnnd7ysxkyykkbmhvr0vn13b21j1j5mzwdvqdkhm9v3c9rbgj"; - x86_64-linux = "1fij00d03ky57jlnhf9n2iqvfa4dgmkgawrxd773gg03hdsk7xcf"; + x86_64-linux = "1zrnvvr9x0s2gp948iajsmgn38xm6x0g2dgxrfjis39rpplsrdww"; }.${stdenv.hostPlatform.system}; src = fetchurl { @@ -30,6 +30,14 @@ let in appimageTools.wrapType2 rec { inherit name src; + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + extraPkgs = pkgs: with pkgs; [ + libsecret + ]; + extraInstallCommands = '' # directory in /nix/store so readonly cp -r ${appimageContents}/* $out diff --git a/nixpkgs/pkgs/applications/editors/texmacs/common.nix b/nixpkgs/pkgs/applications/editors/texmacs/common.nix index 3ffcc8ecf45c..e52d95f837df 100644 --- a/nixpkgs/pkgs/applications/editors/texmacs/common.nix +++ b/nixpkgs/pkgs/applications/editors/texmacs/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: +{ lib, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: rec { extraFontsSrc = fetchurl { url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; diff --git a/nixpkgs/pkgs/applications/editors/texmacs/default.nix b/nixpkgs/pkgs/applications/editors/texmacs/default.nix index 6046a3aa313d..dd5e5e61b29c 100644 --- a/nixpkgs/pkgs/applications/editors/texmacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/texmacs/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, callPackage, fetchFromGitHub, +{ lib, mkDerivation, callPackage, fetchurl, guile_1_8, qtbase, xmodmap, which, freetype, libjpeg, sqlite, @@ -16,19 +16,17 @@ let pname = "TeXmacs"; - version = "1.99.15"; + version = "1.99.18"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; in mkDerivation { - name = "${pname}-${version}"; + inherit pname version; - src = fetchFromGitHub { - owner = "texmacs"; - repo = "texmacs"; - rev = "v${version}"; - sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; + src = fetchurl { + url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; + sha256 = "0il3fwgw20421aj90wg8kyhkwk6lbgb3bb2g5qamh5lk90yj725i"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/nixpkgs/pkgs/applications/editors/texstudio/default.nix index 988e32ae7128..77af6b679396 100644 --- a/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "05q70wbdaldhrlapss4agmvz1cwqd229nd5amkj069v1wxrkvpb7"; + sha256 = "03q1mdz47crflkvpc364ky52farad7517jhszb1fg1s3c2bnndn0"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/nixpkgs/pkgs/applications/editors/texworks/default.nix b/nixpkgs/pkgs/applications/editors/texworks/default.nix index d0347bcb37c6..87990b6eae8f 100644 --- a/nixpkgs/pkgs/applications/editors/texworks/default.nix +++ b/nixpkgs/pkgs/applications/editors/texworks/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config , qtscript, poppler, hunspell , withLua ? true, lua , withPython ? true, python3 }: @@ -14,6 +14,14 @@ mkDerivation rec { sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z"; }; + patches = [ + (fetchpatch { + name = "fix-compilation-with-qt-5.15.patch"; + url = "https://github.com/TeXworks/texworks/commit/a5352a3a94e3685125650b65e6197de060326cc2.patch"; + sha256 = "0pf7h1m11x0s039bxknm7rxdp9b4g8ch86y38jlyy56c74mw97i6"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtscript poppler hunspell ] ++ lib.optional withLua lua diff --git a/nixpkgs/pkgs/applications/editors/thonny/default.nix b/nixpkgs/pkgs/applications/editors/thonny/default.nix index e98d57420e81..39aefe3fa163 100644 --- a/nixpkgs/pkgs/applications/editors/thonny/default.nix +++ b/nixpkgs/pkgs/applications/editors/thonny/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: with python3.pkgs; diff --git a/nixpkgs/pkgs/applications/editors/tiled/default.nix b/nixpkgs/pkgs/applications/editors/tiled/default.nix index f5306e75a56c..b6222c8a6d2c 100644 --- a/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, qmake +{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake , python, qtbase, qttools }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix b/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix index 087a375c50cc..6ea6b6c60940 100644 --- a/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: +{ lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: let macvim = callPackage ./macvim.nix { inherit stdenv; }; @@ -12,7 +12,6 @@ let # sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"` # if you want to preserve that behavior. configure = let - inherit (stdenv) lib; doConfig = config: let vimrcConfig = config // { # always source the bundled system vimrc diff --git a/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/nixpkgs/pkgs/applications/editors/vscode/generic.nix index eea34cacfc04..470683bad43f 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -3,6 +3,9 @@ , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu +# Populate passthru.tests +, tests + # Attributes inherit from specific versions , version, src, meta, sourceRoot , executableName, longName, shortName, pname @@ -16,7 +19,7 @@ in inherit pname version src sourceRoot; passthru = { - inherit executableName; + inherit executableName tests; }; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh b/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh index cb1400f048e0..d1ae71cd11e2 100755 --- a/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh +++ b/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused gawk +#!nix-shell -i bash -p curl jq gnused # Update script for the vscode versions and hashes. # Usually doesn't need to be called by hand, @@ -16,8 +16,7 @@ fi # VSCode -VSCODE_VER=$(curl -s -L "https://code.visualstudio.com/Download" | grep "is now available" | awk -F'</span>' '{print $1}' | awk -F'>' '{print $NF}') -VSCODE_VER=$(curl -s -L "https://code.visualstudio.com/updates/v${VSCODE_VER/./_}" | grep "Downloads:" | awk -F'code.visualstudio.com/' '{print $2}' | awk -F'/' '{print $1}') +VSCODE_VER=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases/latest | jq --raw-output .tag_name) sed -i "s/version = \".*\"/version = \"${VSCODE_VER}\"/" "$ROOT/vscode.nix" VSCODE_LINUX_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-x64/stable" diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 7324a19620dc..e772796c34eb 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c"; - x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r"; - aarch64-linux = "0i3yl9rx9h7qkl3k9qk6gg35nhz737qzzbvzvdwkqjaacsbpfgf8"; - armv7l-linux = "19iz2bxcq6y8sklr6zcnbp47kki9l00x3nvr213lkk3kj08l0afv"; + x86_64-linux = "0c0m5qkqv3zhcxmwx72b7z67sjcd1miv8d10kxpk9vffyrxkmj93"; + x86_64-darwin = "1spd5rbhra4n38lp0sgxd2cr1bngsmi32a43g02vdmmhkmk0iixc"; + aarch64-linux = "1ql3hn6c59g7d0cwhg54ixww2i9jmkjw3nyzz97yw8wk63zwz024"; + armv7l-linux = "0pdqcbw7rygvdzys787kf8ag17g9qyv7k33dqhi5h2zc96j867c0"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.52.1"; + version = "1.53.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index cae161106151..bdc5552a64f9 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl }: +{ lib, stdenv, callPackage, fetchurl, nixosTests }: let inherit (stdenv.hostPlatform) system; @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1ckg279vvg8h1n8ippa9vlyw4vk3frinb6fvvi47zggs31168m7b"; - x86_64-darwin = "168g34v2b8r1pdbnqrs0c0k9aa60n5rspixziywnq7m61i23nlgd"; - aarch64-linux = "1cd4sg6k7sqmj3yzmprq1rz928bvc3zrch8agfd8zfap1d6nfaal"; - armv7l-linux = "0f8z4lws027dyqhcrkzm9rvifwid5m0icprg0xk01l7y18n3q923"; + x86_64-linux = "1b9pzfi034idhi6f3n0sz3fckf95ckf2qx3sgfn9fx2g52r9m9z1"; + x86_64-darwin = "1983d8hn04xl5vw7p6842cv5x08q7vilqg7nhvy5yg3lj9q2rpp0"; + aarch64-linux = "09l32abkq110ib4hjd0yv9avr8a2vg5vs7w4jpk0p499gzrysh2l"; + armv7l-linux = "1s0gbq1fapq2i905c0xxfyh0656qnb7dmg00khlwbplxzd6i6m18"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.52.1"; + version = "1.53.2"; pname = "vscodium"; executableName = "codium"; @@ -45,6 +45,8 @@ in inherit sha256; }; + tests = nixosTests.vscodium; + meta = with lib; { description = '' Open source source code editor developed by Microsoft for Windows, diff --git a/nixpkgs/pkgs/applications/gis/grass/default.nix b/nixpkgs/pkgs/applications/gis/grass/default.nix index 65f42d7c53f0..ef7458d7394c 100644 --- a/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -1,10 +1,8 @@ -{ stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw +{ lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid }: -let inherit (stdenv) lib; in - stdenv.mkDerivation rec { name = "grass"; version = "7.6.1"; diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index ee608b7538ff..58c47721b6b1 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-46"; - sha256 = "019l1qv8ds8hvyjwi1g21293a7v28bxf8ycnvr9828kpdhf4jxaa"; + version = "7.0.10-61"; + sha256 = "sha256-c/90N5H9iz5JYmn7/ynHgSOAmO5NTtkxajChZvjfMP8="; patches = []; }; in diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index ad559a6f2167..66ad424253eb 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices @@ -12,39 +12,19 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64" else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" else throw "ImageMagick is not supported on this platform."; - - cfg = { - version = "6.9.11-29"; - sha256 = "0adjdpi91ya0g3v7y503n95833m25aibkim5swg5lnwjrba407hg"; - patches = []; - } - # Freeze version on mingw so we don't need to port the patch too often. - # FIXME: This version has multiple security vulnerabilities - // lib.optionalAttrs (stdenv.hostPlatform.isMinGW) { - version = "6.9.2-0"; - sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; - patches = [(fetchpatch { - name = "mingw-build.patch"; - url = "https://raw.githubusercontent.com/Alexpux/MINGW-packages/" - + "01ca03b2a4ef/mingw-w64-imagemagick/002-build-fixes.patch"; - sha256 = "1pypszlcx2sf7wfi4p37w1y58ck2r8cd5b2wrrwr9rh87p7fy1c0"; - })]; - }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "imagemagick"; - inherit (cfg) version; + version = "6.9.11-60"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; - rev = cfg.version; - inherit (cfg) sha256; + rev = version; + sha256 = "12810882a0kf4zlgyi290z9bjs921m05njbljkjfw6s1hf0mncl0"; }; - patches = cfg.patches; - outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/nixpkgs/pkgs/applications/graphics/avocode/default.nix index d185c30ff435..8726fc1d7935 100644 --- a/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.11.0"; + version = "4.11.1"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-50aGechzlVVRQz6WOASHRjT46BKbwyhbt7/0oq2PsOg="; + sha256 = "sha256-Qe5mV9GBLHsmzMQg6dKib/sTnNdyOTj4wYQ9xd/iqJM="; }; libPath = lib.makeLibraryPath (with xorg; [ diff --git a/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/nixpkgs/pkgs/applications/graphics/darktable/default.nix index 0f47b87d4ac1..2ff712851b94 100644 --- a/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.4.0"; + version = "3.4.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda"; + sha256 = "sha256-f8P4UdqbzXxQU+zQnyGqPrYQO+mKbFj1IBC28iF0lB4="; }; nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/graphics/dia/CVE-2019-19451.patch b/nixpkgs/pkgs/applications/graphics/dia/CVE-2019-19451.patch new file mode 100644 index 000000000000..28d6598330a3 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/dia/CVE-2019-19451.patch @@ -0,0 +1,11 @@ +diff -ru a/app/app_procs.c b/app/app_procs.c +--- a/app/app_procs.c 2021-01-30 11:09:52.000000000 -0500 ++++ b/app/app_procs.c 2021-01-30 11:11:05.000000000 -0500 +@@ -785,6 +785,7 @@ + + if (!filename) { + g_print (_("Filename conversion failed: %s\n"), filenames[i]); ++ ++i; + continue; + } + diff --git a/nixpkgs/pkgs/applications/graphics/dia/default.nix b/nixpkgs/pkgs/applications/graphics/dia/default.nix index 6fe8aed8f674..d9de3eb7fc12 100644 --- a/nixpkgs/pkgs/applications/graphics/dia/default.nix +++ b/nixpkgs/pkgs/applications/graphics/dia/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation { sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; }; + patches = [ + ./CVE-2019-19451.patch + ]; + buildInputs = [ gtk2 libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl libart_lgpl ] diff --git a/nixpkgs/pkgs/applications/graphics/displaycal/default.nix b/nixpkgs/pkgs/applications/graphics/displaycal/default.nix index d1cee064aee6..3b6bb01bb150 100644 --- a/nixpkgs/pkgs/applications/graphics/displaycal/default.nix +++ b/nixpkgs/pkgs/applications/graphics/displaycal/default.nix @@ -1,5 +1,5 @@ { python2 -, lib, stdenv +, lib , fetchurl , pkg-config , libXext diff --git a/nixpkgs/pkgs/applications/graphics/dosage/default.nix b/nixpkgs/pkgs/applications/graphics/dosage/default.nix index b2997c2c474a..db0012a184be 100644 --- a/nixpkgs/pkgs/applications/graphics/dosage/default.nix +++ b/nixpkgs/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "dosage"; diff --git a/nixpkgs/pkgs/applications/graphics/emulsion/default.nix b/nixpkgs/pkgs/applications/graphics/emulsion/default.nix index 133deec19521..9792ce4d6d2b 100644 --- a/nixpkgs/pkgs/applications/graphics/emulsion/default.nix +++ b/nixpkgs/pkgs/applications/graphics/emulsion/default.nix @@ -15,7 +15,6 @@ , libxcb , libxkbcommon , wayland -, xdg_utils , AppKit , CoreGraphics , CoreServices diff --git a/nixpkgs/pkgs/applications/graphics/feh/default.nix b/nixpkgs/pkgs/applications/graphics/feh/default.nix index 739b6ae5d1be..fac3dbb55347 100644 --- a/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "0d66qz9h37pk8h10bc918hbv3j364vyni934rlw2j951s5wznj8n"; + sha256 = "sha256-Q3Qg838RYU4AjQZuKjve/Px4FEyCEpmLK6zdXSHqI7Q="; }; outputs = [ "out" "man" "doc" ]; diff --git a/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix b/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix index 667f5afe5793..99e8478224f4 100644 --- a/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, ghostscript, libpng, makeWrapper -, coreutils, bc, gnugrep, gawk, gnused } : +{ lib +, stdenv +, fetchurl +, ghostscript +, libpng +, makeWrapper +, coreutils +, bc +, gnugrep +, gawk +, gnused +}: stdenv.mkDerivation rec { pname = "fig2dev"; diff --git a/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/nixpkgs/pkgs/applications/graphics/freecad/default.nix index 3563220f2b87..1c4f05b42dac 100644 --- a/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook, opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }: diff --git a/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix index b2a5b771211c..db3bd494b6b1 100644 --- a/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix @@ -23,9 +23,12 @@ let mkdir -p $out/${gimp.targetScriptDir}/${name}; for p in "$@"; do cp "$p" -r $out/${gimp.targetScriptDir}/${name}; done } - installPlugins(){ - mkdir -p $out/${gimp.targetPluginDir}/${name}; - for p in "$@"; do cp "$p" -r $out/${gimp.targetPluginDir}/${name}; done + installPlugin() { + # The base name of the first argument is the plug-in name and the main executable. + # GIMP only allows a single plug-in per directory: + # https://gitlab.gnome.org/GNOME/gimp/-/commit/efae55a73e98389e38fa0e59ebebcda0abe3ee96 + pluginDir=$out/${gimp.targetPluginDir}/$(basename "$1") + install -Dt "$pluginDir" "$@" } ''; @@ -35,7 +38,7 @@ let } // attrs // { - name = "gimp-plugin-${name}"; + name = "${gimp.name}-plugin-${name}"; buildInputs = [ gimp gimp.gtk @@ -83,15 +86,28 @@ in Filters/Generic/FFT Forward Filters/Generic/FFT Inverse */ - name = "fourier-0.4.3"; - buildInputs = with pkgs; [ fftw ]; + pname = "fourier"; + version = "0.4.3"; src = fetchurl { - url = "https://www.lprp.fr/files/old-web/soft/gimp/${name}.tar.gz"; + url = "https://www.lprp.fr/files/old-web/soft/gimp/${pname}-${version}.tar.gz"; sha256 = "0mf7f8vaqs2madx832x3kcxw3hv3w3wampvzvaps1mkf2kvrjbsn"; }; - installPhase = "installPlugins fourier"; + buildInputs = with pkgs; [ fftw ]; + + postPatch = '' + # The tarball contains a prebuilt binary. + make clean + ''; + + installPhase = '' + runHook preInstall + + installPlugin fourier + + runHook postInstall + ''; meta = with lib; { description = "GIMP plug-in to do the fourier transform"; @@ -131,7 +147,7 @@ in rev = "de4367f71e40fe6d82387eaee68611a80a87e0e1"; sha256 = "1zzvbczly7k456c0y6s92a1i8ph4ywmbvdl8i4rcc29l4qd2z8fw"; }; - installPhase = "installPlugins src/texturize"; + installPhase = "installPlugin src/texturize"; meta.broken = true; # https://github.com/lmanul/gimp-texturize/issues/1 }; @@ -145,7 +161,7 @@ in url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; }; - installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? + installPhase = "installPlugin src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? }; lqrPlugin = pluginDerivation rec { @@ -181,7 +197,7 @@ in buildInputs = with pkgs; [ lensfun gexiv2 ]; installPhase = " - installPlugins gimp-lensfun + installPlugin gimp-lensfun "; meta = { diff --git a/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix b/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix index 094dcf0703e4..8fde04d0d1df 100644 --- a/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix +++ b/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: +{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); diff --git a/nixpkgs/pkgs/applications/graphics/glimpse/default.nix b/nixpkgs/pkgs/applications/graphics/glimpse/default.nix new file mode 100644 index 000000000000..de85fb9bf174 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/glimpse/default.nix @@ -0,0 +1,197 @@ +{ stdenv +, lib +, fetchFromGitHub +, substituteAll +, pkg-config +, intltool +, babl +, gegl +, gtk2 +, glib +, gdk-pixbuf +, isocodes +, pango +, cairo +, freetype +, fontconfig +, lcms +, libpng +, libjpeg +, poppler +, poppler_data +, libtiff +, libmng +, librsvg +, libwmf +, zlib +, libzip +, ghostscript +, aalib +, shared-mime-info +, python2 +, libexif +, gettext +, xorg +, glib-networking +, libmypaint +, gexiv2 +, harfbuzz +, mypaint-brushes1 +, libwebp +, libheif +, libgudev +, openexr +, AppKit +, Cocoa +, gtk-mac-integration-gtk2 +, libxslt +, automake +, autoconf +, libtool +, makeWrapper +, autoreconfHook +, gtk-doc +}: +let + python = python2.withPackages (pp: [ pp.pygtk ]); +in +stdenv.mkDerivation rec { + pname = "glimpse"; + version = "0.2.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "glimpse-editor"; + repo = "Glimpse"; + rev = "v${version}"; + sha256 = "sha256-qbZQmAo7fuJWWbn0QTyxAwAenZOdsGueUq5/3IV8Njc="; + }; + + patches = [ + # to remove compiler from the runtime closure, reference was retained via + # gimp --version --verbose output + (substituteAll { + src = ./remove-cc-reference.patch; + cc_version = stdenv.cc.cc.name; + }) + ../gimp/hardcode-plugin-interpreters.patch + ]; + + postPatch = '' + ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + intltool + gettext + automake + autoconf + makeWrapper + gtk-doc + libxslt + libtool + ]; + + buildInputs = [ + babl + gegl + gtk2 + glib + gdk-pixbuf + pango + cairo + gexiv2 + harfbuzz + isocodes + freetype + fontconfig + lcms + libpng + libjpeg + poppler + poppler_data + libtiff + openexr + libmng + librsvg + libwmf + zlib + libzip + ghostscript + aalib + shared-mime-info + libwebp + libheif + python + libexif + xorg.libXpm + glib-networking + libmypaint + mypaint-brushes1 + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + gtk-mac-integration-gtk2 + ] ++ lib.optionals stdenv.isLinux [ + libgudev + ]; + + # needed by gimp-2.0.pc + propagatedBuildInputs = [ + gegl + ]; + + # Check if librsvg was built with --disable-pixbuf-loader. + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; + + preAutoreconf = '' + # The check runs before glib-networking is registered + export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + ''; + + postFixup = '' + wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version} \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + passthru = rec { + # The declarations for `glimpse-with-plugins` wrapper, + # used for determining plug-in installation paths + majorVersion = "2.0"; + targetPluginDir = "lib/glimpse/${majorVersion}/plug-ins"; + targetScriptDir = "share/glimpse/${majorVersion}/scripts"; + targetDataDir = "share/gimp/${majorVersion}"; + targetLibDir = "lib/gimp/${majorVersion}"; + + # probably its a good idea to use the same gtk in plugins ? + gtk = gtk2; + }; + + configureFlags = [ + "--without-webkit" # old version is required + "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "--with-icc-directory=/run/current-system/sw/share/color/icc" + # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) + "--libdir=\${exec_prefix}/lib" + ]; + + # on Darwin, + # test-eevl.c:64:36: error: initializer element is not a compile-time constant + doCheck = !stdenv.isDarwin; + + enableParallelBuilding = true; + + meta = with lib; { + description = "An open source image editor based on the GNU Image Manipulation Program"; + longDescription = '' + Glimpse is an open source image editor based on the GNU Image Manipulation Program (GIMP). The goal is to experiment with new ideas and expand the use of free software. + ''; + homepage = "https://glimpse-editor.org"; + maintainers = with maintainers; [ ashkitten erictapen ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/graphics/glimpse/plugins/default.nix b/nixpkgs/pkgs/applications/graphics/glimpse/plugins/default.nix new file mode 100644 index 000000000000..48c65c3d5646 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/glimpse/plugins/default.nix @@ -0,0 +1,11 @@ +# Use `glimpse-with-plugins` package for Glimpse with all plug-ins. +# If you just want a subset of plug-ins, you can specify them explicitly: +# `glimpse-with-plugins.override { plugins = with glimpsePlugins; [ gap ]; }`. + +{ gimpPlugins, glimpse }: + +# This attrs can be extended in the future if there happen to be glimpse-only +# plugins or some that need further modification in order to work with Glimpse. +gimpPlugins.overrideScope' (self: super: { + gimp = glimpse; +}) diff --git a/nixpkgs/pkgs/applications/graphics/glimpse/remove-cc-reference.patch b/nixpkgs/pkgs/applications/graphics/glimpse/remove-cc-reference.patch new file mode 100644 index 000000000000..e63bf88dfdd7 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/glimpse/remove-cc-reference.patch @@ -0,0 +1,13 @@ +diff --git a/app/gimp-version.c b/app/gimp-version.c +index b584398231..1b40a1570f 100644 +--- a/app/gimp-version.c ++++ b/app/gimp-version.c +@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose, + GIMP_BUILD_ID, + gimp_version_get_revision (), + GIMP_BUILD_PLATFORM_FAMILY, +- CC_VERSION, ++ "@cc_version@", + lib_versions); + g_free (lib_versions); + diff --git a/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix b/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix new file mode 100644 index 000000000000..cdfb2f668731 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix @@ -0,0 +1,30 @@ +{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome3, plugins ? null }: + +let + allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins); + selectedPlugins = if plugins == null then allPlugins else plugins; + extraArgs = map (x: x.wrapArgs or "") selectedPlugins; + versionBranch = lib.versions.majorMinor glimpse.version; + +in +symlinkJoin { + name = "glimpse-with-plugins-${glimpse.version}"; + + paths = [ glimpse ] ++ selectedPlugins; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do + wrapProgram $out/bin/$each \ + --set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \ + --set GIMP2_DATADIR "$out/share/glimpse/2.0" \ + --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + ${toString extraArgs} + done + + for each in glimpse glimpse-console; do + ln -sf "$each-${versionBranch}" $out/bin/$each + done + ''; +} diff --git a/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix b/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix index 5916cdd3b4a0..24e064e721ba 100644 --- a/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.35"; + version = "1.3.36"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0l024l4hawm9s3jqrgi2j0lxgm61dqh8sgkj1017ma7y11hqv2hq"; + sha256 = "0ilg6fkppb4avzais1dvi3qf6ln7v3mzj7gjm83w7pwwfpg3ynsx"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix index 30c211498279..0e65d3199ab5 100644 --- a/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, wrapGAppsHook, +{ lib, fetchurl, perlPackages, wrapGAppsHook, # libs librsvg, sane-backends, sane-frontends, # runtime dependencies diff --git a/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/nixpkgs/pkgs/applications/graphics/gthumb/default.nix index cefb9c03dc04..faa25f4aef0e 100644 --- a/nixpkgs/pkgs/applications/graphics/gthumb/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gm7q6n9lnjsdqpx5b0cqjayhzwnplqb6p5pshzhbfp2zqd2g9ss"; + sha256 = "/erkKBg3j5s8qwBgTu61t8Cnpez+ad4IuZOGd0ZDXJM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 95b96bcff1b3..f5b8b8062155 100644 --- a/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , lzma , qt5 diff --git a/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index d70e3c5f0d59..ba6af5d781f2 100644 --- a/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng"; + sha256 = "sha256-2j4jBRGgjL8h6GcQ0WFFhZT+qHhn6RV7Z+0BoE6ieYo="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/nixpkgs/pkgs/applications/graphics/ipe/default.nix b/nixpkgs/pkgs/applications/graphics/ipe/default.nix index 1ea21506e314..72c79d7dc501 100644 --- a/nixpkgs/pkgs/applications/graphics/ipe/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ipe/default.nix @@ -1,43 +1,67 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript -, libjpeg, libpng, qtbase, mkDerivation +{ lib +, mkDerivation +, fetchurl +, pkg-config +, cairo +, freetype +, ghostscript +, gsl +, libjpeg +, libpng +, libspiro +, lua5 +, qtbase +, texlive +, zlib }: mkDerivation rec { - name = "ipe-7.2.13"; + pname = "ipe"; + version = "7.2.23"; src = fetchurl { - url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; - sha256 = "1a6a88r7j5z01z6k1z72a8g3n6lxdjjxxkdrzrfdd6df2gbs6g5g"; + url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${pname}-${version}-src.tar.gz"; + sha256 = "0yvm3zfba1ljyy518vjnvwpyg7lgnmdwm19v5k0wfgz64aca56x1"; }; - sourceRoot = "${name}/src"; + sourceRoot = "${pname}-${version}/src"; - IPEPREFIX=placeholder "out"; - URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; - LUA_PACKAGE = "lua"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript + cairo + freetype + ghostscript + gsl + libjpeg + libpng + libspiro + lua5 + qtbase + texlive + zlib ]; - nativeBuildInputs = [ pkg-config ]; + IPEPREFIX=placeholder "out"; + URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; + LUA_PACKAGE = "lua"; qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin" ]; enableParallelBuilding = true; - #TODO: make .desktop entry + # TODO: make .desktop entry - meta = { + meta = with lib; { description = "An editor for drawing figures"; - homepage = "http://ipe.otfried.org"; - license = lib.licenses.gpl3Plus; + homepage = "http://ipe.otfried.org"; # https not available + license = licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. It supports making small figures for inclusion into LaTeX-documents as well as presentations in PDF. ''; - maintainers = [ lib.maintainers.ttuegel ]; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ ttuegel ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix b/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix index 283ed1179544..294b6c4ca701 100644 --- a/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook +{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook , kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz diff --git a/nixpkgs/pkgs/applications/graphics/krop/default.nix b/nixpkgs/pkgs/applications/graphics/krop/default.nix index 314e4c6ec140..ef335cd6be2a 100644 --- a/nixpkgs/pkgs/applications/graphics/krop/default.nix +++ b/nixpkgs/pkgs/applications/graphics/krop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}: +{ lib, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}: python3Packages.buildPythonApplication rec { pname = "krop"; diff --git a/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index d90ef152401e..18fe87b128de 100644 --- a/nixpkgs/pkgs/applications/graphics/lightburn/default.nix +++ b/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "0.9.19"; + version = "0.9.20"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "0j3ydivd666fphmgi3ar48xabgi2dcky7p2fyfl7ghxjplflqs9q"; + sha256 = "sha256-FtkBIoz5u70DbZZBH4uSaAkmOphWA9H0uYuukIPVGUM="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix b/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix index 36154af137bd..c44ff57d18f3 100644 --- a/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkg-config +{ lib, mkDerivation, cmake, fetchFromGitHub, pkg-config , boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr , qtbase, qtdeclarative, qttools, qtwebengine, eigen diff --git a/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix b/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix index 0800ee0c437d..9ac853c896e8 100644 --- a/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "08izphj7jyk3wsq3qbzaf2fplys80vr39wliqc1i4c5cr90nrq1l"; + sha256 = "sha256-JgpYGzD2FsqcCWnOKBiVCxUKqLfT4S++uUBZekhGWmA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix b/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix index 81077578eb27..add40043c0fa 100644 --- a/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , wrapGAppsHook , installShellFiles diff --git a/nixpkgs/pkgs/applications/graphics/meme/default.nix b/nixpkgs/pkgs/applications/graphics/meme/default.nix index c894de2c9330..d06ff027c5bb 100644 --- a/nixpkgs/pkgs/applications/graphics/meme/default.nix +++ b/nixpkgs/pkgs/applications/graphics/meme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , unstableGitUpdater , buildGoModule , fetchFromGitHub diff --git a/nixpkgs/pkgs/applications/graphics/mypaint/default.nix b/nixpkgs/pkgs/applications/graphics/mypaint/default.nix index 9da9c20942ec..7b83bdec8c6b 100644 --- a/nixpkgs/pkgs/applications/graphics/mypaint/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mypaint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , gtk3 , gettext diff --git a/nixpkgs/pkgs/applications/graphics/nomacs/default.nix b/nixpkgs/pkgs/applications/graphics/nomacs/default.nix index 8a3e41965ffe..bd6d732ac684 100644 --- a/nixpkgs/pkgs/applications/graphics/nomacs/default.nix +++ b/nixpkgs/pkgs/applications/graphics/nomacs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , fetchpatch diff --git a/nixpkgs/pkgs/applications/graphics/openscad/default.nix b/nixpkgs/pkgs/applications/graphics/openscad/default.nix index c8950eba398a..3accf2fd5904 100644 --- a/nixpkgs/pkgs/applications/graphics/openscad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/openscad/default.nix @@ -29,13 +29,13 @@ mkDerivation rec { pname = "openscad"; - version = "2019.05"; + version = "2021.01"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; rev = "${pname}-${version}"; - sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l"; + sha256 = "sha256-2tOLqpFt5klFPxHNONnHVzBKEFWn4+ufx/MU+eYbliA="; }; nativeBuildInputs = [ bison flex pkg-config gettext qmake ]; diff --git a/nixpkgs/pkgs/applications/graphics/ovito/default.nix b/nixpkgs/pkgs/applications/graphics/ovito/default.nix new file mode 100644 index 000000000000..f0dc5f2b363e --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/ovito/default.nix @@ -0,0 +1,41 @@ +{ mkDerivation, lib, fetchFromGitLab, cmake +, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python +, qtbase, qtsvg, qttools, qscintilla }: + +mkDerivation rec { + pname = "ovito"; + version = "3.4.0"; + + src = fetchFromGitLab { + owner = "stuko"; + repo = "ovito"; + rev = "v${version}"; + sha256 = "1y3wr6yzpsl0qm7cicp2mppfszxd0fgx8hm99in9wff9qd0r16b5"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + netcdf + hdf5 + fftwSinglePrec + muparser + openssl + ffmpeg + python + qtbase + qtsvg + qttools + qscintilla + ]; + + meta = with lib; { + description = "Scientific visualization and analysis software for atomistic and particle simulation data"; + homepage = "https://ovito.org"; + license = with licenses; [ gpl3Only mit ]; + maintainers = with maintainers; [ twhitehead ]; + }; +} diff --git a/nixpkgs/pkgs/applications/graphics/paraview/default.nix b/nixpkgs/pkgs/applications/graphics/paraview/default.nix index 7bbff5499f65..79feab3ab7ae 100644 --- a/nixpkgs/pkgs/applications/graphics/paraview/default.nix +++ b/nixpkgs/pkgs/applications/graphics/paraview/default.nix @@ -1,6 +1,6 @@ { boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper, - mkDerivation, ninja, mpi, python3, lib, stdenv, tbb, libGLU, libGL }: + mkDerivation, ninja, mpi, python3, lib, tbb, libGLU, libGL }: mkDerivation rec { pname = "paraview"; diff --git a/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index bcc094981214..857a68df0923 100644 --- a/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pdfcpu"; diff --git a/nixpkgs/pkgs/applications/graphics/photoflare/default.nix b/nixpkgs/pkgs/applications/graphics/photoflare/default.nix index ca2455dd048c..0c25364b76aa 100644 --- a/nixpkgs/pkgs/applications/graphics/photoflare/default.nix +++ b/nixpkgs/pkgs/applications/graphics/photoflare/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools +{ mkDerivation, lib, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/graphics/photoqt/default.nix b/nixpkgs/pkgs/applications/graphics/photoqt/default.nix index fe49d5fa154d..52e38b23c1ff 100644 --- a/nixpkgs/pkgs/applications/graphics/photoqt/default.nix +++ b/nixpkgs/pkgs/applications/graphics/photoqt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch +{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects , extra-cmake-modules, poppler, kimageformats, libarchive, libdevil }: diff --git a/nixpkgs/pkgs/applications/graphics/phototonic/default.nix b/nixpkgs/pkgs/applications/graphics/phototonic/default.nix index 21960358a7bd..5044e60161cf 100644 --- a/nixpkgs/pkgs/applications/graphics/phototonic/default.nix +++ b/nixpkgs/pkgs/applications/graphics/phototonic/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, exiv2 }: mkDerivation rec { pname = "phototonic"; diff --git a/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix b/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix index d4788b3c1e76..e3ab0c772a1d 100644 --- a/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , pygobject3 diff --git a/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix b/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix index a20a0a2db61b..97a3684682d4 100644 --- a/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix @@ -11,11 +11,11 @@ let in gnustep'.gsmakeDerivation rec { pname = "pikopixel"; - version = "1.0-b9e"; + version = "1.0-b10"; src = fetchurl { url = "http://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz"; - sha256 = "1gmgb5ch7s6fwvg85l6pl6fsx0maqwd8yvg7sz3r9lj32g2pz5wn"; + sha256 = "1b27npgsan2nx1p581b9q2krx4506yyd6s34r4sf1r9x9adshm77"; }; sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; diff --git a/nixpkgs/pkgs/applications/graphics/pinta/default.nix b/nixpkgs/pkgs/applications/graphics/pinta/default.nix index 8b6e581ae0b1..2635b2d3d886 100644 --- a/nixpkgs/pkgs/applications/graphics/pinta/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pinta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, +{ lib, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, gettext }: let diff --git a/nixpkgs/pkgs/applications/graphics/processing/default.nix b/nixpkgs/pkgs/applications/graphics/processing/default.nix index 434f9fab88df..2e61e40b01fe 100644 --- a/nixpkgs/pkgs/applications/graphics/processing/default.nix +++ b/nixpkgs/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "processing"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0cvv8jda9y8qnfcsziasyv3w7h3w22q78ihr23cm4an63ghxci58"; }; + patches = [ + (fetchpatch { + name = "oraclejdk-8u281-compat.patch"; + url = "https://github.com/processing/processing/commit/7e176876173c93e3a00a922e7ae37951366d1761.patch"; + sha256 = "g+zwpoIVgw7Sp6QWW3vyPZ/fKHk+o/YCY6xnrX8IGKo="; + }) + ]; + nativeBuildInputs = [ ant rsync makeWrapper ]; buildInputs = [ jdk ]; diff --git a/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix b/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix index c4fc79c7fecd..47bf2d950283 100644 --- a/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix +++ b/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, pkg-config, cmake, qtbase, qttools, qtx11extras, poppler }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools, qtx11extras, poppler }: mkDerivation rec { pname = "qcomicbook"; diff --git a/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 26522d78bcdd..f444ebfe5be3 100644 --- a/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivationWith, fetchurl, python3Packages +{ lib, mkDerivationWith, fetchurl, python3Packages , file, intltool, gobject-introspection, libgudev , udisks, gexiv2, gst_all_1, libnotify , exiftool, gdk-pixbuf, libmediainfo, vmtouch diff --git a/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix index b985ae7d5716..c51794881e94 100644 --- a/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix +++ b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mkDerivation +{ lib, fetchFromGitHub, cmake, pkg-config, mkDerivation , qtbase, qtx11extras, qtsvg, makeWrapper , vulkan-loader, libglvnd, xorg, python3, python3Packages , bison, pcre, automake, autoconf, addOpenGLRunpath diff --git a/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 0e768afdde1d..9713618d79ab 100644 --- a/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: - +{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: let myPatchElf = file: with lib; '' patchelf --set-interpreter \ @@ -7,22 +6,23 @@ let ${file} ''; - udevRules = callPackage ./udev_rules_type1.nix {}; + udevRules = callPackage ./udev_rules_type1.nix { }; + +in +stdenv.mkDerivation rec { + pname = "brscan4"; + version = "0.4.9-1"; + src = { + "i686-linux" = fetchurl { + url = "http://download.brother.com/welcome/dlf006646/${pname}-${version}.i386.deb"; + sha256 = "0pkg9aqvnkpjnb9cgzf7lxw2g4jqrf2w98irkv22r0gfsfs3nwma"; + }; + "x86_64-linux" = fetchurl { -in stdenv.mkDerivation rec { - name = "brscan4-0.4.8-1"; - src = - if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; - sha256 = "15hrf1gpm36lniqi6yf47dvdqjinm644xb752c6rcv8n06wb79ag"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; - sha256 = "0pyprjl0capg403yp6pp07gd6msx9kn7bzjcdswdbn28fyxrk5l4"; - } - else throw "${name} is not supported on ${stdenv.hostPlatform.system} (only i686-linux and x86_64 linux are supported)"; + url = "https://download.brother.com/welcome/dlf006645/${pname}-${version}.amd64.deb"; + sha256 = "0kakkl8rmsi2yr3f8vd1kk8vsl9g2ijhqil1cvvbwrhwgi0b7ai7"; + }; + }."${stdenv.hostPlatform.system}"; unpackPhase = '' ar x $src @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { meta = { description = "Brother brscan4 sane backend driver"; homepage = "http://www.brother.com"; - platforms = lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ jraygauthier ]; }; diff --git a/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix b/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix index 361f1fa18094..048b8b56fc08 100644 --- a/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix +++ b/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation +{ lib, fetchFromGitHub, mkDerivation , cmake, libjpeg, libpng, libtiff, boost , qtbase, qttools }: diff --git a/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix b/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix index 22751f38fe1e..313920d8154e 100644 --- a/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, tesseractBase, languages +{ lib, makeWrapper, tesseractBase, languages # A list of languages like [ "eng" "spa" … ] or `null` for all available languages , enableLanguages ? null diff --git a/nixpkgs/pkgs/applications/graphics/xfig/default.nix b/nixpkgs/pkgs/applications/graphics/xfig/default.nix index 53a9632e1923..8773db5bead6 100644 --- a/nixpkgs/pkgs/applications/graphics/xfig/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xfig/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm -, libXmu, libXi, libXp, Xaw3d, libXaw, fig2dev +{ lib +, stdenv +, fetchurl +, xlibsWrapper +, makeWrapper +, libXpm +, libXmu +, libXi +, libXp +, Xaw3d +, libXaw +, fig2dev }: stdenv.mkDerivation rec { @@ -11,6 +21,18 @@ stdenv.mkDerivation rec { sha256 = "1czamqp0xn0j6qjnasa3fjnrzi072v6qknylr6jrs4gwsfw4ybyw"; }; + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + xlibsWrapper + libXpm + libXmu + libXi + libXp + Xaw3d + libXaw + ]; + postPatch = '' sed -i 's:"fig2dev":"${fig2dev}/bin/fig2dev":' src/main.c ''; @@ -25,10 +47,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d libXaw ]; - meta = with lib; { description = "An interactive drawing tool for X11"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/logging/humioctl/default.nix b/nixpkgs/pkgs/applications/logging/humioctl/default.nix index 0130017356c7..f3aef213ad28 100644 --- a/nixpkgs/pkgs/applications/logging/humioctl/default.nix +++ b/nixpkgs/pkgs/applications/logging/humioctl/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, installShellFiles, lib, stdenv }: +{ buildGoModule, fetchFromGitHub, installShellFiles, lib }: let humioCtlVersion = "0.28.2"; diff --git a/nixpkgs/pkgs/applications/misc/1password/default.nix b/nixpkgs/pkgs/applications/misc/1password/default.nix index 3728216da7ad..4bfb6a65edc5 100644 --- a/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -8,10 +8,12 @@ stdenv.mkDerivation rec { url = { "i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { "i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A="; "x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw="; + "aarch64-linux" = "0932bspm1likky1n0rg15d01gspkm1fns2ma82qyb91yr6d18ddk"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { @@ -46,6 +48,6 @@ stdenv.mkDerivation rec { downloadPage = "https://app-updates.agilebits.com/product_history/CLI"; maintainers = with maintainers; [ joelburget marsam ]; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix b/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix index 133194f7af51..516b786222db 100644 --- a/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { pname = "antfs-cli"; diff --git a/nixpkgs/pkgs/applications/misc/ape/apeclex.nix b/nixpkgs/pkgs/applications/misc/ape/apeclex.nix index b01bfbedb8a6..81096d9877f7 100644 --- a/nixpkgs/pkgs/applications/misc/ape/apeclex.nix +++ b/nixpkgs/pkgs/applications/misc/ape/apeclex.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, attemptoClex, callPackage }: +{ lib, attemptoClex, callPackage }: callPackage ./. { pname = "ape-clex"; diff --git a/nixpkgs/pkgs/applications/misc/archivy/default.nix b/nixpkgs/pkgs/applications/misc/archivy/default.nix index c94011466ec3..c670a4b367d9 100644 --- a/nixpkgs/pkgs/applications/misc/archivy/default.nix +++ b/nixpkgs/pkgs/applications/misc/archivy/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, python3, fetchPypi, appdirs, attrs, requests, +{ lib, python3, fetchPypi, appdirs, attrs, requests, beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf, pypandoc, python-dotenv, python-frontmatter, tinydb, validators, -watchdog, wtforms }: +watchdog, wtforms, html2text, flask-compress }: python3.pkgs.buildPythonApplication rec { pname = "archivy"; - version = "0.9.3"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b6ff08a9ecd0a929663c36c73844ac5cb4dc847e69aae639a450c64d4320a506"; + sha256 = "FDyUfahjv4zqOVFr0nRhcgxr7mskFP1W/PlhZWx/6E8="; }; # Relax some dependencies @@ -17,13 +17,11 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace requirements.txt \ --replace 'WTForms ==' 'WTForms >=' \ --replace 'attrs == 20.2.0' 'attrs' \ - --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \ --replace 'elasticsearch ==' 'elasticsearch >=' \ --replace 'python_dotenv ==' 'python_dotenv >=' \ --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ --replace 'requests ==' 'requests >=' \ --replace 'validators ==' 'validators >=' \ - --replace 'watchdog ==' 'watchdog >=' ''; propagatedBuildInputs = [ @@ -42,6 +40,8 @@ python3.pkgs.buildPythonApplication rec { validators watchdog wtforms + html2text + flask-compress ]; # __init__.py attempts to mkdir in read-only file system diff --git a/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index 82e7c1bb21bc..bd3194e3fea2 100644 --- a/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets , qtquickcontrols2, qtgraphicaleffects }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/misc/autospotting/default.nix b/nixpkgs/pkgs/applications/misc/autospotting/default.nix index 0b57ad292661..ac929bfa5b15 100644 --- a/nixpkgs/pkgs/applications/misc/autospotting/default.nix +++ b/nixpkgs/pkgs/applications/misc/autospotting/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "autospotting"; diff --git a/nixpkgs/pkgs/applications/misc/avrdudess/default.nix b/nixpkgs/pkgs/applications/misc/avrdudess/default.nix index 696d69c701c9..29469d9fff91 100644 --- a/nixpkgs/pkgs/applications/misc/avrdudess/default.nix +++ b/nixpkgs/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: +{ lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg-utils }: stdenv.mkDerivation { name = "avrdudess-2.2.20140102"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { export LD_LIBRARY_PATH="${lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. - export PATH="${lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH" + export PATH="${lib.makeBinPath [ avrdude xdg-utils ]}:\$PATH" # avrdudess must have its resource files in its current working directory cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" diff --git a/nixpkgs/pkgs/applications/misc/barrier/default.nix b/nixpkgs/pkgs/applications/misc/barrier/default.nix index fa5980b115ee..b9dbcf529be1 100644 --- a/nixpkgs/pkgs/applications/misc/barrier/default.nix +++ b/nixpkgs/pkgs/applications/misc/barrier/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, +{ lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, openssl, wrapGAppsHook, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: diff --git a/nixpkgs/pkgs/applications/misc/bibletime/default.nix b/nixpkgs/pkgs/applications/misc/bibletime/default.nix index 3213ed9edf0d..eb909155e4e1 100644 --- a/nixpkgs/pkgs/applications/misc/bibletime/default.nix +++ b/nixpkgs/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, stdenv, fetchurl, cmake, pkg-config, sword, boost, clucene_core +{ lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core , qtbase, qttools, qtsvg, qtwebkit }: diff --git a/nixpkgs/pkgs/applications/misc/bleachbit/default.nix b/nixpkgs/pkgs/applications/misc/bleachbit/default.nix index 89686e50d175..952d1fe16db6 100644 --- a/nixpkgs/pkgs/applications/misc/bleachbit/default.nix +++ b/nixpkgs/pkgs/applications/misc/bleachbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3Packages , fetchurl , gettext diff --git a/nixpkgs/pkgs/applications/misc/break-time/default.nix b/nixpkgs/pkgs/applications/misc/break-time/default.nix index 05815e242f02..3458ac3f2507 100644 --- a/nixpkgs/pkgs/applications/misc/break-time/default.nix +++ b/nixpkgs/pkgs/applications/misc/break-time/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , rustPlatform -, lib, stdenv +, lib , wrapGAppsHook }: diff --git a/nixpkgs/pkgs/applications/misc/buku/default.nix b/nixpkgs/pkgs/applications/misc/buku/default.nix index 772754ecc6d5..68b4f7b3e560 100644 --- a/nixpkgs/pkgs/applications/misc/buku/default.nix +++ b/nixpkgs/pkgs/applications/misc/buku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { version = "4.5"; diff --git a/nixpkgs/pkgs/applications/misc/calcurse/default.nix b/nixpkgs/pkgs/applications/misc/calcurse/default.nix index ba8edb2baa50..8a83c593986a 100644 --- a/nixpkgs/pkgs/applications/misc/calcurse/default.nix +++ b/nixpkgs/pkgs/applications/misc/calcurse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = '' patchShebangs . - buildPythonPath ${python3Packages.httplib2} + buildPythonPath "${python3Packages.httplib2} ${python3Packages.oauth2client}" patchPythonScript $out/bin/calcurse-caldav ''; diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index d838cd4e859f..7917975f4f28 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchurl , poppler_utils @@ -16,21 +17,21 @@ , hyphen , unrarSupport ? false , chmlib -, pythonPackages +, python3Packages , libusb1 , libmtp -, xdg_utils +, xdg-utils , makeDesktopItem , removeReferencesTo }: mkDerivation rec { pname = "calibre"; - version = "4.23.0"; + version = "5.10.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Ft5RRzzw4zb5RqVyUaHk9Pu6H4V/F9j8FKoTLn61lRg="; + sha256 = "18pnqxdyvgmw12yarxhvsgs4jk6c5hp05gf8khybcd78330954v9"; }; patches = [ @@ -42,9 +43,20 @@ mkDerivation rec { # the unrar patch is not from debian ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; + escaped_pyqt5_dir = builtins.replaceStrings ["/"] ["\\/"] (toString python3Packages.pyqt5); + platform_tag = + if stdenv.hostPlatform.isDarwin then + "WS_MACX" + else if stdenv.hostPlatform.isWindows then + "WS_WIN" + else + "WS_X11"; + prePatch = '' - sed -i "/pyqt_sip_dir/ s:=.*:= '${pythonPackages.pyqt5}/share/sip/PyQt5':" \ - setup/build_environment.py + sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \ + setup/build.py + sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${platform_tag}\"]/g" \ + setup/build.py # Remove unneeded files and libs rm -rf resources/calibre-portable.* \ @@ -57,8 +69,6 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake removeReferencesTo ]; - CALIBRE_PY3_PORT = builtins.toString pythonPackages.isPy3k; - buildInputs = [ chmlib fontconfig @@ -74,9 +84,9 @@ mkDerivation rec { poppler_utils qtbase sqlite - xdg_utils + xdg-utils ] ++ ( - with pythonPackages; [ + with python3Packages; [ apsw beautifulsoup4 css-parser @@ -92,11 +102,13 @@ mkDerivation rec { msgpack netifaces pillow + pyqt-builder pyqt5 pyqtwebengine python regex - sip + sip_5 + zeroconf # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll @@ -114,11 +126,11 @@ mkDerivation rec { export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo.dev}/include/podofo export PODOFO_LIB_DIR=${podofo.lib}/lib - export SIP_BIN=${pythonPackages.sip}/bin/sip + export SIP_BIN=${python3Packages.sip}/bin/sip export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${pythonPackages.python.interpreter} setup.py install --root=$out \ + ${python3Packages.python.interpreter} setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ @@ -147,7 +159,7 @@ mkDerivation rec { # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h preFixup = '' remove-references-to -t ${podofo.dev} \ - $out/lib/calibre/calibre/plugins${lib.optionalString pythonPackages.isPy3k "/3"}/podofo.so + $out/lib/calibre/calibre/plugins/podofo.so for program in $out/bin/*; do wrapProgram $program \ diff --git a/nixpkgs/pkgs/applications/misc/candle/default.nix b/nixpkgs/pkgs/applications/misc/candle/default.nix index d3357b41bd2e..8df75b0cbd19 100644 --- a/nixpkgs/pkgs/applications/misc/candle/default.nix +++ b/nixpkgs/pkgs/applications/misc/candle/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qtserialport, qmake }: mkDerivation rec { pname = "candle"; diff --git a/nixpkgs/pkgs/applications/misc/charm/default.nix b/nixpkgs/pkgs/applications/misc/charm/default.nix index becbbda8acff..97e8227e6c96 100644 --- a/nixpkgs/pkgs/applications/misc/charm/default.nix +++ b/nixpkgs/pkgs/applications/misc/charm/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "charm"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "0cgl5dpyzc4lciij9q9yghppiclrdnrl1jsbizfgh2an3s18ab8k"; + sha256 = "0mjq0yy60czsw40h5n515qmi6bbvhrddll4sn5r2q1nf9pvviqr6"; }; vendorSha256 = "1spzawnk2fslc1m14dp8lx4vpnxwz7xgm1hxbpz4bqlqz1hfd6ax"; doCheck = false; - buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; + buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ]; meta = with lib; { description = "Manage your charm account on the CLI"; diff --git a/nixpkgs/pkgs/applications/misc/cheat/default.nix b/nixpkgs/pkgs/applications/misc/cheat/default.nix index 988af330deb5..90eb38329a32 100644 --- a/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , buildGoModule, installShellFiles }: buildGoModule rec { diff --git a/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix b/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix index fb5d9aed9596..13ee17999fe1 100644 --- a/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix +++ b/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, libchewing, qtbase +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, libchewing, qtbase , qttools }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/misc/clight/clightd.nix b/nixpkgs/pkgs/applications/misc/clight/clightd.nix index 51c61ca28e7a..547e7e0b6da9 100644 --- a/nixpkgs/pkgs/applications/misc/clight/clightd.nix +++ b/nixpkgs/pkgs/applications/misc/clight/clightd.nix @@ -1,23 +1,31 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , dbus, cmake, pkg-config -, glib, udev, polkit, libmodule +, glib, udev, polkit, libusb1, libjpeg, libmodule , pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil , enableDpms ? true, libXext -, enableGamma ? true, libXrandr +, enableGamma ? true, libdrm, libXrandr, wayland , enableScreen ? true }: stdenv.mkDerivation rec { pname = "clightd"; - version = "4.2"; + version = "5.1"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "07z1m1x7nnczd51sg7m2lb6rb2c37c8glsnbrlq44hx176sj9cmj"; + sha256 = "sha256-BEGum0t+FrCTAEQwTsWeYpoIqimTAz+Bv/ZQPQ3fePY="; }; + patches = [ + # Not needed by next version bump + (fetchpatch { + url = "https://github.com/FedeDP/Clightd/commit/a52a2888e3798c572dad359a017cb0d40e7c5fb7.patch"; + sha256 = "sha256-nUzNBia1EvBQxinAfjyKbuldBoHLY1hfMaxgG2lKQWg="; + }) + ]; + # dbus-1.pc has datadir=/etc SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services"; # systemd.pc has prefix=${systemd.out} @@ -48,19 +56,22 @@ stdenv.mkDerivation rec { glib udev polkit + libusb1 + libjpeg libmodule pcre libXdmcp util-linux libpthreadstubs - ] ++ optional enableDdc ddcutil - ++ optional enableDpms libXext - ++ optional enableGamma libXrandr; + ] ++ optionals enableDdc [ ddcutil ] + ++ optionals enableDpms [ libXext ] + ++ optionals enableGamma [ libXrandr ] + ++ optionals (enableDpms || enableGamma || enableScreen) [ libdrm wayland ]; postInstall = '' mkdir -p $out/bin - ln -svT $out/lib/clightd/clightd $out/bin/clightd + ln -svT $out/libexec/clightd $out/bin/clightd ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/clight/default.nix b/nixpkgs/pkgs/applications/misc/clight/default.nix index 6ef2e886a190..e502cd6ccf3b 100644 --- a/nixpkgs/pkgs/applications/misc/clight/default.nix +++ b/nixpkgs/pkgs/applications/misc/clight/default.nix @@ -6,24 +6,21 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "1j7va217g1k8lxl3lly13js8myf0shjc6knalq8q6lakc6j1mkxx"; + sha256 = "sha256-NmfnE6ZWgG9erBmrFFIhutnB1t2Ix/6jo+EeXYVtehg="; }; - # bash-completion.pc completionsdir=${bash-completion.out} - COMPLETIONS_DIR = "${placeholder "out"}/share/bash-completions/completions"; # dbus-1.pc has datadir=/etc SESSION_BUS_DIR = "${placeholder "out"}/share/dbus-1/services"; postPatch = '' sed -i "s@/usr@$out@" CMakeLists.txt sed -i "s@/etc@$out\0@" CMakeLists.txt - sed -i "s@pkg_get_variable(COMPLETIONS_DIR.*@set(COMPLETIONS_DIR $COMPLETIONS_DIR)@" CMakeLists.txt sed -i "s@pkg_get_variable(SESSION_BUS_DIR.*@set(SESSION_BUS_DIR $SESSION_BUS_DIR)@" CMakeLists.txt ''; @@ -46,6 +43,12 @@ stdenv.mkDerivation rec { ] ++ optional withGeoclue geoclue2 ++ optional withUpower upower; + cmakeFlags = [ + # bash-completion.pc completionsdir=${bash-completion.out} + "-DBASH_COMPLETIONS_DIR=${placeholder "out"}/share/bash-completions/completions" + "-DZSH_COMPLETIONS_DIR=${placeholder "out"}/share/zsh/site-functions" + ]; + meta = with lib; { description = "A C daemon that turns your webcam into a light sensor"; homepage = "https://github.com/FedeDP/Clight"; diff --git a/nixpkgs/pkgs/applications/misc/clipcat/default.nix b/nixpkgs/pkgs/applications/misc/clipcat/default.nix index 80e4982fc8a0..497e5616e805 100644 --- a/nixpkgs/pkgs/applications/misc/clipcat/default.nix +++ b/nixpkgs/pkgs/applications/misc/clipcat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.4.19"; + version = "0.5.0"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - sha256 = "1lhnm521qqy3aw2iyk1dv4yc5ms0c5x5iipx96bz6v6y0cnmf4kw"; + sha256 = "0rxl3ksjinw07q3p2vjqg80k3c6wx2q7pzpf2344zyfb4gkqzx1c"; }; - cargoSha256 = "04iflyvz8g53z658rkxafiyi2m9kzxwl3p1xgkjq7vacmz5jk15c"; + cargoSha256 = "1ffgvhkdj8wkhlgi0cj0njdm9ycxq2qda4b5qn8bmaygzr2zkwpd"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; @@ -38,26 +38,15 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=all" ]; postInstall = '' - installShellCompletion --bash --name clipcatd completions/bash-completion/completions/clipcatd - installShellCompletion --fish --name clipcatd.fish completions/fish/completions/clipcatd.fish - installShellCompletion --zsh --name _clipcatd completions/zsh/site-functions/_clipcatd - - installShellCompletion --bash --name clipcatctl completions/bash-completion/completions/clipcatctl - installShellCompletion --fish --name clipcatctl.fish completions/fish/completions/clipcatctl.fish - installShellCompletion --zsh --name _clipcatctl completions/zsh/site-functions/_clipcatctl - - installShellCompletion --bash --name clipcat-menu completions/bash-completion/completions/clipcat-menu - installShellCompletion --fish --name clipcat-menu.fish completions/fish/completions/clipcat-menu.fish - installShellCompletion --zsh --name _clipcat-menu completions/zsh/site-functions/_clipcat-menu - - installShellCompletion --bash --name clipcat-notify completions/bash-completion/completions/clipcat-notify - installShellCompletion --fish --name clipcat-notify.fish completions/fish/completions/clipcat-notify.fish - installShellCompletion --zsh --name _clipcat-notify completions/zsh/site-functions/_clipcat-notify + installShellCompletion --bash completions/bash-completion/completions/* + installShellCompletion --fish completions/fish/completions/* + installShellCompletion --zsh completions/zsh/site-functions/* ''; meta = with lib; { description = "Clipboard Manager written in Rust Programming Language"; - license = licenses.gpl3; + homepage = "https://github.com/xrelkd/clipcat"; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; }; diff --git a/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix b/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix index 631d53b506fc..56938f5338dc 100644 --- a/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glibcLocales, pandoc, python3 }: +{ lib, fetchFromGitHub, glibcLocales, pandoc, python3 }: let pythonPackages = python3.pkgs; diff --git a/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/nixpkgs/pkgs/applications/misc/crow-translate/default.nix index 7b9d7faba940..8cb87274c1dc 100644 --- a/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , mkDerivation , fetchFromGitHub , substituteAll diff --git a/nixpkgs/pkgs/applications/misc/cum/default.nix b/nixpkgs/pkgs/applications/misc/cum/default.nix index 6b851e80f346..42df68f6721a 100644 --- a/nixpkgs/pkgs/applications/misc/cum/default.nix +++ b/nixpkgs/pkgs/applications/misc/cum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: with python3Packages; diff --git a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 1e186bdf5fd2..7b1dbf4d85ef 100644 --- a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: +{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: buildPythonPackage { pname = "libarcus"; diff --git a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index fb920235031f..f12059e6317b 100644 --- a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: +{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: buildPythonPackage { pname = "libsavitar-lulzbot"; diff --git a/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix index 77a4f3edef65..01166092b2b5 100644 --- a/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake +{ lib, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }: buildPythonPackage { diff --git a/nixpkgs/pkgs/applications/misc/dasel/default.nix b/nixpkgs/pkgs/applications/misc/dasel/default.nix index 3a46b5e2f9a6..061e3bc62de9 100644 --- a/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "dasel"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "/WB/SsOih0N5P4cUAD6zkCajplzZ/Jez0H80+CG08rc="; + sha256 = "sha256-310zrxVjUECg/3+ydo9J8EdF0RbguBIT2PklEgpgRFU="; }; - vendorSha256 = "BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; + vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; buildFlagsArray = '' -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version} diff --git a/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix b/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix index 3425ceb44a93..fe15d90f254c 100644 --- a/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: +{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: let version = "0.7.1"; diff --git a/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix b/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix index 6af92285c2b0..19cfa95a88e4 100644 --- a/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix +++ b/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: +{ lib, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: mkDerivation { pname = "dfilemanager"; diff --git a/nixpkgs/pkgs/applications/misc/diffpdf/default.nix b/nixpkgs/pkgs/applications/misc/diffpdf/default.nix index c1a4d5e44405..30715dd51f35 100644 --- a/nixpkgs/pkgs/applications/misc/diffpdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: +{ lib, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: mkDerivation rec { version = "2.1.3"; diff --git a/nixpkgs/pkgs/applications/misc/ding/default.nix b/nixpkgs/pkgs/applications/misc/ding/default.nix index f0a7e2a779fe..36e2923522de 100644 --- a/nixpkgs/pkgs/applications/misc/ding/default.nix +++ b/nixpkgs/pkgs/applications/misc/ding/default.nix @@ -10,11 +10,11 @@ let }; in stdenv.mkDerivation rec { - name = "ding-1.8.1"; + name = "ding-1.9"; src = fetchurl { url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz"; - sha256 = "0chjqs3z9zs1w3l7b5lsaj682rgnkf9kibcbzhggqqcn1pbvl5sq"; + sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; }; buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ]; diff --git a/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix b/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix index a0b4237c7f67..a8817a542e31 100644 --- a/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }: +{ lib, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }: buildPythonApplication rec { pname = "dmensamenu"; diff --git a/nixpkgs/pkgs/applications/misc/dockbarx/default.nix b/nixpkgs/pkgs/applications/misc/dockbarx/default.nix index e0e9fcd6febf..b31c17cc319a 100644 --- a/nixpkgs/pkgs/applications/misc/dockbarx/default.nix +++ b/nixpkgs/pkgs/applications/misc/dockbarx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, gnome2, keybinder }: +{ lib, fetchFromGitHub, pythonPackages, gnome2, keybinder }: pythonPackages.buildPythonApplication rec { ver = "0.93"; diff --git a/nixpkgs/pkgs/applications/misc/dotfiles/default.nix b/nixpkgs/pkgs/applications/misc/dotfiles/default.nix index 913ed9523baa..911a319a963f 100644 --- a/nixpkgs/pkgs/applications/misc/dotfiles/default.nix +++ b/nixpkgs/pkgs/applications/misc/dotfiles/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages }: +{ lib, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "dotfiles"; diff --git a/nixpkgs/pkgs/applications/misc/dstask/default.nix b/nixpkgs/pkgs/applications/misc/dstask/default.nix index 78efa133c1e4..cd1c659ec5bc 100644 --- a/nixpkgs/pkgs/applications/misc/dstask/default.nix +++ b/nixpkgs/pkgs/applications/misc/dstask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dstask"; diff --git a/nixpkgs/pkgs/applications/misc/dupeguru/default.nix b/nixpkgs/pkgs/applications/misc/dupeguru/default.nix index 418658fec228..d2332b4d9c7d 100644 --- a/nixpkgs/pkgs/applications/misc/dupeguru/default.nix +++ b/nixpkgs/pkgs/applications/misc/dupeguru/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: +{lib, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: python3Packages.buildPythonApplication rec { pname = "dupeguru"; diff --git a/nixpkgs/pkgs/applications/misc/electrum/dash.nix b/nixpkgs/pkgs/applications/misc/electrum/dash.nix index 29ac8b4484b5..d0606001ad43 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/dash.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/dash.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { version = "2.9.3.1"; diff --git a/nixpkgs/pkgs/applications/misc/electrum/default.nix b/nixpkgs/pkgs/applications/misc/electrum/default.nix index 5a3e6265c25c..273077b3bdae 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -125,7 +125,7 @@ python3.pkgs.buildPythonApplication { ''; passthru.updateScript = import ./update.nix { - inherit (stdenv) lib; + inherit lib; inherit writeScript common-updater-scripts diff --git a/nixpkgs/pkgs/applications/misc/electrum/ltc.nix b/nixpkgs/pkgs/applications/misc/electrum/ltc.nix index ad6ed6f7a783..bd015afdc572 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/ltc.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/ltc.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , python3Packages , wrapQtAppsHook diff --git a/nixpkgs/pkgs/applications/misc/elfx86exts/default.nix b/nixpkgs/pkgs/applications/misc/elfx86exts/default.nix index 8fc7fb32743d..690b88d8417e 100644 --- a/nixpkgs/pkgs/applications/misc/elfx86exts/default.nix +++ b/nixpkgs/pkgs/applications/misc/elfx86exts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix b/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix index 0b5922f8f699..2e70beb6173c 100644 --- a/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix +++ b/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: +{ lib, stdenv, fetchzip, fltk, zlib, xdg-utils, xorg, libjpeg, libGL }: stdenv.mkDerivation rec { pname = "eureka-editor"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv"; }; - buildInputs = [ fltk zlib xdg_utils libjpeg xorg.libXinerama libGL ]; + buildInputs = [ fltk zlib xdg-utils libjpeg xorg.libXinerama libGL ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/misc/exercism/default.nix b/nixpkgs/pkgs/applications/misc/exercism/default.nix index 1eeeba1b4391..79420eacec82 100644 --- a/nixpkgs/pkgs/applications/misc/exercism/default.nix +++ b/nixpkgs/pkgs/applications/misc/exercism/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "exercism"; diff --git a/nixpkgs/pkgs/applications/misc/expenses/default.nix b/nixpkgs/pkgs/applications/misc/expenses/default.nix index 7f932b5b1e56..63f942c2c593 100644 --- a/nixpkgs/pkgs/applications/misc/expenses/default.nix +++ b/nixpkgs/pkgs/applications/misc/expenses/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildGoModule , fetchFromGitHub , sqlite diff --git a/nixpkgs/pkgs/applications/misc/far2l/default.nix b/nixpkgs/pkgs/applications/misc/far2l/default.nix index c3e9218b5886..b414cbdd0ed4 100644 --- a/nixpkgs/pkgs/applications/misc/far2l/default.nix +++ b/nixpkgs/pkgs/applications/misc/far2l/default.nix @@ -1,29 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash, - xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash +, xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick +, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: -let - newer-colorer-schemes = fetchFromGitHub { - owner = "colorer"; - repo = "Colorer-schemes"; - rev = "7c831f5e94a90530ace8b2bb9916210e3a2fcda6"; # 2019-11-28 (far2l has older Colorer-schemes) - sha256 = "18vaahdz5i7xdf00c9h9kjjswm4jszywm8zkhva4c4ivr4qqnv2c"; - }; -in stdenv.mkDerivation rec { pname = "far2l"; - version = "2019-12-14.git${builtins.substring 0 7 src.rev}"; + version = "2020-12-30.git${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; - rev = "dceaa3918ea2c5e43600bad3fc63f861b8d26fc4"; - sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi"; + rev = "52c1372441443aafd1a7dff6f17969a6ec19885d"; + sha256 = "0s7427fgxzj5zkyy6mhb4y5hqa6adsr30m0bigycp12b0495ryx0"; }; nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; - buildInputs = [ wxGTK30 glib pcre ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build + ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats + #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace far2l/bootstrap/trash.sh \ @@ -34,7 +28,7 @@ stdenv.mkDerivation rec { '' + '' echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh substituteInPlace far2l/bootstrap/open.sh \ - --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' + --replace 'xdg-open' '${xdg-utils}/bin/xdg-open' substituteInPlace far2l/vtcompletor.cpp \ --replace '"/bin/bash"' '"${bash}/bin/bash"' substituteInPlace multiarc/src/formats/zip/zip.cpp \ @@ -48,10 +42,6 @@ stdenv.mkDerivation rec { --replace '"gzip ' '"${gzip}/bin/gzip ' \ --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ --replace '"tar ' '"${gnutar}/bin/tar ' - - cp ${newer-colorer-schemes}/hrc/hrc/base/nix.hrc colorer/configs/base/hrc/base/ - cp ${newer-colorer-schemes}/hrc/hrc/base/cpp.hrc colorer/configs/base/hrc/base/ - cp ${newer-colorer-schemes}/hrc/hrc/inet/jscript.hrc colorer/configs/base/hrc/base/ ''; installPhase = '' @@ -77,10 +67,13 @@ stdenv.mkDerivation rec { stripDebugList = [ "bin" "share" ]; meta = with lib; { - description = "An orthodox file manager"; + description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; homepage = "https://github.com/elfmz/far2l"; - license = licenses.gpl2; - maintainers = [ maintainers.volth ]; + license = licenses.gpl2Plus; # NOTE: might change in far2l repo soon, check next time + maintainers = with maintainers; [ volth hypersw ]; platforms = platforms.all; + # fails to compile with: + # error: no member named 'st_ctim' in 'stat' + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix b/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix index 26b8beab19cd..36629179ab58 100644 --- a/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix +++ b/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fluxbox , gnused diff --git a/nixpkgs/pkgs/applications/misc/feedbackd/default.nix b/nixpkgs/pkgs/applications/misc/feedbackd/default.nix new file mode 100644 index 000000000000..34119c2006d4 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/feedbackd/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, wrapGAppsHook +, glib +, gsound +, libgudev +, json-glib +, vala +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "feedbackd-unstable"; + version = "2021-01-25"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = "feedbackd"; + rev = "v0.0.0+git${builtins.replaceStrings ["-"] [""] version}"; + sha256 = "184ag10sfzrka533inv6f38x6z769kq5jj56vdkcm65j5h786w5v"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + vala + gobject-introspection + ]; + + buildInputs = [ + glib + gsound + libgudev + json-glib + ]; + + meta = with lib; { + description = "A daemon to provide haptic (and later more) feedback on events"; + homepage = "https://source.puri.sm/Librem5/feedbackd"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pacman99 ]; + platforms = platforms.linux; + }; +} + diff --git a/nixpkgs/pkgs/applications/misc/fetchmail/default.nix b/nixpkgs/pkgs/applications/misc/fetchmail/default.nix index 01493e131817..d1659822bb2d 100644 --- a/nixpkgs/pkgs/applications/misc/fetchmail/default.nix +++ b/nixpkgs/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, openssl }: let - version = "6.4.15"; + version = "6.4.16"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-c1shdHSTfhPPzeotQqNGv2hIfg1h7+vk0Nnt3LOia5Y="; + sha256 = "sha256-BEuaCsA6+653RJed7+Pi4y45FBvKaP0Mje2i7UCIT7k="; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/applications/misc/fff/default.nix b/nixpkgs/pkgs/applications/misc/fff/default.nix index 2b21c984f34f..a3f791940cbf 100644 --- a/nixpkgs/pkgs/applications/misc/fff/default.nix +++ b/nixpkgs/pkgs/applications/misc/fff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg_utils, file, coreutils, w3m, xdotool }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg-utils, file, coreutils, w3m, xdotool }: stdenv.mkDerivation rec { pname = "fff"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"; }; - pathAdd = lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); + pathAdd = lib.makeSearchPath "bin" ([ xdg-utils file coreutils w3m xdotool ]); nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bashInteractive ]; diff --git a/nixpkgs/pkgs/applications/misc/flavours/default.nix b/nixpkgs/pkgs/applications/misc/flavours/default.nix new file mode 100644 index 000000000000..6ee546fa7c55 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/flavours/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "flavours"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "Misterio77"; + repo = pname; + rev = "v${version}"; + sha256 = "1lvbq026ap02f22mv45s904a0f81dr2f07j6bq0wnwl5wd5w0wpj"; + }; + + cargoSha256 = "0wgi65k180mq1q6j4nma0wpfdvl67im5v5gmhzv1ap6xg3bicdg1"; + + meta = with lib; { + description = "An easy to use base16 scheme manager/builder that integrates with any workflow"; + homepage = "https://github.com/Misterio77/flavours"; + changelog = "https://github.com/Misterio77/flavours/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/free42/default.nix b/nixpkgs/pkgs/applications/misc/free42/default.nix new file mode 100644 index 000000000000..29c6df8a72ea --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/free42/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, gtk3 +, alsaLib +}: + +stdenv.mkDerivation rec { + pname = "free42"; + version = "2.5.24a"; + + src = fetchFromGitHub { + owner = "thomasokken"; + repo = pname; + rev = "v${version}"; + sha256 = "xP0kzpmX6Q5Dg7azvyUZIdoi52AYkUmiCkUA1aVY+nQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 alsaLib ]; + + postPatch = '' + sed -i -e "s|/bin/ls|ls|" gtk/Makefile + ''; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + make -C gtk cleaner + make --jobs=$NIX_BUILD_CORES -C gtk + make -C gtk clean + make --jobs=$NIX_BUILD_CORES -C gtk BCD_MATH=1 + runHook postBuild + ''; + + preInstall = '' + install --directory $out/bin \ + $out/share/doc/${pname} \ + $out/share/${pname}/skins \ + $out/share/icons/hicolor/48x48/apps \ + $out/share/icons/hicolor/128x128/apps + ''; + + installPhase = '' + runHook preInstall + install -m755 gtk/free42dec gtk/free42bin $out/bin + install -m644 gtk/README $out/share/doc/${pname}/README-GTK + install -m644 README $out/share/doc/${pname}/README + + install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps + install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps + install -m644 skins/* $out/share/${pname}/skins + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/thomasokken/free42"; + description = "A software clone of HP-42S Calculator"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/fuzzel/default.nix b/nixpkgs/pkgs/applications/misc/fuzzel/default.nix index 337d68b4b20d..3dafe8fa671f 100644 --- a/nixpkgs/pkgs/applications/misc/fuzzel/default.nix +++ b/nixpkgs/pkgs/applications/misc/fuzzel/default.nix @@ -1,13 +1,12 @@ -{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}: +{ stdenv, lib, fetchzip, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}: stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.4.2"; + version = "1.5.1"; - src = fetchgit { - url = "https://codeberg.org/dnkl/fuzzel"; - rev = version; - sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2"; + src = fetchzip { + url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz"; + sha256 = "0zy0icd3647jyq4xflp35vwn52yxgj3zz4n30br657xjq1l5afzl"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; diff --git a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 60124f6aa73d..5eebda9610e4 100644 --- a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.16.3"; + version = "1.16.4"; src = fetchPypi { inherit pname version; - sha256 = "5926794d7a602cb9d4edf0a2094b266b790033db0a62689fa01e5272d7388587"; + sha256 = "744deddf22fdbc51d1d89776c41b0f1127d2b4d212bd092718fad2c0dc7f160f"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix b/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix index 1e0aba0400f0..12b5a38877ac 100644 --- a/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix +++ b/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "geoipupdate"; diff --git a/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix b/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix index 6664974a41ad..d4f50451719b 100644 --- a/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix +++ b/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: +{ lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: with lib; diff --git a/nixpkgs/pkgs/applications/misc/go-jira/default.nix b/nixpkgs/pkgs/applications/misc/go-jira/default.nix index c2871766debb..2f2a0a22126e 100644 --- a/nixpkgs/pkgs/applications/misc/go-jira/default.nix +++ b/nixpkgs/pkgs/applications/misc/go-jira/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-jira"; diff --git a/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix b/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix index 57e2d95f0430..fa58c2d3965a 100644 --- a/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix +++ b/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, mkDerivation +{ lib, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper diff --git a/nixpkgs/pkgs/applications/misc/gpsbabel/gui.nix b/nixpkgs/pkgs/applications/misc/gpsbabel/gui.nix index 3de63203f24c..4025b313128b 100644 --- a/nixpkgs/pkgs/applications/misc/gpsbabel/gui.nix +++ b/nixpkgs/pkgs/applications/misc/gpsbabel/gui.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: +{ lib, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: mkDerivation { pname = "gpsbabel-gui"; diff --git a/nixpkgs/pkgs/applications/misc/gpsprune/default.nix b/nixpkgs/pkgs/applications/misc/gpsprune/default.nix index 2348384abd0f..5df2940dff3e 100644 --- a/nixpkgs/pkgs/applications/misc/gpsprune/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "20"; + version = "20.2"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "1i9p6h98azgradrrkcwx18zwz4c6zkxp4bfykpa2imi1z3ry5q2b"; + sha256 = "sha256-40GrihCeDAqJCFcg4FMFxCg7bzd6CrDR5JU70e5VHDE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index ed1b31559f53..5ea01dfa19fd 100644 --- a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.2"; + version = "8.5"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "05wn4kmvsswwd2q2pffxbplb38capwv7iddsghix3r5zds13142z"; + sha256 = "sha256-ygBM8HtCF8d4KVOakP4ssFyTgAsPQDfjAMJaEqo+Ml4="; }; patches = (substituteAll { diff --git a/nixpkgs/pkgs/applications/misc/gramps/default.nix b/nixpkgs/pkgs/applications/misc/gramps/default.nix index 4fc4586ca4e3..1628f0473fa6 100644 --- a/nixpkgs/pkgs/applications/misc/gramps/default.nix +++ b/nixpkgs/pkgs/applications/misc/gramps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, +{ lib, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, pango, gobject-introspection, wrapGAppsHook, gettext, # Optional packages: enableOSM ? true, osm-gps-map, diff --git a/nixpkgs/pkgs/applications/misc/gsctl/default.nix b/nixpkgs/pkgs/applications/misc/gsctl/default.nix index 101baa093966..15d8b9663960 100644 --- a/nixpkgs/pkgs/applications/misc/gsctl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gsctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gsctl"; diff --git a/nixpkgs/pkgs/applications/misc/hamster/default.nix b/nixpkgs/pkgs/applications/misc/hamster/default.nix index 855123ef7931..dbf7e1aee746 100644 --- a/nixpkgs/pkgs/applications/misc/hamster/default.nix +++ b/nixpkgs/pkgs/applications/misc/hamster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, intltool, glib, itstool +{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool , wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/applications/misc/haxor-news/default.nix b/nixpkgs/pkgs/applications/misc/haxor-news/default.nix index 467cbfad6568..fc9607e7be6b 100644 --- a/nixpkgs/pkgs/applications/misc/haxor-news/default.nix +++ b/nixpkgs/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, fetchpatch }: +{ lib, fetchFromGitHub, python3, fetchpatch }: let diff --git a/nixpkgs/pkgs/applications/misc/hivemind/default.nix b/nixpkgs/pkgs/applications/misc/hivemind/default.nix index fc22d3a854a6..6ada1fd749bd 100644 --- a/nixpkgs/pkgs/applications/misc/hivemind/default.nix +++ b/nixpkgs/pkgs/applications/misc/hivemind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, runtimeShell }: +{ lib, buildGoPackage, fetchFromGitHub, runtimeShell }: buildGoPackage rec { pname = "hivemind"; diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index 2d2ccefe934e..35246a45da27 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "hugo"; diff --git a/nixpkgs/pkgs/applications/misc/jgmenu/default.nix b/nixpkgs/pkgs/applications/misc/jgmenu/default.nix index d0b9eff35f4f..88274b8664d3 100644 --- a/nixpkgs/pkgs/applications/misc/jgmenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/jgmenu/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "jgmenu"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "00q4v31x4q7nm61wda4v0gznv18bm3qs8mp04pcns60qacdv9lkk"; + sha256 = "sha256-+JO/A7+6/yeYz0tP7vxSi04cS1bEet+3sAs7CYXKxI8="; }; nativeBuildInputs = [ @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/johanmalm/jgmenu"; description = "Small X11 menu intended to be used with openbox and tint2"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 8433cc9c87f6..f737470d53f1 100644 --- a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.6.7"; + version = "1.7.10"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "0g1fac8l0w0b11bs4c9mi2k426hcqa7q4ks48fzxq0yl9ricjlrb"; - x86_64-darwin = "1h5crdjzvjg30hdmh3fkygxi5gy714wpz4gwy5dn8s3xr12mmgka"; + x86_64-linux = "1f8pfssfqigh0fl5r5wpvdpn48dx1q9qq4mfqi2s5z94h7ci2jxg"; + x86_64-darwin = "0s29mhf88nlhaabmd32k21h1qiavgpqqksbdjxkx8bfg591s8jqb"; }.${system} or throwSystem; }; diff --git a/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix index ad7ca25324d6..b34661e6eb8e 100644 --- a/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.7.35160"; + version = "0.9.39536"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "00fzycy199l9y738cj71s88qz96ppczb5sqsk3x9w4jj4m6ks239"; + sha256 = "sha256-JZtc6Si3ZQoRG3q+ctzPPQm7WbMYRailIuq/Y5Avd2s="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/nixpkgs/pkgs/applications/misc/jrnl/default.nix index 7fc8ef88330f..8d2cabb5b8b2 100644 --- a/nixpkgs/pkgs/applications/misc/jrnl/default.nix +++ b/nixpkgs/pkgs/applications/misc/jrnl/default.nix @@ -1,30 +1,56 @@ -{ lib, stdenv -, python3 +{ lib +, ansiwrap +, asteval +, buildPythonApplication +, colorama +, cryptography +, fetchFromGitHub +, keyring +, parsedatetime +, poetry +, pytestCheckHook +, python-dateutil +, pytz +, pyxdg +, pyyaml +, tzlocal }: -with python3.pkgs; - buildPythonApplication rec { pname = "jrnl"; - version = "1.9.8"; + version = "2.7"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "d254c9c8f24dcf985b98a1d5311337c7f416e6305107eec34c567f58c95b06f4"; + src = fetchFromGitHub { + owner = "jrnl-org"; + repo = pname; + rev = "v${version}"; + sha256 = "1hyjjw9mxy73n3pkliaaif135h2sd4iy43pw9d5zynid5abnr3yz"; }; + nativeBuildInputs = [ poetry ]; + propagatedBuildInputs = [ - pytz six tzlocal keyring dateutil - parsedatetime pycrypto + ansiwrap + asteval + colorama + cryptography + keyring + parsedatetime + python-dateutil + pytz + pyxdg + pyyaml + tzlocal ]; - # No tests in archive - doCheck = false; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jrnl" ]; meta = with lib; { homepage = "http://maebert.github.io/jrnl/"; description = "A simple command line journal application that stores your journal in a plain text file"; - license = licenses.mit; + license = licenses.gpl3Only; maintainers = with maintainers; [ zalakain ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix b/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix index 341341c3ca88..467945af6ac8 100644 --- a/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix +++ b/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix @@ -6,7 +6,7 @@ , kio , kjobwidgets , kxmlgui -, lib, stdenv +, lib }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/misc/keepass/default.nix b/nixpkgs/pkgs/applications/misc/keepass/default.nix index c1d9448c6a6d..32572ffcdb3b 100644 --- a/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, +{ lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, unzip, icoutils, gtk2, xorg, xdotool, xsel, coreutils, unixtools, glib, plugins ? [] }: with builtins; buildDotnetPackage rec { @@ -111,7 +111,7 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; homepage = "http://www.keepass.info/"; - maintainers = with lib.maintainers; [ amorsillo obadz jraygauthier ]; + maintainers = with lib.maintainers; [ amorsillo obadz ]; platforms = with lib.platforms; all; license = lib.licenses.gpl2; }; diff --git a/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/nixpkgs/pkgs/applications/misc/keepassx/community.nix index 548356992c33..c7e87dbbfd44 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -40,13 +40,13 @@ with lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "1jd2mvafyn095crfs2hnfprqiy8yqsvfybwbjq8n0agapnz4bl5h"; + sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ diff --git a/nixpkgs/pkgs/applications/misc/keeweb/default.nix b/nixpkgs/pkgs/applications/misc/keeweb/default.nix index cf14679cd9bb..391e698dcf7f 100644 --- a/nixpkgs/pkgs/applications/misc/keeweb/default.nix +++ b/nixpkgs/pkgs/applications/misc/keeweb/default.nix @@ -4,7 +4,7 @@ let throwSystem = throw "Unsupported system: ${system}"; pname = "keeweb"; - version = "1.16.5"; + version = "1.16.7"; name = "${pname}-${version}"; suffix = { @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; sha256 = { - x86_64-linux = "18qcr8zyn20n5zrrha0qwgq2ic10bp189fps87lbnmcjknrkac9g"; - x86_64-darwin = "0crpjkcqgs7q5c814bx2npjh9kpyyb87yagm5wcy9j21kwrbqv6k"; - aarch64-darwin = "1wkf9inrm5qg0c4xrk0s97mx5j21xvlqwwkvydl513gyfzi2g9gp"; + x86_64-linux = "0a4yh2jh9sph17mqqi62gm5jc4yffkysq6yiggyzz5f8xw4p315j"; + x86_64-darwin = "0ix1apddqvz561pw5lx47x091wlfj27zh8k8v7kn5xvm09hswfkr"; + aarch64-darwin = "0p0kql79kcb3w947g1ljhbj15b8aqrwcrbi0cknb12f6iq47lkz7"; }.${system} or throwSystem; }; diff --git a/nixpkgs/pkgs/applications/misc/khard/default.nix b/nixpkgs/pkgs/applications/misc/khard/default.nix index 5effc88acb00..3bec8db06874 100644 --- a/nixpkgs/pkgs/applications/misc/khard/default.nix +++ b/nixpkgs/pkgs/applications/misc/khard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibcLocales, python3 }: +{ lib, glibcLocales, python3 }: python3.pkgs.buildPythonApplication rec { version = "0.17.0"; diff --git a/nixpkgs/pkgs/applications/misc/kondo/default.nix b/nixpkgs/pkgs/applications/misc/kondo/default.nix index 545dc85efebf..dcbeb4087599 100644 --- a/nixpkgs/pkgs/applications/misc/kondo/default.nix +++ b/nixpkgs/pkgs/applications/misc/kondo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "kondo"; diff --git a/nixpkgs/pkgs/applications/misc/koreader/default.nix b/nixpkgs/pkgs/applications/misc/koreader/default.nix index fd00cefdf394..a903600b46d2 100644 --- a/nixpkgs/pkgs/applications/misc/koreader/default.nix +++ b/nixpkgs/pkgs/applications/misc/koreader/default.nix @@ -11,12 +11,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2021.01"; + version = "2021.01.1"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "0cc7pk27wlvziihggzlrb3wsjmndafa13cy1snqr5x71bb81fv6r"; + sha256 = "0kignyia2xrg84bqzsp8rid4c79zg11lhw52z1854jw9v9324pja"; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/applications/misc/kupfer/default.nix b/nixpkgs/pkgs/applications/misc/kupfer/default.nix index ce21ea75b307..243583b87627 100644 --- a/nixpkgs/pkgs/applications/misc/kupfer/default.nix +++ b/nixpkgs/pkgs/applications/misc/kupfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , intltool , python3Packages diff --git a/nixpkgs/pkgs/applications/misc/loxodo/default.nix b/nixpkgs/pkgs/applications/misc/loxodo/default.nix index e32535d4445e..65f9a9f0f17e 100644 --- a/nixpkgs/pkgs/applications/misc/loxodo/default.nix +++ b/nixpkgs/pkgs/applications/misc/loxodo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python27Packages, fetchgit }: +{ lib, python27Packages, fetchgit }: let py = python27Packages; python = py.python; diff --git a/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix index d7eabae0e8e5..b580fabf58e9 100644 --- a/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix +++ b/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix @@ -28,7 +28,7 @@ in buildFHSUserEnv { # DGen // TODO: libarchive is broken # Dolphin - bluez ffmpeg_3 gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm + bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm wavpack orc nettle gmp pcre vulkan-loader # DOSBox @@ -97,7 +97,7 @@ in buildFHSUserEnv { libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd harfbuzz + vulkan-loader xdg-utils sqlite gnutls p11-kit libbsd harfbuzz # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" diff --git a/nixpkgs/pkgs/applications/misc/madonctl/default.nix b/nixpkgs/pkgs/applications/misc/madonctl/default.nix index 249ed48bd1c4..2a65fc25af2f 100644 --- a/nixpkgs/pkgs/applications/misc/madonctl/default.nix +++ b/nixpkgs/pkgs/applications/misc/madonctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "madonctl"; diff --git a/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix index a743a9fbc27d..2fd217e3cd6a 100644 --- a/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.6.09"; + version = "5.7.20"; src = fetchurl { - url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.amd64.tar.gz"; - sha256 = "0v9j6fwr0xl03kr77vf4wdb06zlplmn4mr3jyzxhvs8a77scmfzb"; + url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; + sha256 = "0lyfss0r0dc6skhdlkslcdagdp9k1mi0w8n5pbrskwcd09c9mxym"; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/misc/mediaelch/default.nix b/nixpkgs/pkgs/applications/misc/mediaelch/default.nix index f19cbee8b79f..4adfe0f65262 100644 --- a/nixpkgs/pkgs/applications/misc/mediaelch/default.nix +++ b/nixpkgs/pkgs/applications/misc/mediaelch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , qmake diff --git a/nixpkgs/pkgs/applications/misc/menumaker/default.nix b/nixpkgs/pkgs/applications/misc/menumaker/default.nix index 192228de5d91..086db35a5ad5 100644 --- a/nixpkgs/pkgs/applications/misc/menumaker/default.nix +++ b/nixpkgs/pkgs/applications/misc/menumaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "menumaker"; diff --git a/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index 15464c0e6a68..ad001eb30457 100644 --- a/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, fetchsvn +, substituteAll , jdk , jre , ant @@ -9,34 +9,27 @@ , withExamples ? false }: let - version = "4565"; - sha256 = "0cfh0msky5812l28mavy6p3k2zgyxb698xk79mvla9l45zcicnvw"; - deps = import ./deps.nix { inherit fetchurl; }; testInputs = import ./testinputs.nix { inherit fetchurl; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "mkgmap"; - inherit version; + version = "4600"; - src = fetchsvn { - inherit sha256; - url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; - rev = version; + src = fetchurl { + url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; + sha256 = "1xnqbyrf5cbxmggkk1pjcj5d1767kbp15v12zy2fpbbn3yf0k3sh"; }; patches = [ - # Disable automatic download of dependencies - ./build.xml.patch - - # Fix testJavaRules test - ./fix-failing-test.patch + (substituteAll { + # Disable automatic download of dependencies + src = ./build.xml.patch; + inherit version; + }) ]; postPatch = with deps; '' - substituteInPlace build.xml \ - --subst-var-by version ${version} - mkdir -p lib/compile cp ${fastutil} lib/compile/${fastutil.name} cp ${osmpbf} lib/compile/${osmpbf.name} @@ -65,8 +58,8 @@ stdenv.mkDerivation { checkPhase = "ant test"; installPhase = '' - install -Dm644 dist/mkgmap.jar $out/share/java/mkgmap/mkgmap.jar - install -Dm644 dist/doc/mkgmap.1 $out/share/man/man1/mkgmap.1 + install -Dm644 dist/mkgmap.jar -t $out/share/java/mkgmap + install -Dm644 dist/doc/mkgmap.1 -t $out/share/man/man1 cp -r dist/lib/ $out/share/java/mkgmap/ makeWrapper ${jre}/bin/java $out/bin/mkgmap \ --add-flags "-jar $out/share/java/mkgmap/mkgmap.jar" @@ -75,9 +68,12 @@ stdenv.mkDerivation { cp -r dist/examples $out/share/mkgmap/ ''; + passthru.updateScript = [ ./update.sh "mkgmap" meta.downloadPage ]; + meta = with lib; { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; homepage = "http://www.mkgmap.org.uk"; + downloadPage = "http://www.mkgmap.org.uk/download/mkgmap.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/misc/mkgmap/fix-failing-test.patch b/nixpkgs/pkgs/applications/misc/mkgmap/fix-failing-test.patch deleted file mode 100644 index 9cfe75583c86..000000000000 --- a/nixpkgs/pkgs/applications/misc/mkgmap/fix-failing-test.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java (revision 4555) -+++ a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java (working copy) -@@ -125,7 +125,7 @@ - assertEquals("prim: different letter", -1, collator.compare("aaac", "aaad")); - assertEquals("prim: different letter", 1, collator.compare("aaae", "aaad")); - assertEquals(0, collator.compare("aaaa", "aaaa")); -- assertEquals(0, collator.compare("aáÄâ", "aaaa")); -+ //assertEquals(0, collator.compare("aáÄâ", "aaaa")); - - collator.setStrength(Collator.SECONDARY); - assertEquals(0, collator.compare("AabBb", "aabbb")); -@@ -132,8 +132,8 @@ - assertEquals(0, collator.compare("aabBb", "aabBb")); - assertEquals(0, collator.compare("aabbB", "aabBb")); - assertEquals(1, collator.compare("aáÄâ", "aaaa")); -- assertEquals("prim len diff", -1, collator.compare("aáÄâ", "aaaaa")); -- assertEquals(-1, collator.compare("aáÄâa", "aaaab")); -+ //assertEquals("prim len diff", -1, collator.compare("aáÄâ", "aaaaa")); -+ //assertEquals(-1, collator.compare("aáÄâa", "aaaab")); - - collator.setStrength(Collator.TERTIARY); - assertEquals("prim: different case", 1, collator.compare("AabBb", "aabbb")); diff --git a/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix b/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix index 6baf4f763070..c78d81771caa 100644 --- a/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, fetchsvn +, substituteAll , jdk , jre , ant @@ -8,34 +8,30 @@ , doCheck ? true }: let - version = "597"; - sha256 = "1al3160amw0gdarrc707dsppm0kcai9mpkfak7ffspwzw9alsndx"; - deps = import ../deps.nix { inherit fetchurl; }; testInputs = import ./testinputs.nix { inherit fetchurl; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "splitter"; - inherit version; + version = "598"; - src = fetchsvn { - inherit sha256; - url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; - rev = version; + src = fetchurl { + url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; + sha256 = "gpbJpDBXA9tmSmx9oKLa7xWtIOHBTYd1iPPgNTC2C2M="; }; patches = [ - # Disable automatic download of dependencies - ./build.xml.patch + (substituteAll { + # Disable automatic download of dependencies + src = ./build.xml.patch; + inherit version; + }) # Fix func.SolverAndProblemGeneratorTest test ./fix-failing-test.patch ]; postPatch = with deps; '' - substituteInPlace build.xml \ - --subst-var-by version ${version} - mkdir -p lib/compile cp ${fastutil} lib/compile/${fastutil.name} cp ${osmpbf} lib/compile/${osmpbf.name} @@ -61,16 +57,19 @@ stdenv.mkDerivation { checkPhase = "ant run.tests && ant run.func-tests"; installPhase = '' - install -Dm644 dist/splitter.jar $out/share/java/splitter/splitter.jar - install -Dm644 doc/splitter.1 $out/share/man/man1/splitter.1 + install -Dm644 dist/splitter.jar -t $out/share/java/splitter + install -Dm644 doc/splitter.1 -t $out/share/man/man1 cp -r dist/lib/ $out/share/java/splitter/ makeWrapper ${jre}/bin/java $out/bin/splitter \ --add-flags "-jar $out/share/java/splitter/splitter.jar" ''; + passthru.updateScript = [ ../update.sh "mkgmap-splitter" meta.downloadPage ]; + meta = with lib; { description = "Utility for splitting OpenStreetMap maps into tiles"; homepage = "http://www.mkgmap.org.uk"; + downloadPage = "http://www.mkgmap.org.uk/download/splitter.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/misc/mkgmap/update.sh b/nixpkgs/pkgs/applications/misc/mkgmap/update.sh new file mode 100755 index 000000000000..ddfca9359359 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/mkgmap/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts + +set -euo pipefail + +version=$(curl -s $2 | sed -n 's#.*<span data-bind="text: current().version">\(.*\)</span>.*#\1#p') +update-source-version $1 "$version" diff --git a/nixpkgs/pkgs/applications/misc/mob/default.nix b/nixpkgs/pkgs/applications/misc/mob/default.nix index 821dc1ccc3ce..12843ffb98c6 100644 --- a/nixpkgs/pkgs/applications/misc/mob/default.nix +++ b/nixpkgs/pkgs/applications/misc/mob/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "mob"; - version = "0.0.25"; + version = "1.2.0"; goPackagePath = "github.com/remotemobprogramming/mob"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "1gs0mv4j66278srrck7llvi5gnfdqxz3a489qn5sx3mw46yx5q93"; + sha256 = "sha256-hBzSf3UUW2FUp1jG1sPt7vN1iDybdMox/h6xHVrM7DY="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/nixpkgs/pkgs/applications/misc/moolticute/default.nix index 804ba33209af..eabc93492378 100644 --- a/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.44.21"; + version = "0.45.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1m3iy2v8mimyb25xisr7i4ga6qlggv1i2aji9qfgagns7ffp53nf"; + sha256 = "sha256-azJ63NI0wzzv3acgoPaeF+lTM1WKpXg595FrK908k1U="; }; outputs = [ "out" "udev" ]; diff --git a/nixpkgs/pkgs/applications/misc/mop/default.nix b/nixpkgs/pkgs/applications/misc/mop/default.nix index 07102fe56f23..007965f868b1 100644 --- a/nixpkgs/pkgs/applications/misc/mop/default.nix +++ b/nixpkgs/pkgs/applications/misc/mop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "mop"; diff --git a/nixpkgs/pkgs/applications/misc/mqtt-bench/default.nix b/nixpkgs/pkgs/applications/misc/mqtt-bench/default.nix index c01a1b9cbc69..657ac9645deb 100644 --- a/nixpkgs/pkgs/applications/misc/mqtt-bench/default.nix +++ b/nixpkgs/pkgs/applications/misc/mqtt-bench/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { pname = "mqtt-bench"; diff --git a/nixpkgs/pkgs/applications/misc/multibootusb/default.nix b/nixpkgs/pkgs/applications/misc/multibootusb/default.nix index 173291183dab..1d625a67b7b9 100644 --- a/nixpkgs/pkgs/applications/misc/multibootusb/default.nix +++ b/nixpkgs/pkgs/applications/misc/multibootusb/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python36Packages, qt5, runtimeShell, lib, stdenv, util-linux, wrapQtAppsHook }: + python36Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the # $PYTHONPATH variable containing some of their code, so that @@ -110,5 +110,6 @@ python36Packages.buildPythonApplication rec { homepage = "http://multibootusb.org/"; license = licenses.gpl2; maintainers = []; # Looking for a maintainer! + broken = true; # "name 'config' is not defined", added 2021-02-06 }; } diff --git a/nixpkgs/pkgs/applications/misc/nixnote2/default.nix b/nixpkgs/pkgs/applications/misc/nixnote2/default.nix index b23c41e6feec..cbb7a110c4c2 100644 --- a/nixpkgs/pkgs/applications/misc/nixnote2/default.nix +++ b/nixpkgs/pkgs/applications/misc/nixnote2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, boost +{ lib, mkDerivation, fetchFromGitHub, boost , qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/misc/nrsc5/default.nix b/nixpkgs/pkgs/applications/misc/nrsc5/default.nix index 8b8fa16fc213..e55438f0eb11 100644 --- a/nixpkgs/pkgs/applications/misc/nrsc5/default.nix +++ b/nixpkgs/pkgs/applications/misc/nrsc5/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { homepage = "https://github.com/theori-io/nrsc5"; description = "HD-Radio decoder for RTL-SDR"; platforms = lib.platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ markuskowa ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 0d10767e5b10..b64654ad6758 100644 --- a/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.10.8"; + version = "0.10.13"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "M+iIvnenfe+4JUKLvGDJXub8d5t2BLoPTo5MrF+5xy4="; + sha256 = "J4kaNtB6DVivNDhrGwrRZJBvu4Bpzl0jY1ZtlAtQiZE="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/nixpkgs/pkgs/applications/misc/ocropus/default.nix b/nixpkgs/pkgs/applications/misc/ocropus/default.nix index 2b0986eeba66..507399c012bb 100644 --- a/nixpkgs/pkgs/applications/misc/ocropus/default.nix +++ b/nixpkgs/pkgs/applications/misc/ocropus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pythonPackages, curl }: +{ lib, fetchFromGitHub, fetchurl, pythonPackages, curl }: let getmodel = name: sha256: { diff --git a/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/nixpkgs/pkgs/applications/misc/octoprint/default.nix index f35d03c6d172..af42466d0ead 100644 --- a/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -3,6 +3,7 @@ , lib , fetchFromGitHub , python3 +, nix-update-script # To include additional plugins, pass them here as an overlay. , packageOverrides ? self: super: {} }: @@ -89,13 +90,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - sha256 = "04x58cjivslsrld341ip11c50d50p2q01090nsyji0j255v986j9"; + sha256 = "sha256-ZL/P/YIHynPmP8ssZZUKZDJscBsSsCq3UtOHrTVLpec="; }; propagatedBuildInputs = with super; [ @@ -143,7 +144,9 @@ let postPatch = let ignoreVersionConstraints = [ + "emoji" "sentry-sdk" + "watchdog" ]; in '' @@ -170,7 +173,10 @@ let "test_set_external_modification" ]; - passthru.python = self.python; + passthru = { + python = self.python; + updateScript = nix-update-script { attrPath = "octoprint"; }; + }; meta = with lib; { homepage = "https://octoprint.org/"; diff --git a/nixpkgs/pkgs/applications/misc/onboard/default.nix b/nixpkgs/pkgs/applications/misc/onboard/default.nix index 42433936aba4..d52120e0fb7d 100644 --- a/nixpkgs/pkgs/applications/misc/onboard/default.nix +++ b/nixpkgs/pkgs/applications/misc/onboard/default.nix @@ -1,5 +1,5 @@ { fetchurl -, lib, stdenv +, lib , substituteAll , aspellWithDicts , at-spi2-core ? null diff --git a/nixpkgs/pkgs/applications/misc/openbox-menu/with-svg.patch b/nixpkgs/pkgs/applications/misc/openbox-menu/000-enable-svg.patch index dd6710f5cfc9..dd6710f5cfc9 100644 --- a/nixpkgs/pkgs/applications/misc/openbox-menu/with-svg.patch +++ b/nixpkgs/pkgs/applications/misc/openbox-menu/000-enable-svg.patch diff --git a/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix b/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix index 9d2695f97fff..71c7903dfe22 100644 --- a/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix +++ b/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, menu-cache }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, gtk2 +, menu-cache +}: stdenv.mkDerivation rec { pname = "openbox-menu"; @@ -12,11 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 menu-cache ]; - patches = [ ./with-svg.patch ]; + # Enables SVG support by uncommenting the Makefile + patches = [ ./000-enable-svg.patch ]; - installPhase = "make install prefix=$out"; + installFlags = [ "prefix=${placeholder "out"}" ]; - meta = { + meta = with lib; { homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html"; description = "Dynamic XDG menu generator for Openbox"; longDescription = '' @@ -24,8 +32,8 @@ stdenv.mkDerivation rec { dynamic menu listing installed applications. Most of the work is done by the LXDE library menu-cache. ''; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.romildo ]; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = [ maintainers.romildo ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/misc/opentx/default.nix b/nixpkgs/pkgs/applications/misc/opentx/default.nix index bb8f8d4013f1..2ca4e3203ac1 100644 --- a/nixpkgs/pkgs/applications/misc/opentx/default.nix +++ b/nixpkgs/pkgs/applications/misc/opentx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , cmake, gcc-arm-embedded, python3Packages , qtbase, qtmultimedia, qttranslations, SDL, gtest , dfu-util, avrdude diff --git a/nixpkgs/pkgs/applications/misc/orca/default.nix b/nixpkgs/pkgs/applications/misc/orca/default.nix index 25cca1536f8d..72d68431b8c0 100644 --- a/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , pkg-config , fetchurl , buildPythonApplication diff --git a/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix b/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix index 2397f3b8806b..009f40e1a219 100644 --- a/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix +++ b/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "0rn67g4xf01i7pkxrdh87jdj2rzkw5pfkx5wkg9245z5yxjxhqj2"; + sha256 = "sha256-IeFbcgwayBl3xxv3onCJr0f1oeveyyNlLxXQlzOoVq0="; }; nativeBuildInputs = [ @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library"; homepage = "https://osmcode.org/osmium-tool/"; + changelog = "https://github.com/osmcode/osmium-tool/blob/v${version}/CHANGELOG.md"; license = with licenses; [ gpl3Plus mit bsd3 ]; maintainers = with maintainers; [ das-g ]; }; diff --git a/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix b/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix index f2386a5cd83b..932fa588d271 100644 --- a/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix +++ b/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, dbus, gnupg }: +{ lib, fetchFromGitHub, python3, dbus, gnupg }: python3.pkgs.buildPythonApplication rec { pname = "pass-secret-service"; diff --git a/nixpkgs/pkgs/applications/misc/pbpst/default.nix b/nixpkgs/pkgs/applications/misc/pbpst/default.nix deleted file mode 100644 index 68b1908e5150..000000000000 --- a/nixpkgs/pkgs/applications/misc/pbpst/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ llvmPackages, lib, stdenv, fetchFromGitHub -, python36Packages, which, pkg-config, curl, git, gettext, jansson - -# Optional overrides -, maxFileSize ? 64 # in MB -, provider ? "https://ptpb.pw/" -}: - -llvmPackages.stdenv.mkDerivation rec { - version = "unstable-2018-01-11"; - name = "pbpst-${version}"; - - src = fetchFromGitHub { - owner = "HalosGhost"; - repo = "pbpst"; - rev = "ecbe08a0b72a6e4212f09fc6cf52a73506992346"; - sha256 = "0dwhmw1dg4hg75nlvk5kmvv3slz2n3b9x65q4ig16agwqfsp4mdm"; - }; - - nativeBuildInputs = [ - python36Packages.sphinx - which - pkg-config - curl - git - gettext - ]; - buildInputs = [ curl jansson ]; - - patchPhase = '' - patchShebangs ./configure - - # Remove hardcoded check for libs in /usr/lib/ - sed -e '64,67d' -i ./configure - ''; - - configureFlags = [ - "--file-max=${toString (maxFileSize * 1024 * 1024)}" # convert to bytes - "--provider=${provider}" - ]; - - meta = with lib; { - description = "A command-line libcurl C client for pb deployments"; - inherit (src.meta) homepage; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ tmplt ]; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix b/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix index da1c79865a77..474fddb25201 100644 --- a/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix +++ b/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix @@ -7,10 +7,10 @@ let inherit (lib) optional; in stdenv.mkDerivation rec { - name = "pcmanfm-1.3.1"; + name = "pcmanfm-1.3.2"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; - sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; + sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; diff --git a/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix index 907cceeb58b7..4255127b3dfe 100644 --- a/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: +{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: python3.pkgs.buildPythonApplication { pname = "pdf-quench"; diff --git a/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix b/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix index 8c8413b2ce60..27a5934e4838 100644 --- a/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, lib +{ fetchFromGitHub, lib , wrapGAppsHook, intltool , python3Packages, gtk3, poppler_gi }: python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "wJ6ImWpszfgErfLh7YgHirVKFIt0ij8A/CdYJmkNBP0="; + sha256 = "0dmgmvpghsm938iznalbg8h8k17a5h3q466yfc67mcll428n4nx3"; }; nativeBuildInputs = [ @@ -29,6 +29,7 @@ python3Packages.buildPythonApplication rec { pikepdf img2pdf setuptools + dateutil ]; # incompatible with wrapGAppsHook @@ -45,6 +46,6 @@ python3Packages.buildPythonApplication rec { description = "Merge or split pdf documents and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface"; platforms = platforms.linux; maintainers = with maintainers; [ symphorien ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } diff --git a/nixpkgs/pkgs/applications/misc/pdfdiff/default.nix b/nixpkgs/pkgs/applications/misc/pdfdiff/default.nix index 31719cdfef2b..5e489bebb25a 100644 --- a/nixpkgs/pkgs/applications/misc/pdfdiff/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdfdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchurl, xpdf }: +{ lib, pythonPackages, fetchurl, xpdf }: let py = pythonPackages; in diff --git a/nixpkgs/pkgs/applications/misc/pdfpc/default.nix b/nixpkgs/pkgs/applications/misc/pdfpc/default.nix index 6430b894b7b5..84ba3ced8fc7 100644 --- a/nixpkgs/pkgs/applications/misc/pdfpc/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdfpc/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A presenter console with multi-monitor support for PDF files"; homepage = "https://pdfpc.github.io/"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index 2aeb3ba7f99f..37905b8e444a 100644 --- a/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "0d7pvl87ybkvcxk69fr35fz0w447hy2pm65bhvlril16ljm2izja"; + sha256 = "sha256-fbcU3NZdQ8NR5tLjEJyOPneVWNMBddLdttLeVwIUtpg="; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/perkeep/default.nix b/nixpkgs/pkgs/applications/misc/perkeep/default.nix index 5a1e5ba65ded..2b14079ae609 100644 --- a/nixpkgs/pkgs/applications/misc/perkeep/default.nix +++ b/nixpkgs/pkgs/applications/misc/perkeep/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchurl, fetchFromGitHub, lib }: +{ buildGoModule, fetchurl, fetchFromGitHub, lib }: let gouiJS = fetchurl { @@ -11,41 +11,49 @@ let sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2"; }; -in buildGoPackage rec { - name = "perkeep-${version}"; - version = "unstable-2020-03-23"; + packages = [ + "perkeep.org/server/perkeepd" + "perkeep.org/cmd/pk" + "perkeep.org/cmd/pk-get" + "perkeep.org/cmd/pk-put" + "perkeep.org/cmd/pk-mount" + ]; + +in buildGoModule rec { + pname = "perkeep"; + version = "0.11"; src = fetchFromGitHub { owner = "perkeep"; repo = "perkeep"; - rev = "c2e31370ddefd86b6112a5d891100ea3382a4254"; - sha256 = "0jf02k20ms7h60wglcq6dj3vqi9rlfww7db5iplgwznbij70c1i4"; + rev = version; + sha256 = "07j5gplk4kcrbazyg4m4bwggzlz5gk89h90r14jvfcpms7v5nrll"; }; - goPackagePath = "perkeep.org"; + vendorSha256 = "1af9a6r9qfrak0n5xyv9z8n7gn7xw2sdjn4s9bwwidkrdm81iq6b"; + deleteVendor = true; # Vendor is out of sync with go.mod buildPhase = '' - cd "$NIX_BUILD_TOP/go/src/$goPackagePath" + cd "$NIX_BUILD_TOP/source" # Skip network fetches - sed -i '/fetchAllJS/a if true { return nil }' make.go cp ${publisherJS} app/publisher/publisher.js cp ${gouiJS} server/perkeepd/ui/goui.js - go run make.go + go run make.go -offline=true -targets=${lib.concatStringsSep "," packages} ''; - # devcam is only useful when developing perkeep, we should not install it as - # part of this derivation. + # genfileembed gets built regardless of -targets, to embed static + # content into the Perkeep binaries. Remove it in post-install to + # avoid polluting paths. postInstall = '' - rm -f $out/bin/devcam + rm -f $out/bin/genfileembed ''; meta = with lib; { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; homepage = "https://perkeep.org"; license = licenses.asl20; - maintainers = with maintainers; [ cstrahan kalbasit ]; - platforms = platforms.unix; + maintainers = with maintainers; [ cstrahan danderson kalbasit ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix b/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix index 67010e713c3c..0a99d357e68f 100644 --- a/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix +++ b/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , pkg-config , qmake diff --git a/nixpkgs/pkgs/applications/misc/pipr/default.nix b/nixpkgs/pkgs/applications/misc/pipr/default.nix index 7332f2016894..6ca315b1092a 100644 --- a/nixpkgs/pkgs/applications/misc/pipr/default.nix +++ b/nixpkgs/pkgs/applications/misc/pipr/default.nix @@ -1,9 +1,8 @@ -{ stdenv +{ lib , fetchFromGitHub , rustPlatform , bubblewrap , makeWrapper -, lib }: rustPlatform.buildRustPackage rec { diff --git a/nixpkgs/pkgs/applications/misc/plover/default.nix b/nixpkgs/pkgs/applications/misc/plover/default.nix index 2a3368e351f7..05886a85bf0c 100644 --- a/nixpkgs/pkgs/applications/misc/plover/default.nix +++ b/nixpkgs/pkgs/applications/misc/plover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python27Packages, python36Packages, wmctrl, +{ lib, fetchurl, python27Packages, python36Packages, wmctrl, qtbase, mkDerivationWith }: { diff --git a/nixpkgs/pkgs/applications/misc/polybar/default.nix b/nixpkgs/pkgs/applications/misc/polybar/default.nix index c79da21ad63a..b01b5af7dedc 100644 --- a/nixpkgs/pkgs/applications/misc/polybar/default.nix +++ b/nixpkgs/pkgs/applications/misc/polybar/default.nix @@ -1,13 +1,29 @@ -{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkg-config -, python3, lib, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage -, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper +{ cairo +, cmake +, fetchFromGitHub +, libXdmcp +, libpthreadstubs +, libxcb +, pcre +, pkg-config +, python3 +, lib +, stdenv +, xcbproto +, xcbutil +, xcbutilcursor +, xcbutilimage +, xcbutilrenderutil +, xcbutilwm +, xcbutilxrm +, makeWrapper , removeReferencesTo # optional packages-- override the variables ending in 'Support' to enable or # disable modules , alsaSupport ? true, alsaLib ? null , githubSupport ? false, curl ? null -, mpdSupport ? false, mpd_clientlib ? null +, mpdSupport ? false, libmpdclient ? null , pulseSupport ? false, libpulseaudio ? null , iwSupport ? false, wirelesstools ? null , nlSupport ? true, libnl ? null @@ -16,7 +32,7 @@ assert alsaSupport -> alsaLib != null; assert githubSupport -> curl != null; -assert mpdSupport -> mpd_clientlib != null; +assert mpdSupport -> libmpdclient != null; assert pulseSupport -> libpulseaudio != null; assert iwSupport -> ! nlSupport && wirelesstools != null; @@ -37,26 +53,24 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - meta = with lib; { - homepage = "https://polybar.github.io/"; - description = "A fast and easy-to-use tool for creating status bars"; - longDescription = '' - Polybar aims to help users build beautiful and highly customizable - status bars for their desktop environment, without the need of - having a black belt in shell scripting. - ''; - license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne ]; - platforms = platforms.linux; - }; - buildInputs = [ - cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto xcbutil - xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm + cairo + libXdmcp + libpthreadstubs + libxcb + pcre + python3 + xcbproto + xcbutil + xcbutilcursor + xcbutilimage + xcbutilrenderutil + xcbutilwm + xcbutilxrm (if alsaSupport then alsaLib else null) (if githubSupport then curl else null) - (if mpdSupport then mpd_clientlib else null) + (if mpdSupport then libmpdclient else null) (if pulseSupport then libpulseaudio else null) (if iwSupport then wirelesstools else null) @@ -69,16 +83,36 @@ stdenv.mkDerivation rec { (if i3Support || i3GapsSupport then makeWrapper else null) ]; - postInstall = if (i3Support || i3GapsSupport) then '' - wrapProgram $out/bin/polybar \ - --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin" - '' else ""; + postInstall = if i3Support + then ''wrapProgram $out/bin/polybar \ + --prefix PATH : "${i3}/bin" + '' + else if i3GapsSupport + then ''wrapProgram $out/bin/polybar \ + --prefix PATH : "${i3-gaps}/bin" + '' + else ''''; nativeBuildInputs = [ - cmake pkg-config removeReferencesTo + cmake + pkg-config + removeReferencesTo ]; postFixup = '' remove-references-to -t ${stdenv.cc} $out/bin/polybar ''; + + meta = with lib; { + homepage = "https://polybar.github.io/"; + description = "A fast and easy-to-use tool for creating status bars"; + longDescription = '' + Polybar aims to help users build beautiful and highly customizable + status bars for their desktop environment, without the need of + having a black belt in shell scripting. + ''; + license = licenses.mit; + maintainers = with maintainers; [ afldcr Br1ght0ne ]; + platforms = platforms.linux; + }; } diff --git a/nixpkgs/pkgs/applications/misc/prevo/default.nix b/nixpkgs/pkgs/applications/misc/prevo/default.nix index 92d788695035..45f5889d4d5d 100644 --- a/nixpkgs/pkgs/applications/misc/prevo/default.nix +++ b/nixpkgs/pkgs/applications/misc/prevo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, symlinkJoin, prevo-tools, prevo-data, makeWrapper }: +{ lib, symlinkJoin, prevo-tools, prevo-data, makeWrapper }: symlinkJoin rec { name = "prevo-${version}"; diff --git a/nixpkgs/pkgs/applications/misc/printrun/default.nix b/nixpkgs/pkgs/applications/misc/printrun/default.nix index 13f9178f330c..631609551306 100644 --- a/nixpkgs/pkgs/applications/misc/printrun/default.nix +++ b/nixpkgs/pkgs/applications/misc/printrun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "printrun"; diff --git a/nixpkgs/pkgs/applications/misc/pueue/default.nix b/nixpkgs/pkgs/applications/misc/pueue/default.nix index d0459cb426c6..dd46c566cd82 100644 --- a/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.8.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "1vdlsfnqnyri0ny2g695lhivs9m25v9lsqf1valwbjv9l9vjxfqa"; + sha256 = "sha256-yOUVDq/wRY35ZQjQVwTLYHKukkKpoggN51wBDdZnhI4="; }; - cargoSha256 = "0qziwb69qpbziz772np8dcb1dvxg6m506k5kl63m75z4zicgykcv"; + cargoSha256 = "sha256-56jJ8IjxWTBlaDd1CVit4RP659Mgw2j2wMWcSDYVihM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/nixpkgs/pkgs/applications/misc/pwsafe/default.nix index 2e7c77c0935a..6aa1099c35c8 100644 --- a/nixpkgs/pkgs/applications/misc/pwsafe/default.nix +++ b/nixpkgs/pkgs/applications/misc/pwsafe/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pwsafe"; - version = "3.53.0"; + version = "3.55.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv"; + sha256 = "sha256-+Vfwz8xGmSzFNdiN5XYkRqGmFuBVIgexXdH3B+XYY3o="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/pydf/default.nix b/nixpkgs/pkgs/applications/misc/pydf/default.nix index 0135e10d6df1..afec377e9b66 100644 --- a/nixpkgs/pkgs/applications/misc/pydf/default.nix +++ b/nixpkgs/pkgs/applications/misc/pydf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "pydf"; diff --git a/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix b/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix index a26b6b014da4..5eb43c0e3575 100644 --- a/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix +++ b/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: buildPythonPackage rec { pname = "Cerberus"; diff --git a/nixpkgs/pkgs/applications/misc/pyditz/default.nix b/nixpkgs/pkgs/applications/misc/pyditz/default.nix index 268d2fb28609..5765aeba7dd0 100644 --- a/nixpkgs/pkgs/applications/misc/pyditz/default.nix +++ b/nixpkgs/pkgs/applications/misc/pyditz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages }: +{ lib, pythonPackages }: with pythonPackages; diff --git a/nixpkgs/pkgs/applications/misc/pytrainer/default.nix b/nixpkgs/pkgs/applications/misc/pytrainer/default.nix index eb775a1f6024..4e1e1f31f198 100644 --- a/nixpkgs/pkgs/applications/misc/pytrainer/default.nix +++ b/nixpkgs/pkgs/applications/misc/pytrainer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , perl , python3 diff --git a/nixpkgs/pkgs/applications/misc/qdirstat/default.nix b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix index a51bd3a80c05..29cd7967e130 100644 --- a/nixpkgs/pkgs/applications/misc/qdirstat/default.nix +++ b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, qmake -, coreutils, xdg_utils, bash +{ lib, fetchFromGitHub, qmake +, coreutils, xdg-utils, bash , makeWrapper, perlPackages, mkDerivation }: let @@ -28,7 +28,7 @@ mkDerivation { for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp do substituteInPlace $i \ - --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open + --replace /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open done for i in src/Cleanup.cpp src/cleanup-config-page.ui do diff --git a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index c6306294ecdd..721c95c028bc 100644 --- a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev , qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: diff --git a/nixpkgs/pkgs/applications/misc/qpdfview/default.nix b/nixpkgs/pkgs/applications/misc/qpdfview/default.nix index 0892632c1d84..6ae81fca27cf 100644 --- a/nixpkgs/pkgs/applications/misc/qpdfview/default.nix +++ b/nixpkgs/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkg-config, poppler, djvulibre, libspectre, cups +{lib, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkg-config, poppler, djvulibre, libspectre, cups , file, ghostscript }: let diff --git a/nixpkgs/pkgs/applications/misc/qsudo/default.nix b/nixpkgs/pkgs/applications/misc/qsudo/default.nix index f7dbc9a90581..5f9958f2d5d6 100644 --- a/nixpkgs/pkgs/applications/misc/qsudo/default.nix +++ b/nixpkgs/pkgs/applications/misc/qsudo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , qmake diff --git a/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix index cdb4f6038211..100be6c2dc87 100644 --- a/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix @@ -67,6 +67,6 @@ mkDerivation rec { # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 # but qt > 5.6 works when only using the native browser # https://github.com/sieren/QSyncthingTray/issues/223 - broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative); + broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative) || stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix b/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix index 5de2428250a0..9480a32aae3d 100644 --- a/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix +++ b/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, lib, stdenv +, lib , fetchFromGitHub , qtbase , qtsvg diff --git a/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix b/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix index 4ab70a5a8d7d..fafd91f7811c 100644 --- a/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, qt5, mkDerivation }: +{ lib, fetchzip, qt5, mkDerivation }: let version = "1.40.43"; diff --git a/nixpkgs/pkgs/applications/misc/ranger/default.nix b/nixpkgs/pkgs/applications/misc/ranger/default.nix index 8394fd4c5343..10ea22a1eca0 100644 --- a/nixpkgs/pkgs/applications/misc/ranger/default.nix +++ b/nixpkgs/pkgs/applications/misc/ranger/default.nix @@ -1,12 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, file, less, highlight -, imagePreviewSupport ? true, w3m ? null}: - -with lib; - -assert imagePreviewSupport -> w3m != null; +{ lib, fetchFromGitHub, python3Packages, file, less, highlight +, imagePreviewSupport ? true, w3m }: python3Packages.buildPythonApplication rec { - name = "ranger-${version}"; + pname = "ranger"; version = "1.9.3"; src = fetchFromGitHub { @@ -18,34 +14,24 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = with python3Packages; [ pytest ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; propagatedBuildInputs = [ file ] ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ]; - checkPhase = '' - py.test tests - ''; - preConfigure = '' ${lib.optionalString (highlight != null) '' sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \ ranger/data/scope.sh ''} - substituteInPlace ranger/data/scope.sh \ - --replace "/bin/echo" "echo" - substituteInPlace ranger/__init__.py \ --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin less}/bin/less'" - for i in ranger/config/rc.conf doc/config/rc.conf ; do - substituteInPlace $i --replace /usr/share $out/share - done - # give file previews out of the box substituteInPlace ranger/config/rc.conf \ + --replace /usr/share $out/share \ --replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh" - '' + optionalString imagePreviewSupport '' + '' + lib.optionalString imagePreviewSupport '' substituteInPlace ranger/ext/img_display.py \ --replace /usr/lib/w3m ${w3m}/libexec/w3m @@ -57,8 +43,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "File manager with minimalistic curses interface"; homepage = "http://ranger.github.io/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = [ maintainers.toonn maintainers.magnetophon ]; + maintainers = with maintainers; [ toonn magnetophon ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/reddsaver/default.nix b/nixpkgs/pkgs/applications/misc/reddsaver/default.nix index c90aeeb0afd6..fae4948d8baf 100644 --- a/nixpkgs/pkgs/applications/misc/reddsaver/default.nix +++ b/nixpkgs/pkgs/applications/misc/reddsaver/default.nix @@ -7,23 +7,23 @@ }: rustPlatform.buildRustPackage rec { - version = "0.2.2"; + version = "0.2.3"; pname = "reddsaver"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "reddsaver"; rev = "v${version}"; - sha256 = "0802jz503jhyz5q6mg1fj2bvkl4nggvs8y03zddd298ymplx5dbx"; + sha256 = "sha256-K6SyfYx8VG0t6yogHwd80AxQuj3TXofHLEqZcDsRs1s="; }; - cargoSha256 = "0z8q187331j3rxj8hzym25pwrikxbd0r829v29y8w6v5n0hb47fs"; + cargoSha256 = "sha256-VDr7fcE13Wy7KoGG3U1GSbWqF5Oad4EobgzOL7dtJDo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - # package does not contain tests as of v0.2.2 + # package does not contain tests as of v0.2.3 docCheck = false; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index 77538f243614..800170b314a5 100644 --- a/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, python3Packages }: +{ lib, buildPythonApplication, fetchPypi, python3Packages }: buildPythonApplication rec { pname = "remarkable-mouse"; diff --git a/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix b/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix index 22a154da4fd0..e2a5f348da57 100644 --- a/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "rmapi"; diff --git a/nixpkgs/pkgs/applications/misc/remarkable/rmview/default.nix b/nixpkgs/pkgs/applications/misc/remarkable/rmview/default.nix index 3148bf0ccf39..385607ec7098 100644 --- a/nixpkgs/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/nixpkgs/pkgs/applications/misc/remarkable/rmview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonApplication rec { pname = "rmview"; diff --git a/nixpkgs/pkgs/applications/misc/rofimoji/default.nix b/nixpkgs/pkgs/applications/misc/rofimoji/default.nix index ed97c17bfd93..1e340697e76d 100644 --- a/nixpkgs/pkgs/applications/misc/rofimoji/default.nix +++ b/nixpkgs/pkgs/applications/misc/rofimoji/default.nix @@ -38,6 +38,9 @@ buildPythonApplication rec { substituteInPlace setup.py --replace 'pyxdg==0.26' 'pyxdg' ''; + # no tests executed + doCheck = false; + meta = with lib; { description = "A simple emoji and character picker for rofi"; homepage = "https://github.com/fdw/rofimoji"; diff --git a/nixpkgs/pkgs/applications/misc/rsclock/default.nix b/nixpkgs/pkgs/applications/misc/rsclock/default.nix index d7b38e2d665d..bc36b2f379e8 100644 --- a/nixpkgs/pkgs/applications/misc/rsclock/default.nix +++ b/nixpkgs/pkgs/applications/misc/rsclock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "rsClock"; diff --git a/nixpkgs/pkgs/applications/misc/rss-bridge-cli/default.nix b/nixpkgs/pkgs/applications/misc/rss-bridge-cli/default.nix index 4ab79440b239..7550e6bcb95f 100644 --- a/nixpkgs/pkgs/applications/misc/rss-bridge-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/rss-bridge-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeShellScriptBin, rss-bridge, php }: +{ lib, writeShellScriptBin, rss-bridge, php }: let phpWithExts = (php.withExtensions diff --git a/nixpkgs/pkgs/applications/misc/rtv/default.nix b/nixpkgs/pkgs/applications/misc/rtv/default.nix index 343936962329..be539a37a301 100644 --- a/nixpkgs/pkgs/applications/misc/rtv/default.nix +++ b/nixpkgs/pkgs/applications/misc/rtv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: with python3Packages; buildPythonApplication rec { diff --git a/nixpkgs/pkgs/applications/misc/signumone-ks/default.nix b/nixpkgs/pkgs/applications/misc/signumone-ks/default.nix index aeea3ff5daa3..eb0af95d58d5 100644 --- a/nixpkgs/pkgs/applications/misc/signumone-ks/default.nix +++ b/nixpkgs/pkgs/applications/misc/signumone-ks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, - atk, ffmpeg, gdk-pixbuf, glibc, gtk3, libav_0_8, libXtst }: + atk, ffmpeg, gdk-pixbuf, gtk3, libXtst }: stdenv.mkDerivation rec { pname = "signumone-ks"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - atk glibc gdk-pixbuf stdenv.cc.cc ffmpeg - libav_0_8 gtk3 libXtst + atk gdk-pixbuf ffmpeg + gtk3 libXtst ]; libPath = lib.makeLibraryPath buildInputs; diff --git a/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix b/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix index e41860551fcd..5beacfad2f95 100644 --- a/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix +++ b/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, python3Packages +{ lib, fetchFromGitHub, python3, python3Packages , gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper , gobject-introspection }: diff --git a/nixpkgs/pkgs/applications/snowmachine/default.nix b/nixpkgs/pkgs/applications/misc/snowmachine/default.nix index 2e05fe0c6439..022d75030d0a 100644 --- a/nixpkgs/pkgs/applications/snowmachine/default.nix +++ b/nixpkgs/pkgs/applications/misc/snowmachine/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python script that will make your terminal snow"; - homepage = "http://github.com/sontek/snowmachine"; + homepage = "https://github.com/sontek/snowmachine"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ djanatyn ]; }; diff --git a/nixpkgs/pkgs/applications/misc/spacefm/default.nix b/nixpkgs/pkgs/applications/misc/spacefm/default.nix index e08240733d12..3d9f72048754 100644 --- a/nixpkgs/pkgs/applications/misc/spacefm/default.nix +++ b/nixpkgs/pkgs/applications/misc/spacefm/default.nix @@ -13,7 +13,13 @@ stdenv.mkDerivation rec { sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx"; }; - patches = [ ./glibc-fix.patch ]; + patches = [ + # fix compilation error due to missing include + ./glibc-fix.patch + + # restrict GDK backends to only X11 + ./x11-only.patch + ]; configureFlags = [ "--with-bash-path=${pkgs.bash}/bin/bash" diff --git a/nixpkgs/pkgs/applications/misc/spacefm/x11-only.patch b/nixpkgs/pkgs/applications/misc/spacefm/x11-only.patch new file mode 100644 index 000000000000..1b2f9f145824 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/spacefm/x11-only.patch @@ -0,0 +1,10 @@ +--- a/src/main.c 2021-02-09 13:54:32.847364236 +0100 ++++ b/src/main.c 2021-02-09 10:41:51.541203271 +0100 +@@ -1350,6 +1351,7 @@ + vfs_file_monitor_clean(); + return 1; + } ++ gdk_set_allowed_backends("x11"); + gtk_init (&argc, &argv); + int ret = custom_dialog_init( argc, argv ); + if ( ret != 0 ) diff --git a/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix index a042cc53c055..2b97d2f0188b 100644 --- a/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "08rnwj7ggh114n3mhhm8hb8fm1njgb4j6vba3hynp8x1c2ngidff"; + sha256 = "sha256-Gkq19OlX6ci2i5mno77O/v3VfUkv6FRQFcH98qaUuXs="; }; - vendorSha256 = "0k06c3jw5z8rw8nk4qf794kyfipylmz6x6l126a2snvwi0lmc601"; + vendorSha256 = "sha256-ARhWKYh8Wy2UEYGabn6l/kbnJ0nHYTIt4hn9wuVgBkw="; # used at runtime, but not installed by default postInstall = '' diff --git a/nixpkgs/pkgs/applications/misc/ssh-tools/default.nix b/nixpkgs/pkgs/applications/misc/ssh-tools/default.nix new file mode 100644 index 000000000000..8740633262fd --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/ssh-tools/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ssh-tools"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "vaporup"; + repo = pname; + rev = "v${version}"; + sha256 = "0m0x9383p9ab4hdirncmrfha130iasa0v4cbif2y5nbxnxgh101r"; + }; + + installPhase = '' + mkdir -p $out/bin + cp ssh-* $out/bin/ + ''; + + meta = with lib; { + description = "Collection of various tools using ssh"; + homepage = "https://github.com/vaporup/ssh-tools/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/surface-control/default.nix b/nixpkgs/pkgs/applications/misc/surface-control/default.nix new file mode 100644 index 000000000000..2c5db1fe15ab --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/surface-control/default.nix @@ -0,0 +1,37 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, coreutils }: + +rustPlatform.buildRustPackage rec { + pname = "surface-control"; + version = "0.3.1-1"; + + src = fetchFromGitHub { + owner = "linux-surface"; + repo = pname; + rev = "v${version}"; + sha256 = "0wclzlix0a2naxbdg3wym7yw19p2wqpcjmkf7gn8cs00shrmzjld"; + }; + + cargoSha256 = "0vi26v9mvx298kx6k5g7h8dnn7r208an9knadc23vxcrrxjr6pn5"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion \ + $releaseDir/build/surface-*/out/surface.{bash,fish} \ + --zsh $releaseDir/build/surface-*/out/_surface + install -Dm 0444 -t $out/etc/udev/rules.d \ + etc/udev/40-surface-control.rules + substituteInPlace $out/etc/udev/rules.d/40-surface-control.rules \ + --replace "/usr/bin/chmod" "${coreutils}/bin/chmod" \ + --replace "/usr/bin/chown" "${coreutils}/bin/chown" + ''; + + meta = with lib; { + description = + "Control various aspects of Microsoft Surface devices on Linux from the Command-Line"; + homepage = "https://github.com/linux-surface/surface-control"; + license = licenses.mit; + maintainers = with maintainers; [ winterqt ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/syncthing-tray/default.nix b/nixpkgs/pkgs/applications/misc/syncthing-tray/default.nix index 15ef1654e70e..db734bff5878 100644 --- a/nixpkgs/pkgs/applications/misc/syncthing-tray/default.nix +++ b/nixpkgs/pkgs/applications/misc/syncthing-tray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }: +{ lib, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }: buildGoPackage rec { pname = "syncthing-tray"; diff --git a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index f5c5faf4d966..2a395a227ba6 100644 --- a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -19,14 +19,14 @@ }: mkDerivation rec { - version = "1.1.0"; + version = "1.1.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "0nzkzx870hzil2kny1irp4w2kxz5gmpchr2qxb7q4f9cnih92n0j"; + sha256 = "sha256-I5QhnYp4ga3ERJ3w4qjh5gFFU+S1Htw26vHK/2M8j5s="; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/nixpkgs/pkgs/applications/misc/tabula-java/default.nix b/nixpkgs/pkgs/applications/misc/tabula-java/default.nix new file mode 100644 index 000000000000..a88a83bc234e --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/tabula-java/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "tabula-java"; + version = "1.0.4"; + + src = fetchurl { + url = "https://github.com/tabulapdf/tabula-java/releases/download/v${version}/tabula-${version}-jar-with-dependencies.jar"; + sha256 = "12d0jcc3j0q8jbqv0gzfiif7c8ig37834vb8yq0jnyr0s72k30xw"; + }; + + buildInputs = [ makeWrapper ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + mkdir -pv $out/share/tabula-java + cp -v $src $out/share/tabula-java/tabula-java.jar + + makeWrapper ${jre}/bin/java $out/bin/tabula-java --add-flags "-jar $out/share/tabula-java/tabula-java.jar" + ''; + + meta = with lib; { + description = "A library for extracting tables from PDF files."; + longDescription = '' + tabula-java is the table extraction engine that powers + Tabula. You can use tabula-java as a command-line tool to + programmatically extract tables from PDFs. + ''; + homepage = "https://tabula.technology/"; + license = licenses.mit; + maintainers = [ maintainers.jakewaksbaum ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index ae730d597ce7..530d60c76313 100644 --- a/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -1,23 +1,23 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.9.5"; + version = "0.9.10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "1348ypjphm5f46civbrcxbbahwwl2j47z1hg8ndq1cg2bh5wb8kg"; + sha256 = "sha256-NQzZhWoLeDF7iTgIljbVi0ULAe7DeIn45Cu6bgFCfKQ="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "11zpy3whzir9mlbvf0jyscqwj9z44a6s5i1bc2cnxyciqy9b57md"; + cargoSha256 = "sha256-9qfqQ7zFw+EwY7o35Y6RhBJ8h5eXnTAsdbqo/w0zO5w="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/nixpkgs/pkgs/applications/misc/termdown/default.nix b/nixpkgs/pkgs/applications/misc/termdown/default.nix index d8bb03138f32..562a0f0bdcbe 100644 --- a/nixpkgs/pkgs/applications/misc/termdown/default.nix +++ b/nixpkgs/pkgs/applications/misc/termdown/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonApplication , click diff --git a/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix index e3e64cfd68af..b44b4bd0a703 100644 --- a/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix +++ b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terminal-parrot"; diff --git a/nixpkgs/pkgs/applications/misc/termpdf.py/default.nix b/nixpkgs/pkgs/applications/misc/termpdf.py/default.nix index 2541a17fc201..95937ea5f2e3 100644 --- a/nixpkgs/pkgs/applications/misc/termpdf.py/default.nix +++ b/nixpkgs/pkgs/applications/misc/termpdf.py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchFromGitHub , fetchPypi diff --git a/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/nixpkgs/pkgs/applications/misc/tickrs/default.nix index ced50748d0f7..d49c62219026 100644 --- a/nixpkgs/pkgs/applications/misc/tickrs/default.nix +++ b/nixpkgs/pkgs/applications/misc/tickrs/default.nix @@ -1,20 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, perl }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, perl, Security }: rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.7.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "159smcjrf5193yijfpvy1g9b1gin72xwbjghfyrrphwscwhb215z"; + sha256 = "sha256-kX5Vp+yNlzBj1ewm7zNtpmbk5B2OQi0nrUNV7l6XUH0="; }; - cargoSha256 = "1s95b3x7vs1z8xs7j6j80y6mfpy5bdgnzmzn3qa9zr6cghabbf6n"; + cargoSha256 = "sha256-X7ULfb2+9l8ik12SwWCTdUfki6xbk8pCnFaiEvCwYGw="; nativeBuildInputs = [ perl ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + meta = with lib; { description = "Realtime ticker data in your terminal"; homepage = "https://github.com/tarkah/tickrs"; diff --git a/nixpkgs/pkgs/applications/misc/tipp10/default.nix b/nixpkgs/pkgs/applications/misc/tipp10/default.nix index 0658b43626ed..3333760a759a 100644 --- a/nixpkgs/pkgs/applications/misc/tipp10/default.nix +++ b/nixpkgs/pkgs/applications/misc/tipp10/default.nix @@ -1,4 +1,4 @@ -{ cmake, lib, stdenv, mkDerivation, fetchFromGitLab, +{ cmake, lib, mkDerivation, fetchFromGitLab, qtmultimedia, qttools, ... }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/misc/todiff/default.nix b/nixpkgs/pkgs/applications/misc/todiff/default.nix index bc172c9b49fb..069a63fb66ba 100644 --- a/nixpkgs/pkgs/applications/misc/todiff/default.nix +++ b/nixpkgs/pkgs/applications/misc/todiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "todiff"; diff --git a/nixpkgs/pkgs/applications/misc/toot/default.nix b/nixpkgs/pkgs/applications/misc/toot/default.nix index d992d9cdc410..2a322b208819 100644 --- a/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "0.27.0"; diff --git a/nixpkgs/pkgs/applications/misc/tootle/default.nix b/nixpkgs/pkgs/applications/misc/tootle/default.nix index 3b9b09aaba9b..0f6747d69f83 100644 --- a/nixpkgs/pkgs/applications/misc/tootle/default.nix +++ b/nixpkgs/pkgs/applications/misc/tootle/default.nix @@ -16,17 +16,18 @@ , json-glib , glib , glib-networking +, libhandy }: stdenv.mkDerivation rec { pname = "tootle"; - version = "0.2.0"; + version = "1.0"; src = fetchFromGitHub { owner = "bleakgrey"; repo = pname; rev = version; - sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi"; + sha256 = "NRM7GiJA8c5z9AvXpGXtMl4ZaYN2GauEIbjBmoY4pdo="; }; nativeBuildInputs = [ @@ -47,15 +48,7 @@ stdenv.mkDerivation rec { json-glib libgee pantheon.granite - ]; - - patches = [ - # Fix build with Vala 0.46 - # https://github.com/bleakgrey/tootle/pull/164 - (fetchpatch { - url = "https://github.com/worldofpeace/tootle/commit/0a88bdad6d969ead1e4058b1a19675c9d6857b16.patch"; - sha256 = "0xyx00pgswnhxxbsxngsm6khvlbfcl6ic5wv5n64x7klk8rzh6cm"; - }) + libhandy ]; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/topydo/default.nix b/nixpkgs/pkgs/applications/misc/topydo/default.nix index 4ff3090d1f85..3ea3511308b2 100644 --- a/nixpkgs/pkgs/applications/misc/topydo/default.nix +++ b/nixpkgs/pkgs/applications/misc/topydo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, glibcLocales }: +{ lib, python3Packages, fetchFromGitHub, glibcLocales }: with python3Packages; diff --git a/nixpkgs/pkgs/applications/misc/tty-share/default.nix b/nixpkgs/pkgs/applications/misc/tty-share/default.nix index be9a0bafcc62..a402a669fbea 100644 --- a/nixpkgs/pkgs/applications/misc/tty-share/default.nix +++ b/nixpkgs/pkgs/applications/misc/tty-share/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: # Upstream has a `./vendor` directory with all deps which we rely upon. buildGoPackage rec { diff --git a/nixpkgs/pkgs/applications/misc/tut/default.nix b/nixpkgs/pkgs/applications/misc/tut/default.nix index 1fa3e9b7883a..3994541f48b1 100644 --- a/nixpkgs/pkgs/applications/misc/tut/default.nix +++ b/nixpkgs/pkgs/applications/misc/tut/default.nix @@ -1,19 +1,18 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "tut"; - version = "0.0.14"; - - goPackagePath = "github.com/RasmusLindroth/tut"; - goDeps = ./deps.nix; + version = "0.0.17"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "1l7lc6cjx97v9zhc0b6lfzqjmyv1i3qj83drkck36if3mc60vvwi"; + sha256 = "0g4kbprsdjk2lbx81azdvz8kkhyk370id3622xxssr894v0i7iwj"; }; + vendorSha256 = "1kf7ynmxrzvhl028b4nbz9h9v9x5srarsbynpgpp4vicmxqlvrmh"; + meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; homepage = "https://github.com/RasmusLindroth/tut"; diff --git a/nixpkgs/pkgs/applications/misc/tut/deps.nix b/nixpkgs/pkgs/applications/misc/tut/deps.nix deleted file mode 100644 index 9264153e5030..000000000000 --- a/nixpkgs/pkgs/applications/misc/tut/deps.nix +++ /dev/null @@ -1,318 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/DATA-DOG/go-sqlmock"; - fetch = { - type = "git"; - url = "https://github.com/DATA-DOG/go-sqlmock"; - rev = "v1.3.3"; - sha256 = "1xrly2vmy1mgj9dbkmivhh8gvq6v9f9xy2yp2dw54i1895zzs928"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/goquery"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/goquery"; - rev = "v1.5.0"; - sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; - }; - } - { - goPackagePath = "github.com/andybalholm/cascadia"; - fetch = { - type = "git"; - url = "https://github.com/andybalholm/cascadia"; - rev = "v1.0.0"; - sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.9.0"; - sha256 = "086z8ssmr1fn9ba4mqnw7pnccfpys6l5yfhvycv1gdrsk7n27mvs"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "v1.0.0"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/gdamore/tcell"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/tcell"; - rev = "v1.3.0"; - sha256 = "1csg9qkmbg4ksj5247kgqcy7bxvqgz6b98r0rv2s4c1mkc99gx2r"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.1"; - sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.20.0"; - sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; - }; - } - { - goPackagePath = "github.com/kyoh86/xdg"; - fetch = { - type = "git"; - url = "https://github.com/kyoh86/xdg"; - rev = "v1.2.0"; - sha256 = "0a5nz53fdz1c2qvwlf2dpjdd72nxri95i6q4b07c37kiipgaxncn"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "v1.0.3"; - sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.4"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.11"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-mastodon"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-mastodon"; - rev = "3e91c76504df"; - sha256 = "1wh2hqrzx80gfs1y34f4h68mnz83asx88v0bsw372ch5j1shswlr"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.8"; - sha256 = "14ilkbhnhl8yj443dd1ga4biapswv4g0b4vm2mix78a8srdww39j"; - }; - } - { - goPackagePath = "github.com/mattn/go-tty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-tty"; - rev = "v0.0.3"; - sha256 = "0d1d63q02pc5k5ga8bw4yjbkrli2769vg237psajsskjirjy53vf"; - }; - } - { - goPackagePath = "github.com/microcosm-cc/bluemonday"; - fetch = { - type = "git"; - url = "https://github.com/microcosm-cc/bluemonday"; - rev = "v1.0.2"; - sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.7.0"; - sha256 = "0sqrwldjj2qxrgjz1diw1ffviya4ma7mz7nhdgydbisi2h55lqla"; - }; - } - { - goPackagePath = "github.com/rivo/tview"; - fetch = { - type = "git"; - url = "https://github.com/rivo/tview"; - rev = "ca37f83cb2e7"; - sha256 = "05nifgrxv6aib8f20mhs9m0grdfdyyg5vyhk6zgwsxjlwbzaj021"; - }; - } - { - goPackagePath = "github.com/rivo/uniseg"; - fetch = { - type = "git"; - url = "https://github.com/rivo/uniseg"; - rev = "v0.1.0"; - sha256 = "0flpc1px1l6b1lxzhdxi0mvpkkjchppvgxshxxnlmm40s76i9ww5"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "b2de0cb4f26d"; - sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "v1.6.4"; - sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; - }; - } - { - goPackagePath = "github.com/tomnomnom/linkheader"; - fetch = { - type = "git"; - url = "https://github.com/tomnomnom/linkheader"; - rev = "02ca5825eb80"; - sha256 = "1ghrv28vrvvrpyr4d4q817yby8g1j04mid8ql00sds1pvfv67d32"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d3edc9973b7e"; - sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "85ca7c5b95cd"; - sha256 = "1504qkgbhhm4f0bhk77v2r1lj6x171ay5m79alkg78wjb5cign5l"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "ab21143f2384"; - sha256 = "15fk0psk53pplpyghz55bhay0kvsv5rikmn5hwgjnnyxq9vfy178"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "v1.55.0"; - sha256 = "1b7wsfal3b3pl5pv5n2qix09b3imh0zhirrphlsg5p2rb8fk0d0j"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } -] diff --git a/nixpkgs/pkgs/applications/misc/twitch-chat-downloader/default.nix b/nixpkgs/pkgs/applications/misc/twitch-chat-downloader/default.nix new file mode 100644 index 000000000000..a8ffb46c1f88 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonApplication +, fetchPypi +, requests +, twitch-python +, pytz +, python-dateutil +}: + +buildPythonApplication rec { + pname = "twitch-chat-downloader"; + version = "3.2.1"; + + src = fetchPypi { + inherit version; + pname = "tcd"; + sha256 = "f9b5ea2ad3badb7deffdd9604368ccb54170cd7929efbaa2d7b534e089ae6338"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "'pipenv>=2020.5.28'," "" + ''; + + propagatedBuildInputs = [ requests twitch-python pytz python-dateutil ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "tcd" ]; + + meta = with lib; { + description = "Twitch Chat Downloader"; + homepage = "https://github.com/PetterKraabol/Twitch-Chat-Downloader"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/tzupdate/default.nix b/nixpkgs/pkgs/applications/misc/tzupdate/default.nix index 3873f8d248eb..f6416f0f3522 100644 --- a/nixpkgs/pkgs/applications/misc/tzupdate/default.nix +++ b/nixpkgs/pkgs/applications/misc/tzupdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: let inherit (python3.pkgs) buildPythonApplication fetchPypi requests; diff --git a/nixpkgs/pkgs/applications/misc/udiskie/default.nix b/nixpkgs/pkgs/applications/misc/udiskie/default.nix index e2178850da1c..87c49a19a196 100644 --- a/nixpkgs/pkgs/applications/misc/udiskie/default.nix +++ b/nixpkgs/pkgs/applications/misc/udiskie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, asciidoc-full, gettext +{ lib, fetchFromGitHub, asciidoc-full, gettext , gobject-introspection, gtk3, libappindicator-gtk3, libnotify, librsvg , udisks2, wrapGAppsHook , python3Packages diff --git a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index 8c17d2642937..989649ec4146 100644 --- a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , nix-update-script , python3Packages diff --git a/nixpkgs/pkgs/applications/misc/ultralist/default.nix b/nixpkgs/pkgs/applications/misc/ultralist/default.nix index 2943fe29f4a0..af2b6be2b2ff 100644 --- a/nixpkgs/pkgs/applications/misc/ultralist/default.nix +++ b/nixpkgs/pkgs/applications/misc/ultralist/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ultralist"; - version = "1.5.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ultralist"; repo = "ultralist"; rev = version; - sha256 = "09kgf83jn5k35lyrnyzbsy0l1livzmy292qmlbx5dkdpaq5wxnmp"; + sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/nixpkgs/pkgs/applications/misc/urlscan/default.nix index 3e97088371ac..a56a09a8e348 100644 --- a/nixpkgs/pkgs/applications/misc/urlscan/default.nix +++ b/nixpkgs/pkgs/applications/misc/urlscan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "urlscan"; diff --git a/nixpkgs/pkgs/applications/misc/usync/default.nix b/nixpkgs/pkgs/applications/misc/usync/default.nix index 8ab2a485a649..cf51a53e7139 100644 --- a/nixpkgs/pkgs/applications/misc/usync/default.nix +++ b/nixpkgs/pkgs/applications/misc/usync/default.nix @@ -6,9 +6,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ebzzry"; - repo = pname; - rev = "9c87ea8a707a47c3d7f6ef94d07591c5ab594282"; - sha256 = "1r05gw041fz9dkkb70zd6kqw9dd8dhpv87407qxqg43pd7x47kf4"; + repo = "usync"; + rev = "99f11b0c196a81843f55ca3456abcb85149b6d51"; + sha256 = "16i1q8f0jmfd43rb8d70l2b383vr5ib4kh7iq3yd345q7xjz9c2j"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/valentina/default.nix b/nixpkgs/pkgs/applications/misc/valentina/default.nix index 1818ed9a2153..7329d8204cd7 100644 --- a/nixpkgs/pkgs/applications/misc/valentina/default.nix +++ b/nixpkgs/pkgs/applications/misc/valentina/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchhg +{ mkDerivation, lib, fetchhg , qmake, qttools , qtbase, qtsvg, qtxmlpatterns , poppler_utils diff --git a/nixpkgs/pkgs/applications/misc/visidata/default.nix b/nixpkgs/pkgs/applications/misc/visidata/default.nix index 2d0a55983430..b7f9d6ca1a66 100644 --- a/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -15,13 +15,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "018z06bfcw0l4k2zdwbgxna9fss4wdqj64ckw5qjis14sb3zkr28"; + sha256 = "1gkvnywjg0n3n7d855ivclsj3d8mzihhkgv9a18srcszkmyix903"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/vym/default.nix b/nixpkgs/pkgs/applications/misc/vym/default.nix index b4591d8717c6..9d820fc4da70 100644 --- a/nixpkgs/pkgs/applications/misc/vym/default.nix +++ b/nixpkgs/pkgs/applications/misc/vym/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, pkg-config, qmake, qtscript, qtsvg }: +{ lib, mkDerivation, fetchurl, pkg-config, qmake, qtscript, qtsvg }: mkDerivation rec { pname = "vym"; diff --git a/nixpkgs/pkgs/applications/misc/waybar/default.nix b/nixpkgs/pkgs/applications/misc/waybar/default.nix index 8dd18de5d895..0cbe325f62af 100644 --- a/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, wrapGAppsHook -, wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell +{ lib +, stdenv +, fetchFromGitHub +, meson +, pkg-config +, ninja +, wrapGAppsHook +, wayland +, wlroots +, gtkmm3 +, libsigcxx +, jsoncpp +, fmt +, scdoc +, spdlog +, gtk-layer-shell , howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? true, libpulseaudio @@ -7,68 +21,69 @@ , nlSupport ? true, libnl , udevSupport ? true, udev , swaySupport ? true, sway -, mpdSupport ? true, mpd_clientlib +, mpdSupport ? true, libmpdclient , withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl }: - stdenv.mkDerivation rec { - pname = "waybar"; - version = "0.9.5"; - src = fetchFromGitHub { - owner = "Alexays"; - repo = "Waybar"; - rev = version; - sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q"; - }; +stdenv.mkDerivation rec { + pname = "waybar"; + version = "0.9.5"; - nativeBuildInputs = [ - meson ninja pkg-config scdoc wrapGAppsHook cmake - ] ++ lib.optional withMediaPlayer gobject-introspection; + src = fetchFromGitHub { + owner = "Alexays"; + repo = "Waybar"; + rev = version; + sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q"; + }; - propagatedBuildInputs = lib.optionals withMediaPlayer [ - glib - playerctl - python38Packages.pygobject3 - ]; - strictDeps = false; + nativeBuildInputs = [ + meson ninja pkg-config scdoc wrapGAppsHook cmake + ] ++ lib.optional withMediaPlayer gobject-introspection; - buildInputs = with lib; - [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] - ++ optional traySupport libdbusmenu-gtk3 - ++ optional pulseSupport libpulseaudio - ++ optional sndioSupport sndio - ++ optional nlSupport libnl - ++ optional udevSupport udev - ++ optional swaySupport sway - ++ optional mpdSupport mpd_clientlib; + propagatedBuildInputs = lib.optionals withMediaPlayer [ + glib + playerctl + python38Packages.pygobject3 + ]; + strictDeps = false; - mesonFlags = (lib.mapAttrsToList - (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") - { - dbusmenu-gtk = traySupport; - pulseaudio = pulseSupport; - sndio = sndioSupport; - libnl = nlSupport; - libudev = udevSupport; - mpd = mpdSupport; - } - ) ++ [ - "-Dout=${placeholder "out"}" - "-Dsystemd=disabled" - ]; + buildInputs = with lib; + [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] + ++ optional traySupport libdbusmenu-gtk3 + ++ optional pulseSupport libpulseaudio + ++ optional sndioSupport sndio + ++ optional nlSupport libnl + ++ optional udevSupport udev + ++ optional swaySupport sway + ++ optional mpdSupport libmpdclient; - preFixup = lib.optional withMediaPlayer '' + mesonFlags = (lib.mapAttrsToList + (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") + { + dbusmenu-gtk = traySupport; + pulseaudio = pulseSupport; + sndio = sndioSupport; + libnl = nlSupport; + libudev = udevSupport; + mpd = mpdSupport; + } + ) ++ [ + "-Dout=${placeholder "out"}" + "-Dsystemd=disabled" + ]; + + preFixup = lib.optional withMediaPlayer '' cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py wrapProgram $out/bin/waybar-mediaplayer.py \ --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" ''; - meta = with lib; { - description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; - license = licenses.mit; - maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; - platforms = platforms.unix; - homepage = "https://github.com/alexays/waybar"; - }; - } + meta = with lib; { + description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; + license = licenses.mit; + maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; + platforms = platforms.unix; + homepage = "https://github.com/alexays/waybar"; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/wbg/default.nix b/nixpkgs/pkgs/applications/misc/wbg/default.nix new file mode 100644 index 000000000000..4f385ef21740 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/wbg/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchgit +, meson +, ninja +, pkg-config +, git +, scdoc +, cairo +, fcft +, libpng +, librsvg +, libxkbcommon +, pixman +, tllist +, wayland +, wayland-protocols +, wlroots +}: + +stdenv.mkDerivation rec { + pname = "wbg"; + version = "unstable-2020-08-01"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/wbg"; + rev = "1b05bd80d0f40e3ba1e977002d0653f532649269"; + sha256 = "0i1j7aqvj0vl2ww5cvffqci1kjqjn0sw6sp2j0ljblaif6qk9asc"; + }; + + nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; + buildInputs = [ + cairo + fcft + libpng + librsvg + libxkbcommon + pixman + tllist + wayland + wayland-protocols + wlroots + ]; + + meta = with lib; { + description = "Wallpaper application for Wayland compositors"; + homepage = "https://codeberg.org/dnkl/wbg"; + license = licenses.isc; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/wego/default.nix b/nixpkgs/pkgs/applications/misc/wego/default.nix index 74c424a277b1..4bbd0289a156 100644 --- a/nixpkgs/pkgs/applications/misc/wego/default.nix +++ b/nixpkgs/pkgs/applications/misc/wego/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "wego"; diff --git a/nixpkgs/pkgs/applications/misc/wikicurses/default.nix b/nixpkgs/pkgs/applications/misc/wikicurses/default.nix index e234a9007fd5..ec7dff141439 100644 --- a/nixpkgs/pkgs/applications/misc/wikicurses/default.nix +++ b/nixpkgs/pkgs/applications/misc/wikicurses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.4"; diff --git a/nixpkgs/pkgs/applications/misc/wofi/default.nix b/nixpkgs/pkgs/applications/misc/wofi/default.nix index 7b9e38c87d17..d8af28093b9e 100644 --- a/nixpkgs/pkgs/applications/misc/wofi/default.nix +++ b/nixpkgs/pkgs/applications/misc/wofi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "wofi"; - version = "1.2.3"; + version = "1.2.4"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i"; + sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c"; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ elyhaka ]; platforms = with platforms; linux; }; diff --git a/nixpkgs/pkgs/applications/misc/wtf/default.nix b/nixpkgs/pkgs/applications/misc/wtf/default.nix index ad107b644722..4a7b7ad63b75 100644 --- a/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "01zydr1w8byjhxf4xj6z001q4ynq0452cn332ap1l1w0dmx9mxyr"; + sha256 = "sha256-xzMXbF0M7asZtyo8DmM5yyNoHKy0H6amRDhu6hjHgq4="; }; - vendorSha256 = "1xyai417l8q44b562ssp5qqw04klrhg5397ahr4pc3i30csz8a7a"; + vendorSha256 = "sha256-6ij0NQMjDnZJhuqkUR7MdBLAMS5Xa2HKIgQjegKJyvc="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix b/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix index c1af7ae373c6..00ae2df100e3 100644 --- a/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; diff --git a/nixpkgs/pkgs/applications/misc/xmenu/default.nix b/nixpkgs/pkgs/applications/misc/xmenu/default.nix index f29bfcb55fe1..c6a37caf34da 100644 --- a/nixpkgs/pkgs/applications/misc/xmenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xmenu"; - version = "4.4.1"; + version = "4.5.4"; src = fetchFromGitHub { owner = "phillbush"; repo = "xmenu"; rev = "v${version}"; - sha256 = "1s70zvsaqnsjqs298vw3py0vcvia68xlks1wcz37pb88bwligz1x"; + sha256 = "1dy3aqqczs7d3f8rf6h7xssgr3881g8m5y4waskizjy9z7chs64q"; }; buildInputs = [ imlib2 libX11 libXft libXinerama ]; diff --git a/nixpkgs/pkgs/applications/misc/xpdf/default.nix b/nixpkgs/pkgs/applications/misc/xpdf/default.nix index cafbcd4b11c8..e57fb75c11f1 100644 --- a/nixpkgs/pkgs/applications/misc/xpdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/xpdf/default.nix @@ -12,11 +12,11 @@ assert enablePrinting -> cups != null; stdenv.mkDerivation rec { pname = "xpdf"; - version = "4.02"; + version = "4.03"; src = fetchzip { - url = "https://xpdfreader-dl.s3.amazonaws.com/${pname}-${version}.tar.gz"; - sha256 = "0dzwq6fnk013wa4l5mjpvm4mms2mh5hbrxv4rhk2ab5ljbzz7b2w"; + url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz"; + sha256 = "09yhvmh1vxjy763nnmawynygp5bh3j4i8ixqja64j11676yl77n6"; }; # Fix "No known features for CXX compiler", see @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { lib.optional enablePrinting cups ++ lib.optional enablePDFtoPPM freetype; - hardeningDisable = [ "format" ]; - desktopItem = makeDesktopItem { name = "xpdf"; desktopName = "Xpdf"; @@ -48,11 +46,16 @@ stdenv.mkDerivation rec { terminal = "false"; }; - postInstall = '' - install -Dm644 ${desktopItem}/share/applications/xpdf.desktop $out/share/applications/xpdf.desktop + postInstall = lib.optionalString (!stdenv.isDarwin) '' + install -Dm644 ${desktopItem}/share/applications/xpdf.desktop -t $out/share/applications install -Dm644 $src/xpdf-qt/xpdf-icon.svg $out/share/pixmaps/xpdf.svg ''; + # wrapQtAppsHook broken on macOS (https://github.com/NixOS/nixpkgs/issues/102044) + postFixup = lib.optionalString stdenv.isDarwin '' + wrapQtApp $out/bin/xpdf + ''; + meta = with lib; { homepage = "https://www.xpdfreader.com"; description = "Viewer for Portable Document Format (PDF) files"; @@ -69,7 +72,7 @@ stdenv.mkDerivation rec { pdffonts: lists fonts used in PDF files pdfdetach: extracts attached files from PDF files ''; - license = with licenses; [ gpl2 gpl3 ]; + license = with licenses; [ gpl2Only gpl3Only ]; platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; knownVulnerabilities = [ diff --git a/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix b/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix index 342c00aa12e3..065ca813155d 100644 --- a/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix @@ -2,30 +2,34 @@ }: stdenv.mkDerivation { - name = "libxpdf-3.02pl4"; + name = "libxpdf-3.02pl5"; src = fetchurl { - url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz"; + url = "https://dl.xpdfreader.com/old/xpdf-3.02.tar.gz"; sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk"; }; patches = [ (fetchurl { - url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch"; + url = "https://dl.xpdfreader.com/old/xpdf-3.02pl1.patch"; sha256 = "1wxv9l0d2kkwi961ihpdwi75whdvk7cgqxkbfym8cjj11fq17xjq"; }) (fetchurl { - url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch"; + url = "https://dl.xpdfreader.com/old/xpdf-3.02pl2.patch"; sha256 = "1nfrgsh9xj0vryd8h65myzd94bjz117y89gq0hzji9dqn23xihfi"; }) (fetchurl { - url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch"; + url = "https://dl.xpdfreader.com/old/xpdf-3.02pl3.patch"; sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r"; }) (fetchurl { - url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch"; + url = "https://dl.xpdfreader.com/old/xpdf-3.02pl4.patch"; sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h"; }) + (fetchurl { + url = "https://dl.xpdfreader.com/old/xpdf-3.02pl5.patch"; + sha256 = "1fki66pw56yr6aw38f6amrx7wxwcxbx4704pjqq7pqqr784b7z4j"; + }) ./xpdf-3.02-protection.patch ./libxpdf.patch ]; @@ -48,6 +52,6 @@ stdenv.mkDerivation { meta = with lib; { platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/nixpkgs/pkgs/applications/misc/yambar/default.nix b/nixpkgs/pkgs/applications/misc/yambar/default.nix new file mode 100644 index 000000000000..47d02a0cec93 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/yambar/default.nix @@ -0,0 +1,86 @@ +{ stdenv +, lib +, fetchgit +, pkg-config +, meson +, ninja +, scdoc +, alsaLib +, fcft +, json_c +, libmpdclient +, libxcb +, libyaml +, pixman +, tllist +, udev +, wayland +, wayland-protocols +, xcbutil +, xcbutilcursor +, xcbutilerrors +, xcbutilwm +}: + +stdenv.mkDerivation rec { + pname = "yambar"; + version = "1.6.1"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/yambar.git"; + rev = version; + sha256 = "p47tFsEWsYNe6IVV65xGG211u6Vm2biRf4pmUDylBOQ="; + }; + + nativeBuildInputs = [ pkg-config meson ninja scdoc ]; + buildInputs = [ + alsaLib + fcft + json_c + libmpdclient + libxcb + libyaml + pixman + tllist + udev + wayland + wayland-protocols + xcbutil + xcbutilcursor + xcbutilerrors + xcbutilwm + ]; + + meta = with lib; { + homepage = "https://codeberg.org/dnkl/yambar"; + description = "Modular status panel for X11 and Wayland"; + longDescription = '' + yambar is a lightweight and configurable status panel (bar, for short) for + X11 and Wayland, that goes to great lengths to be both CPU and battery + efficient - polling is only done when absolutely necessary. + + It has a number of modules that provide information in the form of + tags. For example, the clock module has a date tag that contains the + current date. + + The modules do not know how to present the information though. This is + instead done by particles. And the user, you, decides which particles (and + thus how to present the data) to use. + + Furthermore, each particle can have a decoration - a background color or a + graphical underline, for example. + + There is no support for images or icons. use an icon font (e.g. Font + Awesome, or Material Icons) if you want a graphical representation. + + There are a number of modules and particles builtin. More can be added as + plugins. You can even write your own! + + To summarize: a bar displays information provided by modules, using + particles and decorations. How is configured by you. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/yokadi/default.nix b/nixpkgs/pkgs/applications/misc/yokadi/default.nix index ca329521142c..e31a69963ff0 100644 --- a/nixpkgs/pkgs/applications/misc/yokadi/default.nix +++ b/nixpkgs/pkgs/applications/misc/yokadi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonApplication, dateutil, +{ lib, fetchurl, buildPythonApplication, dateutil, sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { diff --git a/nixpkgs/pkgs/applications/misc/zk-shell/default.nix b/nixpkgs/pkgs/applications/misc/zk-shell/default.nix index 5e27f9d45b6a..1dbaa842ba43 100644 --- a/nixpkgs/pkgs/applications/misc/zk-shell/default.nix +++ b/nixpkgs/pkgs/applications/misc/zk-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.0.0"; diff --git a/nixpkgs/pkgs/applications/misc/zscroll/default.nix b/nixpkgs/pkgs/applications/misc/zscroll/default.nix index 748bc21ee35f..3acac8b3c68d 100644 --- a/nixpkgs/pkgs/applications/misc/zscroll/default.nix +++ b/nixpkgs/pkgs/applications/misc/zscroll/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, python3Packages, fetchFromGitHub }: +{ lib, python3, python3Packages, fetchFromGitHub }: let version = "1.0"; in diff --git a/nixpkgs/pkgs/applications/networking/Sylk/default.nix b/nixpkgs/pkgs/applications/networking/Sylk/default.nix index 7391ad4c688c..c514ec22f110 100644 --- a/nixpkgs/pkgs/applications/networking/Sylk/default.nix +++ b/nixpkgs/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.9.4"; + version = "3.0.1"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-LnJ8Pd+AHIrHrYpIx+rxnFKZ1uh2viDHC5TaU1BL62s="; + hash = "sha256-VgepO7LHFmNKq/H0RFcIkafgtiVGt8K/LdiCO5Dw2s4="; }; profile = '' diff --git a/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index 56f2162bf08b..a1ea1d64c63f 100644 --- a/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -96,11 +96,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.3.2"; + version = "5.3.3"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "123d4mx2nsh8q3ckm4g2chdcdwgg0cz9cvhiwjggxzvy7j6bqgy4"; + sha256 = "1854m93mr2crg68zhh1pgwwis0dqdv0778wqrb8dz9sdz940rza8"; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch b/nixpkgs/pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch new file mode 100644 index 000000000000..fb551646b7c6 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch @@ -0,0 +1,44 @@ +From 04933c578f51aa1f536991318dc5aede57f81c0d Mon Sep 17 00:00:00 2001 +From: Attila Lendvai <attila@lendvai.name> +Date: Sat, 30 Jan 2021 14:02:02 +0100 +Subject: [PATCH 1/2] clef-service: accept default CONFIGDIR from the + environment + +--- + packaging/bee-clef-service | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/packaging/bee-clef-service b/packaging/bee-clef-service +index 10bcd92..34c7edd 100755 +--- a/packaging/bee-clef-service ++++ b/packaging/bee-clef-service +@@ -1,16 +1,21 @@ + #!/usr/bin/env sh + + start() { +- KEYSTORE=/var/lib/bee-clef/keystore +- CONFIGDIR=/var/lib/bee-clef ++ if [ -z "$CONFIGDIR" ]; then ++ CONFIGDIR=/var/lib/bee-clef ++ fi ++ if [ -z "$PASSWORD_FILE" ]; then ++ PASSWORD_FILE=${CONFIGDIR}/password ++ fi ++ KEYSTORE=${CONFIGDIR}/keystore ++ SECRET=$(cat ${PASSWORD_FILE}) + CHAINID=5 +- SECRET=$(cat /var/lib/bee-clef/password) + # clef with every start sets permissions back to 600 +- (sleep 4; chmod 660 /var/lib/bee-clef/clef.ipc) & ++ (sleep 4; chmod 660 ${CONFIGDIR}/clef.ipc) & + ( sleep 2; cat << EOF + { "jsonrpc": "2.0", "id":1, "result": { "text":"$SECRET" } } + EOF +-) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath /var/lib/bee-clef ++) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR} + } + + stop() { +-- +2.29.2 + diff --git a/nixpkgs/pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch b/nixpkgs/pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch new file mode 100644 index 000000000000..611aed0b890a --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch @@ -0,0 +1,25 @@ +From 1a1ab986245e8b74648a1a0adb5d1c7019561d18 Mon Sep 17 00:00:00 2001 +From: Attila Lendvai <attila@lendvai.name> +Date: Sat, 30 Jan 2021 15:24:57 +0100 +Subject: [PATCH 2/2] nix diff for substituteAll + +--- + packaging/bee-clef-service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/packaging/bee-clef-service b/packaging/bee-clef-service +index 34c7edd..31e9d95 100755 +--- a/packaging/bee-clef-service ++++ b/packaging/bee-clef-service +@@ -15,7 +15,7 @@ start() { + ( sleep 2; cat << EOF + { "jsonrpc": "2.0", "id":1, "result": { "text":"$SECRET" } } + EOF +-) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR} ++) | @clefBinary@ --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules @out@/share/bee-clef/rules.js --nousb --4bytedb-custom @out@/share/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR} + } + + stop() { +-- +2.29.2 + diff --git a/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix b/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix new file mode 100644 index 000000000000..a94386ea3f11 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix @@ -0,0 +1,57 @@ +{ version ? "release", stdenv, lib, substituteAll, fetchFromGitHub, go-ethereum }: + +stdenv.mkDerivation rec { + pname = "bee-clef"; + version = "0.4.7"; + + src = fetchFromGitHub { + owner = "ethersphere"; + repo = "bee-clef"; + rev = "refs/tags/v${version}"; + sha256 = "1sfwql0kvnir8b9ggpqcyc0ar995gxgfbhqb1xpfzp6wl0g3g4zz"; + }; + + buildInputs = [ go-ethereum ]; + + clefBinary = "${go-ethereum}/bin/clef"; + + patches = [ + ./0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch + ./0002-nix-diff-for-substituteAll.patch + ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin/ + mkdir -p $out/share/bee-clef/ + mkdir -p $out/lib/systemd/system/ + cp packaging/bee-clef.service $out/lib/systemd/system/ + substituteAll packaging/bee-clef-service $out/share/bee-clef/bee-clef-service + substituteAll ${./ensure-clef-account} $out/share/bee-clef/ensure-clef-account + substituteAll packaging/bee-clef-keys $out/bin/bee-clef-keys + cp packaging/rules.js packaging/4byte.json $out/share/bee-clef/ + chmod +x $out/bin/bee-clef-keys + chmod +x $out/share/bee-clef/bee-clef-service + chmod +x $out/share/bee-clef/ensure-clef-account + patchShebangs $out/ + ''; + + meta = with lib; { + # homepage = "https://gateway.ethswarm.org/bzz/docs.swarm.eth/docs/installation/bee-clef/"; + homepage = "https://docs.ethswarm.org/docs/installation/bee-clef"; + description = "External signer for Ethereum Swarm Bee"; + longDescription = '' + clef is go-ethereum's external signer. + + bee-clef is a package that starts up a vanilla clef instance as a systemd service, + but configured in such a way that is suitable for bee (relaxed security for + automated operation). + + This package contains the files necessary to run the bee-clef service. + ''; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ attila-lendvai ]; + platforms = go-ethereum.meta.platforms; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/bee/bee.nix b/nixpkgs/pkgs/applications/networking/bee/bee.nix new file mode 100644 index 000000000000..5ffff9187500 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/bee/bee.nix @@ -0,0 +1,77 @@ +{ version ? "release", stdenv, lib, fetchFromGitHub, buildGoModule, coreutils }: + +let + + versionSpec = rec { + unstable = rec { + pname = "bee-unstable"; + version = "2021-01-30"; + rev = "824636a2c2629c329ab10275cef6a0b7395343ad"; + goVersionString = "g" + builtins.substring 0 7 rev; # this seems to be some kind of standard of git describe... + sha256 = "0ly1yqjq29arbak8lchdradf39l5bmxpbfir6ljjc7nyqdxz0sxg"; + vendorSha256 = "0w1db7xpissdpf8i5bb96z92zbasj5x9kk3kcisxn0dwla6n55n3"; + }; + release = rec { + pname = "bee"; + version = "0.4.2"; + rev = "refs/tags/v${version}"; + sha256 = "1jg7aivsgdb9bm87dlmwpf1g6gla8j6v55xmzs8h5xmwqcybbmag"; + vendorSha256 = "0w1db7xpissdpf8i5bb96z92zbasj5x9kk3kcisxn0dwla6n55n3"; + }; + "0.4.2" = release; + "0.4.1" = rec { + pname = "bee"; + version = "0.4.1"; + rev = "refs/tags/v${version}"; + sha256 = "1bmgbav52pcb5p7cgq9756512fzfqhjybyr0dv538plkqx47mpv7"; + vendorSha256 = "0j393va4jrg9q3wlc9mgkbpgnn2w2s3k2hcn8phzj8d5fl4n4v2h"; + }; + }.${version}; + +in + +buildGoModule { + inherit (versionSpec) pname version vendorSha256; + + src = fetchFromGitHub { + owner = "ethersphere"; + repo = "bee"; + inherit (versionSpec) rev sha256; + }; + + nativeBuildInputs = [ coreutils ]; + + subPackages = [ "cmd/bee" ]; + + # no symbol table, no debug info, and pass the commit for the version string + buildFlags = lib.optionalString ( lib.hasAttr "goVersionString" versionSpec) + "-ldflags -s -ldflags -w -ldflags -X=github.com/ethersphere/bee.commit=${versionSpec.goVersionString}"; + + # Mimic the bee Makefile: without disabling CGO, two (transitive and + # unused) dependencies would fail to compile. + preBuild = '' + export CGO_ENABLED=0 + ''; + + postInstall = '' + mkdir -p $out/lib/systemd/system + cp packaging/bee.service $out/lib/systemd/system/ + cp packaging/bee-get-addr $out/bin/ + chmod +x $out/bin/bee-get-addr + patchShebangs $out/bin/ + ''; + + meta = with lib; { + homepage = "https://swarm.ethereum.org/"; + description = "Ethereum Swarm Bee"; + longDescription = '' + A decentralised storage and communication system for a sovereign digital society. + + Swarm is a system of peer-to-peer networked nodes that create a decentralised storage and communication service. The system is economically self-sustaining due to a built-in incentive system enforced through smart contracts on the Ethereum blockchain. + + Bee is a Swarm node implementation, written in Go. + ''; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ attila-lendvai ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/bee/ensure-clef-account b/nixpkgs/pkgs/applications/networking/bee/ensure-clef-account new file mode 100644 index 000000000000..def67ff9cc33 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/bee/ensure-clef-account @@ -0,0 +1,47 @@ +#!/usr/bin/env sh + +set -e + +# NOTE This file is called by the systemd service in its preStart +# hook, but it's not Nix specific in any way. Ideally, the same file +# should be called from the postinst scripts of the other packages, +# but... the world is not ideal. + +# What follows was extracted from, and should be in sync with +# https://github.com/ethersphere/bee-clef/tree/master/packaging + +DATA_DIR="$1" +CONFIG_DIR="$2" +PASSWORD_FILE=${DATA_DIR}/password +MASTERSEED=${DATA_DIR}/masterseed.json +KEYSTORE=${DATA_DIR}/keystore + +echo "ensure-clef-account $DATA_DIR $CONFIG_DIR" + +if ! test -f ${PASSWORD_FILE}; then + < /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 > ${PASSWORD_FILE} + chmod 0400 ${PASSWORD_FILE} + echo "Initialized ${PASSWORD_FILE} from /dev/urandom" +fi + +if ! test -f ${MASTERSEED}; then + parse_json() { echo $1|sed -e 's/[{}]/''/g'|sed -e 's/", "/'\",\"'/g'|sed -e 's/" ,"/'\",\"'/g'|sed -e 's/" , "/'\",\"'/g'|sed -e 's/","/'\"---SEPERATOR---\"'/g'|awk -F=':' -v RS='---SEPERATOR---' "\$1~/\"$2\"/ {print}"|sed -e "s/\"$2\"://"|tr -d "\n\t"|sed -e 's/\\"/"/g'|sed -e 's/\\\\/\\/g'|sed -e 's/^[ \t]*//g'|sed -e 's/^"//' -e 's/"$//' ; } + SECRET=$(cat ${PASSWORD_FILE}) + CLEF="@clefBinary@ --configdir ${DATA_DIR} --keystore ${KEYSTORE} --stdio-ui" + $CLEF init >/dev/null << EOF +$SECRET +$SECRET +EOF + $CLEF newaccount >/dev/null << EOF +$SECRET +EOF + $CLEF setpw 0x$(parse_json $(cat ${KEYSTORE}/*) address) >/dev/null << EOF +$SECRET +$SECRET +$SECRET +EOF + $CLEF attest $(sha256sum ${CONFIG_DIR}/rules.js | cut -d' ' -f1 | tr -d '\n') >/dev/null << EOF +$SECRET +EOF + echo "Clef data dir initialized" +fi diff --git a/nixpkgs/pkgs/applications/networking/brig/default.nix b/nixpkgs/pkgs/applications/networking/brig/default.nix index a56a586b82a1..20b685a162fe 100644 --- a/nixpkgs/pkgs/applications/networking/brig/default.nix +++ b/nixpkgs/pkgs/applications/networking/brig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "brig"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix b/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix index 2184c8d699a4..afd2e9b9c1a7 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix @@ -12,6 +12,10 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ]; + # No tests are available + doCheck = false; + pythonImportsCheck = [ "av98" ]; + meta = with lib; { homepage = "https://tildegit.org/solderpunk/AV-98"; description = "Experimental console client for the Gemini protocol"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index e4d3f5484e23..6e772c7931db 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -38,7 +38,7 @@ , udev , xorg , zlib -, xdg_utils +, xdg-utils , wrapGAppsHook }: @@ -79,7 +79,7 @@ rpath = lib.makeLibraryPath [ nss pango udev - xdg_utils + xdg-utils xorg.libxcb zlib ]; @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.19.86"; + version = "1.19.88"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "fnkxfhuYTDKPrXSNlG0SlgDls4jnV146wrhxg1crR9c="; + sha256 = "jySedvm9V3O4kri1PgoqC0OsC1gvB0Nwx8leoUZnHK0="; }; dontConfigure = true; @@ -144,8 +144,8 @@ stdenv.mkDerivation rec { done # Replace xdg-settings and xdg-mime - ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings - ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime + ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings + ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime ''; installCheckPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix b/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix index aa57b9a17f64..e106eb7ff664 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: +{ lib, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: let version = "1.6.4"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix b/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix index 6482ce59da6c..be3d8295f991 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , rustPlatform , pkg-config diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md b/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md index 9d23e3143c60..9576cb486288 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md @@ -1,11 +1,11 @@ # Maintainers -- TODO: We need more maintainers: - - https://github.com/NixOS/nixpkgs/issues/78450 - - If you just want to help out without becoming a maintainer: - - Look for open Nixpkgs issues or PRs related to Chromium - - Make your own PRs (but please try to make reviews as easy as possible) -- Primary maintainer (responsible for updating Chromium): @primeos +- Note: We could always use more contributors, testers, etc. E.g.: + - A dedicated maintainer for the NixOS stable channel + - PRs with cleanups, improvements, fixes, etc. (but please try to make reviews + as easy as possible) + - People who handle stale issues/PRs +- Primary maintainer (responsible for all updates): @primeos - Testers (test all stable channel updates) - `nixos-unstable`: - `x86_64`: @danielfullmer @@ -13,11 +13,14 @@ - Stable channel: - `x86_64`: @Frostman - Other relevant packages: - - `chromiumBeta` and `chromiumDev`: For testing purposes (not build on Hydra) + - `chromiumBeta` and `chromiumDev`: For testing purposes only (not build on + Hydra). We use these channels for testing and to fix build errors in advance + so that `chromium` updates are trivial and can be merged fast. - `google-chrome`, `google-chrome-beta`, `google-chrome-dev`: Updated via Chromium's `upstream-info.json` - - `ungoogled-chromium`: Based on `chromium` (the expressions are regularly - copied over and patched accordingly) + - `ungoogled-chromium`: @squalus + - `chromedriver`: Updated via Chromium's `upstream-info.json` and not built + from source. # Upstream links @@ -36,6 +39,11 @@ update `upstream-info.json`. After updates it is important to test at least `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which reuses `upstream-info.json`). +Note: The source tarball is often only available a few hours after the release +was announced. The CI/CD status can be tracked here: +- https://ci.chromium.org/p/infra/builders/cron/publish_tarball +- https://ci.chromium.org/p/infra/builders/cron/publish_tarball_dispatcher + To run all automated NixOS VM tests for Chromium, ungoogled-chromium, and Google Chrome (not recommended, currently 6x tests!): ``` @@ -79,3 +87,13 @@ that a new major release of LLVM is required. Those channels are only used to test and fix builds in advance. They may be broken at times and must not delay stable channel updates. + +# Testing + +Useful tests: +- Version: chrome://version/ +- GPU acceleration: chrome://gpu/ +- Essential functionality: Browsing, extensions, video+audio, JS, ... +- WebGL: https://get.webgl.org/ +- VA-API: https://wiki.archlinux.org/index.php/chromium#Hardware_video_acceleration +- Optional: Widevine CDM (proprietary), Benchmarks, Ozone, etc. diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix index 22d21a5efa5b..c4a5508b7537 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkChromiumDerivation, channel, enableWideVine, ungoogled }: +{ lib, mkChromiumDerivation, channel, enableWideVine, ungoogled }: with lib; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 2b7cdb9b4b7c..d93fc5ceb405 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -4,7 +4,7 @@ , gnutar, bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libcap -, xdg_utils, yasm, nasm, minizip, libwebp +, xdg-utils, yasm, nasm, minizip, libwebp , libusb1, pciutils, nss, re2 , python2Packages, perl, pkg-config @@ -19,13 +19,12 @@ , jre8 , pipewire_0_2 , libva +, libdrm, wayland, mesa, libxkbcommon # Ozone # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport -, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone # package customization -, useOzone ? true , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -89,7 +88,7 @@ let bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy libpng libcap - xdg_utils minizip libwebp + xdg-utils minizip libwebp libusb1 re2 ffmpeg libxslt libxml2 nasm @@ -101,12 +100,14 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; + chromiumVersionAtLeast = min-version: + versionAtLeast upstream-info.version min-version; versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (importJSON ./upstream-info.json).stable.version; - in if versionAtLeast stable-version upto-version - then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." + ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version; + in if versionAtLeast ungoogled-version upto-version + then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." result else result; @@ -141,17 +142,21 @@ let jre pipewire_0_2 libva + libdrm wayland mesa.drivers libxkbcommon ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ]; + ++ optional pulseSupport libpulseaudio; patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags - # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) - ]; + # ++ optional (versionRange "68" "72") (githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000") + ] ++ optional (versionRange "89" "90.0.4402.0") (githubPatch + # To fix the build of chromiumBeta and chromiumDev: + "b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs + "1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x" + ); postPatch = '' # remove unused third-party @@ -190,7 +195,7 @@ let '/usr/share/locale/' \ '${glibc}/share/locale/' - sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ + sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ @@ -220,11 +225,11 @@ let ''; gnFlags = mkGnFlags ({ + is_official_build = true; custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; - is_official_build = true; + system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; - use_vaapi = !stdenv.isAarch64; # TODO: Remove once M88 is released use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; use_gio = gnomeSupport; @@ -260,15 +265,16 @@ let } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs useOzone { - use_ozone = true; - use_xkbcommon = true; - use_glib = true; - use_gtk = true; - use_system_libwayland = true; - use_system_minigbm = true; - use_system_libdrm = true; - system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + } // optionalAttrs (chromiumVersionAtLeast "89") { + # Disable PGO (defaults to 2 since M89) because it fails without additional changes: + # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version + chrome_pgo_phase = 0; + } // optionalAttrs (chromiumVersionAtLeast "90") { + # Disable build with TFLite library because it fails without additional changes: + # ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it + # Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz + # See also chrome/services/machine_learning/README.md + build_with_tflite_lib = false; } // optionalAttrs ungoogled { chrome_pgo_phase = 0; enable_hangout_services_extension = false; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index f8eee605b8ef..79899d822b00 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils +, llvmPackages_11, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 @@ -12,7 +12,6 @@ , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true -, enablePepperFlash ? false , enableWideVine ? false , enableVaapi ? false # Disabled by default due to unofficial support , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -45,24 +44,29 @@ let browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; - plugins = callPackage ./plugins.nix { - inherit enablePepperFlash; - }; - ungoogled-chromium = callPackage ./ungoogled.nix {}; }; pkgSuffix = if channel == "dev" then "unstable" else (if channel == "ungoogled-chromium" then "stable" else channel); pkgName = "google-chrome-${pkgSuffix}"; - chromeSrc = fetchurl { - urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ - "https://dl.google.com/linux/chrome/deb/pool/main/g" - "http://95.31.35.30/chrome/pool/main/g" - "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" - "http://repo.fdzh.org/chrome/deb/pool/main/g" - ]; - sha256 = chromium.upstream-info.sha256bin64; + chromeSrc = + let + # Use the latest stable Chrome version if necessary: + version = if chromium.upstream-info.sha256bin64 != null + then chromium.upstream-info.version + else (lib.importJSON ./upstream-info.json).stable.version; + sha256 = if chromium.upstream-info.sha256bin64 != null + then chromium.upstream-info.sha256bin64 + else (lib.importJSON ./upstream-info.json).stable.sha256bin64; + in fetchurl { + urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ + "https://dl.google.com/linux/chrome/deb/pool/main/g" + "http://95.31.35.30/chrome/pool/main/g" + "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" + "http://repo.fdzh.org/chrome/deb/pool/main/g" + ]; + inherit sha256; }; mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; @@ -157,7 +161,6 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; libPath = lib.makeLibraryPath [ libva pipewire_0_2 ]; in with lib; '' @@ -165,8 +168,7 @@ in stdenv.mkDerivation { eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ - ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \ - ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} + ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} ed -v -s "$out/bin/chromium" << EOF 2i @@ -190,7 +192,7 @@ in stdenv.mkDerivation { export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS # Mainly for xdg-open but also other xdg-* tools: - export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH" + export PATH="${xdg-utils}/bin\''${PATH:+:}\$PATH" . w diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix deleted file mode 100644 index 355f56331720..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv, gcc -, jshon -, glib -, nspr -, nss -, fetchzip -, enablePepperFlash ? false - -, upstream-info -}: - -with lib; - -let - mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; - - # Generate a shell fragment that emits flags appended to the - # final makeWrapper call for wrapping the browser's main binary. - # - # Note that this is shell-escaped so that only the variable specified - # by the "output" attribute is substituted. - mkPluginInfo = { output ? "out", allowedVars ? [ output ] - , flags ? [], envVars ? {} - }: let - shSearch = ["'"] ++ map (var: "@${var}@") allowedVars; - shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars; - # We need to triple-escape "val": - # * First because makeWrapper doesn't do any quoting of its arguments by - # itself. - # * Second because it's passed to the makeWrapper call separated by IFS but - # not by the _real_ arguments, for example the Widevine plugin flags - # contain spaces, so they would end up as separate arguments. - # * Third in order to be correctly quoted for the "echo" call below. - shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; - mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'"; - mkFlag = flag: ["--add-flags" (shEsc flag)]; - mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)]; - envList = mapAttrsToList mkEnvVar envVars; - quoted = map mkSh (flatten ((map mkFlag flags) ++ envList)); - in '' - mkdir -p "''$${output}/nix-support" - echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" - ''; - - flash = stdenv.mkDerivation rec { - pname = "flashplayer-ppapi"; - version = "32.0.0.465"; - - src = fetchzip { - url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "16qbc2s8dg2rwggphf8f5665iccc6lrvgz45bdwskg9pwg87hlj1"; - stripRoot = false; - }; - - patchPhase = '' - chmod +x libpepflashplayer.so - patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so - ''; - - doCheck = true; - checkPhase = '' - ! find -iname '*.so' -exec ldd {} + | grep 'not found' - ''; - - installPhase = '' - flashVersion="$( - "${jshon}/bin/jshon" -F manifest.json -e version -u - )" - - install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so" - - ${mkPluginInfo { - allowedVars = [ "out" "flashVersion" ]; - flags = [ - "--ppapi-flash-path=@out@/lib/libpepflashplayer.so" - "--ppapi-flash-version=@flashVersion@" - ]; - }} - ''; - - dontStrip = true; - - meta = { - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ taku0 ]; - platforms = platforms.x86_64; - }; - }; - -in { - enabled = optional enablePepperFlash flash; -} diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py index 314d000e08a2..d6788fa41927 100755 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py @@ -13,6 +13,7 @@ import sys from codecs import iterdecode from collections import OrderedDict from datetime import datetime +from distutils.version import LooseVersion from os.path import abspath, dirname from urllib.request import urlopen @@ -122,7 +123,7 @@ def print_updates(channels_old, channels_new): for channel_name in channels_old: version_old = channels_old[channel_name]["version"] version_new = channels_new[channel_name]["version"] - if version_old < version_new: + if LooseVersion(version_old) < LooseVersion(version_new): attr_name = channel_name_to_attr_name(channel_name) print(f'- {attr_name}: {version_old} -> {version_new}') @@ -165,9 +166,18 @@ with urlopen(HISTORY_URL) as resp: f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb') except subprocess.CalledProcessError: - # This build isn't actually available yet. Continue to - # the next one. - continue + if (channel_name == 'ungoogled-chromium' and 'sha256' in channel and + build['version'].split('.')[0] == last_channels['stable']['version'].split('.')[0]): + # Sometimes ungoogled-chromium is updated to a newer tag than + # the latest stable Chromium version. In this case we'll set + # sha256bin64 to null and the Nixpkgs code will fall back to + # the latest stable Google Chrome (only required for + # Widevine/DRM which is disabled by default): + channel['sha256bin64'] = None + else: + # This build isn't actually available yet. Continue to + # the next one. + continue channel['deps'] = get_channel_dependencies(channel['version']) if channel_name == 'stable': diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index b095353c6322..38d1d535076e 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "88.0.4324.96", - "sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9", - "sha256bin64": "09210781s9y49l6qkbd1v8w52741rmhxz6cc6qsldnqpm5mwlgsc", + "version": "88.0.4324.150", + "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", + "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", "deps": { "gn": { "version": "2020-11-05", @@ -12,51 +12,51 @@ } }, "chromedriver": { - "version": "88.0.4324.27", - "sha256_linux": "1vx1llg0x6903ggqa345iswd63y9c24184zv784q01zqxqwn0g8p", - "sha256_darwin": "0x1s6crfwkcn86w6p8g4vmx5raqlr41pjr4h2dbwppgrc0nx1p14" + "version": "88.0.4324.96", + "sha256_linux": "0hhy3c50hlnic6kz19565s8wv2yn7k45hxnkxbvb46zhcc5s2z41", + "sha256_darwin": "11mzcmp6dr8wzyv7v2jic7l44lr77phi4y3z1ghszhfdz5dil5xp" } }, "beta": { - "version": "88.0.4324.96", - "sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9", - "sha256bin64": "1v7bpidqs8y3k7kzfp52q8xsdc515mnf9arfw9pp5bsp79fl3rik", + "version": "89.0.4389.47", + "sha256": "022fq3mbd3j9a7lf02936ks0yvf73bwz1ws6m6zmnn9v8waardj2", + "sha256bin64": "09gjbg8678xfh22r3gzjvrkhgda77pr8an4j5ka5672jvhj4hbq9", "deps": { "gn": { - "version": "2020-11-05", + "version": "2021-01-07", "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" + "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140", + "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" } } }, "dev": { - "version": "89.0.4389.9", - "sha256": "12jiy5p1cbrs0gc3kd86walcnh038lzs5gnb9vif45f7kxn3c9pm", - "sha256bin64": "1wmidvf5gfm1xkpaj07gsvyk1r8b6jbcv46w5vclydlc1r6wh81s", + "version": "90.0.4412.3", + "sha256": "1yjpfircdl38nrjh3an469g7q8178jyvawkfpnzc5aqsgkpkl442", + "sha256bin64": "1asdjicb4l4l2ak3fkxcwdx1avpc1m8wvyhxmj1k3bqa4qmvz3hz", "deps": { "gn": { - "version": "2021-01-07", + "version": "2021-01-25", "url": "https://gn.googlesource.com/gn", - "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140", - "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" + "rev": "55ad154c961d8326315b1c8147f4e504cd95e9e6", + "sha256": "0x5i1axkg44z412357sdb6kgs1h9ykzy8p5c7s40bybs4hg33lkc" } } }, "ungoogled-chromium": { - "version": "87.0.4280.141", - "sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l", - "sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp", + "version": "88.0.4324.150", + "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", + "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", "deps": { "gn": { - "version": "2020-09-09", + "version": "2020-11-05", "url": "https://gn.googlesource.com/gn", - "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", - "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", + "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" }, "ungoogled-patches": { - "rev": "87.0.4280.141-1", - "sha256": "0r09d27jrdz01rcwifchbq7ksh2bac15h8svq18jx426mr56dzla" + "rev": "88.0.4324.150-1", + "sha256": "0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y" } } } diff --git a/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix b/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix index 6b3b63512307..874a73dae8e8 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, meson, ninja, pkg-config, nix-update-script +{ lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook, gnome3 }: diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 20101258da5c..6b8a3b1c3381 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -201,6 +201,6 @@ stdenv.mkDerivation { url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; platforms = builtins.attrNames mozillaPlatforms; - maintainers = with maintainers; [ taku0 ]; + maintainers = with maintainers; [ taku0 lovesegfault ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index dbca2e9c92c9..4d72f2106198 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "84.0.2"; + version = "85.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ach/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ach/firefox-85.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "00ad2b1cf208c43fef463979c39a6e1f272d360b4b539e3255aa9f17bbc115be"; + sha256 = "24a938fb96347b938db028452e5a1b9f6c63c43f1e9b7ff0bf2a43f92d1df45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/af/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/af/firefox-85.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "fa9b27a4e23dbad3bc87ba275df4cc87f44bfe13f009268f4ea70ff31ec6e847"; + sha256 = "5799e2c1c5408da29f9922cd1a694a0ef7d4250b504dd827d5cdeeb41bc7de6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/an/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/an/firefox-85.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "074206329118376889a1a8f414617c821e9fbbc35a8f9b8d38f3dcd1622280cc"; + sha256 = "04ee06350b7cc1f1ab808e8cff3d02060effbb9fa656c2f687b7cbe9d18b9c2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ar/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ar/firefox-85.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8871b4c191aed7f5923f4dd64254a41e03780c66f4179c3a54768758c2f99f5e"; + sha256 = "a92dbd6c4253a8ded0cf4681a6c165e6809e495d1aba84d2158b80d571c1c660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ast/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ast/firefox-85.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a2a143d21d9381410896ac90fd359a086859183fb5e8f18a71157be4263ae481"; + sha256 = "eeee2c9a00ab94630f331d7f1e781ba5085415d816d403e14f356717cf5fa967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/az/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/az/firefox-85.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "f8493138759fbf0d2e9f13c3510c51b1b343fc2e10eef9b96d083a35e9a57a26"; + sha256 = "107fab10c5ac5947676509fce31dec23e70b4cc2f1467e914157fab0555dbada"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/be/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/be/firefox-85.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a943d5f372ab63cef96d351f52d248cd2b575756b8a53c9d17b88035c8022bad"; + sha256 = "a04273533574232e0b2c370e2d48ab2206b53b45743543fe0efeea8bd51988cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/bg/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bg/firefox-85.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d3c12c9a43ae9728fffbcf016a03bcf1411fb891e8bb84a58b9f3cb5adfb9a68"; + sha256 = "0b18c8862ce9c26cb63919c3bd3aa911b6179eebcbc9a38001953b49dd09ad36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/bn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bn/firefox-85.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "95c19322009f9f8be9f2e11d0baa530111db13fe65d93e93d97f8953e8653741"; + sha256 = "8aa13bccd6fcd9f9c91a18dae807394dc46ea32103608c829d4dd073861b95f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/br/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/br/firefox-85.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "20178f91bbb29ab3994db94fcb0929a15754395a6c5c1a2a5f292a3e0fe97ff6"; + sha256 = "121f9474e56deb5f2a606aa153c8f3c6b857f0966c9843257d22a8be01b609a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/bs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bs/firefox-85.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c61a7cf7cc981175a2041534dc90548be21973c7b520a6e4f3da45e7d8f5b509"; + sha256 = "c4781d938cd86988edc31674a46acb0120209b101d9b563c20ec6a213d161a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ca-valencia/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ca-valencia/firefox-85.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "a52c5fdc41d360a660330ecc055ebd2206a7ada996af17bf76d97e5a82dc552d"; + sha256 = "f0b0e35ae0ba98d0585c45a660c85345b71f834e61875f923713f0c05a78509d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ca/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ca/firefox-85.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1d827df4ff4ae8eecf1cbb888c8f011ab0320c05a878da0b24e8e0b4abfb1a59"; + sha256 = "1208d84a85694ce1327c9a8ab6cdb6aeb45b990704bbb9fef9b1edd664597fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/cak/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cak/firefox-85.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "dfff83803ed04547aa8c8c9b12ee2fda7388017e8e17bab3d2d1244026779b8d"; + sha256 = "ddbc3a5d3283994b7408fd8970023b71178c83db12ba8be54553395791bc9ace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/cs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cs/firefox-85.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "601b791c8829653f4eabb08c5d66fba83acddd001b1ccfe2f1f3b615808c9928"; + sha256 = "c02faaf56a820c45bb38119c03becc53cd2ae25e93bed3ad93cc88f091b00a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/cy/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cy/firefox-85.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "aa14be4f6e6adebfd11e334a305355ed4cf199d3d578c7648b6f42fe73275b3d"; + sha256 = "1d206ea516202af87511d13cbd8482b9dcbeca2447ac8b684937668afac68439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/da/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/da/firefox-85.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dcc37cc52c473b77f9944eae767cc218330bad1d4753e3da7ae9bc1d59b6ea5f"; + sha256 = "68976d8cd0ce910c6b8155a68a955f4dfd182fe7625ea3386f083fff27f216a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/de/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/de/firefox-85.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5d7332a8b02c84afdca3fa0876087312dc8abfb4307cfd12896aa9671b6dc855"; + sha256 = "6510c8105420027f1632da15060d332f9ec93353c03111a592477bf45dae5925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/dsb/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/dsb/firefox-85.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a79e0512916e0258d73815fc32c343a908c2bf684a3ee55f6603ed2bff204261"; + sha256 = "736a478e15f11126ad5dbdca66cd8938d72602041ff0c1f5f78101d4f62b1aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/el/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/el/firefox-85.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "fcf89299094d3757c8cec828ea43befc02cc258d3640f7474fc24dac63bcbafa"; + sha256 = "d0c2f1c156d239c2c410d15216a8d331cde8cdb7d54bdf40aa6519f582b93bbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/en-CA/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-CA/firefox-85.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7849e70478c410500f0e49cf3372e7b3395a8668e2df13641450db2e23485f0b"; + sha256 = "0b68ac180a828a94743349cb53f64224d0013de610a5c9cffed9a9242caadab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/en-GB/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-GB/firefox-85.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6533bd93be6777db55a0787447b97d0cf32d770ab79dbb0a4689e528c277e807"; + sha256 = "978397ce347115b87ac24c174ac4363bd345ef8471d25bfc4a639722ed7098e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/en-US/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-US/firefox-85.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4d987bc87b56dfd2518e162401496c247750ca0a18d8c9072c9ad1ecbd67cbb9"; + sha256 = "98763f4b1526811967d71e1bbb9552a9a3fd877321ecb497083b9e313b528c31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/eo/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/eo/firefox-85.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "88bcb8ff61ad19d3a9975b8a8e302b2b4f37303c04e02770e5eaa6a99dc8a1eb"; + sha256 = "a44c9b60e0e8342dcff31ab0bc2776680b9a94bea51ef237fc4b1f013fea6ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-AR/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-AR/firefox-85.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "44469a62926e451499b3f813034001dcd9228c80a05d9d69431b9918fdc6b99b"; + sha256 = "3229e32a2db2f5a7638a734c538fbaf1b83f9dd203bb67008460783239da04c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-CL/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-CL/firefox-85.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "81e42f8acedd167a1f69d500fca94752a5453e096b471d07e86adcd99e29b40e"; + sha256 = "574c90358de584b2bf4ec874a8f5a22fd777ceeca92c2894fe978a793faea7c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-ES/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-ES/firefox-85.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "4b47dcf3b595b5c0011a8f8f56f938991cd68576cf4655e04e43ebec14e1256f"; + sha256 = "1e92995900cfdbb94d673d5efb02e84321dc8917edab1ce6c86b98f860f483a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/es-MX/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-MX/firefox-85.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c54dcd581d45d273b8b6138393a662b4618e8bd181f625cda6d23ca6b9baf358"; + sha256 = "56de604e9b32c7552825d87c0c2802bff66d72faad5d173fc71388118a47c046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/et/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/et/firefox-85.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2fa06a0e49fc69719acd018148a400c9fbfb3ad68ad13183b1c26971337474b3"; + sha256 = "53297a8e1f8c5d3ac05d44c3aac1f886d7065cec6666548c3a571ec06702eb63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/eu/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/eu/firefox-85.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9171ab64137fa21b4ee50598d244af0760898c6553ae060252109314b997fcf0"; + sha256 = "3b392831ee487279ffbc2156421243990a2abe94cdcf233c375f7949c28571a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fa/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fa/firefox-85.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "3b16e8290e15999a29a9ac92d8294ac212e4e9e4c96fe2ebba09ca43dc66edbe"; + sha256 = "bdaf06e327bc17ff05d82e27d85d4ff747b8af58e8a0b95599d4af0068c6948c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ff/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ff/firefox-85.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "1124cd9611e9ccbfe1255afaf8cf3591b0f61d0d2e63c4cae877209b8c591ba9"; + sha256 = "8e029e2f755f107bbdaf4833332f94b062284529230ef148ec404d9954da5b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fi/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fi/firefox-85.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e3afa4a74b325d52b6cca0436b36d7d5c0d4e2e50755da28aeb587411f705e8f"; + sha256 = "b1cf30bbd4046c3f6b200b876bfa022b34771d1aebb48a56b35817d5d0f46d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fr/firefox-85.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c5470bf4a8a71985bb356c0e56b516108ee6abd6437815bfaf6e3c2f5fe09e46"; + sha256 = "95f5265e9e7be13a8d50ff4e0c45f1247531fc78076081cf7045ffcf5e366846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/fy-NL/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fy-NL/firefox-85.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4608593cde1c810cfd1301f87fe348b5172d92863416b5b135e2adf8b41a5106"; + sha256 = "f22756db0256f2d7b3ccb15c15f1006834e8a53251ba8a315f0d72365d7140e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ga-IE/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ga-IE/firefox-85.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "64101b561b5adc391c79347b870784d18f9b8457ea8523b5cd8448aa6f9ea80e"; + sha256 = "7c67dc57553eca0c59293cff6f3097e56719d3c6b67d6599ea56ef799992e566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gd/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gd/firefox-85.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "1048d1f82dc14c4da5954b3e8da2b0cddfe2ec31e9cd520a60202655771f260e"; + sha256 = "a1a4ceefc1f83454280e70316fcc9d0c2bb635a77596bafeed2f06d3cb133340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gl/firefox-85.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bfd82fb48bd4e403f60acc217c48f42e2ad967f9810ad632e112354acdf6f459"; + sha256 = "02afd3809826d41a75f6554cc7f49eb65725df2721f16484907eb0ad3cb172c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gn/firefox-85.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "bf4d24303ee087df005cf04bb1511ebed5635c0b6a27154d292d00240ac35ac4"; + sha256 = "dc4de709435a0015d3c4fcb615cf8ed96814b2f6038c37ee5045e632891f8719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/gu-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gu-IN/firefox-85.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3669c53042edf83d37ad4e7ab7486f9ac3c2535811fd21fce45188b153b3eb66"; + sha256 = "f9a66be242916abf1576397204c8fd0c88574fcc68fb06480d82a6d7008f1f67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/he/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/he/firefox-85.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "cf83947396daac7bf4c53d97a58df2fc856056833a3547ca19289fb0b0f4b895"; + sha256 = "8739ec72ada89c64be8ebf692734a80f7a825c7201b4f7d43c3b0b8e18f8edba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hi-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hi-IN/firefox-85.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "f497cd8173fe2f4b4e14921805004ce81b5e8f63f70b3a135a9be787ad34693d"; + sha256 = "db9f6f97951291d86f8406d919377ef1121195665734edcb4ae731ebb15efa12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hr/firefox-85.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6e2eb6ede94ff51ab5d2c57744c16738bba50beb5cb4140d42ae1085d6a186ec"; + sha256 = "b8fe4cf3e7c9d30c377504d58ae11c612cf74f0a02c3b25d4efe3ed6ee7365f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hsb/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hsb/firefox-85.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "99fad7bdc3db88dd5fc2d6244f37716938f2fa44904ffabfe44a25840b390716"; + sha256 = "73207d15a6146e4bfe5b2324421993382a41f8648c0fe5e4f2ef72ed5182fc74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hu/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hu/firefox-85.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "bd94dbefb12821ca1e0232dff9804ee7e1caf5fdd3a5823268f757b70f467930"; + sha256 = "d57ac494fa650d1f0d46f9109952c1493ed476dcf26fbe843c3e9c5a722eac3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/hy-AM/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hy-AM/firefox-85.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b9497158d7cce081fd9f6c4c0eab0871ae00eee7745b59544f63026b48757c83"; + sha256 = "58ea459134ccddc63156161300f075cb747125a16aeeb8f616662783b2a8be73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ia/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ia/firefox-85.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "cd4f2462e64989151e4962cd89f8d3e97f295505bf1c447db6549f898ec6a38b"; + sha256 = "d0e4ab532d39eb094de62ae41fb40055e8dc20f2b69856f0ff28633f3c2a5139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/id/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/id/firefox-85.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0c0b086fc304ed4ab1f23b659999cb303b9016962d26f0509b73009a9c651ae8"; + sha256 = "f60c707585e197263fd64a85a120cd4c52da17194d54a2fc538bdface62b1c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/is/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/is/firefox-85.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a7482f969ad5e537c1d8084cab54eb03b12860df4c084a7aaf51409577af6b49"; + sha256 = "f0d2a9052ebefee0f7774e47fe13de41ba8c2b7cba5ca784d6d218fbb2549a75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/it/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/it/firefox-85.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2139dd8f281de5ef79c3a3671eaeb0704db0dcff286df6da44351fcc5d102864"; + sha256 = "4946d59a1b5fe36ddeacb371efe2072f66623d82eb4f26cf0fe6b96e8dd54203"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ja/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ja/firefox-85.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "818b66e1e9ff60f30bceb6b44acd2c704de5f64016de7bea45a4110118341314"; + sha256 = "2a9f7705b5ef1258f925a6e48ccd99243003cb429bef9bba4ad56dfbd294ce11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ka/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ka/firefox-85.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "805d101b7977061af0d5e3b99a8980b972aa4c8eb6ae9914d10c527a58a6aaed"; + sha256 = "443b974d1631602734402a2a6dedaec8a7cc017e1abbb768ceb5e767978c36af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/kab/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kab/firefox-85.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "34a75868f2e8da1fb87235b29b2b1fa7d28b55dea8351a472cc1d752c1b084dc"; + sha256 = "8f8283696206450cf21a4c88384ca915030a1dd7df9e93911b620dc9375e5db6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/kk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kk/firefox-85.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a8c40b1ebac7d0375232518f35b854600f35e52dd6b0123e86a70cb0f3386406"; + sha256 = "c9d78fdd7ac9d79dbb713a7130baceb4f19aca6bf8e7218950190ff95d921b6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/km/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/km/firefox-85.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "3ccc2a85edec4f90c39d23ba74474e27326ed18fd020847d567ed93406ca9678"; + sha256 = "1fb2612268f53fe300955daadae60be238070dae35555707027a8a62ce4ec3f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/kn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kn/firefox-85.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "634c0ba151f9334f4991c2f118b96de45d8a4fe359a08c3cb001f3b813d89198"; + sha256 = "86208426d917883c2eb6ea9248feead33d4115093bddf5f1c690ed176adb9c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ko/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ko/firefox-85.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d085163b35684903418648648dca8ad078e1a89f611775ab4b01fb60aa4d1b2b"; + sha256 = "b8057874e199124ebf283ab67e184dd2fed016b1bcb31a2f220e2e5d38d4f438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/lij/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lij/firefox-85.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b676b6f955441df571541b52b6534ad12caf5df45d16dd374b3cda19d58e990c"; + sha256 = "2e5bdea7a0f68efb0e6bdbe64a1df287644e14ce5fbb896040f3315c6412fc43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/lt/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lt/firefox-85.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "eb5499c40bfc805599e51f490d1bd860c6c46512f927a47af3f9ae5bdb9e3fbc"; + sha256 = "e1f79eba23036cdee87b9a5a2f48284bc006a191644d26e50a7ec61cb26d26c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/lv/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lv/firefox-85.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "935e736c0d46254d8429d87eb2a72e46c9c70c92ebdb1fd1077798e538af770f"; + sha256 = "4d8f26a3b6211799a87dbbab6692f4a00c81b1d70c6af990a684b1b65c255482"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/mk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/mk/firefox-85.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "310fcae105829fd03ede31c32e1f078c69d1bed7880469976159968de1f7ccfb"; + sha256 = "3e5741eee9b27aa91827ef19e9b2b0200719120d07dccd37f5752ba1b746e29b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/mr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/mr/firefox-85.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "acd8be31fba57a9ced68960c1dd28c9e91a88433b0b885bd3f8e2656a639e3bc"; + sha256 = "247a11da64a28084d68d450cfa92ba66868891796d60a09ff9bf28d2af347a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ms/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ms/firefox-85.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "71a6a63883123b19e70c0bb1e6251550fa4b5035792c7b767d47839428d4e0a9"; + sha256 = "79e1823ce9d454d70660464776f1d492f67c3489f7e9ed20fef5a7331def0cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/my/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/my/firefox-85.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "121264d0508aa26f9d6e89620bb1821d07763c28d5085b5cf7d0ce90704bf983"; + sha256 = "ebe50de263127be29aecc611c2e4b5c60068245fe64ee0a72beb2680253f85dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/nb-NO/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nb-NO/firefox-85.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9b930c9e5e92c01ae89c7388d6a168d83b4e95f945381f1301a6137795f4e017"; + sha256 = "7e5f1266acf220fa8db165c3cc3ed2bf287ca809e3dce9b74e6284a8a3bd9e63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ne-NP/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ne-NP/firefox-85.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "99994740252ec76e9728950d307762acec5ab6555d4b5921d89a083447bd7e70"; + sha256 = "0b7fecf7497937709d83e002951ec4425b080fe4a6f6cc967a3eab65db93a212"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/nl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nl/firefox-85.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "cbe751edd3b72a8cd823b9cf548ce77e3a148bceac4861853d1374e79c2cf694"; + sha256 = "7125adcabd21b4edb2828b295713b3a35cd174abea748d5d4f8456c3e18e5707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/nn-NO/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nn-NO/firefox-85.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f63c3f08d01d8963d8ec6047b69efec9f36a92d822a8ae966cc2a7d66f33f93e"; + sha256 = "560d195e6b472228403b2fd5651c7a61e84491e788faafb77af511e3c74e7fb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/oc/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/oc/firefox-85.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "675090877a1cb5841ddb98c5ba8ebaba9d4ad2d4de9d17c7e9559ba6a8b2e1ec"; + sha256 = "ae15b401c284e5e68819e68b0e9e76ca909ff167f2d15b3d77b546708a7e7369"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pa-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pa-IN/firefox-85.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6fd35af9216a1099c246f9e12161384d6a5d1d24e846d3aabe5bef3a55b215b8"; + sha256 = "32d9ef570e718ef79b004fcbb9a7e212d06e8171c0056f90709423495c3c7bdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pl/firefox-85.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "54cae52178e21f0f2beabe1120746962141cbf79fb5dc6eef11ae1f2705e9e4d"; + sha256 = "2201fb7b8edb8ce2b3446a4accf3f0ace2b1a18a7690a20b6e64ecb5ee1a61e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pt-BR/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pt-BR/firefox-85.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "f1dc18aea91440dfe5e34b332c2e2b2b0241d7af1c1a8f2a979eead34db64480"; + sha256 = "f80d4d45078bb3884d8302913ac738f33cd984709e95e279d341284b9c29749c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/pt-PT/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pt-PT/firefox-85.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c2159af01743f1004e3dba0b99a2670155ae3e695f0fd0208b367f910bcba642"; + sha256 = "aba0a4166f0b815e1bc96c4faca818e82adc4b4d1bb8d26cd1f086de681eb56b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/rm/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/rm/firefox-85.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "211813cb32c9f2b0880c7116dc935929570c81937d3446aef506da3705172099"; + sha256 = "450640a39b0773a255c97d884d51f7dd0de04da523e28dcfb9680e750b68e965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ro/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ro/firefox-85.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a2144bde6023d4b8468128c52015849e6a8f77c0c10d4851a9255f6204a98a77"; + sha256 = "eb20d1a28f510ca98baf24c10feb186d21900690d9f0c8be5c180b72c9d3408d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ru/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ru/firefox-85.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "098748cde08f1d362a8eed6432353a1edabc84579abb30aca983772c5b6ac36e"; + sha256 = "7b0c8c5b5cdbb66b36366289f7b65263abb19c174ac89cbb2970a5742eec2d66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/si/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/si/firefox-85.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "41707b3e3b7dbaaea510c58ba503fe22de84963fe1979b2e4c7e00cdf1ded01a"; + sha256 = "1f2e5c35d9766cb46c9c5ce5ff0f6c95ca12d0c14d12cc29d098562b8f35e9b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sk/firefox-85.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4ba12f304145102db13feaca98f84bae5e06609c721967e1b69d68643a94c1db"; + sha256 = "528d3270d9bd722545fb57ab09059e0f43c0f605e479c0869cbe0757d1f38d8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sl/firefox-85.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2dfafc7ca5fdf0a03a8301f1daacc397fc49f3fae18f6ac6454b4110c5bdd65f"; + sha256 = "d4948a03a97424c7b499e339a509b2ebba9b716c84e4713b140576bd787178ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/son/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/son/firefox-85.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "13139fb6bb47472c2ce47dd535bdeea6fa90521681c2a8e8ea963bebecbdd54f"; + sha256 = "34a841faec9720c9ec32d6e00ca775d266f47ca3b660876cbd4a1d7c9d7b87af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sq/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sq/firefox-85.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9710315181f78df3673b71fef597b9498c0a860b167ab4b9c4e68df9c500a6be"; + sha256 = "aa5688e676bbb8ae87f089d78d4d6cb2a9c3393bf252a7c277ab6a8c97a80951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sr/firefox-85.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bbd69589dc5a1fe7b3a0f74c0d8e20cb4cf6b7ed771faf7c161c96301736e89c"; + sha256 = "882263a340ef6b11b35e91262620218078c87b193f3d0ca8eb3a9365dfb98d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/sv-SE/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sv-SE/firefox-85.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a5769159d0c7bc89865ffe1e2fd6b88675afdbda29752ebdaae986f0ace7d3f4"; + sha256 = "5b8baf5ee22e5da51040afb4cbdb4a6f165aecb117d181561c97903a0e63b74d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ta/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ta/firefox-85.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "836aef11ef967ee8c74b9c4221525c31427ee509b798952b59a43a6c7c2169f8"; + sha256 = "14a00497f7a4f27680e95126b4584a13d3376b8d4f39fe0a0de9a7356bd8dca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/te/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/te/firefox-85.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a8e091052e0f606ad8b29b344d65cd86ee45a2b349c99e462f96cc36c08c18e8"; + sha256 = "0de38fdd91056121d68734c76b799534921e8adf37566465a72b4fce9d5af693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/th/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/th/firefox-85.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "17679aff5806314398ffd9568be11157f41b0820313394f7c59c8bc69af8cff2"; + sha256 = "80aff43b79ab4343d6b9bb2a5eebada3ef376313fe47cb2d1d7ad51f2f2a57ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/tl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/tl/firefox-85.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7fd68265f2d1187dab49480004355d241fbe628cf9bce7a613ed5e048df9223d"; + sha256 = "acdcbb66a68421030634bf1ea1c265ff38e84dbe010aa41058da64ce966d1e57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/tr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/tr/firefox-85.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0eeb30611cd3da04ef0c3439e59a3c2c46f2d38b566795691f8992041507550a"; + sha256 = "a3365e32fb78743ae45f89ae1740a7c51cd11e927454cc836bac4e9f62cd9abe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/trs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/trs/firefox-85.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "31ed82b3b45c9f9e6a84fb57b32c23468f42d4072b04437db5dd62f1d541ea80"; + sha256 = "a9da73cdade15ce508678c8347c6bf03c2d93578cfd095e0c586682efba7f2fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/uk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/uk/firefox-85.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "bee267b4822a44edfcacd11bc6aa83ed2957dce95789926ea3cf3d714fd99542"; + sha256 = "05ebea023813ea0755e105f6f1451ee0d85bba5e52660230f25487bb9d997bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/ur/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ur/firefox-85.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "1da5fbc3e3b77a102d00bd1db146944640b9e8c5a9c7c5222a3570281846d1b5"; + sha256 = "ee4cda80858fc6ab33996a546be8de565a5d4d969ce26d0d1aa70ba7a923e496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/uz/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/uz/firefox-85.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "11b92211b88db216ee17537c27d86511f827a7435bbe3cc0ea39d0c015c55c0a"; + sha256 = "7be525a02c9bbd4beee8678eb8488f50337aaf16883ebd41f5b2f67586b4e57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/vi/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/vi/firefox-85.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "29e1f625c9862cb13b5f6238ba2f72200b864abf66ff44af11ca991c67a742d5"; + sha256 = "cc6a9d73810294f3261aaf26d4678c4a49b88375f48321384443f027a5a0b5ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xh/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/xh/firefox-85.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "6e859ba83b1fcc2930db6ac53ddc5f36ec2bc325b034337c33a2e5b531f905d8"; + sha256 = "5eee0a8b232448992ab37546d698d4f212df53c562f29261023e64cf5762138c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/zh-CN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/zh-CN/firefox-85.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "afa32b9e1560aff7c7a6dd9d3c627690ee70c20ea5748f1754cc8ebdffeccb15"; + sha256 = "94ac5a87b53fc8aa6769a4f6faf56d0089965514d8e811ca94ce2cd996e536e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/zh-TW/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/zh-TW/firefox-85.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5f0ec2ca348b788590ec4eb552d34c204612895145521eb53a3b1dd73c34eafc"; + sha256 = "025c04100a427e231db031aa43694a51191ded2c31f22913bcd694c734bd516d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ach/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ach/firefox-85.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f003b9197505256cefcc96a07a3314ee9438a5024048d9815691d5f149233e67"; + sha256 = "9f770cc6655b31ee907f949e0ba2f197d0d6fb3ae33ec1fcab311ffb7b109fb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/af/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/af/firefox-85.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "67b9eecc70db21a150ad45682be637e3c6187cd8b0ca3fab9c20e12517372925"; + sha256 = "7ecd58201a5f3eb6fce474bdcbb0f672c8f492f30de3ec4f8f3cc48c2c967313"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/an/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/an/firefox-85.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "08fe11419370ed3e8a47819f22bed8f5cc4cadd3296dd69304a4fb5f5a7a5dd1"; + sha256 = "362d8bf290f67ea40c93fa058813c073a51911940b916595c0a8f1599ef46713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ar/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ar/firefox-85.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "fb85564a9037ee9168dfb14ed9f743affa5cd7829e2f2637f75184713db93712"; + sha256 = "6b66c3f25eeea055e42a74ce6c327f09e8fe4f18acb1f947deee351d2cdda1da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ast/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ast/firefox-85.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "89c659c314dfe2674ce65a37793c151db5c127452e786f77772c1db7b0fc1aa8"; + sha256 = "0efef2406fe4d8093a1ce6bb56d1a54eaef5bb429b6fa560fff7373a7435cb3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/az/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/az/firefox-85.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "9062c6fcd28afd070baff45df8320aab43e61e7d6343945bd1304a2b8fcf78ce"; + sha256 = "bb0dc33a53a2f871b9743f17a36f50fabed87c137521404675e69df69f121350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/be/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/be/firefox-85.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "0043bb412b2ad9c4bd5f60199f8e3c3e1d81b8bd35d687c909ea65cf0a1eaedd"; + sha256 = "7459818c037c45ff2969998b8d3f481eb8384802e5444e2f3c58340f316aec14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/bg/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bg/firefox-85.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "97ebda162b20aefad89ea918896a1d0a2b7546a67b577000f4ddb6cb93bc5a32"; + sha256 = "55f10b4a5cc1d06dcb81aca68c59a0aa64d7934e01c3f5f3dbcc27dd7497e3a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/bn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bn/firefox-85.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "705b8e97ca21e14343f16c39ac5a081d866f7b422be154eb55cc4ebe728ef9a3"; + sha256 = "6491efbf19bdf11b877d04dc22707864c07e9b52452408cf386bcb7bda3cf840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/br/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/br/firefox-85.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8a61f457be78003ba212b9921a657428d117bdc978e1f62eb4ba2b2cfd553b13"; + sha256 = "4ae74e5843edbb01d35b7564b1e998f58fc1c50d849fca9a9e97e540abe6f140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/bs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bs/firefox-85.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "074a4153395b6397ffa5b2a74bb22b456e15357a760003a4dfc2c5974e8efa1f"; + sha256 = "c796121189e7bcf5ec5a90218db35fb34393d4e70ab7100567b3f7aa43daaea4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ca-valencia/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ca-valencia/firefox-85.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "87109dec410e6f57199743666d46e81a42fe6364cb55742e24391d922bd8c0dd"; + sha256 = "a2097281cb1d5191992399686c26754a57d0a3bf241961374e335c225c4f7324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ca/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ca/firefox-85.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7ab7be9dd01b25f119de9a432b1487a506d5b8306b7c516614feb9a559de6cdc"; + sha256 = "4135f8421b6594a468dad1057d2684cc8c5e3fee1b095653d42c86c6b4b62ab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/cak/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cak/firefox-85.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e5518707de8deffc05024f76248711b59037f994a1b6883e65243a01a82076c7"; + sha256 = "93799eaee71f6e1914c9161d075163bbc7c42d85b196301eb6891bb7c3debba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/cs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cs/firefox-85.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "682add587e420149a34cdba03a0b91a7190a33753bb40972836c8e12110ea356"; + sha256 = "25678ecf83437174adca71c682ff36145b0f68e45cdaec515fda671907c21133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/cy/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cy/firefox-85.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "396764a821b7333aae3dfa6924e5246ac6aeb613470e5098ff542aa5d7dca65d"; + sha256 = "85b571e0fe4f0bdedb8b433f8363a7649a1c5fdfeba40b35f069ef1518a28600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/da/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/da/firefox-85.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "28aa6f2f3ae2fd19b5b6d149c1bf735ae55c56ff3bee0646bef98dcdfcbf3dff"; + sha256 = "d998daa0d89d7d4a632c576f9d81d5fe7af3c0e54332968d593d88e5f81fa246"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/de/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/de/firefox-85.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "eefb48753ea89ebbd27e7357a22ae7246086093d7054b684ed8f2ed1dbd66835"; + sha256 = "a84adef78975397d45941ced4b17abfacc2a26a0b758336c99eb174b33f51c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/dsb/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/dsb/firefox-85.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "65c947541d4c6125b292b6e5ac61486bb434b56a824e304c343464d4a8ac4021"; + sha256 = "6647771748299fe56d9f023e612de6c3dfcd1b711cdcde74ea39bafb957deb5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/el/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/el/firefox-85.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "86d20281cd16436acc0c015b2a72775ab3beaf1f52348181131c210448dd9ccd"; + sha256 = "73a7a168b65362901a4b198200e2a5167244e886131203543bcf83f2998261cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/en-CA/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-CA/firefox-85.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d71c02929a7e4b08bfe1d83eaa577755d7dd1074f2328c428bea73c1bdd82920"; + sha256 = "d47e5707ab2ea2e369adffaaa49c52f461d3c01b6b28b31b0876bc5284d2de66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/en-GB/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-GB/firefox-85.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5ef6635f57a34fab6dcc54462b621721063ab354798d8924e8621895fc3ed4ac"; + sha256 = "6a50517b8ecd2fdbb897dca8de5a948214180fcb25ba3654faee7bb563d049d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/en-US/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-US/firefox-85.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "7008acb0a5112d22b02f75fa8b46ecdb46dc2cb0ab691791595f2ac45187d6e5"; + sha256 = "83ace0384a14e383e65716ef9305d72e39832b855ebecf2035e6267b4c9a97a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/eo/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/eo/firefox-85.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e9dadf0b2b655bbcee8557805ee1b93cfef911c9c1a60d63b31afc84f06f9021"; + sha256 = "2e8b25943115edae1dda4265aa3fd1edd8683318e47aa3b11f9e2f3d6f89a372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-AR/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-AR/firefox-85.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "3ca485c3eda6a0d2cf348d2870fa708ad374dc0fc830696484e0c2ff5ef3c967"; + sha256 = "559b0de8d0d846f58e15675e31e0db57ba00ad2b98d3a042c1d6d25a9727e1a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-CL/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-CL/firefox-85.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e69f6b048f42ff8eac54176d5b3c85cd31ce02794f22bce2a09fd262d62789a1"; + sha256 = "3297f38424fc6cdf2ddefa72732f977cb1ba1b309dbd3d845b63a038d748359c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-ES/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-ES/firefox-85.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1cf1ea30406e16564fabd54b339ebd2111498eecbf25ec93c7401e2143e1d456"; + sha256 = "614e69e978f0e814b54150a013872081d6365d9e5bb03ee1147c5310d6315dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/es-MX/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-MX/firefox-85.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "94a8ea4e1fb63470a46a83678f71698b151ebf9c57794a086a8982d29edc0706"; + sha256 = "765d1ca2685a462f173d7ba1863a2263008cba71738548dcdab83f6c010b7dc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/et/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/et/firefox-85.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b4fde31f58defe8b35d4c9325f1485093bfb155c73f6d3c02fa3cdcbc8393105"; + sha256 = "1465b6447bd476f98060321562ec0ab47b117f1271dc97f9924da573c77b5a3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/eu/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/eu/firefox-85.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d84a2bdc2f55b57c612abbb0208ef4b7683ef7d696739e9b1a36238daf61ab9f"; + sha256 = "4f25ccef829ad465d62676aec9c6daff9e5910cdb5447c0d9b5befee89b7e4f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fa/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fa/firefox-85.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "054e6269745c8ae120daab489a9157618956bf2ecbc309bc64b7fb2f73400766"; + sha256 = "c2bed62b36d648133edd1541799b231dbfb1c0c5fb6213ac28c3abc0a38ee66d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ff/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ff/firefox-85.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1ebef6026207141e0d3d37533ecff2b22a4e936e27a58939fbaa72d723078049"; + sha256 = "527591e25cd83c6ba7fe443dd40ad6963dd1b7f69a693e76cd1e18a2bf74c082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fi/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fi/firefox-85.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "9a8609ae113b392d3bcee30ae48c1e8b4ce6a1fc180c7f936c52934fa1911429"; + sha256 = "3c89fb2c42b854fa800c47e5c91d19defe56be5f6474c500bab309eb84df0a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fr/firefox-85.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "afcc5075d8455d32360d5045125290c8b843e48f4b774ab48d5c2f49e1cd9fe2"; + sha256 = "a7b033c9df0e11abb6dae08f62dbfb34f740fb9d849e0bd8a027ecf0461ff5ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/fy-NL/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fy-NL/firefox-85.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "232dd4a17ff87945b1ea11183fea8711c572e31d34898d15b378a54697c720b9"; + sha256 = "d162a3c113182178a7de0c5f3dab907badf9625ab50e8a922ceb4c34c4616c31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ga-IE/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ga-IE/firefox-85.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c68e57472d6837074bb8180063ce6eebf0396b187aa3d47ee9bccf1cd1529459"; + sha256 = "637d65856d46474d51cff1da13b9b1e74984cb646cc5a6a643fcbc7fc1ec37fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gd/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gd/firefox-85.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ed6ab375a3e487ee3c6f2d4017f8bde6c3ff29978a8b2f125b58e3ca2472ce38"; + sha256 = "aab2f06d6ed6108fe48350ce0275d3d244f175e6c2427f54b403d6bd6ddc18cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gl/firefox-85.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "28993fb518753a241abb2e6a22583f8a318bfeeca4e0eca76bedfb2aa0a01e07"; + sha256 = "a5945bf732fc6e3edddb0e7bb9067c591f4fc347f56a35c8622311706d8c135b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gn/firefox-85.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "370637503e0fa36b937f32867bd68a300fe1bd8d99188ab86ad9392ab5b8a8b6"; + sha256 = "6036a369187f5e30322d140e1add09cc0a51e5d092693a5acb65176c872bf53b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/gu-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gu-IN/firefox-85.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "1fc77e276cf34424e3c7522af9bfb5d3dd43e33357ce01b696655c2a91a8f2a0"; + sha256 = "2b6d3c13a44b1234f591536c8f7f3cf5d1b56af53f366150e0565a36d4fa678e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/he/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/he/firefox-85.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b1ffe2fcfd55fff2b696dd40d3292ad9cf2cde1179bd8c9c7103df9c902b276e"; + sha256 = "c3d01e14f24de5635a9c0d3c7625fcb9b84129ce9505d2601390f2d40fff5a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hi-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hi-IN/firefox-85.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d13f74a4a45e7a20a1ec3354dce98f33bef647d6153aed2539cf567a6eb3fcfc"; + sha256 = "23f1dd3a9603d797abf6a1411c7b6e44d4fb2dc7b26294670ce4c63cb859e42f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hr/firefox-85.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f0a288dc290d2665948e3536b7b52b799461bf060be38b957aff7cd52aac02ff"; + sha256 = "e30d8a599b28b05a3f83692dbadeb9185829b1a87c84ab5449f142ad1a7a8a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hsb/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hsb/firefox-85.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e395166b3039027e56eb6d2d7f97b121c1bd947cd6266829b949b221cbb2cb74"; + sha256 = "1a6cb70573e9e0356e18a18d1a0a4d2f7188549c19cbed7e28d3b801915c22ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hu/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hu/firefox-85.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "666b47226545e9e8f45ff09e3428d6317fbe67a197e13ada814b6a4f72544a98"; + sha256 = "c2cc048b05e197e028606535fdeb62a205c037eb5823560f187ec4152be41d97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/hy-AM/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hy-AM/firefox-85.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "779111633101f8b7da4c84d3d085ab1e8e3502d255316d17eca653b0481d0885"; + sha256 = "a4b6b0d0f05ce86d13dbf08448724106278891cb79387e29f9ba3874c1aa6ec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ia/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ia/firefox-85.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "e27ac7b8e8d2f3c4f453563d2d2efd3005b12be1696de453182a53a3de490ab1"; + sha256 = "f7d761ea9ee5d6037886a9aa8eb93747ae9f943957a296cdcca0dbbb0e7a2b38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/id/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/id/firefox-85.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "86dcf72326ea283bcfd612cbec0ea095be72fe16d446a317a31c886d91f5b452"; + sha256 = "1599cd0ea460ee1280753bea5d5c84419506f72f8d87818114665ced3237407f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/is/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/is/firefox-85.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "17305f92a16967d941df34a59706f90b94b8c671d01e8aab768fbfd473a81f78"; + sha256 = "ec9b790cc55ed72fcd79afb6502db207906f89aff4053d62efa12a37bbe85b93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/it/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/it/firefox-85.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4b2804d9c52c4f9202e867f2540523cc45675b5d34e46a8d59b044c88a840f5e"; + sha256 = "97c625e01e9a565ef10079ae980cd2ee45761f428594158f6c05fb4a3f1142c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ja/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ja/firefox-85.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6a8bc7abc0c320a31d7fac4e457bd46a3fe7379f795e8cb2f36b2de70bf048f3"; + sha256 = "625dc84ed56bb46032eae0087ae96d17127594efd99e4aeea410d4c8bef93819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ka/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ka/firefox-85.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "de6b6be1696d20148cb94cfacaee0fe5ec128550de006a6f64723885d47a1352"; + sha256 = "45a00fe06fc302d59744b8c9dfc9d7a4e27ed4ac3727848f52597208020ce16a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/kab/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kab/firefox-85.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a898355c71d00c72aedb87901184f69d0598fabc4827c9070ebb900a48dbf152"; + sha256 = "32b8ce9f195ecc610e3327402953609eb8621cbe116e22bba76131c9dd1b9738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/kk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kk/firefox-85.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1945b3526a8f52cc7cbaa30e344333c43c7d228d557a249fa4f41a8bb91eb4b1"; + sha256 = "651f3c7314b919af1348771ef7c5ea986fe3d9d7e42e056172fa55d675e17e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/km/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/km/firefox-85.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3e033fae06700495784b4eaa911309d250d3e55a94139a65f44248975c414980"; + sha256 = "1a62be10235639a7c2256521838fee8637ebd575cee39c5744a65ef057afe1b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/kn/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kn/firefox-85.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "b70553b460d0604bff55ea29657e74b1133995ae93bb958b6b20af366cce2eeb"; + sha256 = "1cdb648165896ccda8da7ef6862605723089cbd8e3c9e6b8692ffeb2d28f9593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ko/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ko/firefox-85.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "0ed0d1a0219ef92c0de45578c3674da0ba0e8fd9ed2e00afc01b05d53ea28112"; + sha256 = "70781041791a7c64e518de27955cf2b57ce3d3ee7afad36737f62783b5255d64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/lij/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lij/firefox-85.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "5fa837001b3bc5d9138ed14e22720933f28fedef63a7dd473976348448cebb30"; + sha256 = "ea44fdf528da53d7f2ba9d447c70079873f802647ee708f6580447af6adc1834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/lt/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lt/firefox-85.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b54990d4737b71dfa235d20ee2f87367b72f0a1245585135a9918d2755b3d1cb"; + sha256 = "ffca3845c97f4d87e0d601c483e2bde8fa8f7f59b44ee85259fc70b1dcfb727f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/lv/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lv/firefox-85.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "06ece913374b567ea10cd9377485d0793a12a151e9e3ba08e3c5433a5e772151"; + sha256 = "b513e100141d1df78de9f05dac72da91c6cf65a8fcc22b9091ec00e6c6ee21ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/mk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/mk/firefox-85.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "dc69547cdf414f783017ebb8931dd24ad1b899f19bac20bca4d21ebe91963a0c"; + sha256 = "c65febe8a9f9b59ecdc61880a5c1a5b2b29fc53ffbc8d968f1773fe60adb082e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/mr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/mr/firefox-85.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "f503a40041ba0f4e44791f8d2e38c41f25698fd970457fd8cafd92d2d3e64102"; + sha256 = "b4d3b6758c67f72e8f8c9dbb0e32fcd7b527b701e41d3d492e3e7ba7817cc544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ms/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ms/firefox-85.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "07491c18e9fe0d7f97b24c8bcf571ede2c4effda58ceacb0395fb7ce9eae1eb7"; + sha256 = "2fe81086a7a15bb29b909987063c058c1826bee6c0c645cae1e7a0907207d1ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/my/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/my/firefox-85.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "19d57112de4c6429e915568ae317c3bef2ef6d58d0c57d5a07be0cb2f1bc11d0"; + sha256 = "40661cc4fa51c2782bd0da0d6f460c3a5fbfaab72e91b15c77f9b7b537484ab8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/nb-NO/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nb-NO/firefox-85.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "72e6576c3a725675c2514d39b3ea4497590410037aca696c5f3f3dd5109b3c09"; + sha256 = "9ce253d8bc316fb976c4f64135f7767060aed90111b54dac687011a772e650ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ne-NP/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ne-NP/firefox-85.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "fb624e1ea63aca7f481024c40e7b5a47e504ea545169566f86e7ca24e36e7582"; + sha256 = "7fb96857d5da6726e68038a9659ac7c18b8e746d0dd5e4823655c8fd093238a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/nl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nl/firefox-85.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a1aab7534d0dde0c61c48bf0f33fb336c12b5d8c644e41188dad7c138531bbf7"; + sha256 = "1d03b2eb31dca3cfbfb38af4e59d3eb84845b8fdaf488b76949a98f744253935"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/nn-NO/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nn-NO/firefox-85.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d1c645cd0b65f8b48b0497b1a16b25a2e11d8de70bb3e37baf6f05c5750525cb"; + sha256 = "64fdf6e8e8086c04c53c84f792382c32579b43548f9410dc074b2aff95165d88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/oc/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/oc/firefox-85.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f110c97c8e464ace6026ddb3da15c13177455bcba067a54d4c531329a4cdfdab"; + sha256 = "6db5c30ca7d449534289f5b84e328484edd5d04512cde11f097f28f5ffb986bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pa-IN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pa-IN/firefox-85.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "4931270889eb97b55b3bea7177e778422045bfcebc25e4bc05019ffbde438c78"; + sha256 = "102ac2026af2d21f27502f190dfeb0f39b148ce39324e480f653f6868df770d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pl/firefox-85.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c0438fb22ef1c610afc16bfd689d1843d6099e91e6b8a30b03a2f692b609eb4a"; + sha256 = "f0a03e6a95a67af8e6949f5b6ad32179f7bf4978f050ca3c453287bdfaca6252"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pt-BR/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pt-BR/firefox-85.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "df61ec134c161d0f44ad0805bda8d1baa37d21c618c4f4d165e40996d7ba5956"; + sha256 = "7177392c8f0c049ad685676aa6aab258274b7d5871c06467f7e87292779b7575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/pt-PT/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pt-PT/firefox-85.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a09341dc8284b77fa3bd1c7d5fbc377a93cd21109e1330b0a2260613df3c4e5e"; + sha256 = "1fcae4be8cb31d30b1187b7d94fde71c41eb95c858467136af32fd7ad1117147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/rm/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/rm/firefox-85.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "19016551888f5104227e3cfed6c66b7ca11e11a31d9c007c3d00f6821126fd03"; + sha256 = "86f801260baccff9e8d9036dae46b0796edc8d90c9a2238da1e1547ac2684da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ro/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ro/firefox-85.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d5cacf3a2c3cf9c3c6fe182005c038094fb6b8ae58ea169123e6289f7a2c5457"; + sha256 = "c1b02e43cc649acef6cdc9498814a4582b46b42de96dc48fcbac4d83b44ba35b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ru/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ru/firefox-85.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "8907175fd858dc243dafd4216b3602f154ce824a2388b714cee9352322781f39"; + sha256 = "c067538578c2891f062716f56f3ae057ef8db2814a03ec7f1eb8855b95f9ace0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/si/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/si/firefox-85.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "19be977d9110dddb944e0ca713aa986fb3c005a4f39bde23a4a0b907cb7d39df"; + sha256 = "8131b12c390e31c06752115abf62426565433261e73ffa37a8389b102ccd06bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sk/firefox-85.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "2a7a5dfacaa016ae6d2dbb52d0803a8a27f74061a6bf71fcbac5fe2e10834374"; + sha256 = "f45f32063d34930b7e0ba4c087e97a78af642a59270c62fbea86b0bd87e06171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sl/firefox-85.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "61c65884ba57fa5fd37919a390b8af4cb0d7abf31ead557f2967049c35a4bc72"; + sha256 = "df8602e60a895887170ff2d18aae487730ef8e0bcfe08010fbe0da30f05af91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/son/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/son/firefox-85.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "be825ca5923ec9aa37417d4d4842bd82ee4271ec201bb317e0b58f654fe8a7c1"; + sha256 = "3dd3bb220c4cfeee6ecd79977e1a619470a2504a4597f314286497164984cd9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sq/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sq/firefox-85.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "c7ab49257d5e44bb96e8f39bb586e51a100b899fb6e595a86bf41ebc25b55021"; + sha256 = "cc04ff65bb4fbc714e21a416af26256d4b203f327e5678c71378fa507242ec6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sr/firefox-85.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b22e12526457dfaaf976eb94262965c3bd46edf4a99380a430d75b2324ad654a"; + sha256 = "abb30a4c0eb7ea9910b21c0f10cace395f9d413ce39051494c97ddd1e18e2c10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/sv-SE/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sv-SE/firefox-85.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "5e024fc41d9287480ab09ea45d46e9dc358be53adce325826d9820b6cf3ab8ae"; + sha256 = "76ae51342d5b8a93ae5f3927a69b9b1a6cd4877b98a7a103f8250bbe105ecf6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ta/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ta/firefox-85.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "529afecbbdfa2f934d755f80c7a0bc9d4bac5053cc0c6421c1687ab16e5b1f02"; + sha256 = "1e9866ac793705555c15ae4d0e16753e90e8deae19e6694ce9f85e8dfa6ee476"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/te/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/te/firefox-85.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d90b59759a4f24f9142250f6fe5853fa0e6afdc30bff7e735fc5b70a3b76f555"; + sha256 = "66dcd400f89054f194f1a794c8731c7344b04f97209023559bfcd0f008e005c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/th/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/th/firefox-85.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "023f86d83e23371bbbe68bb586a08e81a58cec027a44c0ddeb217ea1343b5cd5"; + sha256 = "adef4cf7769510a8b47628eff5ee0f3b00c23862634fd8f6975daf599cf7b056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/tl/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/tl/firefox-85.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "2fd3a1f80900f16eac1de89c8a7a4f93cafef144a24d9c261b09549a3b659448"; + sha256 = "465d089eb0c68d8279e3cc7f8ceb5c08527fc48b0292cc8ce523879c4643fbb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/tr/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/tr/firefox-85.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "1144aa3437ae67c6921ddeeceb59dad5767d1d59c7932fa0da460c64a4f5577f"; + sha256 = "00d75ff3605672f6704fb600208872e536f76907ed25a4f90325cabc1924f991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/trs/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/trs/firefox-85.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "1f3e1d5fec2b4d9b11c3c0ded1a68aa7e36d13fae472ce782fd820d4fd32a7c6"; + sha256 = "299be659a464911dd27d92c36f567f675a26aa6d92af63deb002e172ba6b40e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/uk/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/uk/firefox-85.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "165dfdd03c178af49d3f3139a0c9032431f92cf91e79d6842b5e0b006c73490c"; + sha256 = "49c2084ec32c03fd2821c8f1220bbbf954b98705e44a6a7fa65ec6f1abb12c02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/ur/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ur/firefox-85.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "6a91871a99188c0bc6a956d92382c800543d95a4d917e64d3295d9b1fe8971e6"; + sha256 = "d703344d8f03186b0fb246108892432f137cc033ae66bef395e7216cfa7bbdd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/uz/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/uz/firefox-85.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ade7a34f46893e3367384b414322895f5cd9ce0d341b7a7ddeb191fcc7679e5a"; + sha256 = "02379c1fd1766eb15d9e99f8a6f08074df943c49ecf6b50a6b29ae8e922bf347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/vi/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/vi/firefox-85.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "aca136daf5a8d71b55e479a37a1d42569ee6c9086ac96bf98587948eb23c5f59"; + sha256 = "0577b4c2891ba646a67a93b4d6373095b98466e32b95993abc79e7bfd240f7d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/xh/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/xh/firefox-85.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "6993f823fd76b8974334b37ebe9c683d43fd2524ea1c485ef0c53db993db15ef"; + sha256 = "83e40e1b33b2782d5dc68d32286da290188e8b5c3d689e5352d53411f95bed4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/zh-CN/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/zh-CN/firefox-85.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b179fb98b0eb374e28574a4eb61f86df8765ee5bac033e93ad6c3e71d010e7cc"; + sha256 = "695e647135b911a5e60374595197cd096b7bc180e63ee3069e4550a612354369"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/zh-TW/firefox-84.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/zh-TW/firefox-85.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0c51a4e5afa22fac0c98e2e960168fb5625a29d2d9e1565ecd08080d83e72d73"; + sha256 = "5dcc5aa463f3c2325dcc7f4f768580dca6adf66e052470ec932bfabe9b3f8f29"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index d8fbcf337eac..98ded55885de 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,6 +1,6 @@ { pname, ffversion, meta, updateScript ? null , src, unpackPhase ? null, patches ? [] -, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }: +, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? [] }: { lib, stdenv, pkg-config, pango, perl, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg @@ -8,7 +8,7 @@ , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libXdamage, libevent, libstartup_notification , libvpx_1_8 -, icu67, libpng, jemalloc, glib +, icu67, libpng, jemalloc, glib, pciutils , autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 @@ -131,28 +131,13 @@ buildStdenv.mkDerivation ({ sha256 = "135n9brliqy42lj3nqgb9d9if7x6x9nvvn0z4anbyf89bikixw48"; }) - # there are two flavors of pipewire support - # The patches for the ESR release and the patches for the current stable - # release. - # Until firefox upstream stabilizes pipewire support we will have to continue - # tracking multiple versions here. + # This patch adds pipewire support for the ESR release ++ lib.optional (pipewireSupport && lib.versionOlder ffversion "83") (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"; }) - ++ - # This picks pipewire patches from fedora that are part of https://bugzilla.mozilla.org/show_bug.cgi?id=1672944 - lib.optionals (pipewireSupport && lib.versionAtLeast ffversion "83") (let - fedora_revision = "d6756537dd8cf4d9816dc63ada66ea026e0fd128"; - mkPWPatch = spec: fetchpatch { - inherit (spec) name sha256; - url = "https://src.fedoraproject.org/rpms/firefox/raw/${fedora_revision}/f/${spec.name}"; - }; - in map mkPWPatch [ - { name = "pw6.patch"; sha256 = "12lhx9wjpw0ahbfmw07wsx76bb223mr453q9cg8cq951vyskch3s"; } - ]) ++ patches; @@ -197,6 +182,8 @@ buildStdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + substituteInPlace toolkit/xre/glxtest.cpp \ + --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' '' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") '' # substitute the /usr/include/ lines for the libraries that pipewire provides. # The patch we pick from fedora only contains the generated moz.build files @@ -366,6 +353,7 @@ buildStdenv.mkDerivation ({ inherit gssSupport; inherit execdir; inherit browserName; + inherit tests; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; hardeningDisable = [ "format" ]; # -Werror=format-security diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 40c6cadee7a6..c70500edff85 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,24 +1,25 @@ -{ stdenv, lib, callPackage, fetchurl, fetchpatch, firefoxCommon }: +{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, firefoxCommon }: rec { firefox = firefoxCommon rec { pname = "firefox"; - ffversion = "84.0.2"; + ffversion = "85.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2cxybnrcr0n75hnw18rrymw1jsd5crqfgnpk10hywbmnkdc72fx5sk51cg890pzwfiagicxfxsacnm3f6g8135k0wsz4294xjjwkm1z"; + sha512 = "2m46li5ni1m4xv42h99rn2hhhv2mqy229wihmzxmgvws1rh2h11yf6x2a07akkjrsp2dmwxmmkhmf9dhakgj9i55z5qqi99azyx07df"; }; meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco ]; + maintainers = with lib.maintainers; [ eelco lovesegfault ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; }; + tests = [ nixosTests.firefox ]; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; versionKey = "ffversion"; @@ -27,10 +28,10 @@ rec { firefox-esr-78 = firefoxCommon rec { pname = "firefox-esr"; - ffversion = "78.6.1esr"; + ffversion = "78.7.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3kq9vb0a8qblqk995xqhghw5d694mr1cjd5alkkwxbdjhpc1mck0ayn40xjph0znga6qdcq8l366p0by8ifbsdhv0x39ng8nvx9jvdf"; + sha512 = "138dcfpdkp78yqgygac212vg5fm5ich2a82p7258ch8hk6bpvpdxbws4sdqwljs92x831dblcsshwkl06vh48899489gx87mdkqd0nm"; }; meta = { @@ -43,6 +44,7 @@ rec { # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; }; + tests = [ nixosTests.firefox-esr ]; updateScript = callPackage ./update.nix { attrPath = "firefox-esr-78-unwrapped"; versionKey = "ffversion"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index e3e8ba610d0a..96a4e15adf87 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,8 +1,7 @@ { stdenv, lib, makeDesktopItem, makeWrapper, lndir, config -, replace, fetchurl, zip, unzip, jq, xdg_utils, writeText +, replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in -, flashplayer, hal-flash , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire @@ -47,28 +46,31 @@ let assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used let - enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; alsaSupport = browser.alsaSupport or false; pipewireSupport = browser.pipewireSupport or false; + # FIXME: This should probably be an assertion now? plugins = let removed = lib.filter (a: builtins.hasAttr a cfg) [ - "enableVLC" + "enableAdobeFlash" + "enableAdobeReader" + "enableBluejeans" "enableDjvu" + "enableFriBIDPlugin" + "enableGoogleTalkPlugin" "enableMPlayer" - "jre" + "enableVLC" "icedtea" - "enableGoogleTalkPlugin" - "enableFriBIDPlugin" - "enableBluejeans" - "enableAdobeReader" + "jre" ]; - in if removed != [] - then throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options, except for the adobe flash player, have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." - else lib.optional enableAdobeFlash flashplayer; + in if removed != [] then + throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." + else + [] + ; nativeMessagingHosts = ([ ] @@ -88,7 +90,6 @@ let ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) - ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio ++ lib.optional alsaSupport alsaLib ++ pkcs11Modules; @@ -265,7 +266,7 @@ let --suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ - --prefix PATH ':' "${xdg_utils}/bin" \ + --prefix PATH ':' "${xdg-utils}/bin" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ diff --git a/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index c32652c8bfc9..c5e5aff77e01 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -22,7 +22,7 @@ # Additional dependencies according to other distros. ## Ubuntu -, liberation_ttf, curl, util-linux, xdg_utils, wget +, liberation_ttf, curl, util-linux, xdg-utils, wget ## Arch Linux. , flac, harfbuzz, icu, libpng, libopus, snappy, speechd ## Gentoo @@ -57,7 +57,7 @@ let dbus gdk-pixbuf gcc-unwrapped.lib systemd libexif - liberation_ttf curl util-linux xdg_utils wget + liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core kerberos libdrm mesa coreutils diff --git a/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 4ade911e1c7b..64f4c27c96c6 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -1,9 +1,11 @@ { stdenv , lib , fetchFromGitHub +, nix-update-script , cmake , pkg-config , libunistring +, mpg123 , openssl , pcre , SDL2 @@ -12,19 +14,19 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.0.3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "1l9qcymjwg3wzbbi4hcyzfrxyqgz2xdy4ab3lr0zq38v025d794n"; + sha256 = "0c7w4a19cwx3bkmbhc9c1wx0zmqd3a1grrj4ffifdic95wdihv7x"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libunistring openssl pcre SDL2 ] + buildInputs = [ libunistring mpg123 openssl pcre SDL2 ] ++ lib.optional stdenv.isDarwin AppKit; hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; @@ -34,6 +36,12 @@ stdenv.mkDerivation rec { mv Lagrange.app $out/Applications '' else null; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A Beautiful Gemini Client"; homepage = "https://gmi.skyjake.fi/lagrange/"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix deleted file mode 100644 index 1a4f9b4ec7b4..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ stdenv -, lib -, fetchurl -, alsaLib -, atk -, bzip2 -, cairo -, curl -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc -, graphite2 -, gtk2 -, harfbuzz -, libICE -, libSM -, libX11 -, libXau -, libXcomposite -, libXcursor -, libXdamage -, libXdmcp -, libXext -, libXfixes -, libXi -, libXinerama -, libXrandr -, libXrender -, libXt -, libXxf86vm -, libdrm -, libffi -, libglvnd -, libpng -, libvdpau -, libxcb -, libxshmfence -, nspr -, nss -, pango -, pcre -, pixman -, zlib -, unzip -, debug ? false - -/* you have to add ~/mm.cfg : - - TraceOutputFileEnable=1 - ErrorReportingEnable=1 - MaxWarnings=1 - - in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt - Then FlashBug (a FireFox plugin) shows the log as well -*/ - -}: - -let - arch = - if stdenv.hostPlatform.system == "x86_64-linux" then - "x86_64" - else if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else throw "Flash Player is not supported on this platform"; - lib_suffix = - if stdenv.hostPlatform.system == "x86_64-linux" then - "64" - else - ""; -in -stdenv.mkDerivation rec { - pname = "flashplayer"; - version = "32.0.0.465"; - - src = fetchurl { - url = - if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_npapi_linux_debug.${arch}.tar.gz" - else - "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; - sha256 = - if debug then - if arch == "x86_64" then - "04p70zc4y7k1klsxa70ngl7g5q6pf2n4018r7d5n6wg2961mjk3y" - else - "1avslj2ssp9fcvygcc8f578gpj3bbbpvap4ssr7ag6xn6mh15adw" - else - if arch == "x86_64" then - "0dbccg7ijlr9wdjkh6chbw0q1qchycbi1a313hrrc613k3djw3x9" - else - "1mhbkb2d6ky1xlgx55yip1l9kh5nq35jjbbm6hf6ckai146j3dr7"; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - dontStrip = true; - dontPatchELF = true; - - preferLocalBuild = true; - - installPhase = '' - mkdir -p $out/lib/mozilla/plugins - cp -pv libflashplayer.so $out/lib/mozilla/plugins - - mkdir -p $out/bin - cp -pv usr/bin/flash-player-properties $out/bin - - mkdir -p $out/lib${lib_suffix}/kde4 - cp -pv usr/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so $out/lib${lib_suffix}/kde4 - - patchelf --set-rpath "$rpath" \ - $out/lib/mozilla/plugins/libflashplayer.so \ - $out/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $out/bin/flash-player-properties - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - rpath = lib.makeLibraryPath - [ stdenv.cc.cc - alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib - glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite - libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama - libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng - libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib - ]; - - meta = { - description = "Adobe Flash Player browser plugin"; - homepage = "http://www.adobe.com/products/flashplayer/"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ taku0 ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix deleted file mode 100644 index ed95d02ade45..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv -, lib -, fetchurl -, alsaLib -, atk -, bzip2 -, cairo -, curl -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc -, graphite2 -, gtk2 -, harfbuzz -, libICE -, libSM -, libX11 -, libXau -, libXcomposite -, libXcursor -, libXdamage -, libXdmcp -, libXext -, libXfixes -, libXi -, libXinerama -, libXrandr -, libXrender -, libXt -, libXxf86vm -, libdrm -, libffi -, libglvnd -, libpng -, libvdpau -, libxcb -, libxshmfence -, nspr -, nss -, pango -, pcre -, pixman -, zlib -, unzip -, debug ? false -}: - -stdenv.mkDerivation { - pname = "flashplayer-standalone"; - version = "32.0.0.465"; - - src = fetchurl { - url = - if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux_debug.x86_64.tar.gz" - else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; - sha256 = - if debug then - "1ija3z5bxg0ppx9r237cxs1cdrhk6pia2kcxbrm6y30kvzrd3nqs" - else - "1hwnvwph7p3nfv2xf7kjw3zdpb546dsia0cmhzg81z016fi7lgw8"; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - dontStrip = true; - dontPatchELF = true; - - preferLocalBuild = true; - - installPhase = '' - mkdir -p $out/bin - cp -pv flashplayer${lib.optionalString debug "debugger"} $out/bin - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $out/bin/flashplayer${lib.optionalString debug "debugger"} - ''; - - rpath = lib.makeLibraryPath - [ stdenv.cc.cc - alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib - glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite - libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama - libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng - libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib - ]; - - meta = { - description = "Adobe Flash Player standalone executable"; - homepage = "https://www.adobe.com/support/flashplayer/debug_downloads.html"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ taku0 ]; - platforms = [ "x86_64-linux" ]; - # Application crashed with an unhandled SIGSEGV - # Not on all systems, though. Video driver problem? - broken = false; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix b/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix index be8adaa1568b..7777bb243fa6 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough"; + NIX_CFLAGS_COMPILE= [ "-Wno-error=implicit-fallthrough" "-Wno-error=maybe-uninitialized" ]; meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index 56acb453a80c..8207040f1b8c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -6,7 +6,7 @@ , libGLU, libGL, perl, python2, libpulseaudio , unzip, xorg, wget, which, yasm, zip, zlib -, withGTK3 ? false, gtk3 +, withGTK3 ? true, gtk3 }: let @@ -16,14 +16,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.17.0"; + version = "29.0.1"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "0478xn5skpls91hkraykc308hppdc8vj9xbgvlm5wkv0y4dp7h5x"; + sha256 = "18flr64041cvffj6jbzx0njnynvyk3k5yljb446a4lwmksvd3nmq"; fetchSubmodules = true; }; @@ -119,6 +119,9 @@ in stdenv.mkDerivation rec { installPhase = '' ./mach install + # Fix missing icon due to wrong WMClass + substituteInPlace ./palemoon/branding/official/palemoon.desktop \ + --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' desktop-file-install --dir=$out/share/applications \ ./palemoon/branding/official/palemoon.desktop diff --git a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 753ea1dc08d5..b1235fe2d8f2 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, python3 +{ lib, fetchurl, fetchzip, python3 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.14.1"; + version = "2.0.2"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "15l7jphy1qjsh6y6kd5mgkxsl6ymm9564g1yypa946jbyrgi8k2m"; + sha256 = "0fxkazz4ykmkiww27l92yr96hq00qn5vvjmknxcy4cl97d2pxa28"; }; # Needs tox @@ -55,13 +55,16 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3Packages; ([ pyyaml backendPackage jinja2 pygments - pypeg2 cssutils pyopengl attrs setuptools # scripts and userscripts libs tldextract beautifulsoup4 pyreadability pykeepass stem - ]; + # extensive ad blocking + adblock + ] + ++ lib.optional (pythonOlder "3.9") importlib-resources + ); patches = [ ./fix-restart.patch ]; diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 39a58454955c..9b0a9078ee5a 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.8"; + version = "10.0.9"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "23sp9vMbXg/c4o9wm+G0bW4KaP7lCUMpSQNK/5mSmeo="; + sha256 = "Dtlfm/memHSxir5XkUGkJICGEM+tPs//ET4PdVM1HPM="; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "vliiyw8KSCiZ2ycCvqOPEW3qSDH9wXwIygU1RYAqA6g="; + sha256 = "GZywFEX/5Br+Zu1w6pegoNOTrSIVQNE2LINsa3Vdlxs="; }; }; in diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 562b6d9f7345..2fe27c16720d 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.5.2115.73-1"; + version = "3.5.2115.87-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0gjar22b0qdirww4mlb0d0pm2cqkhlp1jn88gwxwvx6g72p3b6lz"; + sha256 = "0m0w2sj6kdd2b67f3kfcf4qyyxhqnmi2qzjwmqpmns9a485s6bn0"; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/c14/default.nix b/nixpkgs/pkgs/applications/networking/c14/default.nix index 572975f78d0b..3a9192164adf 100644 --- a/nixpkgs/pkgs/applications/networking/c14/default.nix +++ b/nixpkgs/pkgs/applications/networking/c14/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "c14-cli"; diff --git a/nixpkgs/pkgs/applications/networking/calls/default.nix b/nixpkgs/pkgs/applications/networking/calls/default.nix index e6d4845761a5..01797397f4ef 100644 --- a/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -1,13 +1,17 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab , meson , ninja +, cmake , pkg-config -, libhandy_0 +, libhandy , modemmanager , gtk3 , gom , gsound +, feedbackd +, callaudiod , evolution-data-server , folks , desktop-file-utils @@ -22,14 +26,14 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; - repo = "calls"; + repo = pname; rev = "v${version}"; - sha256 = "1wqkczl1fn4d2py00fsb6kh05avmc7c49gi49j3592fqsvi87j18"; + sha256 = "1qmjdhnr95dawccw1ss8hc3lk0cypj86xg2amjq7avzn86ryd76l"; }; nativeBuildInputs = [ @@ -38,16 +42,19 @@ stdenv.mkDerivation rec { pkg-config desktop-file-utils vala + cmake wrapGAppsHook ]; buildInputs = [ modemmanager - libhandy_0 + libhandy evolution-data-server folks gom gsound + feedbackd + callaudiod gtk3 libpeas ]; diff --git a/nixpkgs/pkgs/applications/networking/cawbird/default.nix b/nixpkgs/pkgs/applications/networking/cawbird/default.nix index 445ee89d5cd6..9cf0e715e0e6 100644 --- a/nixpkgs/pkgs/applications/networking/cawbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/cawbird/default.nix @@ -5,6 +5,7 @@ , json-glib , sqlite , libsoup +, liboauth , gettext , gspell , vala @@ -21,14 +22,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.3.2"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "11s8x48syy5wjj23ab4bn5jxhi7l5sx7aw6q2ggk99v042hxh3h2"; + sha256 = "1baw3h5wq2ib4bnphazq7n9c9wc94g0n6v4y5kg71n1dir0c3jkh"; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { json-glib sqlite libsoup + liboauth gettext dconf gspell diff --git a/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index c82b297f9d69..6b1df1acf5ad 100644 --- a/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cloudflared"; - version = "2021.1.5"; + version = "2021.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-nknRQdlYVfqCi9SMVTak615Yn/9N99+zHITDKL5nZ00="; + sha256 = "sha256-kmlyj6Q+OAJ0cKMeWxajPDBm99WpRf+Gpvc+Jy79DCo="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 69c08fed2df3..8460322f05b1 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "2.12.5"; + version = "2.12.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-uHec8/eGu2W3ZqXfnC/u+AOGY0nZL/GD/pZmz8aKgg0="; + sha256 = "sha256-bMbfFAI4oGZc7FOlU8LczbjAq1cYmJg5WTXkQKS9vgo="; }; - vendorSha256 = "sha256-CcSR2TZldeAbBE0yTR+4oa8mDCIx33pu9h8NE1LkRFQ="; + vendorSha256 = "sha256-4XPMixVNj6PUKobNLwpsOBT7Zs/7pkhDtQacLIB5EfE="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix b/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix index c6f835351061..728e23ff380f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "atlantis"; diff --git a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 4d7e226463fd..de032cc60e99 100644 --- a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "cloudfoundry-cli"; - version = "7.0.1"; - - goPackagePath = "code.cloudfoundry.org/cli"; - - subPackages = [ "." ]; + version = "7.2.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "0jh4x7xlijp1naak5qyc256zkzlrczl6g4iz94s8wx2zj7np0q5l"; + sha256 = "0cf5vshyz6j70sv7x43r1404hdcmkzxgdb7514kjilp5z6wsr1nv"; }; + # vendor directory stale + deleteVendor = true; + vendorSha256 = "0p0s0dr7kpmmnim4fps62vj4zki2qxxdq5ww0fzrf1372xbl4kp2"; + + subPackages = [ "." ]; # upstream have helpfully moved the bash completion script to a separate # repo which receives no releases or even tags @@ -24,24 +25,16 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; - makeTarget = let hps = stdenv.hostPlatform.system; in - if hps == "x86_64-darwin" then - "out/cf-cli_osx" - else if hps == "x86_64-linux" then - "out/cf-cli_linux_x86-64" - else if hps == "i686-linux" then - "out/cf-cli_linux_i686" - else - throw "make target for this platform unknown"; - - buildPhase = '' - cd go/src/${goPackagePath} - CF_BUILD_DATE="1970-01-01" make $makeTarget - cp $makeTarget out/cf - ''; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01" + "-X code.cloudfoundry.org/cli/version.binaryVersion=${version}" + ]; - installPhase = '' - install -Dm555 out/cf "$out/bin/cf" + postInstall = '' + mv "$out/bin/cli" "$out/bin/cf" installShellCompletion --bash $bashCompletionScript ''; @@ -50,6 +43,5 @@ buildGoPackage rec { homepage = "https://github.com/cloudfoundry/cli"; maintainers = with maintainers; [ ris ]; license = licenses.asl20; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index e01842205045..8fc667e3391c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "1nkaspz96yglq1fr8a3xr39qmbs98pk7qpqav3cfd82qwbq7vs06"; + sha256 = "sha256-n+OtFXgFmW0xsGEtC6ua0qjdsJSbEjn08mAl5Z51Kp8="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix index 5a4f6b7db0e5..c483125d851c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "machine"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix index c833dea21c7e..4940f6331d44 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }: +{ lib, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }: buildGoPackage rec { pname = "docker-machine-kvm"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix b/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix index d8b156bed88e..3c3bc2bace25 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix @@ -1,27 +1,12 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre -, version ? "1.6" }: - -let - versionMap = { - "1.5" = { - flinkVersion = "1.5.5"; - sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z"; - }; - "1.6" = { - flinkVersion = "1.11.1"; - sha256 = "0338bg2sb427c1rrf2cmsz63sz0yk6gclpli2lskq0mpx72wxpl0"; - }; - }; -in - -with versionMap.${version}; +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "flink-${flinkVersion}"; + pname = "flink"; + version = "1.12.1"; src = fetchurl { - url = "mirror://apache/flink/${name}/${name}-bin-scala_2.11.tgz"; - inherit sha256; + url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz"; + sha256 = "146azc5wg1xby3nqz8mha959qy99z2h8032rfgs2mcl3d5rrsm2l"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 1dadc0b7f087..a45f3553b921 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "fluxcd"; - version = "0.6.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "08mdcnzvjfiw81vribayl58vsjb4sipsnn4x7zv4yk0vvw72i9k8"; + sha256 = "1k7zcn8l60qfgiixkjcmp94w87w88n475mmhf58vl5pfz21p9vky"; }; - vendorSha256 = "1aijdx4mln78srz6b8nghkwsliia86x9xrfzs3sz7v4h36vhdjpa"; + vendorSha256 = "16yixz47zrzjkb2k4n03zfivpc2cavcrrv4fz8s5a4xzfrcp4nvx"; nativeBuildInputs = [ installShellFiles ]; @@ -21,6 +21,11 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/flux --version | grep ${version} > /dev/null + ''; + postInstall = '' for shell in bash fish zsh; do $out/bin/flux completion $shell > flux.$shell diff --git a/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index 896c04d6879e..4a8f42e3cc7e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "fluxctl"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix b/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix index f9b67b6821a6..d9827039500c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config +{ lib, fetchFromGitHub, rustPlatform, pkg-config , libsodium, libarchive, openssl, zeromq }: rustPlatform.buildRustPackage rec { diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index 7d97896c360a..5da9e9220a80 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "helm"; - version = "3.4.2"; + version = "3.5.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "17bb0f2w0qn6zq5isskckwqlscqig2d6pra3f7mfwilnckg1lj9s"; + sha256 = "sha256-XFWJtzKQrZL6lcr8JNiEQ8ldG5289x5pE21E8XgoYkA="; }; - vendorSha256 = "0ycp0i26rf3c96i4nqcbh7rb6i6lk62hljcsgsjyggq3pj3gpb4x"; + vendorSha256 = "sha256-mjWQxCCtTgj1VCFjnuJWgDjwMt/r4jiFC9Of+CXRgPg="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 2073916ffe17..72fcc2f9c35f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.137.0"; + version = "0.138.4"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-HrVQS09lllUC4HClWahMV72j2TiQnzEUkV16YKm6984="; + sha256 = "sha256-Y0/0wC00s7QY7/B6igOoPKXv5TE2P8NoGd9UhfVmLOk="; }; - vendorSha256 = "sha256-dL36mcYCs92USf18BMB6vXd+qLsk2BYmAEm1bwx+o5k="; + vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index 15ccd065e2f5..ccfeb6ed87a5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-CvepOpAI40eTS5p5gjtbzahn0tX/z4CId1DDqlaMSMw="; + sha256 = "sha256-4oJ/undqDSNn+Xn8eFEgOx+7263tmdXTHxXBkyFLpsE="; }; - vendorSha256 = "sha256-VRNQ6TsjM0IgnSyZRzAaf7DO6TZx5KrAWNqq+wuvmhE="; + vendorSha256 = "sha256-mktq5Dnk1mBO2yy5SeMDxa/akXdO5i2WafMTGtH53H8="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index 5f136fef8075..a7d99fc5bd59 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-9mQYJvZU/Ra+LyzfDbWGfopkdGBD7DpS9/yvRvGHDKg="; + sha256 = "sha256-GfQjgtjFynYa8SfQyoGjsyXEv0XuaK8ZbTcMhQGkcTg="; }; - vendorSha256 = "sha256-7LQY32hNXLxg/IUBbzzgb67yrbPGLCTNtmNvjE9tUno="; + vendorSha256 = "sha256-Xj9nC9ijLVmrSvgKq33yUyMO+RmeDkf7FKKCehP4GFE="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index 5a7d953a0695..739992e6bc0b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -120,7 +120,7 @@ let # with generated bindata yet. k3sBuildStage1 = buildGoPackage rec { name = "k3s-build-1"; - version = "${k3sVersion}"; + version = k3sVersion; goPackagePath = "github.com/rancher/k3s"; @@ -160,7 +160,7 @@ let }; k3sBin = buildGoPackage rec { name = "k3s-bin"; - version = "${k3sVersion}"; + version = k3sVersion; goPackagePath = "github.com/rancher/k3s"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index abc23058303b..11e2b0a29153 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "k9s"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index 98ffcd6fe670..9b1a155a25b7 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: let goPackagePath = "k8s.io/kops"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index f38e3135ecb4..5bfceefad5a5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,11 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.0-k3s2" }: -let - k3sVersion = "1.20.0-k3s2"; -in buildGoModule rec { pname = "kube3d"; - version = "3.4.0"; + version = "4.2.0"; excludedPackages = "tools"; @@ -13,7 +10,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1fisbzv786n841pagy7zbanll7k1g5ib805j9azs2s30cfhvi08b"; + sha256 = "sha256-R2RbQlceOD/uY3IdLLiM23gESh/oWnsiTWxHeH/Si18="; }; vendorSha256 = null; @@ -24,8 +21,8 @@ buildGoModule rec { "-ldflags=" "-w" "-s" - "-X github.com/rancher/k3d/v3/version.Version=v${version}" - "-X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}" + "-X github.com/rancher/k3d/v4/version.Version=v${version}" + "-X github.com/rancher/k3d/v4/version.K3sVersion=v${k3sVersion}" ]; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix index b8bef9ecc052..561bcbf7ad3b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.16.0"; in +let version = "0.17.0"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "1ipw7r9fyqbh1bjvk7ifmj3skh799ly90y4ph37r8mqk1wb92rz4"; + sha256 = "sha256-/91im204vBS3NjrMOvwTVO6tEBgdpirqJFqCnbIB+iQ="; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix index fd7eabf12761..38323b98b194 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "kubeless"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix index c72702fdc77a..d7f829dc00e3 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, go }: +{ lib, fetchFromGitHub, buildGoModule, go }: buildGoModule rec { pname = "kubelogin"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubernix/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernix/default.nix index 1411892b75b8..88cacfea4f1a 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubernix/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubernix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "kubernix"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index 51ae1202a378..f2071494f168 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.13.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "1hlj7i7pjyvrf9cpx6s41sdn7wjwfk7c0akx45kw662vrxcqcgf2"; + sha256 = "sha256-sUeXzmgSOkpqzqrX9+wNGj2X7gcf5QSpavXK4MJe8qE="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix index d26f8ed5dc67..28b3b7199974 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }: +{ lib, fetchFromGitHub, buildGoModule, makeWrapper }: buildGoModule rec { pname = "kubeval"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index 8718da462469..11b62f479c78 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule { pname = "linkerd-unstable"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix b/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix index e0a6cd48d6ea..ef85494bd140 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix @@ -1,22 +1,15 @@ { lib, python3 }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - tornado = super.tornado_5; - }; - }; -in with python.pkgs; buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "luigi"; version = "3.0.2"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; - propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ]; + propagatedBuildInputs = with python3.pkgs; [ dateutil tornado python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 570cb57a357e..81ca2283d204 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.17.0"; + version = "1.17.1"; - vendorSha256 = "sha256-cA0sgH00XawwaOAGCDbabmBE/+5Y87kThXgPe5zwlro="; + vendorSha256 = "1flny2f7n3vqhl9vkwsqxvzl8q3fv8v0h1p0d0qaqp9lgn02q3bh"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-IQ/AAr5b8ZOaQKkSrU8JsPxjqAwVmT4Kt3hf3e1dMeA="; + sha256 = "1m4kw77j4swwg3vqwmwrys7cq790w4g6y4gvdg33z9n1y9xzqys3"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix new file mode 100644 index 000000000000..3885278f1f13 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix @@ -0,0 +1,65 @@ +{ pkgs +, poetry2nix +, lib +, overrides ? (self: super: {}) +, stdenv +}: + +let + + interpreter = ( + poetry2nix.mkPoetryPackages { + projectDir = ./.; + overrides = [ + poetry2nix.defaultPoetryOverrides + (import ./poetry-git-overlay.nix { inherit pkgs; }) + ( + self: super: { + + nixops = super.nixops.overridePythonAttrs ( + old: { + meta = old.meta // { + homepage = https://github.com/NixOS/nixops; + description = "NixOS cloud provisioning and deployment tool"; + maintainers = with lib.maintainers; [ adisbladis aminechikhaoui eelco rob domenkozar ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; + }; + + } + ); + } + ) + + # User provided overrides + overrides + + # Make nixops pluginable + (self: super: { + nixops = super.__toPluginAble { + drv = super.nixops; + finalDrv = self.nixops; + + nativeBuildInputs = [ self.sphinx ]; + postInstall = '' + doc_cache=$(mktemp -d) + sphinx-build -b man -d $doc_cache doc/ $out/share/man/man1 + + html=$(mktemp -d) + sphinx-build -b html -d $doc_cache doc/ $out/share/nixops/doc + ''; + + }; + }) + + ]; + } + ).python; + +in interpreter.pkgs.nixops.withPlugins(ps: [ + ps.nixops-encrypted-links + ps.nixops-virtd + ps.nixops-aws + ps.nixops-gcp + ps.nixopsvbox +]) diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix new file mode 100644 index 000000000000..365221dd3166 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -0,0 +1,74 @@ +{ pkgs }: +self: super: { + + nixops = super.nixops.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/NixOS/nixops.git"; + rev = "1ed5a091bc52de6c91319f446f833018a1cb326e"; + sha256 = "1fx17qv9cl7hz7322zh4xlg02xn7bwwjj82cdcvqpsjf83crz3xi"; + }; + } + ); + + nixops-aws = super.nixops-aws.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/NixOS/nixops-aws.git"; + rev = "dbbaa1b15b6cf7ca1ceeb0a6195f5ee27693c505"; + sha256 = "13gw3h7g19a0s7dpayjfksrmw6g0364dcm5z2d6mlyzdkfgak4jn"; + }; + } + ); + + nixops-encrypted-links = super.nixops-encrypted-links.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixops-encrypted-links.git"; + rev = "0bb9aa50a7294ee9dca10a18ff7d9024234913e1"; + sha256 = "00wj03wcry83acwljq5v80dyrqaxpqb4j3jsdkfy3d7n5g4aq19l"; + }; + } + ); + + nixops-gcp = super.nixops-gcp.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixops-gce.git"; + rev = "23596af53eabc4e3bcf72beaaed82b2c8d40e419"; + sha256 = "10gfdhf4b3ldrpns8z66mqxwfcbgf9ccz8fx0rcp7gsgsffb0i3c"; + }; + } + ); + + nixops-virtd = super.nixops-virtd.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixops-libvirtd.git"; + rev = "af6cf5b2ced57b7b6d36b5df7dd27a14e0a5cfb6"; + sha256 = "1j75yg8a44dlbig38mf7n7p71mdzff6ii1z1pdp32i4ivk3l0hy6"; + }; + } + ); + + nixopsvbox = super.nixopsvbox.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixops-vbox.git"; + rev = "2729672865ebe2aa973c062a3fbddda8c1359da0"; + sha256 = "07bmrbg3g2prnba2kwg1rg6rvmnx1vzc538y2q3g04s958hala56"; + }; + } + ); + + nixos-modules-contrib = super.nixos-modules-contrib.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixos-modules-contrib.git"; + rev = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8"; + sha256 = "0f6ra5r8i1jz8ymw6l3j68b676a1lv0466lv0xa6mi80k6v9457x"; + }; + } + ); + +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock new file mode 100644 index 000000000000..1c6ed7459947 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -0,0 +1,841 @@ +[[package]] +name = "alabaster" +version = "0.7.12" +description = "A configurable sidebar-enabled Sphinx theme" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "apache-libcloud" +version = "3.3.1" +description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" +category = "main" +optional = false +python-versions = ">=3.5.*, <4" + +[package.dependencies] +requests = ">=2.5.0" + +[[package]] +name = "babel" +version = "2.9.0" +description = "Internationalization utilities" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.dependencies] +pytz = ">=2015.7" + +[[package]] +name = "boto" +version = "2.49.0" +description = "Amazon Web Services Library" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "boto3" +version = "1.17.0" +description = "The AWS SDK for Python" +category = "main" +optional = false +python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" + +[package.dependencies] +botocore = ">=1.20.0,<1.21.0" +jmespath = ">=0.7.1,<1.0.0" +s3transfer = ">=0.3.0,<0.4.0" + +[[package]] +name = "botocore" +version = "1.20.0" +description = "Low-level, data-driven core of boto 3." +category = "main" +optional = false +python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" + +[package.dependencies] +jmespath = ">=0.7.1,<1.0.0" +python-dateutil = ">=2.1,<3.0.0" +urllib3 = ">=1.25.4,<1.27" + +[[package]] +name = "certifi" +version = "2020.12.5" +description = "Python package for providing Mozilla's CA Bundle." +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "cffi" +version = "1.14.4" +description = "Foreign Function Interface for Python calling C code." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +pycparser = "*" + +[[package]] +name = "chardet" +version = "4.0.0" +description = "Universal encoding detector for Python 2 and 3" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "colorama" +version = "0.4.4" +description = "Cross-platform colored terminal text." +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "cryptography" +version = "3.3.1" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +category = "main" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*" + +[package.dependencies] +cffi = ">=1.12" +six = ">=1.4.1" + +[package.extras] +docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] +docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] +pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] +ssh = ["bcrypt (>=3.1.5)"] +test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] + +[[package]] +name = "docutils" +version = "0.16" +description = "Docutils -- Python Documentation Utilities" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "idna" +version = "2.10" +description = "Internationalized Domain Names in Applications (IDNA)" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "imagesize" +version = "1.2.0" +description = "Getting image size from png/jpeg/jpeg2000/gif file" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "jinja2" +version = "2.11.3" +description = "A very fast and expressive template engine." +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.dependencies] +MarkupSafe = ">=0.23" + +[package.extras] +i18n = ["Babel (>=0.8)"] + +[[package]] +name = "jmespath" +version = "0.10.0" +description = "JSON Matching Expressions" +category = "main" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" + +[[package]] +name = "libvirt-python" +version = "6.10.0" +description = "The libvirt virtualization API python binding" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "markupsafe" +version = "1.1.1" +description = "Safely add untrusted strings to HTML/XML markup." +category = "dev" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" + +[[package]] +name = "nixops" +version = "2.0.0" +description = "NixOS cloud provisioning and deployment tool" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +pluggy = "^0.13.1" +PrettyTable = "^0.7.2" +typeguard = "^2.7.1" +typing-extensions = "^3.7.4" + +[package.source] +type = "git" +url = "https://github.com/NixOS/nixops.git" +reference = "master" +resolved_reference = "1ed5a091bc52de6c91319f446f833018a1cb326e" + +[[package]] +name = "nixops-aws" +version = "1.0" +description = "NixOps AWS plugin" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +boto = "^2.49.0" +boto3 = "^1.13.7" +nixops = "rev master" +nixos-modules-contrib = "rev master" +typing-extensions = "^3.7.4" + +[package.source] +type = "git" +url = "https://github.com/NixOS/nixops-aws.git" +reference = "master" +resolved_reference = "dbbaa1b15b6cf7ca1ceeb0a6195f5ee27693c505" + +[[package]] +name = "nixops-encrypted-links" +version = "1.0" +description = "Encrypted links support for NixOps" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +nixops = "branch master" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-encrypted-links.git" +reference = "master" +resolved_reference = "0bb9aa50a7294ee9dca10a18ff7d9024234913e1" + +[[package]] +name = "nixops-gcp" +version = "1.0" +description = "NixOps backend for Google Cloud Platform" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +apache-libcloud = "^3.2.0" +cryptography = "^3.1.1" +nixops = "branch master" +nixos-modules-contrib = "branch master" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-gce.git" +reference = "master" +resolved_reference = "23596af53eabc4e3bcf72beaaed82b2c8d40e419" + +[[package]] +name = "nixops-virtd" +version = "1.0" +description = "NixOps plugin for virtd" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +libvirt-python = "^6.1" +nixops = "branch master" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-libvirtd.git" +reference = "master" +resolved_reference = "af6cf5b2ced57b7b6d36b5df7dd27a14e0a5cfb6" + +[[package]] +name = "nixopsvbox" +version = "1.7" +description = "NixOps backend for VirtualBox" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +nixops = "rev master" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-vbox.git" +reference = "master" +resolved_reference = "2729672865ebe2aa973c062a3fbddda8c1359da0" + +[[package]] +name = "nixos-modules-contrib" +version = "0.1.0" +description = "NixOS modules that don't quite belong in NixOS." +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +nixops = "rev master" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixos-modules-contrib.git" +reference = "master" +resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8" + +[[package]] +name = "packaging" +version = "20.9" +description = "Core utilities for Python packages" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.dependencies] +pyparsing = ">=2.0.2" + +[[package]] +name = "pluggy" +version = "0.13.1" +description = "plugin and hook calling mechanisms for python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.extras] +dev = ["pre-commit", "tox"] + +[[package]] +name = "prettytable" +version = "0.7.2" +description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format." +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "pycparser" +version = "2.20" +description = "C parser in Python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "pygments" +version = "2.7.4" +description = "Pygments is a syntax highlighting package written in Python." +category = "dev" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "pyparsing" +version = "2.4.7" +description = "Python parsing module" +category = "dev" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" + +[[package]] +name = "python-dateutil" +version = "2.8.1" +description = "Extensions to the standard Python datetime module" +category = "main" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" + +[package.dependencies] +six = ">=1.5" + +[[package]] +name = "pytz" +version = "2021.1" +description = "World timezone definitions, modern and historical" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "requests" +version = "2.25.1" +description = "Python HTTP for Humans." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.dependencies] +certifi = ">=2017.4.17" +chardet = ">=3.0.2,<5" +idna = ">=2.5,<3" +urllib3 = ">=1.21.1,<1.27" + +[package.extras] +security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] +socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] + +[[package]] +name = "s3transfer" +version = "0.3.4" +description = "An Amazon S3 Transfer Manager" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +botocore = ">=1.12.36,<2.0a.0" + +[[package]] +name = "six" +version = "1.15.0" +description = "Python 2 and 3 compatibility utilities" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" + +[[package]] +name = "snowballstemmer" +version = "2.1.0" +description = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms." +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "sphinx" +version = "3.4.3" +description = "Python documentation generator" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +alabaster = ">=0.7,<0.8" +babel = ">=1.3" +colorama = {version = ">=0.3.5", markers = "sys_platform == \"win32\""} +docutils = ">=0.12" +imagesize = "*" +Jinja2 = ">=2.3" +packaging = "*" +Pygments = ">=2.0" +requests = ">=2.5.0" +snowballstemmer = ">=1.1" +sphinxcontrib-applehelp = "*" +sphinxcontrib-devhelp = "*" +sphinxcontrib-htmlhelp = "*" +sphinxcontrib-jsmath = "*" +sphinxcontrib-qthelp = "*" +sphinxcontrib-serializinghtml = "*" + +[package.extras] +docs = ["sphinxcontrib-websupport"] +lint = ["flake8 (>=3.5.0)", "isort", "mypy (>=0.790)", "docutils-stubs"] +test = ["pytest", "pytest-cov", "html5lib", "cython", "typed-ast"] + +[[package]] +name = "sphinxcontrib-applehelp" +version = "1.0.2" +description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +lint = ["flake8", "mypy", "docutils-stubs"] +test = ["pytest"] + +[[package]] +name = "sphinxcontrib-devhelp" +version = "1.0.2" +description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document." +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +lint = ["flake8", "mypy", "docutils-stubs"] +test = ["pytest"] + +[[package]] +name = "sphinxcontrib-htmlhelp" +version = "1.0.3" +description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +lint = ["flake8", "mypy", "docutils-stubs"] +test = ["pytest", "html5lib"] + +[[package]] +name = "sphinxcontrib-jsmath" +version = "1.0.1" +description = "A sphinx extension which renders display math in HTML via JavaScript" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +test = ["pytest", "flake8", "mypy"] + +[[package]] +name = "sphinxcontrib-qthelp" +version = "1.0.3" +description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document." +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +lint = ["flake8", "mypy", "docutils-stubs"] +test = ["pytest"] + +[[package]] +name = "sphinxcontrib-serializinghtml" +version = "1.1.4" +description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)." +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +lint = ["flake8", "mypy", "docutils-stubs"] +test = ["pytest"] + +[[package]] +name = "typeguard" +version = "2.10.0" +description = "Run-time type checker for Python" +category = "main" +optional = false +python-versions = ">=3.5.3" + +[package.extras] +doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] +test = ["pytest", "typing-extensions"] + +[[package]] +name = "typing-extensions" +version = "3.7.4.3" +description = "Backported and Experimental Type Hints for Python 3.5+" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "urllib3" +version = "1.26.3" +description = "HTTP library with thread-safe connection pooling, file post, and more." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" + +[package.extras] +brotli = ["brotlipy (>=0.6.0)"] +secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] +socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] + +[metadata] +lock-version = "1.1" +python-versions = "^3.8" +content-hash = "bd064837654a0d4a4691b3df01338b92c95a449ff400a9cd49fee843ab13ee92" + +[metadata.files] +alabaster = [ + {file = "alabaster-0.7.12-py2.py3-none-any.whl", hash = "sha256:446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359"}, + {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"}, +] +apache-libcloud = [ + {file = "apache-libcloud-3.3.1.tar.gz", hash = "sha256:d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"}, + {file = "apache_libcloud-3.3.1-py2.py3-none-any.whl", hash = "sha256:c3722c4dd58b0ee4beaf4e615e0ba82505d9a915e55319dc84383687166a3eed"}, +] +babel = [ + {file = "Babel-2.9.0-py2.py3-none-any.whl", hash = "sha256:9d35c22fcc79893c3ecc85ac4a56cde1ecf3f19c540bba0922308a6c06ca6fa5"}, + {file = "Babel-2.9.0.tar.gz", hash = "sha256:da031ab54472314f210b0adcff1588ee5d1d1d0ba4dbd07b94dba82bde791e05"}, +] +boto = [ + {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, + {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, +] +boto3 = [ + {file = "boto3-1.17.0-py2.py3-none-any.whl", hash = "sha256:b4860f56bc585d3d1fde90d288da5eb4d1198401d72201dc3e25de8887b080e2"}, + {file = "boto3-1.17.0.tar.gz", hash = "sha256:2a39bd5e5f2d50ce9267d682cc92750f8771399665021f47e80f9c8d2fb812a6"}, +] +botocore = [ + {file = "botocore-1.20.0-py2.py3-none-any.whl", hash = "sha256:634b39ab0d55477cfbffb0e5dff31b7ab4bb171b04a0c69f8bcf65135f26ba94"}, + {file = "botocore-1.20.0.tar.gz", hash = "sha256:a608d6d644b852f3c154fc433eaae52febbebc7c474fa8f4d666797d0931770a"}, +] +certifi = [ + {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"}, + {file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"}, +] +cffi = [ + {file = "cffi-1.14.4-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775"}, + {file = "cffi-1.14.4-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06"}, + {file = "cffi-1.14.4-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26"}, + {file = "cffi-1.14.4-cp27-cp27m-win32.whl", hash = "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c"}, + {file = "cffi-1.14.4-cp27-cp27m-win_amd64.whl", hash = "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b"}, + {file = "cffi-1.14.4-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d"}, + {file = "cffi-1.14.4-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca"}, + {file = "cffi-1.14.4-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698"}, + {file = "cffi-1.14.4-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b"}, + {file = "cffi-1.14.4-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293"}, + {file = "cffi-1.14.4-cp35-cp35m-win32.whl", hash = "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2"}, + {file = "cffi-1.14.4-cp35-cp35m-win_amd64.whl", hash = "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7"}, + {file = "cffi-1.14.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f"}, + {file = "cffi-1.14.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362"}, + {file = "cffi-1.14.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec"}, + {file = "cffi-1.14.4-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b"}, + {file = "cffi-1.14.4-cp36-cp36m-win32.whl", hash = "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668"}, + {file = "cffi-1.14.4-cp36-cp36m-win_amd64.whl", hash = "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009"}, + {file = "cffi-1.14.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb"}, + {file = "cffi-1.14.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d"}, + {file = "cffi-1.14.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03"}, + {file = "cffi-1.14.4-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01"}, + {file = "cffi-1.14.4-cp37-cp37m-win32.whl", hash = "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e"}, + {file = "cffi-1.14.4-cp37-cp37m-win_amd64.whl", hash = "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35"}, + {file = "cffi-1.14.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d"}, + {file = "cffi-1.14.4-cp38-cp38-manylinux1_i686.whl", hash = "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b"}, + {file = "cffi-1.14.4-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53"}, + {file = "cffi-1.14.4-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e"}, + {file = "cffi-1.14.4-cp38-cp38-win32.whl", hash = "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d"}, + {file = "cffi-1.14.4-cp38-cp38-win_amd64.whl", hash = "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375"}, + {file = "cffi-1.14.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909"}, + {file = "cffi-1.14.4-cp39-cp39-manylinux1_i686.whl", hash = "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd"}, + {file = "cffi-1.14.4-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a"}, + {file = "cffi-1.14.4-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:7ef7d4ced6b325e92eb4d3502946c78c5367bc416398d387b39591532536734e"}, + {file = "cffi-1.14.4-cp39-cp39-win32.whl", hash = "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3"}, + {file = "cffi-1.14.4-cp39-cp39-win_amd64.whl", hash = "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b"}, + {file = "cffi-1.14.4.tar.gz", hash = "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c"}, +] +chardet = [ + {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, + {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, +] +colorama = [ + {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, + {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, +] +cryptography = [ + {file = "cryptography-3.3.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030"}, + {file = "cryptography-3.3.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0"}, + {file = "cryptography-3.3.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812"}, + {file = "cryptography-3.3.1-cp27-cp27m-win32.whl", hash = "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e"}, + {file = "cryptography-3.3.1-cp27-cp27m-win_amd64.whl", hash = "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901"}, + {file = "cryptography-3.3.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d"}, + {file = "cryptography-3.3.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5"}, + {file = "cryptography-3.3.1-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302"}, + {file = "cryptography-3.3.1-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244"}, + {file = "cryptography-3.3.1-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c"}, + {file = "cryptography-3.3.1-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c"}, + {file = "cryptography-3.3.1-cp36-abi3-win32.whl", hash = "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a"}, + {file = "cryptography-3.3.1-cp36-abi3-win_amd64.whl", hash = "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7"}, + {file = "cryptography-3.3.1.tar.gz", hash = "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6"}, +] +docutils = [ + {file = "docutils-0.16-py2.py3-none-any.whl", hash = "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"}, + {file = "docutils-0.16.tar.gz", hash = "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"}, +] +idna = [ + {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, + {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, +] +imagesize = [ + {file = "imagesize-1.2.0-py2.py3-none-any.whl", hash = "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1"}, + {file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"}, +] +jinja2 = [ + {file = "Jinja2-2.11.3-py2.py3-none-any.whl", hash = "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419"}, + {file = "Jinja2-2.11.3.tar.gz", hash = "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"}, +] +jmespath = [ + {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, + {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, +] +libvirt-python = [ + {file = "libvirt-python-6.10.0.tar.gz", hash = "sha256:47a8e90d9f49bc0296d2817f6009e18dbb69844ce10b81c2a2672bccd6f49fd5"}, +] +markupsafe = [ + {file = "MarkupSafe-1.1.1-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-win32.whl", hash = "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e"}, + {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f"}, + {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-win32.whl", hash = "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-win_amd64.whl", hash = "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-win32.whl", hash = "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-win32.whl", hash = "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-win32.whl", hash = "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8"}, + {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, +] +nixops = [] +nixops-aws = [] +nixops-encrypted-links = [] +nixops-gcp = [] +nixops-virtd = [] +nixopsvbox = [] +nixos-modules-contrib = [] +packaging = [ + {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, + {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, +] +pluggy = [ + {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, + {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, +] +prettytable = [ + {file = "prettytable-0.7.2.tar.bz2", hash = "sha256:853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36"}, + {file = "prettytable-0.7.2.tar.gz", hash = "sha256:2d5460dc9db74a32bcc8f9f67de68b2c4f4d2f01fa3bd518764c69156d9cacd9"}, + {file = "prettytable-0.7.2.zip", hash = "sha256:a53da3b43d7a5c229b5e3ca2892ef982c46b7923b51e98f0db49956531211c4f"}, +] +pycparser = [ + {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, + {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, +] +pygments = [ + {file = "Pygments-2.7.4-py3-none-any.whl", hash = "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435"}, + {file = "Pygments-2.7.4.tar.gz", hash = "sha256:df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337"}, +] +pyparsing = [ + {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, + {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, +] +python-dateutil = [ + {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, + {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, +] +pytz = [ + {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, + {file = "pytz-2021.1.tar.gz", hash = "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da"}, +] +requests = [ + {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, + {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, +] +s3transfer = [ + {file = "s3transfer-0.3.4-py2.py3-none-any.whl", hash = "sha256:1e28620e5b444652ed752cf87c7e0cb15b0e578972568c6609f0f18212f259ed"}, + {file = "s3transfer-0.3.4.tar.gz", hash = "sha256:7fdddb4f22275cf1d32129e21f056337fd2a80b6ccef1664528145b72c49e6d2"}, +] +six = [ + {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"}, + {file = "six-1.15.0.tar.gz", hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"}, +] +snowballstemmer = [ + {file = "snowballstemmer-2.1.0-py2.py3-none-any.whl", hash = "sha256:b51b447bea85f9968c13b650126a888aabd4cb4463fca868ec596826325dedc2"}, + {file = "snowballstemmer-2.1.0.tar.gz", hash = "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"}, +] +sphinx = [ + {file = "Sphinx-3.4.3-py3-none-any.whl", hash = "sha256:c314c857e7cd47c856d2c5adff514ac2e6495f8b8e0f886a8a37e9305dfea0d8"}, + {file = "Sphinx-3.4.3.tar.gz", hash = "sha256:41cad293f954f7d37f803d97eb184158cfd90f51195131e94875bc07cd08b93c"}, +] +sphinxcontrib-applehelp = [ + {file = "sphinxcontrib-applehelp-1.0.2.tar.gz", hash = "sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"}, + {file = "sphinxcontrib_applehelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:806111e5e962be97c29ec4c1e7fe277bfd19e9652fb1a4392105b43e01af885a"}, +] +sphinxcontrib-devhelp = [ + {file = "sphinxcontrib-devhelp-1.0.2.tar.gz", hash = "sha256:ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"}, + {file = "sphinxcontrib_devhelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:8165223f9a335cc1af7ffe1ed31d2871f325254c0423bc0c4c7cd1c1e4734a2e"}, +] +sphinxcontrib-htmlhelp = [ + {file = "sphinxcontrib-htmlhelp-1.0.3.tar.gz", hash = "sha256:e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b"}, + {file = "sphinxcontrib_htmlhelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:3c0bc24a2c41e340ac37c85ced6dafc879ab485c095b1d65d2461ac2f7cca86f"}, +] +sphinxcontrib-jsmath = [ + {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"}, + {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"}, +] +sphinxcontrib-qthelp = [ + {file = "sphinxcontrib-qthelp-1.0.3.tar.gz", hash = "sha256:4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"}, + {file = "sphinxcontrib_qthelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:bd9fc24bcb748a8d51fd4ecaade681350aa63009a347a8c14e637895444dfab6"}, +] +sphinxcontrib-serializinghtml = [ + {file = "sphinxcontrib-serializinghtml-1.1.4.tar.gz", hash = "sha256:eaa0eccc86e982a9b939b2b82d12cc5d013385ba5eadcc7e4fed23f4405f77bc"}, + {file = "sphinxcontrib_serializinghtml-1.1.4-py2.py3-none-any.whl", hash = "sha256:f242a81d423f59617a8e5cf16f5d4d74e28ee9a66f9e5b637a18082991db5a9a"}, +] +typeguard = [ + {file = "typeguard-2.10.0-py3-none-any.whl", hash = "sha256:a75c6d86ac9d1faf85c5ae952de473e5d26824dda6d4394ff6bc676849cfb939"}, + {file = "typeguard-2.10.0.tar.gz", hash = "sha256:d830132dcd544d3f8a2a842ea739eaa0d7c099fcebb9dcdf3802f4c9929d8191"}, +] +typing-extensions = [ + {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"}, + {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"}, + {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, +] +urllib3 = [ + {file = "urllib3-1.26.3-py2.py3-none-any.whl", hash = "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80"}, + {file = "urllib3-1.26.3.tar.gz", hash = "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"}, +] diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/pyproject.toml b/nixpkgs/pkgs/applications/networking/cluster/nixops/pyproject.toml new file mode 100644 index 000000000000..09ffb54fa2bb --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -0,0 +1,21 @@ +[tool.poetry] +name = "nixopsenv" +version = "2.0.0" +description = "NixOps 2.0" +authors = ["Adam Hoese <adam.hose@tweag.io>"] + +[tool.poetry.dependencies] +python = "^3.8" +nixops = {git = "https://github.com/NixOS/nixops.git"} +nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"} +nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} +nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} +nixops-encrypted-links = {git = "https://github.com/nix-community/nixops-encrypted-links.git"} +nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} + +[tool.poetry.dev-dependencies] +sphinx = "^3.1.2" + +[build-system] +requires = ["poetry>=0.12"] +build-backend = "poetry.masonry.api" diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix b/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix new file mode 100644 index 000000000000..6d298b8df83e --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix @@ -0,0 +1,10 @@ +{ pkgs ? import <nixpkgs> {} }: + +pkgs.mkShell { + buildInputs = [ + pkgs.poetry2nix.cli + pkgs.pkgconfig + pkgs.libvirt + pkgs.poetry + ]; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/update b/nixpkgs/pkgs/applications/networking/cluster/nixops/update new file mode 100755 index 000000000000..1d1fd93fdbea --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/update @@ -0,0 +1,11 @@ +#!/usr/bin/env nix-shell +#! nix-shell -I nixpkgs=../../../../../. -i bash +set -eux + +rm -f ./poetry.lock ./poetry-git-overlay.nix + +poetry lock + +# builtins.fetchGit is disabled in restricted eval +# Pin fixed-output derivations from lock file +poetry2nix lock diff --git a/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 6be32ed17a4b..ffc682ca4d90 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "0lm691w4v2sdv5i2dkszwv6g11ig2aavlbxh40kjlmc05dz7dapv"; + sha256 = "sha256-8qY99sEEOFY2eMfuZSWv49nw1LKVHn50P1gYQN6y2f4="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix deleted file mode 100644 index 58bdb694eed5..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage -, buildGoPackage -, nvidia_x11 -, nvidiaGpuSupport -}: - -callPackage ./generic.nix { - inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.11.8"; - sha256 = "1dhh07bifr02jh2lls8fv1d9ra67ymgh8qxqvpvm0cd0qdd469z1"; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix index b6e053e757de..82f508c63ee8 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.12.9"; - sha256 = "1a0ig6pb0z3qp7zk4jgz3h241bifmjlyqsfikyy3sxdnzj7yha27"; + version = "0.12.10"; + sha256 = "12hlzjkay7y1502nmfvq2qkhp9pq7vp4zxypawnh98qvxbzv149l"; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix index ff4434399bd7..6ae59033835c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.2"; - sha256 = "1l9j6k5dzh9ym9j75mam10vd9b5qh4xqfj6d63bjp7gkk4hd1jxx"; + version = "1.0.3"; + sha256 = "142rwpli8mbyg4vhhybnym34rk9w1ns4ddfhqjr1ygmxb1rlsngi"; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix index 4eb2bf78b54a..ebf3cb417d69 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz"; }; - doBuild = false; doCheck = false; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index 8e5942a033f9..e956715d9b0c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wMt/I2zpdM7l+YNwHkAA6sVRWUtlGpN+94jqx2Jy4HA="; + sha256 = "sha256-u+yxAGVVFsZpiexToNDUfQATsYOkKWHkYF9roK0OInY="; }; - vendorSha256 = "sha256-fhIIqirEEdqn/n8bBtLw07fEGfnpC/8SOLbkhnytyME="; + vendorSha256 = "sha256-c5sel3xs4npTENqRQu8d9hUOK1OFQodF3M0ZpUpr1po="; + + buildFlagsArray = [ "-ldflags=" "-s" "-w" ]; meta = with lib; { description = "Octant plugin for viewing Starboard security information"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix index 09bf82e43fed..53209d2edd67 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux +{ lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux , coreutils, kerberos, ncurses, clang, installShellFiles , components ? [ "cmd/oc" diff --git a/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix b/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix index 650532ae8b96..89802f12be5e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "popeye"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/spacegun/default.nix b/nixpkgs/pkgs/applications/networking/cluster/spacegun/default.nix index 64623f88ddaa..684e9f65a5bf 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/spacegun/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/spacegun/default.nix @@ -1,16 +1,21 @@ -{ pkgs, nodejs, stdenv, lib, ... }: +{ pkgs, fetchFromGitHub, nodejs, stdenv, lib, ... }: let - - packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json)); + src = fetchFromGitHub { + owner = "dvallin"; + repo = "spacegun"; + rev = "v0.3.3"; + sha256 = "0cd9yzms44dj9ix8lrhbkby5zsyb8wambs24j6c3ibr67sggr6sq"; + }; nodePackages = import ./node-composition.nix { inherit pkgs nodejs; inherit (stdenv.hostPlatform) system; }; in -nodePackages."${packageName}".override { - nativeBuildInputs = [ pkgs.makeWrapper ]; +nodePackages.package.override { + inherit src; + nativeBuildInputs = [ pkgs.makeWrapper pkgs.nodePackages.node-gyp-build ]; postInstall = '' # Patch shebangs in node_modules, otherwise the webpack build fails with interpreter problems diff --git a/nixpkgs/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/nixpkgs/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh index 293a72a16237..bda3d1727c4f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh +++ b/nixpkgs/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh @@ -1,10 +1,17 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# Download package.json and package-lock.json from the v0.3.3 release +curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package.json -o package.json +curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json + node2nix \ --nodejs-10 \ --node-env ../../../../development/node-packages/node-env.nix \ --development \ --input package.json \ + --lock package-lock.json \ --output node-packages.nix \ --composition node-composition.nix + +rm -f package.json package-lock.json diff --git a/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 89b805fc1538..7cbb2328ae73 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-packages.nix b/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-packages.nix index 423e34f10df1..9203d8f60c5e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-packages.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-packages.nix @@ -1,142 +1,142 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "@babel/code-frame-7.8.3" = { + "@babel/code-frame-7.5.5" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.8.3"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "3d85pd9lfbm8yrlpn6wj9g56snbnpr9fx0w1b9x26jbirc2xfrvnifwzprp0f6bhqijshgm0q35axic8d11v4j0kq493dapcyk33n3b"; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw=="; }; }; - "@babel/core-7.8.7" = { + "@babel/core-7.6.2" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.8.7"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz"; - sha512 = "34gjbasmqp8z2rbwlc5b9sfnvs7fw1hm3i5bcdk0ddymr9b280fbcgfx6mgiwhkv3gzgawjvzcg1bzqp9f0hhifkhrdg8r4fqbnl6dc"; + url = "https://registry.npmjs.org/@babel/core/-/core-7.6.2.tgz"; + sha512 = "l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ=="; }; }; - "@babel/generator-7.8.8" = { + "@babel/generator-7.6.2" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.8.8"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz"; - sha512 = "0k5w5pcsv2m6992nh49qjil2b1aqzdbdrcxzcp89v7wq9wx7llnx5ijyzl9w895iry3hnp8mk3srgp52kgz4swvjqf9lwdxxrb99b0w"; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz"; + sha512 = "j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ=="; }; }; - "@babel/helper-function-name-7.8.3" = { + "@babel/helper-function-name-7.1.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.8.3"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz"; - sha512 = "0w35m1kq2dmsgdgjxvpmg6gxm1rzl1jqf23h3k7pwh9nmwsmqbgv0rzy7fs6dq31dqq6j17bwyww0091r41aj0rl3zi1nj2a1gn0b04"; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; + sha512 = "A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw=="; }; }; - "@babel/helper-get-function-arity-7.8.3" = { + "@babel/helper-get-function-arity-7.0.0" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.8.3"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; - sha512 = "12g2gjipd8svg02d12iqbf0rz4m99g36qccn3f81xij3ac4f7kqzx0407xma49h11j88iz8jil2whj7j96wqpwd67abi23xczwd2l0m"; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; + sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ=="; }; }; - "@babel/helper-plugin-utils-7.8.3" = { + "@babel/helper-plugin-utils-7.0.0" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.8.3"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; - sha512 = "1jj9ibj72hqv1qm4hvdnk728fi9mihrwhq0xcs2qlxbs8iz9d2zb4a23sm7ny0s42asrdyy2s98shgnqm0rhn2314k6pcyxspiymrwg"; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz"; + sha512 = "CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="; }; }; - "@babel/helper-split-export-declaration-7.8.3" = { + "@babel/helper-split-export-declaration-7.4.4" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.8.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; - sha512 = "1sgm6wd88kmizvig5m0ims97vmlylfii72xcw4k01h2wsw3cpc312s1asnjrq5y472hcqfh2mwn8dwpqkpcvs0ssqwnz1c1xhwz47fz"; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; + sha512 = "Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q=="; }; }; - "@babel/helpers-7.8.4" = { + "@babel/helpers-7.6.2" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.8.4"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz"; - sha512 = "3rr2xlnr2hmpbrgysgs0jyrz4bjyg80cxij1wn899v53zqj4i1bcm3ajpnr03v1swlczkzapn7nvzmzhwlqxl1hw5pciq8h0zpxxxjl"; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz"; + sha512 = "3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA=="; }; }; - "@babel/highlight-7.8.3" = { + "@babel/highlight-7.5.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.8.3"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz"; - sha512 = "09353nlk7ng0h135l14dhwk4jahsdrapvd0185wra8l73wjbnkb11jl42znj1rxypb38jlzcraxf4xdka1ssis5khgjvgql2kkk4zix"; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz"; + sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ=="; }; }; - "@babel/parser-7.8.8" = { + "@babel/parser-7.6.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.8.8"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz"; - sha512 = "1q85si9966ra57f43dccjanxnyy65c66lykxgv5z231wpi4w023nk8l7s8m54bp9fv4yd3pl682yh0krny22qmfygxggc2g61dldvlq"; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz"; + sha512 = "mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg=="; }; }; - "@babel/plugin-syntax-object-rest-spread-7.8.3" = { + "@babel/plugin-syntax-object-rest-spread-7.2.0" = { name = "_at_babel_slash_plugin-syntax-object-rest-spread"; packageName = "@babel/plugin-syntax-object-rest-spread"; - version = "7.8.3"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha512 = "2a9vg6b6p2rfhcflic2w6rbrbiqrdgj4ra2q20g1qv6ncwmvja2jq8snygwfw1ll1k94rqnbj4hc1fpizgr1v35rfvxqvwr6658r2jy"; + url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz"; + sha512 = "t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA=="; }; }; - "@babel/template-7.8.6" = { + "@babel/template-7.6.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.8.6"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz"; - sha512 = "0z8kzrpis50nr4vsyqr77cpqad0xfsacw45jdhwsl89mdzpvy8wcvc0kdy938kb0ll069plxhgy3a3fpag408ci2pb47gxzrhy2rcyd"; + url = "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz"; + sha512 = "5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ=="; }; }; - "@babel/traverse-7.8.6" = { + "@babel/traverse-7.6.2" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.8.6"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz"; - sha512 = "3s53fzm55c14accqfxhvdck1vkj87489w0rhcl7zj8phf9iz21qs0garpghgs0h1cj4s4n2fb7czipdm2mlrj19iaygh37zsv8ja7yq"; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz"; + sha512 = "8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ=="; }; }; - "@babel/types-7.8.7" = { + "@babel/types-7.6.1" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.8.7"; + version = "7.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz"; - sha512 = "0kj404kqcscn0qdpis6kha2263fb0njap0qqcjbwf38jv9qvpxw39f84iiyjspgwz7v1bqcdpjpfb274dkgh2v9ih10w57i85wfnr4k"; + url = "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz"; + sha512 = "X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g=="; }; }; - "@cnakazawa/watch-1.0.4" = { + "@cnakazawa/watch-1.0.3" = { name = "_at_cnakazawa_slash_watch"; packageName = "@cnakazawa/watch"; - version = "1.0.4"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz"; - sha512 = "2hl7iz90jal2f27hgyb5rbmcp96p182xkmflyj5rsyqqffng8vkzz3fcjvbvcpdykij40ax4yirdc6p68yrmjvai7hr8y93mj20indz"; + url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz"; + sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA=="; }; }; "@jest/console-24.9.0" = { @@ -145,7 +145,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz"; - sha512 = "0nwvmyk8p01b6331xizblr7h9kkgp8rybjpfj1pa57h9w47lsnpyzzhh9vsji9q361bg17fmxwkgxs10k7nk9lcmfvphag7qipzms36"; + sha512 = "Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ=="; }; }; "@jest/core-24.9.0" = { @@ -154,7 +154,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz"; - sha512 = "3c0jsaq55pcz4gx9sg9dccqpakbdfplm0w715lw904p8lvvz6p9899j47ndfcpnb5pba3vdzr96f5gmanwgmskyapshm51hrvg2120n"; + sha512 = "Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A=="; }; }; "@jest/environment-24.9.0" = { @@ -163,7 +163,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz"; - sha512 = "1lpii90h62jy8h2awivnqdjarsicik5g1npmsyjm8yq24iv3n6d0ilgajw3v95qrw5m2gcpsy82cyqb35xkn9sn7i4gg1ngwjb503g4"; + sha512 = "5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ=="; }; }; "@jest/fake-timers-24.9.0" = { @@ -172,7 +172,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz"; - sha512 = "3s57a5043fphl08b2gb8frph1gm1x47lb7za0n0iqspr4p0iwibvm7wmzgal27b8h2v93i229cyh786kymy80l3b3bhqjwqmlsiqr3r"; + sha512 = "eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A=="; }; }; "@jest/reporters-24.9.0" = { @@ -181,7 +181,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz"; - sha512 = "0dkr3yy0x1n8b1226aczwz75785nl21hh913sadyqj48j0fq4sr9n2q2b2v23gqg6p63p4hcjcsdadlway599n57bgvf7ns539igvls"; + sha512 = "mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw=="; }; }; "@jest/source-map-24.9.0" = { @@ -190,7 +190,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz"; - sha512 = "038h2qlv880agd1b1mqxmkxbqv76ikcvdas4gjzkppg77yzd61ww2nwvliwgymc860niaa9xsi2p5svrwg80hrk4w6bwrbcd723nz7x"; + sha512 = "/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg=="; }; }; "@jest/test-result-24.9.0" = { @@ -199,7 +199,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz"; - sha512 = "2464cq11b9d51nrx8j5vi5m2572rrhi001l2lxz84wg5r6bkpskkszrk3s47w51h1rgm668ix0fgzwhgihjcxkafiy15738n0fnnhaw"; + sha512 = "XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA=="; }; }; "@jest/test-sequencer-24.9.0" = { @@ -208,7 +208,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz"; - sha512 = "3h61jyz33sya4wglmvp4f1m5lhxagwv76gdbjafdxfc1nag58vdv4b65yiggsry5xx9ixjd8j1grjw3d3rsjy8gpifnv49li99srapa"; + sha512 = "6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A=="; }; }; "@jest/transform-24.9.0" = { @@ -217,7 +217,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz"; - sha512 = "2cwna8zadqd9ahyf32pyg0hgrnn8qwwg55cdyw5imfbvj9g9kljwsbagx87074kzp3rdai22glvwkwpv7lk0aa49dw5ziai4fdi9i2d"; + sha512 = "TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ=="; }; }; "@jest/types-24.9.0" = { @@ -226,25 +226,16 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz"; - sha512 = "03hdscpch75yk366szkrfi63n6mqd5hscqslcpxklq5j99n05qg1p54zj51jhcld1dvkc4hgw0vmzjcr0qncphfb54yx9jsxp6vp8jw"; + sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw=="; }; }; - "@kubernetes/client-node-0.10.3" = { + "@kubernetes/client-node-0.10.1" = { name = "_at_kubernetes_slash_client-node"; packageName = "@kubernetes/client-node"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.10.3.tgz"; - sha512 = "0ra42q33nywyiwiccxcg501ajdc1rz1lvg6kfwk6xypi1vlkmmvxiywc20y4s6v48i40m8j5sl2y40ni9jg7v396w86wcczsb6va3wv"; - }; - }; - "@sindresorhus/is-0.7.0" = { - name = "_at_sindresorhus_slash_is"; - packageName = "@sindresorhus/is"; - version = "0.7.0"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; - sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q"; + url = "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.10.1.tgz"; + sha512 = "AOfrCPa5oqdk/7lzIVU+4yYPlphc8cGW+kbiJAS5+GTbUpo62f5jPbWSPv83jTjQwfhWucj3t+3VHxQGdNexsw=="; }; }; "@types/accepts-1.3.5" = { @@ -253,7 +244,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz"; - sha512 = "30y19l2wp8plrlgcj6fn0qc7wdy72rcn69zvmn8463738bx4mz7pxwl8dml92gi7y1ry2hqzaq0ljvk8wfp6f9k0v092kpazlingrwc"; + sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; }; }; "@types/axios-0.14.0" = { @@ -271,25 +262,25 @@ let version = "7.0.7"; src = fetchurl { url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.7.tgz"; - sha512 = "18iifcb27svl3qmsh5vvpidyw3cj6hhif0il25xsg76vq9gb4h8gmfqs5hv3is2dab09a6nwbinf6f1q641spv7spr33a9ynxp426vl"; + sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ=="; }; }; - "@types/babel__core-7.1.6" = { + "@types/babel__core-7.1.3" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.6"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz"; - sha512 = "17ggrqy35zds8rkpa2kglnk8f5dc43sgbkbjcfjbaygi53jxwm9ji6vr1xqanhs2yn4spla51fjdypl2hsfdrkfhpkzban0ridf2fdm"; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz"; + sha512 = "8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA=="; }; }; - "@types/babel__generator-7.6.1" = { + "@types/babel__generator-7.6.0" = { name = "_at_types_slash_babel__generator"; packageName = "@types/babel__generator"; - version = "7.6.1"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz"; - sha512 = "1xw1hijlii2sxf25d5pcqlgqsb6vpzw7c3z9s0s20f1cdyyb768cajmxxk3l1c9g8md3h797v6pzvjvpjmw8q83aw8w69agcpxsc4kc"; + url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.0.tgz"; + sha512 = "c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw=="; }; }; "@types/babel__template-7.0.2" = { @@ -298,16 +289,16 @@ let version = "7.0.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz"; - sha512 = "199fw9pirw68kdc47d80sy6gg5g6m8raxawnxwpcs0nc6bmxrv19qmv1212lfyw67a2l5b5abxz9g0i1fwnrxm6h6rqkv4njw5b7bpw"; + sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; }; }; - "@types/babel__traverse-7.0.9" = { + "@types/babel__traverse-7.0.7" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.9"; + version = "7.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz"; - sha512 = "2vza0zha9nrlal5hgfdbaavx6xqxq195whl8274barqkyw26vrvvi9d7jkwp4harbx158wsxwjh4ypgkyb9w9cg73iz7fkdppq50hcc"; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz"; + sha512 = "CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw=="; }; }; "@types/babylon-6.16.5" = { @@ -316,16 +307,16 @@ let version = "6.16.5"; src = fetchurl { url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.5.tgz"; - sha512 = "3pvh96p07fz7ib5j5519lk4xm59i6yv2dyy4xsmjv853fi61lziwz0q03y3bih2nvvskcy82jqsaxaadagjmrr9wdbkv9m5qzkrwzf4"; + sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="; }; }; - "@types/body-parser-1.19.0" = { + "@types/body-parser-1.17.1" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.19.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "0av4v9bdhgbq0jils3jajym9gcfddyx63g2xx8fh6vqafqb5vdcm98p1kfl70ydih9m393zp13krslmii5bmf05ngyaxn139nn0kpsv"; + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz"; + sha512 = "RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w=="; }; }; "@types/caseless-0.12.2" = { @@ -334,7 +325,7 @@ let version = "0.12.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz"; - sha512 = "39jv2a7v9mi41wxbv242icriy5asbzyk95iy25ay3gwa1d6yi40cd6gclbzn81hig9xvvi5z7j2gq4ybirjfyihpq8wa3s160r33jg9"; + sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; }; }; "@types/command-line-args-5.0.0" = { @@ -343,34 +334,34 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/command-line-args/-/command-line-args-5.0.0.tgz"; - sha512 = "0vcqbwg68hir26fcyaqqn0w6i70cas8zn2ibhk9j0vl5mnwd2j448fvl6lqx5cny62szngdbjz6bxqfiz3ig360w3x663pr55gqzqz1"; + sha512 = "4eOPXyn5DmP64MCMF8ePDvdlvlzt2a+F8ZaVjqmh2yFCpGjc1kI3kGnCFYX9SCsGTjQcWIyVZ86IHCEyjy/MNg=="; }; }; - "@types/connect-3.4.33" = { + "@types/connect-3.4.32" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.33"; + version = "3.4.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz"; - sha512 = "3n5gxr7z1jn60gvcnzls1c3fgzbv171acdp4shbn095wnbb8hdba3cjq1sac8aina3bg957ww5hg89swcgbdjfp9irmkkiqfs8npqfv"; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz"; + sha512 = "4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg=="; }; }; - "@types/cookies-0.7.4" = { + "@types/cookies-0.7.3" = { name = "_at_types_slash_cookies"; packageName = "@types/cookies"; - version = "0.7.4"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz"; - sha512 = "2pzkddkjlxs4h8rpkh6xd381f0m6hwhxsmfx7f4vkzjxv55hyvdx7km3ks4wckd7jz0rfzzr45nphaggj48q0iwin25n0ar6qrsscd1"; + url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.3.tgz"; + sha512 = "NEkYn8pNsYZIxf3ZrjdPoeyueiPc0RbQClUpTwmdHkpmQQ8iDAlQYKpabuegHy7BJcqTteSTkhURMEs9ZxyEWg=="; }; }; - "@types/cron-1.7.2" = { + "@types/cron-1.7.1" = { name = "_at_types_slash_cron"; packageName = "@types/cron"; - version = "1.7.2"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.2.tgz"; - sha512 = "17az71shn84qjqsnb5646z4amysvnhmgpsxj0ja2w2zlykmn7m3q1bchgrd30indnd0z8ryxzhisgd78yij87nv04wjfm9c2wnlsjh0"; + url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.1.tgz"; + sha512 = "48brwgU18DqA0mQX1As5OcJEo1yNjaXMM6Mk4r8K1dOzLJRQ37FE/kCivKx7ClKEHfhX2FdcxKzJ1B744a+V3A=="; }; }; "@types/events-3.0.0" = { @@ -379,25 +370,34 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; - sha512 = "3v6shgxnlkc7izsc00g8ilpxi1q2mpcmbjyfawyqcj8mwfhlx2cnkm3hj87gsd39yyq33pilb0dbb4cdc8wwhn7dcwj4srg0amrp8qi"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.17.3" = { + "@types/express-4.17.1" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.3"; + version = "4.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz"; - sha512 = "1vd6aidhc6l28s5r9hjg2bzmmbmqp0dspsdp2h6affggfb9g8rzzxnbjxdan9n1b1n0d44n3amcx6yvzs1pdrzinf5j79zpk120dir3"; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz"; + sha512 = "VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w=="; }; }; - "@types/express-serve-static-core-4.17.2" = { + "@types/express-serve-static-core-4.16.9" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.2"; + version = "4.16.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz"; + sha512 = "GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ=="; + }; + }; + "@types/form-data-2.5.0" = { + name = "_at_types_slash_form-data"; + packageName = "@types/form-data"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz"; - sha512 = "1pa7rrhwf6wzp8lnbk2zjgvc2sxks36bw23p060kz1mm4kwyipddhn9zg4n2wnmym7a9ahw6fhk3ircal30f8ih8i7ancrdjwr74pqj"; + url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.5.0.tgz"; + sha512 = "23/wYiuckYYtFpL+4RPWiWmRQH2BjFuqCUi2+N3amB1a1Drv+i/byTrGvlLwRVLFNAZbwpbQ7JvTK+VCAPMbcg=="; }; }; "@types/formidable-1.0.31" = { @@ -406,7 +406,7 @@ let version = "1.0.31"; src = fetchurl { url = "https://registry.npmjs.org/@types/formidable/-/formidable-1.0.31.tgz"; - sha512 = "3fx9xxa6d30fvgc3rkag182sjjpi43qdyzf9l6l050zi8hk2h4511m0pb59k7ha611khkjg7bamvxry5v1ig1zdb4lgsi15vzk4r23l"; + sha512 = "dIhM5t8lRP0oWe2HF8MuPvdd1TpPTjhDMAqemcq6oIZQCBQTovhBAdTQ5L5veJB4pdQChadmHuxtB0YzqvfU3Q=="; }; }; "@types/glob-7.1.1" = { @@ -415,7 +415,7 @@ let version = "7.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; - sha512 = "3dhbgdkzpgx010hfgkhndrb094kbd3z6s4waicihnl0rp3jk0f0gs8vvzi84xzissrhml1dfgvbdhahzbh75nny1g6429fnqvlp866l"; + sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; }; }; "@types/http-assert-1.5.1" = { @@ -424,7 +424,7 @@ let version = "1.5.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz"; - sha512 = "1cn6djbpsp6rky1sllzs6s311xz0zhzkwb38s68w83ij8whsygjr87ymzbp0x3gbxxnvhfa1xh1c5vxfan6q3dz2gbjgiv9kzphlq1w"; + sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ=="; }; }; "@types/istanbul-lib-coverage-2.0.1" = { @@ -433,16 +433,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz"; - sha512 = "2b0br9w70brjpzw8ck05lr79v6hc4sdk1q2jq6qs55nw869ylsfwng48ghj0yjcm9skkn76g8ry8rdf2b35i2iynbh957k7m3cl64l5"; + sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg=="; }; }; - "@types/istanbul-lib-report-3.0.0" = { + "@types/istanbul-lib-report-1.1.1" = { name = "_at_types_slash_istanbul-lib-report"; packageName = "@types/istanbul-lib-report"; - version = "3.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha512 = "2parlinb7jrj152li79c6fs089y970f0s7yvzpkid8m4r8cgr9rn54bhg5ak7hsw6yvs9isx0diwjq20fb3dggnc5la2m6z0dfa0ld6"; + url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz"; + sha512 = "3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg=="; }; }; "@types/istanbul-reports-1.1.1" = { @@ -451,61 +451,70 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz"; - sha512 = "0s1jhax5h82lqchx13zj07h3zpyhqzckbnc76yl3a864xy91x11s06q3b2nds5pi89059xxa2b57p45ja90da60hr1gay9i5w3275jj"; + sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA=="; }; }; - "@types/jest-24.9.1" = { + "@types/jest-24.0.15" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "24.9.1"; + version = "24.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jest/-/jest-24.0.15.tgz"; + sha512 = "MU1HIvWUme74stAoc3mgAi+aMlgKOudgEvQDIm1v4RkrDudBh1T+NFp5sftpBAdXdx1J0PbdpJ+M2EsSOi1djA=="; + }; + }; + "@types/jest-diff-20.0.1" = { + name = "_at_types_slash_jest-diff"; + packageName = "@types/jest-diff"; + version = "20.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz"; - sha512 = "3hkz9dl54is1hmjiscs6sdvmafpv192bb3qz6sq6yq862dhvl4i5qwqbikbkmcn1576jiccpvrc35kvlng132piy45hwm6j8lggrg8m"; + url = "https://registry.npmjs.org/@types/jest-diff/-/jest-diff-20.0.1.tgz"; + sha512 = "yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA=="; }; }; - "@types/js-yaml-3.12.2" = { + "@types/js-yaml-3.12.1" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; - version = "3.12.2"; + version = "3.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz"; - sha512 = "2x03h69ivbpj4lsrpq698phn44jbq45jq31zdr7k30phrfv8r0gxr35qi98qbqa6rb599k8nhgj7gwnvll5lw6ml5j263961vz6w8fh"; + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.1.tgz"; + sha512 = "SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA=="; }; }; - "@types/keygrip-1.0.2" = { + "@types/keygrip-1.0.1" = { name = "_at_types_slash_keygrip"; packageName = "@types/keygrip"; - version = "1.0.2"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.2.tgz"; - sha512 = "0mqq8pzrfh058ha153xmyrbvcwpqq02z0ap89pw2rgfw9ll8c78dnxa0161i3pjhz7q0n7kizh73841637s4spc35qygnkkx96nk60q"; + url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.1.tgz"; + sha1 = "ff540462d2fb4d0a88441ceaf27d287b01c3d878"; }; }; - "@types/koa-2.11.2" = { + "@types/koa-2.0.48" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.11.2"; + version = "2.0.48"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.2.tgz"; - sha512 = "2b2i4xy8zwfig5p744i5n32krsyvgbdjg1nzr2dawwykr9m6zp37l4g8m0mr7936yzd80yiwn2rmq4n6d1fcj6dkndnwd8dm2axwhyr"; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.0.48.tgz"; + sha512 = "CiIUYhHlOFJhSCTmsFoFkV2t9ij1JwW26nt0W9XZoWTvmAw6zTE0+k3IAoGICtjzIfhZpZcO323NHmI1LGmdDw=="; }; }; - "@types/koa-compose-3.2.5" = { + "@types/koa-compose-3.2.4" = { name = "_at_types_slash_koa-compose"; packageName = "@types/koa-compose"; - version = "3.2.5"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.5.tgz"; - sha512 = "02hhnlq6kz27g5y2vlnj3pk1rnm16gh2qb7hf3gpxrarxrz35pc40y0aiz34ncaiggpk8306yz9q0pwm75mc099m1cy9m04xbycdj87"; + url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.4.tgz"; + sha512 = "ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA=="; }; }; - "@types/koa-router-7.4.0" = { + "@types/koa-router-7.0.41" = { name = "_at_types_slash_koa-router"; packageName = "@types/koa-router"; - version = "7.4.0"; + version = "7.0.41"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.4.0.tgz"; - sha512 = "1m9sk2skfl0vrggx53s3d3aw2ijphxkig9mjiw90016ljmz7hryyi3z74qxwmfvwg265k0cvhffq0c7j1aaxd210klsl9w2cf274hqa"; + url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.0.41.tgz"; + sha512 = "WZwdCzMOvx2zA4MTinmrzqn66I87mE8S5lFgVY05/BVKULDi2Yup2Q2AOnw9vvaLME4IVJhWAeXpZjdZpKZDtg=="; }; }; "@types/koa-send-4.1.2" = { @@ -514,7 +523,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/koa-send/-/koa-send-4.1.2.tgz"; - sha512 = "10xa7f3s5sdnr0ks3gbdmd635qyj160yj9b737qagw4bqbzg0hbk3irnvih4y0dc3i5lg8m8jf4p0nx52gv4vwwyhvxn5avzwi8mymd"; + sha512 = "rfqKIv9bFds39Jxvsp8o3YJLnEQVPVriYA14AuO2OY65IHh/4UX4U/iMs5L0wATpcRmm1bbe0BNk23TRwx3VQQ=="; }; }; "@types/koa-static-4.0.1" = { @@ -523,25 +532,25 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/koa-static/-/koa-static-4.0.1.tgz"; - sha512 = "3isnj0yxhf6xg0ymb317xj4a4fxdywk1xb0wadc5ghimab8m3q6vx3yv7zzyi84hx8wdm83fw65z108n0cdvnhij28hfw64jyvmqaj9"; + sha512 = "SSpct5fEcAeRkBHa3RiwCIRfDHcD1cZRhwRF///ZfvRt8KhoqRrhK6wpDlYPk/vWHVFE9hPGqh68bhzsHkir4w=="; }; }; - "@types/koa-views-2.0.4" = { + "@types/koa-views-2.0.3" = { name = "_at_types_slash_koa-views"; packageName = "@types/koa-views"; - version = "2.0.4"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.4.tgz"; - sha512 = "2bkbmh8mba0sm82lp0ividj4l09lbmdw1swfpf7kvdrc1q3710q1y57zysr0kpg3j4ngy4m4gf73a4cwqcjx1rsbmjb22wgp1a42qb8"; + url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.3.tgz"; + sha512 = "XLn//7qUUz2U9ZKXyHPwVIcQbZcW3phYTFXHGa1eW5BN88bi8n2fegvwJ+TokL2jRmRqBWwMB5p7Aab9iq1sZw=="; }; }; - "@types/lodash-4.14.149" = { + "@types/lodash-4.14.140" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.149"; + version = "4.14.140"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz"; - sha512 = "0jnvvzg602jxgjxl0fvi7iws4msvxvkff6mqvinyy0fcmxfxrpf46k30r6s0z7cb12r17sg0j6nbhg8s8xbvgf2rmgv0vvzkg6slcca"; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.140.tgz"; + sha512 = "OU57uYCUUv9s8lgQTYuQlL6xkttWtz8VLCJSnt8ikla9+UXqMGJ8adCprSw7egJHSHwGvFpGhfpQDtHm/NQ3Cw=="; }; }; "@types/lodash.clonedeep-4.5.6" = { @@ -550,7 +559,7 @@ let version = "4.5.6"; src = fetchurl { url = "https://registry.npmjs.org/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz"; - sha512 = "2010qs0qh6d3vd77rhbwid7xvq511bgzp9vj4s3k2mlzqj78jwgb60dc84mdl4c38fz3bgx5shl6k57dm9mxbw90iq0s4lxpmi66kbh"; + sha512 = "cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA=="; }; }; "@types/mime-2.0.1" = { @@ -559,7 +568,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz"; - sha512 = "35iimmp0d3zg4774qavnq9wh54dgnxfks59fks65f8q8d1008x00a1fmkdnxcs27znlc69mzbxp1frzpxx85c5w4x0ha5prgs0ks0hp"; + sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; "@types/minimatch-3.0.3" = { @@ -568,7 +577,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "2ff7lcgph45bp2v5zsaxcy00rbh5n5h4njbicwhqilz66pd1lw7xfrpfl4i4ppfcx78zg9cp582b5fjif0dg7r18m44vxfksslvlyml"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; "@types/mkdirp-0.5.2" = { @@ -577,25 +586,25 @@ let version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz"; - sha512 = "177ihvl818zn0w93xipz417pm2cj2jzwnqs2khkj0k2dd7gs6ssv460affznfiii54a5l8qffigcq6xl74zsy6339c7cqpvkdd9r62k"; + sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-10.17.17" = { + "@types/node-10.14.19" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.17"; + version = "10.14.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.17.tgz"; - sha512 = "3qw8j56g9078d7lahi73ifnpbk2x385diqgq1qgr62drcxbqgjnkbncy25nhdas05hwkfgzf69r2bj4x6mdwr1yrsrmbpagfr36g4w2"; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.19.tgz"; + sha512 = "j6Sqt38ssdMKutXBUuAcmWF8QtHW1Fwz/mz4Y+Wd9mzpBiVFirjpNQf363hG5itkG+yGaD+oiLyb50HxJ36l9Q=="; }; }; - "@types/node-12.12.30" = { + "@types/node-12.0.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.30"; + version = "12.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz"; - sha512 = "0rdl54cn0jbb3g2mlp09fywwf8d6plyspmiggr5rja9z93z4n606kj8srbgjk9f83wjxd9qmq20ixj2a90369whvrmsbsp4zhblqgxk"; + url = "https://registry.npmjs.org/@types/node/-/node-12.0.8.tgz"; + sha512 = "b8bbUOTwzIY3V5vDTY1fIJ+ePKDUBqt2hC2woVGotdQQhG/2Sh62HOKHrT7ab+VerXAcPyAiTEipPu/FsreUtg=="; }; }; "@types/ora-3.2.0" = { @@ -604,7 +613,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/ora/-/ora-3.2.0.tgz"; - sha512 = "3xvxw1cs55wdb1ihpg8df91crz17agjwq79kd342s137kwkz823n8adxxrr74fnb1rn0ffsq9zacyz2cv642ljn41dj39ha2pvpsncf"; + sha512 = "jll99xUKpiFbIFZSQcxm4numfsLaOWBzWNaRk3PvTSE7BPqTzzOCFmS0mQ7m8qkTfmYhuYbehTGsxkvRLPC++w=="; }; }; "@types/range-parser-1.2.3" = { @@ -613,16 +622,16 @@ let version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; - sha512 = "0w59kqlbrl9ich2pv2xqanzmg9f51404zqsba9l8aimqd77zbrdxcyq9q13xfnhr0d1dz4mx6z7n976ryc2nk2gfch5p507njm5f0bv"; + sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; - "@types/request-2.48.4" = { + "@types/request-2.48.1" = { name = "_at_types_slash_request"; packageName = "@types/request"; - version = "2.48.4"; + version = "2.48.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz"; - sha512 = "21mnsvbrykpzp1f1rd2ibk3nsgr8kyqikk5rdmq4qlkpf10gnpxp414hnvnbwjp27l5hvpc5l0fx0qhw20h7zi143qw6iwq68qpansv"; + url = "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz"; + sha512 = "ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg=="; }; }; "@types/serve-static-1.13.3" = { @@ -631,7 +640,7 @@ let version = "1.13.3"; src = fetchurl { url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz"; - sha512 = "39fm32fi9qpb1bz4q399y9rzv02ywml2m1qmclyr1ckrmy4vdn8nv5f9986ckn19yapxif0ljs0gc717xd7dmssjnh37qrxkp1d56m2"; + sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g=="; }; }; "@types/stack-utils-1.0.1" = { @@ -640,25 +649,25 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz"; - sha512 = "29j551rin7d7ygf7pd95db51b4jf48vsjnl03l4djdi6sh5jsk2f4kxwf21ixzj92mwq8y4cfhbcihwppxfkm4pkb5sqiv91a1833cp"; + sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="; }; }; - "@types/tough-cookie-2.3.6" = { + "@types/tough-cookie-2.3.5" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; - version = "2.3.6"; + version = "2.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz"; - sha512 = "0yla1v86agvz3wlkdjcn7i4hpgb02nwjsafg0xkdkclbiil08fkxjj9c4q4yj785ps3gdc5p3sqx2y0rajg1v6x068ih418g4r42wy0"; + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz"; + sha512 = "SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg=="; }; }; - "@types/underscore-1.9.4" = { + "@types/underscore-1.9.3" = { name = "_at_types_slash_underscore"; packageName = "@types/underscore"; - version = "1.9.4"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.4.tgz"; - sha512 = "1czi6sv1hf482wlzsl9an3s18r033aiy54airz2558f1g32ppkz3jy44mnhzwyi9g87miwggp4l8yfgc95d4qg6qka6ywq2q48dcc8a"; + url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.3.tgz"; + sha512 = "SwbHKB2DPIDlvYqtK5O+0LFtZAyrUSw4c0q+HWwmH1Ve3KMQ0/5PlV3RX97+3dP7yMrnNQ8/bCWWvQpPl03Mug=="; }; }; "@types/websocket-0.0.40" = { @@ -667,34 +676,34 @@ let version = "0.0.40"; src = fetchurl { url = "https://registry.npmjs.org/@types/websocket/-/websocket-0.0.40.tgz"; - sha512 = "0ajm2lr5mbfin316js7lzg3fvvhyd78ms1y929ppwqbg1fv6k9qnbcbz472p637xx29azlgiy3l0zzv4zvcmi9f7df5z0l80mkmxnwm"; + sha512 = "ldteZwWIgl9cOy7FyvYn+39Ah4+PfpVE72eYKw75iy2L0zTbhbcwvzeJ5IOu6DQP93bjfXq0NGHY6FYtmYoqFQ=="; }; }; - "@types/ws-6.0.4" = { + "@types/ws-6.0.3" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "6.0.4"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; - sha512 = "318vy2l4c8cw6nm061l15pp3ss2llblyy2y7a8w92vp6da3n7s3iiha5shpxrmc5c3gv0ap0vq9x10vv64g5np1xggdlnwrnigyp4ry"; + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz"; + sha512 = "yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w=="; }; }; - "@types/yargs-13.0.8" = { + "@types/yargs-13.0.3" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "13.0.8"; + version = "13.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz"; - sha512 = "36csm2rf0wi6cj680qswwvyl3lvh88ayl578165z8d1hxh6saswzn2g2zl5v20c08jg9rdjhqwwi336yj0jh6l76fy0yldv04pwf2sw"; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz"; + sha512 = "K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ=="; }; }; - "@types/yargs-parser-15.0.0" = { + "@types/yargs-parser-13.1.0" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "15.0.0"; + version = "13.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha512 = "35k8bcpm51w11xbny2a8gqgz12pdn3pw8w0jf36jzlkcmpkrqlqnqf9gbrwj9sah0pv05clzlgk2a7kvnr9q3h1za4rbw9dzxdc23ql"; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz"; + sha512 = "gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg=="; }; }; "@webassemblyjs/ast-1.8.5" = { @@ -703,7 +712,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz"; - sha512 = "00rj3q9igpw0cihw48xx7qpmmv64yy821bvy52dqxqc7w8kq2hga2f2v2g5j83is5kdz4hfdla4a3h6q5lwpdshxynrzsqr0ag1z4v8"; + sha512 = "aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ=="; }; }; "@webassemblyjs/floating-point-hex-parser-1.8.5" = { @@ -712,7 +721,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz"; - sha512 = "2shwdw16zcsl2rkvyc8jlgcs5564si8m64b0v9f8ssmrxmrd84c82brnwbyblhynqldvyr8f3fl9pjvfgzw0phz0qm5mfzbc7svp7zn"; + sha512 = "9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ=="; }; }; "@webassemblyjs/helper-api-error-1.8.5" = { @@ -721,7 +730,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz"; - sha512 = "363avw28ls7abwqcy7wvhdr853pccnzd9b58i1k7l1aax5cads499b494i1lwj4nlb8ksypy3nchr97i9y5r57k91dag7ig7fgyvbv5"; + sha512 = "Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA=="; }; }; "@webassemblyjs/helper-buffer-1.8.5" = { @@ -730,7 +739,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz"; - sha512 = "3yxqbq2lizijhxxr5ics6i0c5hc6c00fw4dqlqiq669mr1b0zalzs0670psbddmd4sq3yks567n1wr00l5flg6lwf34xlcjfgr92ba6"; + sha512 = "Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q=="; }; }; "@webassemblyjs/helper-code-frame-1.8.5" = { @@ -739,7 +748,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz"; - sha512 = "0ljgrac16148nv6nbzk5jisalyjx3pgm4vdcbzympzn143367w1k82lvpr7iwrslildvi6ck1jj9vjqy8fj2fkyli6qhr4v5dsil02m"; + sha512 = "VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ=="; }; }; "@webassemblyjs/helper-fsm-1.8.5" = { @@ -748,7 +757,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz"; - sha512 = "2imw7y018r4hyvyaaw2cpvrv3qp9bv4vg816l2yvl79xwd2dnplmsmmwsv3vmy2b8mvdjzq0dknkd2i6sjbgpzgn4ychicfqvz9f6wi"; + sha512 = "kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow=="; }; }; "@webassemblyjs/helper-module-context-1.8.5" = { @@ -757,7 +766,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz"; - sha512 = "3gfr1zif7fxlfbpfkcqncq8vmrimncn6pmvh0x7av1pb82a9vhhahpy2mkrgdrc3w62gw0lbbhj4zwgrxzgabaf246vadx6gvdl3vgw"; + sha512 = "/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g=="; }; }; "@webassemblyjs/helper-wasm-bytecode-1.8.5" = { @@ -766,7 +775,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz"; - sha512 = "10klm32913whkdnjk7jgf262lgl6wqv9qkw6ssjg1lmlzwa0qbn159l962j6pfx3idzaf4w014gmcy17wssdri6v1xxj3dph4qiivha"; + sha512 = "Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ=="; }; }; "@webassemblyjs/helper-wasm-section-1.8.5" = { @@ -775,7 +784,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz"; - sha512 = "2s3d3bh4wrizs5y2p480qnxs5m1hx9pfkppa38f7mk9w49cfq6h0gq5c0q79aqrl4jpyzqzmrsdbyx9562q1bb547mm9y8i7kgkqpam"; + sha512 = "VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA=="; }; }; "@webassemblyjs/ieee754-1.8.5" = { @@ -784,7 +793,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz"; - sha512 = "3g8bqb43s1n4nrzn5f7vrhdpi88mnr49xpwcq5jb0ql7baslh3cxni2rijp0hng7daai5d0n7dnn0llyazis2mckwzvcaggi90sz839"; + sha512 = "aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g=="; }; }; "@webassemblyjs/leb128-1.8.5" = { @@ -793,7 +802,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz"; - sha512 = "3ncjzk3d9pjnjd0vfagpbaa02jpmgapq2hyamzpfpaidshgcyqbz6rfhfp3arvjcdxpws4d9bi0wf552pzr9vs9i8rv4y159jwi8mm6"; + sha512 = "plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A=="; }; }; "@webassemblyjs/utf8-1.8.5" = { @@ -802,7 +811,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz"; - sha512 = "27hlgvdfxw9arxzrdrnfd7zmzp953439jyjh8acb3g2nm0ysr9il2xl3v0dklr9yvv6jkmj7s9yi29l2izgghypxqvjrblhv5zf1g2k"; + sha512 = "U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw=="; }; }; "@webassemblyjs/wasm-edit-1.8.5" = { @@ -811,7 +820,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz"; - sha512 = "3lzdvq0vwmp3civ70pdrr3970i7viiywnwry8ysmvmfbd4zhkffs4d5vyy5ibvxmmass9nlmvs3cd8fwh633yx8prr0wnqc5wrl9383"; + sha512 = "A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q=="; }; }; "@webassemblyjs/wasm-gen-1.8.5" = { @@ -820,7 +829,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz"; - sha512 = "1d2nc7b2zjdyaxyrvxm5mck8aj0p95dznknn8j8wi5d3ah55zpf2kp18kk79l55fbb7k9vhri74yqbks9ay9qrwbh12si6l897l29h4"; + sha512 = "BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg=="; }; }; "@webassemblyjs/wasm-opt-1.8.5" = { @@ -829,7 +838,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz"; - sha512 = "3npgmsia24ap1yhdpdn1c9bwdq71glsxdyn7kyphz5x4gnxl97v04iwgcsaj2k1di5vgq1m8mlqfrllxk4fvviwl8xd11ylxyc3dahw"; + sha512 = "HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q=="; }; }; "@webassemblyjs/wasm-parser-1.8.5" = { @@ -838,7 +847,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz"; - sha512 = "2bprpybs2qm4m1fbdd877aqj8s153j4gg32bf8qnmigqnjcfwl6mxmbzb90xq7qx6zvwqniv4rirgd40b4c2qab6bfdgsjk9xh14bd6"; + sha512 = "pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw=="; }; }; "@webassemblyjs/wast-parser-1.8.5" = { @@ -847,7 +856,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz"; - sha512 = "2r6vw7gg4ij9mjl2f564mwnjsrn7nzsvr1gcrpch0f87xayvjky82f4cn6sh0d8714fpqqqrfq6a1797jnnqs2xidsp2n4abkac59bm"; + sha512 = "daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg=="; }; }; "@webassemblyjs/wast-printer-1.8.5" = { @@ -856,7 +865,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz"; - sha512 = "0r5hhrrqk2ww81xjvbxjglp0sh6igz55pjy45ly4786kq3b723vlhqsydr7j87sb3zyww9zvjil08jmk8dcr2978zpmk1h47sj38if3"; + sha512 = "w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -865,7 +874,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha512 = "1wczr2c331gq4q6w6nsiylqs6q6dp0j2lvc231826gfrdhr3lcimmyhswp4g0b5p7k7k525gq6gh0wpg65sjlp2s4f0n6ww18m2fzqd"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; }; }; "@xtuc/long-4.2.2" = { @@ -874,16 +883,16 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; - sha512 = "00n8akj5s578b8r7vcdz817cnmga21vznz895kygvb0j780968szj171f91b0bgvz880ff7zq025q4087cgxb2fqpyg01sgil2ymq9n"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; - "abab-2.0.3" = { + "abab-2.0.2" = { name = "abab"; packageName = "abab"; - version = "2.0.3"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz"; - sha512 = "192f58ba6nxqhzyxlp9dlj156ry71s8mlfvgbg37kj2slffixrwj2s3zwpnyyhy4mh5m7sy3idir119mk518hjhii6skd9djwz77hdn"; + url = "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz"; + sha512 = "2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg=="; }; }; "abbrev-1.1.1" = { @@ -892,7 +901,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; "accepts-1.3.7" = { @@ -901,7 +910,7 @@ let version = "1.3.7"; src = fetchurl { url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "2j51dxzbgz22q0k7dhivimfsqx9a0f0h9slfd7n20gz3y1944gx3y7xai54za0x3zhbar6vqiaab2i9p913cwqk414qk3cnrm138pr2"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; "acorn-3.3.0" = { @@ -922,31 +931,31 @@ let sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; - "acorn-5.7.4" = { + "acorn-5.7.3" = { name = "acorn"; packageName = "acorn"; - version = "5.7.4"; + version = "5.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz"; - sha512 = "0k4pivh1yagdalb26khf36wscaxi3kbv6w48zg5jsll2scl2wq4f4gxcq9ggnzf37l4y446n4a3bmr85wx0fnwk89pvp1n1drabwgyl"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz"; + sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; - "acorn-6.4.1" = { + "acorn-6.3.0" = { name = "acorn"; packageName = "acorn"; - version = "6.4.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz"; - sha512 = "1s65pswzbh0155lsrdln08lifgs34zb53vkfl8fvxwnfmrc84vj01m9b31w4n846k7vk8lr5ns6wqf0fxc8xz98vkihldxsgn9ksl35"; + url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz"; + sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="; }; }; - "acorn-7.1.1" = { - name = "acorn"; - packageName = "acorn"; - version = "7.1.1"; + "acorn-dynamic-import-4.0.0" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz"; - sha512 = "29c8jlhwnfbnqa2s1v593lcpksv4hl56lywss4gy6w0mwmhx4ydf2n7var8bhcf39nm9asph0ybnf1hkw0s0j91qi7r99ir01v7pmv9"; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"; + sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="; }; }; "acorn-globals-3.1.0" = { @@ -964,7 +973,7 @@ let version = "4.3.4"; src = fetchurl { url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz"; - sha512 = "38gm4qa9sr1znbnlv4w33f1zrqsvldv66yqlflsc7r5ifxwsnpizsa93yxd3d1a8wy08j424smizrywkzam36z4jpsf0ixm3l9d0mvj"; + sha512 = "clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A=="; }; }; "acorn-walk-6.2.0" = { @@ -973,34 +982,16 @@ let version = "6.2.0"; src = fetchurl { url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz"; - sha512 = "1q392w8cii4phm8maghmlfjzgzmwhd2n0xadah315lqflygnaf5g7gn6lhbdfszf1sdqx5j4bik89qa6zg03n8cfj1b6w7my74yrszd"; - }; - }; - "acorn-walk-7.1.1" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz"; - sha512 = "10s7pz9c2jqw7sjmkkwfb6kyyfgb7qqpmz2gc0fq9phhmfknyw029x1jbw0cwi47wbacpwkw65601arnid2l95lmz0xbzv6ddilznf1"; - }; - }; - "aggregate-error-1.0.0" = { - name = "aggregate-error"; - packageName = "aggregate-error"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz"; - sha1 = "888344dad0220a72e3af50906117f48771925fac"; + sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; }; }; - "ajv-6.12.0" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; "ajv-errors-1.0.1" = { @@ -1009,7 +1000,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz"; - sha512 = "24kqslzd256yc0dckqcg8n1rngyfzdflfznp55hnhkv3rhyzirjhpj31rgiiryyjlw8a64x9ba7hdqkpiwf6jpllwyyyhr7zqxmy90c"; + sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; }; }; "ajv-keywords-3.4.1" = { @@ -1018,7 +1009,7 @@ let version = "3.4.1"; src = fetchurl { url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha512 = "1lyjmfg70gijr3gjs63qmawfazm5mz8vb1bknyy1vzdif6a30vi3dpwkrlv4j4i5dg56jd3fliqgfq0rxbm98a42jxbgnyxmdn65va4"; + sha512 = "RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="; }; }; "align-text-0.1.4" = { @@ -1036,7 +1027,7 @@ let version = "3.2.4"; src = fetchurl { url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz"; - sha512 = "2n6gl8300ihln724832pvvzrii5c4qjli9xc16s632ywnyrfbv1kmcqg133v25583hqhflpsfi2yhkjy6nhzj0si5v36zhym0cifxc4"; + sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; }; }; "ansi-escapes-3.2.0" = { @@ -1045,7 +1036,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "12pp3q4c44hrzr2xl9vqjigwjn2wr1j0lhvshl75z5m6a97hqkd047sdcma1inzjvxhpkzk1qkvag7cw3sya32s9wsfasr6xsnnj63h"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; "ansi-html-0.0.7" = { @@ -1081,7 +1072,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; "ansi-styles-2.2.1" = { @@ -1099,7 +1090,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; "any-promise-1.3.0" = { @@ -1117,7 +1108,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; - sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6"; + sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; "aproba-1.2.0" = { @@ -1126,7 +1117,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; }; "argparse-1.0.10" = { @@ -1135,7 +1126,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; "arr-diff-4.0.0" = { @@ -1153,7 +1144,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; }; }; "arr-union-3.1.0" = { @@ -1171,7 +1162,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz"; - sha512 = "3aqfm29ppm74q3q0xlxldmf1a3vbkl9a6fbljf211cfgc7asjbkdglbpr6a5a04r0rvnk7y709k6nvaqa2nb3df1ipgqfh2hl1v2jsf"; + sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; }; }; "array-equal-1.0.0" = { @@ -1198,7 +1189,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; - sha512 = "2swmvaw9xcvzv29i247057pq4khyss7gnc0p244v1l2g2p2xpsr47m0dfaf54yscd3fc9njh3kvwly99w8shvd9p5fq6nvwwmqg7mw4"; + sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; }; }; "array-union-1.0.2" = { @@ -1243,7 +1234,7 @@ let version = "0.2.4"; src = fetchurl { url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "asn1.js-4.10.1" = { @@ -1252,7 +1243,7 @@ let version = "4.10.1"; src = fetchurl { url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; - sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; + sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; "assert-1.5.0" = { @@ -1261,7 +1252,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; - sha512 = "1n2xh5m359gm4my50j2206n32q2h044lqrl8h122gjn41fizlrh32j1lj7wqfix1iblyvi7zvdgvzbf97f840lr17vfk8ph1imj0fqh"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; }; }; "assert-plus-1.0.0" = { @@ -1288,16 +1279,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; - sha512 = "0ga6b0jymkw4jrfvjilhfrddml29l1nrvj7r57d140p7rn31mmbni4j9z343v2zzz2zcnlsr2s17kmlgjkyvs9pxrf88an11pm9y77r"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; }; }; - "async-2.6.3" = { + "async-1.5.2" = { name = "async"; packageName = "async"; - version = "2.6.3"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; - sha512 = "1g679kw2qqpqx1yd4s778r8rw3cv9qwmib5x3klk64kcl5ndw71bljcpav5jkk6grizlpvrqszsbs6fkmnlvcq5fnz2q33mrnb6zyfd"; + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; }; }; "async-each-1.0.3" = { @@ -1306,16 +1297,16 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; - sha512 = "00vbg0zvq40mmvzz9q3klkk5ly5jh75kc8s3bf7j2ff9zivla3wlc8d622gajjq4w66mln5570dc936my6wh08ippfj5jagj51s3xfg"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; - "async-limiter-1.0.1" = { + "async-limiter-1.0.0" = { name = "async-limiter"; packageName = "async-limiter"; - version = "1.0.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "0sy81yyf4na58ic2m0ib0prkb9njb1qzl7wf3vlq4hhm4xnwgxaph0lr43gs1sd0rai2xp1h6phlwvni9jiggm94dd54i0wc1cabhvj"; + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; }; }; "asynckit-0.4.0" = { @@ -1333,7 +1324,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; - sha512 = "1rbq2rl2ry0y3nkqs3013vgjrnzf03609rg58092r8zkvzzn6v15grhv2yhzb48sz74zmjcj8ix7f5whrfp4zvsxyzrh64fhs9awvjs"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; "awesome-typescript-loader-5.2.1" = { @@ -1342,7 +1333,7 @@ let version = "5.2.1"; src = fetchurl { url = "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz"; - sha512 = "3b9ng7k3l7342hb2qqggp8y84ifzgb7ncjwjjn770gy7fda0c9aq897i7c4gn4w8l02xg88pji4pad46wr6j5755wmwl1q9w3lglnxj"; + sha512 = "slv66OAJB8orL+UUaTI3pKlLorwIvS4ARZzYR9iJJyGsEgOqueMfOMdKySWzZ73vIkEe3fcwFgsKMg4d8zyb1g=="; }; }; "aws-sign2-0.7.0" = { @@ -1354,22 +1345,22 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.9.1" = { + "aws4-1.8.0" = { name = "aws4"; packageName = "aws4"; - version = "1.9.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; - sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; }; }; - "axios-0.19.2" = { + "axios-0.19.0" = { name = "axios"; packageName = "axios"; - version = "0.19.2"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; - sha512 = "0fa6ngb4rkbyp5r4ccjgs2ykdbz8i2hcr41av59jicgq6mfva739kcd6n5dqzj3hsx7d4qi201g93li3qddn14bz9qvh76irgj2cf3y"; + url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz"; + sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ=="; }; }; "babel-6.23.0" = { @@ -1396,7 +1387,7 @@ let version = "6.26.3"; src = fetchurl { url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz"; - sha512 = "0617drz6fkpdpkl4snbfz7ivd296j19182m7x4klhqac60qr77wn8bkgpz696sscxykcv1n8cdv09pz7v9xq6s1k552fyp6w0p8ag7a"; + sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA=="; }; }; "babel-generator-6.26.1" = { @@ -1405,7 +1396,7 @@ let version = "6.26.1"; src = fetchurl { url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz"; - sha512 = "2jfjq7ggb0ygyzxg3vw248iq0iw2v00janjva1bf3l322k4zjcx9hvq9qqy67gxxyl2igw1asxfgp769hd5229pc70kwri9l1iz09qz"; + sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA=="; }; }; "babel-helper-builder-binary-assignment-operator-visitor-6.24.1" = { @@ -1516,13 +1507,22 @@ let sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; }; }; + "babel-jest-24.8.0" = { + name = "babel-jest"; + packageName = "babel-jest"; + version = "24.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-24.8.0.tgz"; + sha512 = "+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw=="; + }; + }; "babel-jest-24.9.0" = { name = "babel-jest"; packageName = "babel-jest"; version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz"; - sha512 = "0iziajgh09ldyj02pmxdkxhzy1wj6n84az4l30p7pllaxlbz9g678q59b0309wfihbj82n4v85pi66n9crksz0f6chy2dx2zisrvnwy"; + sha512 = "ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw=="; }; }; "babel-messages-6.23.0" = { @@ -1549,7 +1549,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz"; - sha512 = "1kj4z39mavs3h7wmb3nwrvhjddb1r138q61nisldfzcb52aikgi0hgg7yvql7xlvy7pxygx7wka7gimvcvbdhjwidwcn0qj8l5n3fp4"; + sha512 = "5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw=="; }; }; "babel-plugin-jest-hoist-24.9.0" = { @@ -1558,7 +1558,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz"; - sha512 = "1gvgnf01laddy7cnxb2ggd1qg1zlsj3s72azdvib6vi9sqmbc7snzhxy6xw4dsmpypb64ncqxlk1mmasy0sycqhs53bk9qmzzc00hyq"; + sha512 = "2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw=="; }; }; "babel-plugin-syntax-async-functions-6.13.0" = { @@ -1702,7 +1702,7 @@ let version = "6.26.2"; src = fetchurl { url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz"; - sha512 = "3sy41x9jlzyzy6wzsj60asahzm6hg9gmr6r1cckdqhzmvckl7jbfb5zwr0nslndnhqgjwdmvxsah41h8v8286hjqbfbhxn4w4w52pq9"; + sha512 = "CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q=="; }; }; "babel-plugin-transform-es2015-modules-systemjs-6.24.1" = { @@ -1828,7 +1828,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz"; - sha512 = "0g45grnsjds9va8zwb68gpm4ngzmnb351bbvphnmis7bifsh2ny2c00bwah57fn1yv87fs69hriimbysbm15dpsvfbpf3lazdlpdr7l"; + sha512 = "9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg=="; }; }; "babel-preset-jest-24.9.0" = { @@ -1837,7 +1837,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz"; - sha512 = "01858ghqwnl2b16rmrwwf6w6z3awwvxm22ld8vnfghf6lil3pkxdjjpfn70iib4plm4ynwrfrsiyr0gf3qxjzgi8k9wfk1q26xd8d4b"; + sha512 = "izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg=="; }; }; "babel-register-6.26.0" = { @@ -1891,7 +1891,7 @@ let version = "6.18.0"; src = fetchurl { url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; - sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb"; + sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; }; }; "balanced-match-1.0.0" = { @@ -1909,7 +1909,7 @@ let version = "0.11.2"; src = fetchurl { url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; - sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; "base64-js-1.3.1" = { @@ -1918,16 +1918,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q"; - }; - }; - "base64url-3.0.1" = { - name = "base64url"; - packageName = "base64url"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz"; - sha512 = "3hb3l768r5h0x6z47fw1kn6v50cx9xncmm6yzbhvrvgja0j26fwvhpyh8ppwnf1c2j8g62c912l7cq5h755fpdiafqhg4yxplz59gca"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; }; }; "batch-0.6.1" = { @@ -1954,7 +1945,7 @@ let version = "6.1.2"; src = fetchurl { url = "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz"; - sha512 = "0dhyz488lykv8avkn9y738mnlkgkffxwsp5xmh9sffsh1xxdnigsd9a6l01vj0bdzqdmzqq0pbw31qh9x06fll38i7s19z2h9mljq06"; + sha512 = "BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw=="; }; }; "big.js-5.2.2" = { @@ -1963,7 +1954,7 @@ let version = "5.2.2"; src = fetchurl { url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; - sha512 = "2cin34lhbrlligarblnrqnl6f419mkpqd4abjms0y1fk1mxzb6rqvh1sg0zif7bgskirhh6shxnqa444syk4cf87fmndil954xzc8mz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; "binary-extensions-1.13.1" = { @@ -1972,25 +1963,16 @@ let version = "1.13.1"; src = fetchurl { url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"; - sha512 = "0drjfs8xmgc4rfi8nbbx7adsinnc5m0nc96dw3r3gars8zvg1kzay5a7a5s3islf13wmw7q9v15i7d2gdghs1lp6rh2wl6x80hcqzjj"; - }; - }; - "bindings-1.5.0" = { - name = "bindings"; - packageName = "bindings"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; - sha512 = "24xpa35sym31k1x9hs78jbmsh58yx7ldkn03d4g5qhmvm0bi5cwqvpn2s6r8hkwhks5mhm81gz878gbp5g9b2s7zniy7gm1z6vvysm7"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; - "bluebird-3.7.2" = { + "bluebird-3.5.5" = { name = "bluebird"; packageName = "bluebird"; - version = "3.7.2"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "2v12rs2wvv94hrlyv0nadxn9x11796k9mk7a8vg0bqsry8m2pbyy9dribalwikh34qkk3rp6gnis849y5z9x5mxzbbdgkfhc3l674sy"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; + sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; }; }; "bn.js-4.11.8" = { @@ -1999,7 +1981,7 @@ let version = "4.11.8"; src = fetchurl { url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; - sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; + sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="; }; }; "body-parser-1.19.0" = { @@ -2008,7 +1990,7 @@ let version = "1.19.0"; src = fetchurl { url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "2rl5ww96fwgmxdqhqmnknsaafw44vsr2xz7vf7nax8qz9jy8bmmdyawcy6yfny0wm7pi8m2jssakzjc1nin8z8207kv0gclpnrhy4bn"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; "bonjour-3.5.0" = { @@ -2026,7 +2008,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; "braces-2.3.2" = { @@ -2035,7 +2017,7 @@ let version = "2.3.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; - sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; "brorand-1.1.0" = { @@ -2047,13 +2029,13 @@ let sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; - "browser-process-hrtime-1.0.0" = { + "browser-process-hrtime-0.1.3" = { name = "browser-process-hrtime"; packageName = "browser-process-hrtime"; - version = "1.0.0"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; - sha512 = "2ijqy6cba233jd04p2sd4a372z807f9rsykxzbf3sn50102h7nv57bid0bldh9is9c4yajgdjwlif9xpnz5xsx06clij6ipq9wm93pn"; + url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; + sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="; }; }; "browser-resolve-1.11.3" = { @@ -2062,7 +2044,7 @@ let version = "1.11.3"; src = fetchurl { url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz"; - sha512 = "1slq1pnm0b2903am1rl17iczlsl08sq4rckkr5fgkchgzfac13kiibwdk08yy2m62lgir8dmj9d61vil8q0vrm1d2mzw1qn2vaf443v"; + sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ=="; }; }; "browserify-aes-1.2.0" = { @@ -2071,7 +2053,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; - sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; }; }; "browserify-cipher-1.0.1" = { @@ -2080,7 +2062,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; - sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; }; "browserify-des-1.0.2" = { @@ -2089,7 +2071,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; - sha512 = "3j1gv3firnsbjppm47ldxbav9rmh3plq026zn728wvhgf19i4r7kxzyyj7hpibhjv61lcm9i4b869yy90c8hfj7w8rmr17p2zbhwah6"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; "browserify-rsa-4.0.1" = { @@ -2116,7 +2098,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; "browserslist-3.2.8" = { @@ -2125,7 +2107,7 @@ let version = "3.2.8"; src = fetchurl { url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz"; - sha512 = "00i65frm5jkbv8pzc13i02fzd39q0ahh653zzjzhq35pz6p0idajfjqg1b7mnnlvxymihcpmd1cfhwaj51hnqjmh4alrg8sjrq6hxaq"; + sha512 = "WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ=="; }; }; "bs-logger-0.2.6" = { @@ -2134,25 +2116,25 @@ let version = "0.2.6"; src = fetchurl { url = "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz"; - sha512 = "2i44nrigqkrnr7acqqppsmv9y97b55vma5fwg30jdhy9m4pc13rb3bpfxm8r560fp81605chdi27mx8dpy3mji3hwxhfvk6ih507px5"; + sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog=="; }; }; - "bser-2.1.1" = { + "bser-2.1.0" = { name = "bser"; packageName = "bser"; - version = "2.1.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"; - sha512 = "30jby01rqjgx78xnzyysjav12c0cj8dcwd40wprcfh1jn3768cdkb834q1zyf3wivhifi47xqa7jai7x16m1jv1mq4g40f69ws56341"; + url = "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz"; + sha512 = "8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg=="; }; }; - "buffer-4.9.2" = { + "buffer-4.9.1" = { name = "buffer"; packageName = "buffer"; - version = "4.9.2"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"; - sha512 = "1d85syv6ashl8f3a6h553d185cg3vq6nhjqnc80vr2z3bak0c9xbm1jawfk9zs43xz34yih6h6j3bhb3njkahdqpji12fsc4kfsmby6"; + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; "buffer-from-1.1.1" = { @@ -2161,7 +2143,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "3c0m16i3fdv3vlq2zz8dakrnhqvs16gvggj485f91fiaa5v0p7pyhamcdw5fggr7djzd8nshmvz4hgbp7714smqxlld2an28q8if1ri"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "buffer-indexof-1.1.1" = { @@ -2170,7 +2152,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; + sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; }; }; "buffer-xor-1.0.3" = { @@ -2191,15 +2173,6 @@ let sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; - "byline-5.0.0" = { - name = "byline"; - packageName = "byline"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; - sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; - }; - }; "bytes-3.0.0" = { name = "bytes"; packageName = "bytes"; @@ -2215,7 +2188,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; - sha512 = "073ccjmvxf726gcgzy0pksvi8x8r51dq6hyv69sc75ynrin7anwk9q3sqhbbbjhqjjrmq42s5f5gdbcgj2jxai6ldpyq6y2ny78payd"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; "cacache-10.0.4" = { @@ -2224,7 +2197,7 @@ let version = "10.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz"; - sha512 = "0f1zwi8bbiia995410m24xljd0ra0vk579q7rk48p7mrq9nbilx3qa2rnp7hjdwnvx28zfad0rfdcwyq3blzkb3rk8b9yl77crp960f"; + sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA=="; }; }; "cacache-12.0.3" = { @@ -2233,7 +2206,7 @@ let version = "12.0.3"; src = fetchurl { url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz"; - sha512 = "0zsyrn5azk0hm2mhfsa2wwz1g66wis9f7ifxl2sphms1i91z75mfmky892g7c538slj94fgd8nlbjnw5irki49vn5gfl586f5ynd9wj"; + sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw=="; }; }; "cache-base-1.0.1" = { @@ -2242,7 +2215,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; "cache-content-type-1.0.1" = { @@ -2251,16 +2224,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz"; - sha512 = "209nv86cqszi98b5mij2w84m5ixnnwxh211nv0zjgfi46l52fp437hqznnc0ckm5nlgr4labfn16wxa7s7lmnaac4vdwliqb9krzar0"; - }; - }; - "cacheable-request-2.1.4" = { - name = "cacheable-request"; - packageName = "cacheable-request"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; + sha512 = "IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA=="; }; }; "callsites-3.1.0" = { @@ -2269,7 +2233,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; - sha512 = "1ljrfqkxsjdvl02qlx1xdsw8csg4az6dkwvlk0zmcz7x3b6q3kbggd8i3ai8jcjicabdsqkhvpjy0898xcdf21m42ajyrggql167h1z"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; }; "camelcase-1.2.1" = { @@ -2296,16 +2260,16 @@ let version = "5.3.1"; src = fetchurl { url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "0kg17fpj4c7akmpa9x0a3fi5glrc3y5k3ppjcpb3pd02ylg3fnzfdvz0pixd223crbs5980sjaxsk9q8kcqxm5d9cb7rlkv3m614vrg"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "caniuse-lite-1.0.30001035" = { + "caniuse-lite-1.0.30000997" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001035"; + version = "1.0.30000997"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz"; - sha512 = "0nv07k5fhwwhak7xbp0kf2z0v2bpjicyrs11c9d14cipzzgcx6has5910iwc7yhh3mja5h52d93x3hrmfam66yk27agdqw09f172mhb"; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000997.tgz"; + sha512 = "BQLFPIdj2ntgBNWp9Q64LGUIEmvhKkzzHhUHR3CD5A9Lb7ZKF20/+sgadhFap69lk5XmK1fTUleDclaRFvgVUA=="; }; }; "capture-exit-2.0.0" = { @@ -2314,7 +2278,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz"; - sha512 = "3m6md2j1rsn26hijf0yfbbfnx6w2jrrqhr2b2xwjc9lyzvypidyz5krczc9wb04z1vq4mgb759ljwn7iggiiigijzhp38lk162zy91y"; + sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g=="; }; }; "caseless-0.12.0" = { @@ -2350,7 +2314,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; "character-parser-2.2.0" = { @@ -2368,7 +2332,7 @@ let version = "8.0.3"; src = fetchurl { url = "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz"; - sha512 = "30ql79azwkvqg2pfwvc0zp51fbwpijfbxdrnw5v5vsd3j2k6bzi5d78p78b877fzrji6clkw284pdakba5jg7dvmjwnx60lg1k8m5v2"; + sha512 = "YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="; }; }; "chokidar-2.1.8" = { @@ -2377,16 +2341,16 @@ let version = "2.1.8"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"; - sha512 = "21d2yf3364v025ivy6ak1bh61qvvq9llryh8c1rhvrif1kalx0j996x8m0qs717cgl97q5c40awyv8gi8hbmpgfpl6zvkff6xmm8rk6"; + sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; }; }; - "chownr-1.1.4" = { + "chownr-1.1.3" = { name = "chownr"; packageName = "chownr"; - version = "1.1.4"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc"; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; + sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; }; }; "chrome-trace-event-1.0.2" = { @@ -2395,7 +2359,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; - sha512 = "06mh145f12ppkxn7xdzrvh7rrjg9c770rqai08m8r5i31br1ihc96i63dyn0c4arfl1hl0za33kzy5i09x4agz77c11xv7hb33z7vzm"; + sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; }; }; "ci-info-2.0.0" = { @@ -2404,7 +2368,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "04yh5kqsx5akwc3rlcwqrvz3lrb8mak15ysxan17hw9pp00kmf20m8d9dpbnkq612wc1wwvjzcci1wgivd8cbak5j7dzl6rv89bplp6"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; "cipher-base-1.0.4" = { @@ -2413,7 +2377,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; - sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; }; }; "class-utils-0.3.6" = { @@ -2422,25 +2386,16 @@ let version = "0.3.6"; src = fetchurl { url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; - "clean-css-4.2.3" = { + "clean-css-4.2.1" = { name = "clean-css"; packageName = "clean-css"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; - sha512 = "0ad50l577m99sgpcdd49zspq8h9n9i3hhngapg9y5q76s7zwdz3hmaw2kc2jg30lk4z3wlyp9kgiyg71dvg0fg89g1xyr3qvq61dhsm"; - }; - }; - "clean-stack-1.3.0" = { - name = "clean-stack"; - packageName = "clean-stack"; - version = "1.3.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; - sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz"; + sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g=="; }; }; "cli-cursor-2.1.0" = { @@ -2458,7 +2413,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz"; - sha512 = "0lj50waj40l4a51whihhvrjb838jqjkp1znn7dqgw6bsb1z7qwfyaxfggwmy3122rvnz4gxa8fn7qmp94zk03q8265khqikmiy3f1dn"; + sha512 = "tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ=="; }; }; "cliui-2.1.0" = { @@ -2476,7 +2431,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; - sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; }; }; "cliui-5.0.0" = { @@ -2485,7 +2440,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "1fg1afsij2xwc4gpqbyhrp3s7q19w7bmii0ghmdv6cdx6giz3v0yqn25i3g7fw2lpi388jpvaf6nf9z2c7xp7w7psrww7569548d1rx"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; }; "clone-1.0.4" = { @@ -2497,15 +2452,6 @@ let sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; }; }; - "clone-response-1.0.2" = { - name = "clone-response"; - packageName = "clone-response"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; - }; - }; "co-4.6.0" = { name = "co"; packageName = "co"; @@ -2521,7 +2467,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/co-body/-/co-body-5.2.0.tgz"; - sha512 = "36nr6zz2qri7lg37azg3n5lq5cwgfi3pf7j35l908qlc0shbbi353k47ama8q7p8c4gb9czdjpr7xy05ar7pnqwdcr1hlpan91wnzxi"; + sha512 = "sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ=="; }; }; "code-point-at-1.1.0" = { @@ -2548,7 +2494,7 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; "color-name-1.1.3" = { @@ -2566,7 +2512,7 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "command-line-args-5.1.1" = { @@ -2575,16 +2521,16 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz"; - sha512 = "1dffdcll80c4cs7d9026187ild861bw26qph26frx8hx2dv23wwsw5g68kykqs8g2da57f62s56psxplx3bxcsprd85v5kbr4dxxgw4"; + sha512 = "hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg=="; }; }; - "commander-2.20.3" = { + "commander-2.20.0" = { name = "commander"; packageName = "commander"; - version = "2.20.3"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s"; + url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"; + sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; }; }; "commondir-1.0.1" = { @@ -2602,16 +2548,16 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; - sha512 = "136ravx3m3gf0ca84sf21hj47wmpqyjzmx6yvhj0b14mga7xcxfcgdc7yj9z8klcbr4yfqzy88fksmf233qx68a9ysw7yh1lixyrpa5"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; - "compressible-2.0.18" = { + "compressible-2.0.17" = { name = "compressible"; packageName = "compressible"; - version = "2.0.18"; + version = "2.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; - sha512 = "13341lfj8d36v6gha16xmv92w4875z8irqdbns3jxlkc3a63aswys5sajq97y1sd42l08inw1l0s51r4l9lv20w6gy14nsxzvnfnp80"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz"; + sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw=="; }; }; "compression-1.7.4" = { @@ -2620,7 +2566,7 @@ let version = "1.7.4"; src = fetchurl { url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; - sha512 = "24kqcbwm455isy2yiyfrdrsh011qi09pbgylw1jws2yfmiwmwp2j8pmax52c41z3x1n84v1j5va29dnxwygkl4pw599b9gx6c7qi94d"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; }; }; "concat-map-0.0.1" = { @@ -2638,7 +2584,7 @@ let version = "1.6.2"; src = fetchurl { url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; "condense-newlines-0.2.1" = { @@ -2656,7 +2602,7 @@ let version = "1.1.12"; src = fetchurl { url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; - sha512 = "2hg7rni4gx8l765i8qzkp9dv69c8r06i8rxxkkkrsklbd8iz6ingxnp10r4fqqrm9jxy3gp8yp0lzpybwdf27kq49abkyxwrchqwmvb"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; "connect-history-api-fallback-1.6.0" = { @@ -2665,16 +2611,16 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; - sha512 = "0p9s5aqb76hamj9z64zd53ndh5r1jv76iw97hwrylmwwjprjn1246hrr5nvp5vs1xwwipq6dv7zj4qwywbn3n4cxc3llfdzvbvh37kv"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; }; }; - "console-browserify-1.2.0" = { + "console-browserify-1.1.0" = { name = "console-browserify"; packageName = "console-browserify"; - version = "1.2.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz"; - sha512 = "168x7bp4xr522yw92himv9xv14q336ps1kkg79qcmarg3q4yzpd52pa8x8zgq11b6996f8053799k6365437si3pk85w5z4y8xiijb4"; + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; }; }; "consolidate-0.15.1" = { @@ -2683,7 +2629,7 @@ let version = "0.15.1"; src = fetchurl { url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; - sha512 = "0rx5m8ygvw7y8rfs0fgpl6ppwk6gm7299qsnm005x88ws9yzb9fcj143f2irjsb94k8x9kdw7pap819dgg3w6x0jayhq9hcpfg3lvhd"; + sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; }; }; "constantinople-3.1.2" = { @@ -2692,7 +2638,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz"; - sha512 = "2xnhrmlbkfpcvckxxrl0hjp6qhhqv1p7c6pwxgqp1g0sa5q5cc514xn48g9x8kqj7g1imzciwgb2msbhvhn0w0v92mb7105l43drqy9"; + sha512 = "yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw=="; }; }; "constants-browserify-1.0.0" = { @@ -2710,7 +2656,7 @@ let version = "0.5.3"; src = fetchurl { url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "3976ggkw1lp21a6m3s19blb9a74kq7a0spw47v0m3vvi1k5wiamrsn20slcr9byx80x2la2sppkwjp7x10gc58142dl7412pvpv84qk"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; }; }; "content-type-1.0.4" = { @@ -2719,16 +2665,16 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convert-source-map-1.7.0" = { + "convert-source-map-1.6.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.7.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha512 = "2hgf7brri4yaflx3y24d2cvznsk0km17mq8mp7sb2hhskf45hcamlgf8vzzbimw36lw128bjbf442p2rx96d1bhn9sk044p69gn8lp0"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz"; + sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A=="; }; }; "cookie-0.4.0" = { @@ -2737,7 +2683,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "1g7bscknfpc6zgznz77hvll6cy5m9jv7zg9nkpdqzmgi0vhv75kh8iyqf6rdslkml47l3jihsz7hy0i8x5n6bfx9ba0kvvrp9y7qypq"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; }; }; "cookie-signature-1.0.6" = { @@ -2749,13 +2695,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "cookies-0.8.0" = { + "cookies-0.7.3" = { name = "cookies"; packageName = "cookies"; - version = "0.8.0"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz"; - sha512 = "2iqv33i76hmss097a18gkv8v1kawzs5zkgkri3nnrql9160y2vpkasv8dqj7l4c9hh6y6ki6nv072y13jrxzfcgp3kvay8zjh1fr8zi"; + url = "https://registry.npmjs.org/cookies/-/cookies-0.7.3.tgz"; + sha512 = "+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A=="; }; }; "copy-concurrently-1.0.5" = { @@ -2764,7 +2710,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; - sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz"; + sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="; }; }; "copy-descriptor-0.1.1" = { @@ -2782,16 +2728,16 @@ let version = "4.6.0"; src = fetchurl { url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz"; - sha512 = "1j7l2xm5blz3ylmq1c0mwlkfbx9faqm09zid0czbyyfr05236pkgvzjzfr7syqb95mgzkzxdag697p4wwsxpcr7my88admlbw491r33"; + sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA=="; }; }; - "core-js-2.6.11" = { + "core-js-2.6.9" = { name = "core-js"; packageName = "core-js"; - version = "2.6.11"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; - sha512 = "1db6yjq48a8kkrfrxd0miblcf7nk2b4afgpr8dfgjl3jvz3xclvrqmz590hx2h59jh79lgl35r101lw5jqs46qybizdbpgzljjyf277"; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz"; + sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="; }; }; "core-util-is-1.0.2" = { @@ -2809,7 +2755,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r"; + sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw=="; }; }; "create-hash-1.2.0" = { @@ -2818,7 +2764,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; - sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; }; }; "create-hmac-1.1.7" = { @@ -2827,16 +2773,16 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; - sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; - "cron-1.8.2" = { + "cron-1.7.1" = { name = "cron"; packageName = "cron"; - version = "1.8.2"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz"; - sha512 = "35a9lj0cl50q669jhxl1f68myxinkmbdbl2yn4z3d93swlckjjiganjcn8iphg2867jil7ahkpapx5md94lw5102ny46a5i5virqk8s"; + url = "https://registry.npmjs.org/cron/-/cron-1.7.1.tgz"; + sha512 = "gmMB/pJcqUVs/NklR1sCGlNYM7TizEw+1gebz20BMc/8bTm/r7QUp3ZPSPlG8Z5XRlvb7qhjEjq/+bdIfUCL2A=="; }; }; "cross-spawn-6.0.5" = { @@ -2845,7 +2791,7 @@ let version = "6.0.5"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha512 = "1csj16gwq9riz0pm73dlxhbnsl1r3ldc5v0aincwj71ambi6xf3kc1kgsbwaakd8rj16k4mrli2syrjd57g6cr81zdzivdd2jn4ndbr"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; "crypto-browserify-3.12.0" = { @@ -2854,7 +2800,7 @@ let version = "3.12.0"; src = fetchurl { url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; }; }; "cssom-0.3.8" = { @@ -2863,7 +2809,7 @@ let version = "0.3.8"; src = fetchurl { url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"; - sha512 = "1i0h2rg4hb1j2430jc46n2zjc5gqg26brpl2ypjank206vjwdbk4n1svfk7nrbdsx7czd1a025a9h6ssh9qhscw4r7vi0fynwflcjvg"; + sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; }; }; "cssstyle-1.4.0" = { @@ -2872,7 +2818,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz"; - sha512 = "1460djxnz2dn84cx1wln5l004dy95pgik0h5bij3f7gw1i45p3mnsylwdps4r37gckfzqv5zvyh3gx95dr0ca01zmx8qpvqhrjwn6hq"; + sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA=="; }; }; "cyclist-1.0.1" = { @@ -2890,7 +2836,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; - sha512 = "0abwyrfpd8rm9bwzgcaxcwd92d07c31cxw1fgs7h51ri2igw4vib1a5x69cg14wqisjad1d0fhglca6218qm9dngr17yhwv8f295bcv"; + sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; }; "dashdash-1.14.1" = { @@ -2908,7 +2854,16 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz"; - sha512 = "1wvgs0ccidbr67x52w8wx58knvvy7ir6j05z1sa3f4rdnpr3dvdlf6rwapfb09z0mi9w129llzvhxa0lj8jy84zpdwzxm0yvcirhdb1"; + sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; + }; + }; + "date-now-0.1.4" = { + name = "date-now"; + packageName = "date-now"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; + sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; "debug-2.6.9" = { @@ -2917,7 +2872,7 @@ let version = "2.6.9"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; "debug-3.1.0" = { @@ -2926,7 +2881,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; "debug-3.2.6" = { @@ -2935,7 +2890,7 @@ let version = "3.2.6"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; "debug-4.1.1" = { @@ -2944,7 +2899,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; "decamelize-1.2.0" = { @@ -2965,15 +2920,6 @@ let sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; }; - "decompress-response-3.3.0" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; - }; - }; "deep-equal-1.0.1" = { name = "deep-equal"; packageName = "deep-equal"; @@ -2998,7 +2944,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; - sha512 = "2067xswfnhdrq76l5wqibx50y8r46q0sdbkax2nxq6gq0ljjrrmmq95k99vnkgcz5xc7r1hhv0w7bw978krjxvdmnawam3ma2nhraw7"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; "defaults-1.0.3" = { @@ -3016,7 +2962,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; }; "define-property-0.2.5" = { @@ -3043,7 +2989,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; - sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; }; "del-4.1.1" = { @@ -3052,7 +2998,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz"; - sha512 = "1fkk8r4abk9009whl0yqapv13rjzj6mr01ghkxpbjkrvr6a6n6hg492mdr72wf3dc13zp3dmzq6z4bzm31h59q7q4anjgrf988sw0a3"; + sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; }; "delayed-stream-1.0.0" = { @@ -3082,22 +3028,13 @@ let sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; - "depd-2.0.0" = { - name = "depd"; - packageName = "depd"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; - sha512 = "2phijq20j255bs4jjs11j5pa0x7y1084k6ch9xa8wgzp71zzgbpm23wyzbcs0mszvj971l9i5aav40sddm000484sl3ij4xzvlcgfc3"; - }; - }; - "des.js-1.0.1" = { + "des.js-1.0.0" = { name = "des.js"; packageName = "des.js"; - version = "1.0.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"; - sha512 = "085ljc5q2yk3jabd61p91n821q4prv13qalbfni9ybcb900b4mmcdnndi5b5prfs9wybp13asd13shlxgrbsgvyfx7nbgvby6jkhhj3"; + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; + sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; }; }; "destroy-1.0.4" = { @@ -3142,7 +3079,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz"; - sha512 = "0mncqs8asq6722qr5jcv5bwi1653nd4s61s9mb9iyk3jkv83w9iynwjfd6ynp1jwsmr7qaspk6yd1x8c05qi9pxikikwfkbnajd3334"; + sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="; }; }; "diff-sequences-24.9.0" = { @@ -3151,7 +3088,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz"; - sha512 = "1xvcq6cya1qr0slk88xxgibba4win89nmmy6945vzi0cqs3f4h72inwbk7wb05v55c23sx69grj872yyk5mnswd2qz33jangf9rcghf"; + sha512 = "Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew=="; }; }; "diffie-hellman-5.0.3" = { @@ -3160,7 +3097,7 @@ let version = "5.0.3"; src = fetchurl { url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; - sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; "dir-glob-2.2.2" = { @@ -3169,7 +3106,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz"; - sha512 = "2rlgbmwy8bl5xqrwifdqhggx21ac4c8k6vgq7ia2h6cxmaiprrlm1p99cn4hb4dmax9wwk4vx96bc50b7ngxgx74fvqbk0njj5w3lkz"; + sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; }; }; "dns-equal-1.0.0" = { @@ -3187,7 +3124,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; - sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; + sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; }; }; "dns-txt-2.0.2" = { @@ -3214,7 +3151,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; - sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; }; }; "domexception-1.0.1" = { @@ -3223,7 +3160,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz"; - sha512 = "2x8mi3fy0wghky9i6bmz1d26yz1bbd4zmaqyc45fhrqhw8kdg6a4k4zz6jn9bisnxr8bff7fypz0vncby6sw8d2ld6r627v94ra1a5d"; + sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug=="; }; }; "duplexer-0.1.1" = { @@ -3235,22 +3172,13 @@ let sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; }; }; - "duplexer3-0.1.4" = { - name = "duplexer3"; - packageName = "duplexer3"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; - }; - }; "duplexify-3.7.1" = { name = "duplexify"; packageName = "duplexify"; version = "3.7.1"; src = fetchurl { url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; - sha512 = "3k23dn0v8n7r3ds3v137vmw1vg3ngd6fw3bb4hasa6bm40qasvdaidjwx0wb4gakp8xvdrsckjn0wkmmi90z8a2sswj8cxhznxgrg6k"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; "ecc-jsbn-0.1.2" = { @@ -3268,7 +3196,7 @@ let version = "0.15.3"; src = fetchurl { url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz"; - sha512 = "3ggssjvjbrq0q12nr33bfbd8qdmmyapkiivxczlp66gi9y14s7dhaqxdmvbmg6lkzzli17w6v3rx3fyb0d82zl18ysgmskxbhq0ip1k"; + sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; }; }; "ee-first-1.1.1" = { @@ -3280,31 +3208,31 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "ejs-2.7.4" = { + "ejs-2.7.1" = { name = "ejs"; packageName = "ejs"; - version = "2.7.4"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz"; - sha512 = "2ad39acbba96hqbgf714pacri515xjn8jd43bkfb1wwp04vflpjj0qhnnmsq074g7d1kycyj1bmf620s43qb3x74hrfb4ky3v5axygf"; + url = "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz"; + sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ=="; }; }; - "electron-to-chromium-1.3.376" = { + "electron-to-chromium-1.3.267" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.376"; + version = "1.3.267"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz"; - sha512 = "27ngh0x7siic0nydq0xics24lnqfqjb2d6ja2fdfp1z979lisiy52m8cbbvrxp2ksr3nlk4s4yg5v4rll49wxjzry63gczrbihwzzvj"; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.267.tgz"; + sha512 = "9Q2ixAJC+oHjWNtJV0MQ4vJMCWSowIrC6V6vcr+bwPddTDHj2ddv9xxXCzf4jT/fy6HP7maPoW0gifXkRxCttQ=="; }; }; - "elliptic-6.5.2" = { + "elliptic-6.5.1" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.2"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz"; - sha512 = "33kzl02iwbq3pl33ihcdq9nm48yzhfj96183zzra06hp3z6bacz3d99pl74jziwygys4npxbxwnvszz12wl8lpkjw8b4r9ki797p33z"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz"; + sha512 = "xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg=="; }; }; "emoji-regex-7.0.3" = { @@ -3313,7 +3241,7 @@ let version = "7.0.3"; src = fetchurl { url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "2s4i22ccvwa2l4xwl9yz6mkyn2kpf58hp1nqiwmmgqlpyr57345i3ll0l4656ryik6a6wz1lgk4vbl6y0dwj5hx2kcbpv0h8924n00b"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; }; "emojis-list-2.1.0" = { @@ -3325,15 +3253,6 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "emojis-list-3.0.0" = { - name = "emojis-list"; - packageName = "emojis-list"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; - sha512 = "3cib7aw0206bfcb324aqh3fsda46mjxghd08gaasxagv6jfc74r2jvcv78rb8h10m879w42nbrn3q8rjifg9s5rclbpr2hzq7bqqk7y"; - }; - }; "encodeurl-1.0.2" = { name = "encodeurl"; packageName = "encodeurl"; @@ -3349,7 +3268,7 @@ let version = "1.4.4"; src = fetchurl { url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "3jyw0a0c7m1yxglwk7i5jh8zb3vvx7f9l4frbskxkgf9cyf4i8ww26p8bimnsryrh1dx7lwrxq64vbpjwfcv1svd4lg8m07fa53bv7s"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; "enhanced-resolve-4.1.0" = { @@ -3358,16 +3277,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz"; - sha512 = "2g5bp8yrd5ixqfg81db9ifalcqdyjxmrc4va86ljng9vnhkk2v0gxc7w28q00wnlp0j6sjilzj7dh4mkj2z49z2jkjwzjgd4j9yzzhp"; - }; - }; - "enhanced-resolve-4.1.1" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; - sha512 = "2w4dww5r1bxbycbb3kq0pdl9v56942678c53j9rwikxf05xd2n5h0b3a6914wxcmzr9wx4m0w56adp3qp21rk1wzkhbybxb9z67djpp"; + sha512 = "F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng=="; }; }; "errno-0.1.7" = { @@ -3376,7 +3286,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; - sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; + sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; }; }; "error-ex-1.3.2" = { @@ -3385,7 +3295,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; "error-inject-1.0.0" = { @@ -3397,31 +3307,31 @@ let sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37"; }; }; - "es-abstract-1.17.4" = { + "es-abstract-1.14.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.4"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz"; - sha512 = "24sx605c7x5di53nzw0x2brrfvy4nw76ws0gsd1hskdifrcxafn8fwk0n11si002zxhfs9c8nba1acaj2zkrqrgp8k5vw0vz2dyxv81"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz"; + sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg=="; }; }; - "es-to-primitive-1.2.1" = { + "es-to-primitive-1.2.0" = { name = "es-to-primitive"; packageName = "es-to-primitive"; - version = "1.2.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0"; + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.53" = { + "es5-ext-0.10.51" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.53"; + version = "0.10.51"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; - sha512 = "3wl9jgj276xsjcf4gvc9w7gg403rg02s1i24r7scvhwg0mmgbqwsszjk94xnzfd3wj4y2khk6wbz8dm9j6lvlcwrbbd324d1svr5kay"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz"; + sha512 = "oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ=="; }; }; "es6-iterator-2.0.3" = { @@ -3433,22 +3343,13 @@ let sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; }; }; - "es6-promise-4.2.8" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"; - sha512 = "3zz892nih7z36hb24sqg3wgzgzp81zjq7h8bbrpdh80yxp46r9rk2ddhr65zqg9ygi4s8ph9fs3in3gkinvqwfhqlpy5iasjz3wd40w"; - }; - }; - "es6-symbol-3.1.3" = { + "es6-symbol-3.1.2" = { name = "es6-symbol"; packageName = "es6-symbol"; - version = "3.1.3"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; - sha512 = "0sgbv9jpq91di424qar8xiw36az4msxqhgpk1ixq5hv4wdbgaxs45q8i671icpg085bh1j7hj93iyszp7x9fmhld30jj3kff6gri7il"; + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz"; + sha512 = "/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ=="; }; }; "escape-html-1.0.3" = { @@ -3469,13 +3370,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escodegen-1.14.1" = { + "escodegen-1.12.0" = { name = "escodegen"; packageName = "escodegen"; - version = "1.14.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz"; - sha512 = "14kvh9zgpdp6ci9l9nqwwlhjz8gidkhgsv1yj8i7jbh087fchwwn62440spqk09f3qz13jrdyqdgfhf2yddkm7p6hgx4jbjqhspnsq6"; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz"; + sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg=="; }; }; "eslint-scope-4.0.3" = { @@ -3484,7 +3385,16 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz"; - sha512 = "2p4myi99y1nk5dy7fvmbspjdynigw3dzkhcm7zaiwfyw2wp6j61y0i8mba18ksv9qi2s1wp6w6xhn7471qs631bqwmz8fzmvas6xdd7"; + sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; + }; + }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; }; }; "esprima-4.0.1" = { @@ -3493,7 +3403,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "esrecurse-4.2.1" = { @@ -3502,7 +3412,7 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; - sha512 = "06zyknk70y80n428x20wvjqy5822wgz2yaxzw387njnz3ar6ixzjcxzr2jsl8wrm0m9jpa4ysbcr9znpk6gbkqd7wby084zxw3l317b"; + sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; }; }; "estraverse-4.3.0" = { @@ -3511,16 +3421,16 @@ let version = "4.3.0"; src = fetchurl { url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "2kh3lczc7smb84ryllqrdvrknxl3h47khh7li6n9m76mj9jfh1ahz2jm8ffpcaac7i4k8zkf3sc3nczzp7djgqmsi6wrkynywlygnfz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "esutils-2.0.3" = { + "esutils-2.0.2" = { name = "esutils"; packageName = "esutils"; - version = "2.0.3"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "3m321j8gmjllmmi1zyvbz0lsmkkjq26bvfr8niwr5b8saxh6icixmpxixyspjb40l54vpx3r3zvln190i47cx16y5x2lf1qg6liqnwi"; + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; }; }; "etag-1.8.1" = { @@ -3538,16 +3448,16 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz"; - sha512 = "05cdww9h7f3kjfmv478p0rcq2ia3lcrvqmsh155hd6wm895i2jn6j68w0ly09c3gjn8hshfdvnh99qchipbclycnb241y993m2d5sm9"; + sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg=="; }; }; - "events-3.1.0" = { + "events-3.0.0" = { name = "events"; packageName = "events"; - version = "3.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz"; - sha512 = "1d21craxji58ccc5l8c39mw7pgk0is7gj1sixm8v1va1zc81hrw8426b9rhrv7z2kwqvix5l7cyfc8awwypj19him6ffd67qbqaxzs6"; + url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz"; + sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="; }; }; "eventsource-1.0.7" = { @@ -3556,7 +3466,7 @@ let version = "1.0.7"; src = fetchurl { url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; - sha512 = "02zyvvhbzxhb7q9pzn867l80whipj03h4nkzjw1r8kppkmgaw0fcgvnkkv11fkfnlcdhkr9f55xrap5qpvbggkad4y4jkymxgpzbfg0"; + sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; }; }; "evp_bytestokey-1.0.3" = { @@ -3565,16 +3475,16 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; - "exec-sh-0.3.4" = { + "exec-sh-0.3.2" = { name = "exec-sh"; packageName = "exec-sh"; - version = "0.3.4"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz"; - sha512 = "3a56in0wklcqf6hk0n22z22yg9kzb7y4xj7yfmj2sahbnkjbr5s0sngpzrr60r5rq9b3f0f1m13da5fn9mfz7p3b5nbxgxmrs8lhhdh"; + url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz"; + sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="; }; }; "execa-1.0.0" = { @@ -3583,7 +3493,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "0nbazkdhh5zqw7l7y4ml860h6pbn72x5kp2iaknqbdk0ygcrp3yh6bnq0brzzsyk3f72ard3ss3kp9a2ffsglib3yiamqwm4mrz3mk9"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; "exit-0.1.2" = { @@ -3619,7 +3529,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz"; - sha512 = "38r26vw1qwvgj86dijd5hps0b5ijk4qq0zy9dcgc2dpafq6jjx1x4k9lpaqs1mbkg4d9a29qkx914y9waavswvgwvcmv8n8qp3l1xf2"; + sha512 = "wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q=="; }; }; "express-4.17.1" = { @@ -3628,16 +3538,7 @@ let version = "4.17.1"; src = fetchurl { url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "3i2sxjf2x1r9wbfdyh5ll8ybbnqq6n4xfxdlc4dsqhssljrlih18csqg142lf16lcfcdgsmvf9pff0rzxjw7p0shnlmpajipwxpswlq"; - }; - }; - "ext-1.4.0" = { - name = "ext"; - packageName = "ext"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; - sha512 = "3n50kbfjicn887f19ragi6k288srkjidzvcnphnb2f8bqw4vn10y73p3ryjyqq0xgrdxnwhy2j9favm7pfb3j3vhf5dmi8licsbkv19"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; }; "extend-3.0.2" = { @@ -3646,7 +3547,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extend-shallow-2.0.1" = { @@ -3673,7 +3574,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; - sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; "extsprintf-1.3.0" = { @@ -3685,22 +3586,22 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-3.1.1" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "3.1.1"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; - "fast-json-stable-stringify-2.1.0" = { + "fast-json-stable-stringify-2.0.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; - version = "2.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn"; + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; "fast-levenshtein-2.0.6" = { @@ -3727,16 +3628,16 @@ let version = "0.11.3"; src = fetchurl { url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"; - sha512 = "0wgmgai5pj0yjcc4gs5b6r94gr8ycsbv1xyjw055cxfy4vm6yrpqp0mpr89ychmzgr5y0mggqrljf9jhb8n5iq63bi3r9yqidpbhv0g"; + sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; }; }; - "fb-watchman-2.0.1" = { + "fb-watchman-2.0.0" = { name = "fb-watchman"; packageName = "fb-watchman"; - version = "2.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz"; - sha512 = "1b67x7n9c1irns63lipsffgi0zm9kfms6k87mznvhak81dijqvfy26nqr3j5mw41mqb3vbbhxbbmcdgc787laz3kaq45slq0wlwjhqf"; + url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz"; + sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"; }; }; "figgy-pudding-3.5.1" = { @@ -3745,16 +3646,7 @@ let version = "3.5.1"; src = fetchurl { url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; - sha512 = "39n5js2y984px4bvwavskv70pazpjnrvy5lnyqif5pdh6pgfinnl3b5zknfkqvlws7gnylmlwryzfpdvh0jgpgsiphx8a64fhjb3lmw"; - }; - }; - "file-uri-to-path-1.0.0" = { - name = "file-uri-to-path"; - packageName = "file-uri-to-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; - sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi"; + sha512 = "vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="; }; }; "filesize-3.6.1" = { @@ -3763,7 +3655,7 @@ let version = "3.6.1"; src = fetchurl { url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz"; - sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c"; + sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; "fill-range-4.0.0" = { @@ -3781,7 +3673,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "1cfqk6g78cb12b1cki4pbcspsy40d0yny513myqji716njyhc5hrj7ll539kz96m6vn27168hhyqvd52cr5x1cs85mm7igfkrdrq1b8"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; "find-cache-dir-1.0.0" = { @@ -3799,7 +3691,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; - sha512 = "0wjlwmvadzac6hwmxv6hsc16z3285i2y0nkwpg4366flza0rx30s3ncx93xn8hkkpxr493zi5b0h94jczinr87h2m6gbhrl265qzbjf"; + sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; }; }; "find-replace-3.0.0" = { @@ -3808,7 +3700,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz"; - sha512 = "04qvcapazb6cj527naq4ycrydqph63gpsq9ly76cvnxy7cm9xwdn2q62rlyvn7iynvm59akggz5jiiygzzbq7wrpwh218124fdzcdp9"; + sha512 = "6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ=="; }; }; "find-up-2.1.0" = { @@ -3826,16 +3718,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; - "findup-sync-3.0.0" = { + "findup-sync-2.0.0" = { name = "findup-sync"; packageName = "findup-sync"; - version = "3.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz"; - sha512 = "1i4px24rzp6x5wczj63r720lxw2rl1yvsk8w36bcmmdsyji2yx59p1nxy3v0hqjfr5s9vzrxh55v83ly3d0mf5r78hw32awp1mdzdv1"; + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; }; }; "flush-write-stream-1.1.1" = { @@ -3844,7 +3736,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; - sha512 = "3pkp1ymgv73zg0d94la628nagxyngq7zm1jmngx6vjc6vi5d4jkmvfygvgac6w6x929hqljwygaidq2znk3l5xd4apdvxvpas21g7nx"; + sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; }; "follow-redirects-1.5.10" = { @@ -3853,7 +3745,7 @@ let version = "1.5.10"; src = fetchurl { url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; - sha512 = "1alfnscb0lnmf1ka8d5jrp48bizkbqrdz616r7q9yv4afqadlli1xmmf7lsvany1kmmnmwpvhbgx70mvcsnjf1ywjnzmkmk53h6apni"; + sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; }; }; "for-in-1.0.2" = { @@ -3880,7 +3772,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "form-data-2.5.1" = { @@ -3889,16 +3781,16 @@ let version = "2.5.1"; src = fetchurl { url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"; - sha512 = "1aa6m5c13kybvcycjdyhr0qbb7097qs7kah89bbhynjs9r5fl6ibbhscpin31nshzhw5nszw5c6x10krrig90afh88la456cgflsvcv"; + sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; }; }; - "formidable-1.2.2" = { + "formidable-1.2.1" = { name = "formidable"; packageName = "formidable"; - version = "1.2.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz"; - sha512 = "3jm9bdwpbsvpf9f7v9gh2dc01p5pg77g1q6g6jwxyaqykr6q6ljp3gvkbxrxa6wkhlnw52qd130f4nx8f6zwf74h8jgy8rmxsdhpj2p"; + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; + sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg=="; }; }; "forwarded-0.1.2" = { @@ -3937,6 +3829,15 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "fs-extra-4.0.3" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; + sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; + }; + }; "fs-write-stream-atomic-1.0.10" = { name = "fs-write-stream-atomic"; packageName = "fs-write-stream-atomic"; @@ -3955,13 +3856,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-1.2.11" = { + "fsevents-1.2.9" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.11"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz"; - sha512 = "0gh6646md6jag20cv3p6c36gf1k2h417lp8a7pwfdbvnbz9khs69hgs344jf2lk7pfqr8gyh13j56n9qvk2ad7nlq0isym93sbpgv7s"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz"; + sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw=="; }; }; "function-bind-1.1.1" = { @@ -3970,16 +3871,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; - }; - }; - "gensync-1.0.0-beta.1" = { - name = "gensync"; - packageName = "gensync"; - version = "1.0.0-beta.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"; - sha512 = "1r0jph65fg2w5p612lr79rb1k2xyvr3cymg0cbsk8nrncdm82l4k1k8sflk3q32zahpdjfsfs15rdqcj7wgahrpzw3picmmsgl05hdg"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; "get-caller-file-1.0.3" = { @@ -3988,7 +3880,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha512 = "3mw8nv3r73b3lp2pzj116p27flkrv1vq6v0ika46w3xqfinm6gxn38glryibvy834mja8ib4j9cjq27qn164z3793c9g88y79asppny"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; }; "get-caller-file-2.0.5" = { @@ -3997,25 +3889,16 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "0b7da6kb3xqk26cw4i6kb1lk911z06z53if2g8l23hmfpbhl6vfbn8iip55j1yplbqnly2abb9d349r6ky2z570839q3p9z2gf4y88g"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-paths-0.0.7" = { + "get-paths-0.0.4" = { name = "get-paths"; packageName = "get-paths"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/get-paths/-/get-paths-0.0.7.tgz"; - sha512 = "2sbm9wgxb9lh20hl3rj1zrpvgq14kxvd16hq6p9drh7z26f6nmy4jp0irbaqk1gjal152shl7kwkwk6gskvla18p0qs8p5mn2vlj1yk"; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + url = "https://registry.npmjs.org/get-paths/-/get-paths-0.0.4.tgz"; + sha512 = "+AxlfMGN7FuJr2zhT6aErH08HMKkRwynTTHtWCenIWkIZgx2OlkZKgt7SM4+rh8Dfi32lo6HcvqeTLxph3kjQw=="; }; }; "get-stream-4.1.0" = { @@ -4024,7 +3907,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "3pwlllj9naaqzlc5axbxz4jqg3v533xd9jz945mjd3zmca3hh3pr1dpwc7416kjszw6igk060v6x2dgwpr7m1rd4djavmvr8bhavihq"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; "get-value-2.0.6" = { @@ -4045,13 +3928,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.6" = { + "glob-7.1.4" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; "glob-parent-3.1.0" = { @@ -4069,16 +3952,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; - sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; - }; - }; - "global-modules-2.0.0" = { - name = "global-modules"; - packageName = "global-modules"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz"; - sha512 = "3q8nyi4i93sc7kfx7mmzmkr3656h7f27f5dkwx0908mz2m4bdih9024qmbss87anjf9d817zbr0mmm2zr9pfli2qw41zxv9j2cdyril"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; }; }; "global-prefix-1.0.2" = { @@ -4090,22 +3964,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "global-prefix-3.0.0" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz"; - sha512 = "1dda0wwyqq1k8qa0cy6ifchm9zfbq0bsrvq68gccp4haqp0hgqs5ax1hrpxkcl9k9j3g1nb0nzi19v8ikcxxc9y6i37a24mjjfah03b"; - }; - }; "globals-11.12.0" = { name = "globals"; packageName = "globals"; version = "11.12.0"; src = fetchurl { url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; - sha512 = "1ab6f0n8yjl3zkl6dwhvxpxh63b4acc7nj7i21z3dx1fz1jv1c3673qpkwiavmcbbf8jlkxapx0x8ybzz5w2yra4ln24lh687y6kq2q"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; "globals-9.18.0" = { @@ -4114,7 +3979,7 @@ let version = "9.18.0"; src = fetchurl { url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab"; + sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; }; "globby-6.1.0" = { @@ -4135,22 +4000,13 @@ let sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; }; }; - "got-8.3.2" = { - name = "got"; - packageName = "got"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; - sha512 = "05i0zb81f4c0z48y9mjckyajm586ygznh8y8di5g0qrg3vi9hpbw2q3cf548as8zx9b4g1q5zf2cab43yx21wnan1l0qsz19zjhjdda"; - }; - }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; "growly-1.3.0" = { @@ -4168,7 +4024,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz"; - sha512 = "0y1sp7474a0w8329a3d69dgqdbaj7azkx415kcdrkri95c6gyvpj6c3mp5v0jdwjasq01xw07lr5l551z77ch0nkcszn7m8d7mf5l8l"; + sha512 = "FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA=="; }; }; "handle-thing-2.0.0" = { @@ -4177,7 +4033,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz"; - sha512 = "28zz3rsr08yf5sib0pnnwyk99023ll7bp73z28r1pb6j722bfdhxmzww91cyh713b3a6bqvfxlglancn95pwdnsb5w8w2sda9xk72vp"; + sha512 = "d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="; + }; + }; + "handlebars-4.3.3" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.3.3.tgz"; + sha512 = "VupOxR91xcGojfINrzMqrvlyYbBs39sXIrWa7YdaQWeBudOlvKEGvCczMfJPgnuwHE/zyH1M6J+IUP6cgDVyxg=="; }; }; "har-schema-2.0.0" = { @@ -4195,7 +4060,7 @@ let version = "5.1.3"; src = fetchurl { url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-1.0.3" = { @@ -4204,7 +4069,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; "has-ansi-2.0.0" = { @@ -4225,31 +4090,13 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; - "has-symbol-support-x-1.4.2" = { - name = "has-symbol-support-x"; - packageName = "has-symbol-support-x"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; - sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; - }; - }; - "has-symbols-1.0.1" = { + "has-symbols-1.0.0" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw"; - }; - }; - "has-to-string-tag-x-1.4.1" = { - name = "has-to-string-tag-x"; - packageName = "has-to-string-tag-x"; - version = "1.4.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; }; }; "has-value-0.3.1" = { @@ -4303,7 +4150,7 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; - sha512 = "1f5xc15zpy3b7hssv57xnd92ja5r073zvd2pczvncxmy1jnbjcx716riyr2syvah88qk7328a6fz049mziv2k837093xqxd86r9m8xm"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; "hmac-drbg-1.0.1" = { @@ -4330,7 +4177,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; - sha512 = "1qc7ngn9k1w5lcqx2ygqb2x9f03knfbsym25l6qsp6q9qdcxa4fzwwjsh9d9lm5l1569v19rjp7sdnz11087f4b6sv34rav9rcacabr"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "hoopy-0.1.4" = { @@ -4339,16 +4186,16 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz"; - sha512 = "1yx4ynb45w5hn214j6xm2357i3hcbhyh21d7040ikmi9ywaqsjycbzp390wp1qixpyjnc8aaacwzqyf1cvlfz7c5fs6brxbd7xjq5qx"; + sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="; }; }; - "hosted-git-info-2.8.8" = { + "hosted-git-info-2.8.4" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.8.8"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha512 = "19a25b4xb3hg00d1nsirc3xfcc07rplbh6msa49rgc8xg5rg38y1z8rfrf0dmll8k4jaml8z337bi6y2cgah66jnwxinn0sch5k7z3z"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz"; + sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="; }; }; "hpack.js-2.1.6" = { @@ -4366,7 +4213,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz"; - sha512 = "1ir4rhs26z0x26nr1bca94rbgyginfyrdza1a550ish1ssv5cf9j94dgl2j47n65yvjsnmhx8m749bljr3qjn7pdndcp7l35375jngg"; + sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; }; }; "html-entities-1.2.1" = { @@ -4378,31 +4225,13 @@ let sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; }; }; - "html-escaper-2.0.0" = { - name = "html-escaper"; - packageName = "html-escaper"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz"; - sha512 = "0i7fxa00a4a7qdgxkiafdbpwvm5x80fivcnhmwbd8qdyxf18zdxzmriqq48k5a7yr7vn0hhzvvf1nki2105hqn29fznnn0iw42vv2vb"; - }; - }; "http-assert-1.4.1" = { name = "http-assert"; packageName = "http-assert"; version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz"; - sha512 = "21ixj6v0igbmy7zx5g4kpqp9fr495ki1jm8qszg1gbwmwcbji51n4zcpm6ll8a927m626rw4vkdamvsi90azmsnapm2d5lkl6mkpp5d"; - }; - }; - "http-cache-semantics-3.8.1" = { - name = "http-cache-semantics"; - packageName = "http-cache-semantics"; - version = "3.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75"; + sha512 = "rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw=="; }; }; "http-deceiver-1.2.7" = { @@ -4429,16 +4258,7 @@ let version = "1.7.2"; src = fetchurl { url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "13c4825kzqlxdqfjrlrwh15ira0bjm9m3b8qcrfzaysiky1m3gb6dv6gcjgpnap9mbl0fajqiibzp1w5r8qnyn8glaj4wgzf6vh2i5r"; - }; - }; - "http-errors-1.7.3" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; - sha512 = "1zx0vws4k6lcw8j8pgc2yrwfw56s6n2z4dvhd9lcj9l1ywnl9ssianilmrlzr6ravkqxv0xbdqg4cn0q3l72d8h0achvcdbqp8dfd35"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; "http-parser-js-0.4.10" = { @@ -4456,7 +4276,7 @@ let version = "1.18.0"; src = fetchurl { url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz"; - sha512 = "2jhzdgr7gcgj58mf798ak1a638wm4mnp45pk48im1rf03dpw39alpyabd7rqwqgjrilaggnmh6nd3m9pqnyn76q3mw5g7rzjf43d0pk"; + sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ=="; }; }; "http-proxy-middleware-0.19.1" = { @@ -4465,7 +4285,7 @@ let version = "0.19.1"; src = fetchurl { url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; - sha512 = "3fl42r9rpdqm0jrrd2wqws6syv02r8cqgy0j6ddrjvn5p3by8shm0mmbych1g5k9i5agc70x6z2904nrgidkdnlq1pwafqhcf0i6xn8"; + sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; "http-signature-1.2.0" = { @@ -4492,7 +4312,7 @@ let version = "0.4.24"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; "ieee754-1.1.13" = { @@ -4501,7 +4321,7 @@ let version = "1.1.13"; src = fetchurl { url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; - sha512 = "179jm8fhl2advz4j63klrp57sm99wvyb5jcxwfr9rhi730ybcxkyfqrr0pmwvir12zjzpkwwvjjkjclwrss7lpab7dg2myqc8izpxz2"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; }; "iferr-0.1.5" = { @@ -4519,7 +4339,7 @@ let version = "3.3.10"; src = fetchurl { url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz"; - sha512 = "2x7za00gs7ipwcq29bslxcdv7j47m28jx14n9ybs5h2icr4024jn5ppmbs6953g2qb3amhs1gg5x0s48ky3mk7ybi36wchsb7kks2ry"; + sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; "import-local-2.0.0" = { @@ -4528,7 +4348,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz"; - sha512 = "04jd526svpmpgya7i580qcb13s9b6bw4s9hng2fsni2gxsz6h8vqxl8gbm5k575yxm5aqhy001rl7p1iy60rsi6371cvynfdpi39avg"; + sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; }; }; "imurmurhash-0.1.4" = { @@ -4540,22 +4360,13 @@ let sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; }; - "indent-string-3.2.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; - sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; - }; - }; "infer-owner-1.0.4" = { name = "infer-owner"; packageName = "infer-owner"; version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; - sha512 = "3s364ysa3q0sxc852a6rlbx0y8spayvg5csradd7s9vn2fr0ky3xpfhy5kkv6afgji3df7kyiswx296kwfakydii9xygqzxgkwn6a90"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; "inflation-2.0.0" = { @@ -4594,22 +4405,13 @@ let sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; - "inherits-2.0.4" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk"; - }; - }; "ini-1.3.5" = { name = "ini"; packageName = "ini"; version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; }; }; "internal-ip-4.3.0" = { @@ -4618,7 +4420,7 @@ let version = "4.3.0"; src = fetchurl { url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; - sha512 = "05c6ydjyg8633b07vn5g168r5lxwvl5k1mjm55brfx35c1z18195bh67f7cfk4bjvyapxfhh8q5i7pv75k353rfp0rcpkgsa2iw2p2b"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; "interpret-1.2.0" = { @@ -4627,16 +4429,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; - sha512 = "1pibn9f6dn61lmilqiv8hb4aix4b78xf9sdws3rnl060vvv6l4qrw6gfmncq5n0f0rah2yj1ssfg80chaw9y5aa860wfdcccb4ghgcr"; - }; - }; - "into-stream-3.1.0" = { - name = "into-stream"; - packageName = "into-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; - sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; + sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="; }; }; "invariant-2.2.4" = { @@ -4645,7 +4438,7 @@ let version = "2.2.4"; src = fetchurl { url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; - sha512 = "0sa0bflh46zr7zqdifqk3a48bmqlmpikrnmwvgz8nx6979piw2m92qrn1g5xnpjzxn864y2jq3gl84jkws2dad3mlwr6s3fa10my4m6"; + sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; }; }; "invert-kv-2.0.0" = { @@ -4654,7 +4447,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; - sha512 = "0lamd4l8hybnh42bg1nav09fj3h7k31vnvsqbqk3mhbhml32042k8hpixhiapqfssi1jyhnw31mdv9zx0fvxzxqi8igahyh5zznzxf0"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; }; }; "ip-1.1.5" = { @@ -4675,22 +4468,13 @@ let sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; }; }; - "ipaddr.js-1.9.1" = { + "ipaddr.js-1.9.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "3gcwhv1wa2hb1vljlcmzhvzliks9rj7nzsw165vgy69jakw8g55ky474mj4j41vfbid8viy9nhwn9kx8pfqrikyl29i98zi9vmkz8nh"; - }; - }; - "is-absolute-url-3.0.3" = { - name = "is-absolute-url"; - packageName = "is-absolute-url"; - version = "3.0.3"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; - sha512 = "3ssxj0ds0anzx5qcgn5lcawrsv3br0zbi1qcfpi9sslp4iwzb0hr9aqy3y72rf9c0bwb0h5svy7l341j0arlkyvx2yp85pfgqhqv6d2"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; }; }; "is-accessor-descriptor-0.1.6" = { @@ -4708,7 +4492,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; "is-arrayish-0.2.1" = { @@ -4735,16 +4519,25 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-buffer-2.0.3" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz"; + sha512 = "U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="; }; }; - "is-callable-1.1.5" = { + "is-callable-1.1.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.5"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; }; }; "is-ci-2.0.0" = { @@ -4753,7 +4546,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; - sha512 = "3inmiidgnyxsaypy9cq2pxcc0n7xcfsy3dlkjhk22y97vwz45b0hg972wj27kc0q5dd7k0zywjl3y5fjsqiq7fvllp1sh19p7p57wk1"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; }; "is-data-descriptor-0.1.4" = { @@ -4771,16 +4564,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.2" = { + "is-date-object-1.0.1" = { name = "is-date-object"; packageName = "is-date-object"; - version = "1.0.2"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai"; + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; "is-descriptor-0.1.6" = { @@ -4789,7 +4582,7 @@ let version = "0.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; }; }; "is-descriptor-1.0.2" = { @@ -4798,7 +4591,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; }; "is-expression-3.0.0" = { @@ -4825,7 +4618,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; }; }; "is-extglob-2.1.1" = { @@ -4837,13 +4630,13 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; - "is-finite-1.1.0" = { + "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; - version = "1.1.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz"; - sha512 = "3gj0k3vlpbc7zg5xkl8yjnilqs2dmk3ks67shchrfmnzkj6r4aad994xwfczx99ccjx6cixdqg4sawk2m92lqhh6jmfl17zlnv8rp3i"; + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -4870,7 +4663,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; - sha512 = "14qphsynlkivbpi3hhf3wmcjh8f5s9d2z6nr1h98ijygyj2jql330h1w52a4z33plgjma305w3rn3nf28q4n6j1qfmz2byq4gih2cki"; + sha512 = "cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="; }; }; "is-generator-function-1.0.7" = { @@ -4879,7 +4672,7 @@ let version = "1.0.7"; src = fetchurl { url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz"; - sha512 = "2vr3bz9zc2d62mnsg16ppb5h2v5h9yfyjbijysi34b10vsly1fn1g4hmqwi40fng3i9pmbkc7vapr3yl23yxc96b2jgvqcf1h9kk5v1"; + sha512 = "YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw=="; }; }; "is-glob-3.1.0" = { @@ -4897,7 +4690,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; "is-number-3.0.0" = { @@ -4909,22 +4702,13 @@ let sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; }; }; - "is-object-1.0.1" = { - name = "is-object"; - packageName = "is-object"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; - sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; - }; - }; "is-path-cwd-2.2.0" = { name = "is-path-cwd"; packageName = "is-path-cwd"; version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; - sha512 = "0aws7clcb9cyvvb4430df9fhfnpg9bl1n07ymzp7jdzia0bvjg25gyd39xp2xhgkgpkqazw8csglblifdql0rpj4kfwg1r26xnkdpn3"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; }; }; "is-path-in-cwd-2.1.0" = { @@ -4933,7 +4717,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; - sha512 = "12yyg4jlg5mmiy2g0r91hz29v3jh5g2wyhdgs1qrfswx2sp7bfsn5g4632yfxmhrpjcy03bxfj12v93yd6pdykkpsmyz912g1f1rnmc"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; }; }; "is-path-inside-2.1.0" = { @@ -4942,16 +4726,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"; - sha512 = "0b5h3ls9n24ma1wqpfsv7n034ryz86rfn1vkz5g0sih2abi9wrs0vx6w583s6qhcgqa6rx5w5layfz7hlakhxvf07qcnnn36x7s2b62"; - }; - }; - "is-plain-obj-1.1.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; }; }; "is-plain-object-2.0.4" = { @@ -4960,7 +4735,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; "is-promise-2.1.0" = { @@ -4972,22 +4747,13 @@ let sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; }; }; - "is-regex-1.0.5" = { + "is-regex-1.0.4" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy"; - }; - }; - "is-retry-allowed-1.2.0" = { - name = "is-retry-allowed"; - packageName = "is-retry-allowed"; - version = "1.2.0"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; - sha512 = "134jdgzg4p15g5jvwsmb0bmglmymn1pyk6r2w8q1fm728f15l7k12sqmfngn0mg3vs34gzg12v684fp9c99l6jnv737b6rgmiwd8ij5"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; }; }; "is-stream-1.1.0" = { @@ -4999,13 +4765,13 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "is-symbol-1.0.3" = { + "is-symbol-1.0.2" = { name = "is-symbol"; packageName = "is-symbol"; - version = "1.0.3"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v"; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; + sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; }; }; "is-typedarray-1.0.0" = { @@ -5032,7 +4798,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; - sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; "is-wsl-1.1.0" = { @@ -5095,7 +4861,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz"; - sha512 = "3bk7frapznyd2q46p7kbk6w1wby8dfjj14p06j485n3s08nc398ah9d3wlr1q59sj5hv1cycvalkmn1vfzlamkp93d69981ccvny406"; + sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w=="; }; }; "isstream-0.1.2" = { @@ -5113,7 +4879,7 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"; - sha512 = "2cgkn8swx4450c0m0alr4lb4fvqjyh3v9mg6ivx2sa9vq0hkb7r0yz87srf8263j089kpjmpnsl6d3l5vg7x4f4kk39n20gw6gg79gi"; + sha512 = "8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA=="; }; }; "istanbul-lib-instrument-3.3.0" = { @@ -5122,7 +4888,7 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz"; - sha512 = "1j5bcfrd9sgjpm1mpgxv847jwwcjfpzfkynjcidpf4mwxbn0p6gz622rcrmbliphcbnw0nxipw0d7aw0gva7rym3lci9rz8icvwhyg6"; + sha512 = "5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA=="; }; }; "istanbul-lib-report-2.0.8" = { @@ -5131,7 +4897,7 @@ let version = "2.0.8"; src = fetchurl { url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz"; - sha512 = "2qm8v7vck1yv85lkx7n060wdvrr547mfrc83xyr6sl4p4av7r6c5jh6mdbvxiqz2m6d5spj6v8fksa9dc6c5r86hjhqh47pkqdmww3w"; + sha512 = "fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ=="; }; }; "istanbul-lib-source-maps-3.0.6" = { @@ -5140,34 +4906,25 @@ let version = "3.0.6"; src = fetchurl { url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz"; - sha512 = "1gm71m2lqpb1p2lrwmf9f9g2maz48s133zvk0zzlblgwnjgnn6dx129cbsx8znklhanwwgck6fwnfpsy5sga5pnwfbpw923rg6cm3j7"; + sha512 = "R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw=="; }; }; - "istanbul-reports-2.2.7" = { + "istanbul-reports-2.2.6" = { name = "istanbul-reports"; packageName = "istanbul-reports"; - version = "2.2.7"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz"; - sha512 = "0m8fjnnvxyyd03g22xna4jnypd01jbvdsz5k9jnqlb1v678zikdzidq7p1x4pdlg1dfzfa9g8lzz01srnamalpmrj5qxrb8ppy4bvds"; + url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz"; + sha512 = "SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA=="; }; }; - "isurl-1.0.0" = { - name = "isurl"; - packageName = "isurl"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; - }; - }; - "jest-24.9.0" = { + "jest-24.8.0" = { name = "jest"; packageName = "jest"; - version = "24.9.0"; + version = "24.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz"; - sha512 = "0dz2j03p5zng926y4l7d5ivp918xscx0rmpavzyh02wy397hc3qr7m8w90zyfizy0gkwcq6xcdw4a3p1rqpqyg8sy0xvvb6aqph3yb2"; + url = "https://registry.npmjs.org/jest/-/jest-24.8.0.tgz"; + sha512 = "o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg=="; }; }; "jest-changed-files-24.9.0" = { @@ -5176,7 +4933,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz"; - sha512 = "2m70h82g3b9fhgyvzvg189inyc1zq20jz8nv763k4zcqg05pswzg92kjwkk26ry257qpk1p7cdg5hivchvmmg5xhh1ms756xnjxd979"; + sha512 = "6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg=="; }; }; "jest-cli-24.9.0" = { @@ -5185,7 +4942,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz"; - sha512 = "0d2yrlapfahrl57m7nwz7lw04gvx72f61sq0w8mga9c1ly2jqm1jfb7jx4xjwqy4rshz0xxrj1zcpy5s60m14n7l1b70kxd50mx2lpr"; + sha512 = "+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg=="; }; }; "jest-config-24.9.0" = { @@ -5194,7 +4951,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz"; - sha512 = "1yjki6v7vm537dmjkfkdbmb9gqw90j3sz1815j1ckx21rb2pshsdpk7qccjn6hfbcn7zy287wb48ynbz6kq7mpvxplhlqamkd0fs124"; + sha512 = "RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ=="; }; }; "jest-diff-24.9.0" = { @@ -5203,7 +4960,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz"; - sha512 = "02sb3bshly5aqlan0hxxw54d15jm33d68zhyl9mr86lwy736g3gdvcs18d3jv9zr82vnnnhcdvi7fc7fd4aglxai8v92x00rx7fpix8"; + sha512 = "qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ=="; }; }; "jest-docblock-24.9.0" = { @@ -5212,7 +4969,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz"; - sha512 = "009kyd5sgsjr8fa7ayc30pggfywigyh6a49rwk6fs1lcn5r61iy7ffza0zssbbra98yp64qgjinbmk09m0pp1yyf0sw096cj1vf6l0p"; + sha512 = "F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA=="; }; }; "jest-each-24.9.0" = { @@ -5221,7 +4978,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz"; - sha512 = "2i6r417rcfrcfm30qy6ahwx0bgnwmj43d9l43vj1fkzj22dp6aygkx8qb6v09iw43q0y2b8pmfdw1k2gjy2wdnbqdf8wnvgh13v9n1q"; + sha512 = "ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog=="; }; }; "jest-environment-jsdom-24.9.0" = { @@ -5230,7 +4987,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz"; - sha512 = "2s9xjipxcg6j92q67l7c9xcc6dy8d5nhjw722j501cxha0fabdp0ld1vzdw9y4hnqbvcy2h6kagjv9vlccbvqxm03p34is1sdblbzv6"; + sha512 = "Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA=="; }; }; "jest-environment-node-24.9.0" = { @@ -5239,7 +4996,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz"; - sha512 = "2wbp9q6p3l2n5zd9s9788rpbyy4xgf07fgf1q8vgnndzgk87jiillyhsjliznj924bssn8pwadqaimgsdpa7pg9q4rk5ir7zvcibpp9"; + sha512 = "6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA=="; }; }; "jest-get-type-24.9.0" = { @@ -5248,7 +5005,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz"; - sha512 = "3qs6d7i3xgiwb787y3d4ymij99fqgrcn6bg0bz27ic0nr58cw49njbhnrb7jpmkq3823mqs1snx7rvz97zlhac7hh5jwyr560riwjwm"; + sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q=="; }; }; "jest-haste-map-24.9.0" = { @@ -5257,7 +5014,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz"; - sha512 = "26w4jc0ic0x8j1vza10vnf1aqahg1wknvq9q40kbsv5i9j5h3krvjb8akjgkkpv9gjh9frq04kyml8gg01d8saliy92vflnrfd4bxci"; + sha512 = "kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ=="; }; }; "jest-jasmine2-24.9.0" = { @@ -5266,7 +5023,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz"; - sha512 = "37r7lh1ni9sizsffg7zcymwr8v30jhnz5kxmpq06i4c5d2b62nmpnci0w2kfmx0nq21ndp6829ypajdbgrdpzn57rzalq0s128fzbha"; + sha512 = "Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw=="; }; }; "jest-leak-detector-24.9.0" = { @@ -5275,7 +5032,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz"; - sha512 = "2n6cx7niz5q8aryz2gahj0kz5s7vvj4xjn5py635kmmrhr7xa0immgd7h6id9zxccrxz8pn8rlp9maz447xfik1dyq32a927ch0b2dm"; + sha512 = "tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA=="; }; }; "jest-matcher-utils-24.9.0" = { @@ -5284,7 +5041,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz"; - sha512 = "0fa7wakjy0cpr8scy7i55r1bp13r42n334abwv6p2zfkxa1dgkv0s00qm31437ixxv0rjah1d86vvjg6nvyn7hc62ifds9fgchzd71r"; + sha512 = "OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA=="; }; }; "jest-message-util-24.9.0" = { @@ -5293,7 +5050,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz"; - sha512 = "2bq0saksr0nf5i1vj8lkrgwpb1ssyasmmxj0bwhn6ckf921bx3lapbg7wwzp96aa0qd81pv5n6gi0iz7cpvm4l67x9lhlvp4qbgqa50"; + sha512 = "oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw=="; }; }; "jest-mock-24.9.0" = { @@ -5302,7 +5059,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz"; - sha512 = "3byaz1py3zmdifhw4743mrj6vq5mkqmkr83ps0w20i3dw2f46sqspx2prn9gyvcqa0i7za0gy6ff0gc28qjrcp4fxqayjlvjlvih4fw"; + sha512 = "3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w=="; }; }; "jest-pnp-resolver-1.2.1" = { @@ -5311,7 +5068,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz"; - sha512 = "2fsj6wsh0r9hbal035dfnly528jk85b00z1rnikavh6zprlhwspq8rqjlv4ds0qkr2l62frwq803h6awxx3hgzpcbhgrqdrv7d700d6"; + sha512 = "pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ=="; }; }; "jest-regex-util-24.9.0" = { @@ -5320,7 +5077,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz"; - sha512 = "101f428mjhbpli5q63y48lr2j3010x571y5km5mfk2zxx9vrqwnwvprsib89f5nv2lysfr6cin7gxc6ryyqx7yfc8za1idfl1psd46k"; + sha512 = "05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA=="; }; }; "jest-resolve-24.9.0" = { @@ -5329,7 +5086,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz"; - sha512 = "0qkydcrqaqslxls0wgkxipas27szpigp62bw03ab640ilj8ym1zfm9x9w0x1ghp14x218dq5jzraf5niwvdybch2lc4z5zma8nxx8jd"; + sha512 = "TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ=="; }; }; "jest-resolve-dependencies-24.9.0" = { @@ -5338,7 +5095,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz"; - sha512 = "3xflqrzhsd48ckwqzd4cc5b2qxng8f9946lws7dam37gwd4dxb5spjsswqa624bh36ymv8il4i4gjv9x4ay5whms19qi7an17ldnvhn"; + sha512 = "Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g=="; }; }; "jest-runner-24.9.0" = { @@ -5347,7 +5104,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz"; - sha512 = "1d1djjic2c29yjm7lccjh8vpa7imjmr3b4y87v255dvg7cn9p7v78298hzjvl00xkaqn4vrnwd9w6rq8hf9yagvf6hlkzrp491hjjra"; + sha512 = "KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg=="; }; }; "jest-runtime-24.9.0" = { @@ -5356,7 +5113,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz"; - sha512 = "2gwrn1nf3fc73wdc0a4gjipld6ahf9iq9k37rdzp5wxish6691xnb4b72j31k2hksr6caijgdgjhgxsbxi36lgmx24zvpl5g616m0zj"; + sha512 = "8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw=="; }; }; "jest-serializer-24.9.0" = { @@ -5365,7 +5122,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz"; - sha512 = "1nkvvhcv9qvpdxj7p66qpi46yy4yqvdw6kfdfpq3b00x4i4ypxa1c8m9s7xh672svcibgv3ghwzfh3limg7mjkx53mzffpw7aj245hg"; + sha512 = "DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ=="; }; }; "jest-snapshot-24.9.0" = { @@ -5374,7 +5131,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz"; - sha512 = "1xq7ysip1hh99xijwdhk5xmax44mkf7r0ggqdfzdmfnj7h75myfzr39nwi3ljvgwgj7lwkliz9bidivggmgl9fd13qvvcwj66ryp3xq"; + sha512 = "uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew=="; }; }; "jest-util-24.9.0" = { @@ -5383,7 +5140,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz"; - sha512 = "0xcvxjx6b045jaki9zg2qjf7j10fv9wmlq2173553l6z11g73id4xgv591r7wdjd81x088fmmv2c53pq60fcjhddiqy562iqm9ikry7"; + sha512 = "x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg=="; }; }; "jest-validate-24.9.0" = { @@ -5392,7 +5149,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz"; - sha512 = "12y3aryz98ppjhkz6zs9pix68d6ng43dq40wyvjhdzlf1cyyfs27qk9ra1zir84g2y42smvq7rclxj8sbkzh8ic9am0h2s05vl2vwhw"; + sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ=="; }; }; "jest-watcher-24.9.0" = { @@ -5401,7 +5158,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz"; - sha512 = "1kqdbclywg8vhhvh6dhrmzmdfj1ivkwdl639qxam38nxvvv869b7j9shaag8zg7cmc5nlw67yhhc7p1pynv6r491l4pcpcgy8wwpxzv"; + sha512 = "+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw=="; }; }; "jest-worker-24.9.0" = { @@ -5410,16 +5167,16 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz"; - sha512 = "1bj47m96z8b7jibrl7ybpmk88l2ic0yzwanlsimc1ca2gz8rhj0zaxaix9baxmyms63lq8dj2yxpafr739k3lhrl83pfjcc2vic8lz7"; + sha512 = "51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw=="; }; }; - "js-beautify-1.10.3" = { + "js-beautify-1.10.2" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.10.3"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.3.tgz"; - sha512 = "2yvdw134756wahvr97k7b7s5d10h3wf454j0vjmwhgbdsmqidlyccrqvjhlm82vdwc3m0074ad79wp4qwmpclhagi9ksvx80lh3zyf1"; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz"; + sha512 = "ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ=="; }; }; "js-stringify-1.0.2" = { @@ -5446,7 +5203,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "0lwyvximqkf1q5w94x2747nj2v035is66vzalrbl3f2gdh9k1m3m29p8zw6r65ps5784x2lxwz8akmv085l4ai358rwbp84axz59lj5"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; "js-yaml-3.13.1" = { @@ -5455,7 +5212,7 @@ let version = "3.13.1"; src = fetchurl { url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; }; "jsbn-0.1.1" = { @@ -5473,7 +5230,7 @@ let version = "11.12.0"; src = fetchurl { url = "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz"; - sha512 = "27wagw1v4qv7snvz46q94kvwfzs4p86izsab5rm1bjh4dj18k527msjszrcnvb924sbwk4pj0ncvdqn6jzwydcpvlsi721jgbiz3hyb"; + sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw=="; }; }; "jsesc-0.5.0" = { @@ -5500,16 +5257,7 @@ let version = "2.5.2"; src = fetchurl { url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "20bfkjw0zjachan7rfv75dn5ky7l12xhyz919mdhh9fjn395ss454ykknjza7fwyx09dj89makcs1xi341dvv4k1cvj94739ifbp2rr"; - }; - }; - "json-buffer-3.0.0" = { - name = "json-buffer"; - packageName = "json-buffer"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; "json-parse-better-errors-1.0.2" = { @@ -5518,7 +5266,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha512 = "2pv1kaf7gjr0bhr2djaf1i88li7q3v5daz4zm4hz57i4h21jgryihxb5c2h0p0q1vrq1ffyg279hp0vjrg73shvxr5lir6plxjb5fls"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; }; "json-schema-0.2.3" = { @@ -5536,7 +5284,16 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stream-1.0.0" = { + name = "json-stream"; + packageName = "json-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stream/-/json-stream-1.0.0.tgz"; + sha1 = "1a3854e28d2bbeeab31cc7ddf683d2ddc5652708"; }; }; "json-stringify-safe-5.0.1" = { @@ -5554,7 +5311,7 @@ let version = "3.3.3"; src = fetchurl { url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; - sha512 = "049m3dzsr3mcgk3g8hw79w9lr296zxs0qmmn45ngfzinyxsvqh6k52i49690bfjlhsv16yrs87vh4nh6lfy80xrdh02haicnnczrgvk"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; }; }; "json5-0.5.1" = { @@ -5572,16 +5329,25 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "0xzlb8ipv7y4s06gdr1j09fgp9a8xcjrwy5qq739vgadwzfyslk6xph4f9d8zv7rrc0fg3qn6fpwg3y1mrzf0hbi5qp8yng11cvi938"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; - "json5-2.1.1" = { + "json5-2.1.0" = { name = "json5"; packageName = "json5"; - version = "2.1.1"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz"; + sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ=="; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz"; - sha512 = "22wbapqjyyia17kracx58ch53wppglmma2r3k2wzfjixnljynv3s7sscdxffl5v70j77j89wvq0ldmpm8xrxdbap3hqs4067mfcgvcp"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; "jsonpath-plus-0.19.0" = { @@ -5590,7 +5356,7 @@ let version = "0.19.0"; src = fetchurl { url = "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-0.19.0.tgz"; - sha512 = "29bszfdwjp446whcdh9mivbff8xl1v8jyamcwf6bg96mqr0jaghari3nfjqjrq33gv1di54kz17vrlj0bpakv2wwq0bpx6npjr7098r"; + sha512 = "GSVwsrzW9LsA5lzsqe4CkuZ9wp+kxBb2GwNniaWzI2YFn5Ig42rSW8ZxVpWXaAfakXNrx5pgY5AbQq7kzX29kg=="; }; }; "jsprim-1.4.1" = { @@ -5611,22 +5377,13 @@ let sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"; }; }; - "keygrip-1.1.0" = { + "keygrip-1.0.3" = { name = "keygrip"; packageName = "keygrip"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz"; - sha512 = "00x227di73g3xvz8pmdhf4ykssibdigbhqw7kr6a22s8w54r7raw71apsc3r2bwda290y3wzsmay0xi59j27lh6icy295ky6a29r149"; - }; - }; - "keyv-3.0.0" = { - name = "keyv"; - packageName = "keyv"; - version = "3.0.0"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; - sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs"; + url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz"; + sha512 = "/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g=="; }; }; "killable-1.0.1" = { @@ -5635,7 +5392,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"; - sha512 = "272kk46rkfh4wq4mispvvy174y6fj8rlnf1m5z8pszpa2igz586k5f8vzz3q3nckxwvkcyqzf48sndd48krwzr9ag22mhjlm4nasfig"; + sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; }; }; "kind-of-3.2.2" = { @@ -5662,16 +5419,16 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; }; }; - "kind-of-6.0.3" = { + "kind-of-6.0.2" = { name = "kind-of"; packageName = "kind-of"; - version = "6.0.3"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "23pm3j7jjxhl5igjj2mg91b2w2x6j39axjy2y7b1z0dp9jgnhxl885znwwvglzhnb5ssdc4v5vy04ks7xpwgzllyy1ngdmxbyxbbi3m"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; }; }; "kleur-3.0.3" = { @@ -5680,25 +5437,25 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"; - sha512 = "3rh87j32f450qslsmms0br15jzkv6b71n08xsms6wv6qfvdxv1b5cridqb7bmkwmvzffx9asikjs4vh328pmifhqn4iylcjafak6ckr"; + sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; }; - "koa-2.11.0" = { + "koa-2.7.0" = { name = "koa"; packageName = "koa"; - version = "2.11.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/koa/-/koa-2.11.0.tgz"; - sha512 = "0q4rl38fvrdnml9ix2ka3nav9zd8ilxh6738b27nvx4r05y0lb17pjw7la9nqgq0q401alrkv1cyyliig40r88c1rd3jk2195s7v50j"; + url = "https://registry.npmjs.org/koa/-/koa-2.7.0.tgz"; + sha512 = "7ojD05s2Q+hFudF8tDLZ1CpCdVZw8JQELWSkcfG9bdtoTDzMmkRF6BQBU7JzIzCCOY3xd3tftiy/loHBUYaY2Q=="; }; }; - "koa-body-4.1.1" = { + "koa-body-4.1.0" = { name = "koa-body"; packageName = "koa-body"; - version = "4.1.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/koa-body/-/koa-body-4.1.1.tgz"; - sha512 = "1wfnjmilqj9fhv5dhmhpr5vx38ja1x8599nnqwx2977mhz15ig66fpcyk2rim80l8b77ir6g6w3wz71hppb445gf129kapwa0lzzdmc"; + url = "https://registry.npmjs.org/koa-body/-/koa-body-4.1.0.tgz"; + sha512 = "rWkMfMaCjFmIAMohtjlrg4BqDzcotK5BdZhiwJu1ONuR1ceoFUjnH3wp0hEV39HuBlc9tI3eUUFMK4Cp6ccFtA=="; }; }; "koa-compose-3.2.1" = { @@ -5716,7 +5473,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz"; - sha512 = "1grd8vfvlnkpwjj8da79mig7p54842wpxzf2dhkj4dmsjm3yh5afh7kq83pig53xbfg6fbds2iwkypgl7r6naqwblpwdf637bqxdq7h"; + sha512 = "8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw=="; }; }; "koa-convert-1.2.0" = { @@ -5728,13 +5485,22 @@ let sha1 = "da40875df49de0539098d1700b50820cebcd21d0"; }; }; + "koa-is-json-1.0.0" = { + name = "koa-is-json"; + packageName = "koa-is-json"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz"; + sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14"; + }; + }; "koa-router-7.4.0" = { name = "koa-router"; packageName = "koa-router"; version = "7.4.0"; src = fetchurl { url = "https://registry.npmjs.org/koa-router/-/koa-router-7.4.0.tgz"; - sha512 = "3x0wdvpg0jxpv26fd4vqhw116nw797i4pzxsgpwm17yll74h8gyxg25zjnwihnm36lhxs9bb1p5m7bm0qcym4lm2b0z17c0fw6mls11"; + sha512 = "IWhaDXeAnfDBEpWS6hkGdZ1ablgr6Q6pGdXCyK38RbzuH4LkUOpPqPw+3f8l8aTDrQmBQ7xJc0bs2yV4dzcO+g=="; }; }; "koa-send-5.0.0" = { @@ -5743,7 +5509,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/koa-send/-/koa-send-5.0.0.tgz"; - sha512 = "2fimqkgi0mli0fl0zfcylnbi29939cp2s7q8c60mnqiszbyyp4snkq5v87sfwjv04nkzc48l80jpkp3hdnw24fv6zp9vlpdbssnhipp"; + sha512 = "90ZotV7t0p3uN9sRwW2D484rAaKIsD8tAVtypw/aBU+ryfV+fR2xrcAwhI8Wl6WRkojLUs/cB9SBSCuIb+IanQ=="; }; }; "koa-static-5.0.0" = { @@ -5752,16 +5518,16 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz"; - sha512 = "1llav1xa767y46f8dhhapgqyyhc4hg7np4d34lbf0r0gg5fa9gi5lypzmn3q346rmym41g4jm0lb0hsnx6z0lpzmn4pc4aqgv49ib2j"; + sha512 = "UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ=="; }; }; - "koa-views-6.2.1" = { + "koa-views-6.2.0" = { name = "koa-views"; packageName = "koa-views"; - version = "6.2.1"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/koa-views/-/koa-views-6.2.1.tgz"; - sha512 = "1xzbplyv8h0gli3blaz4k8s148m29iq39mqk1jpdh6qs14x1y5ayimfscy1rvl1wy0ix6hmd1cd9g8bcsbd8c8d4qdckfhaiz1yskf1"; + url = "https://registry.npmjs.org/koa-views/-/koa-views-6.2.0.tgz"; + sha512 = "Y1rCFd4I5uSjZg0r4Zzs4hDjYTSGHhdBM5DuEhccWzknWikwOfc2ph/DkrocKhtQfFbLPHkkz/Ox38AL+p99BA=="; }; }; "lazy-cache-1.0.4" = { @@ -5779,7 +5545,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; - sha512 = "1wcm03j1xmwayngclsgc7xk3rfsn8d3lcas6yfxszjpjwa37nwiia213cxkagdfc56anijwb679bg42ak1w59d0bkq6j47wqdpw9wva"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; }; }; "left-pad-1.3.0" = { @@ -5788,7 +5554,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz"; - sha512 = "08aih5wmcyaw8f8nxlcf6lhr8synqf7jpvcp0ah2vdkshckvhvw2a8sj2bqkf5dr3fq43rilnq8lj86zhasccqlrb09h0jd6lzlr3jw"; + sha512 = "XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="; }; }; "leven-3.1.0" = { @@ -5797,7 +5563,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"; - sha512 = "3acc4jl6xib9wx3gqgq9wqab262mwjyc8d6aa7igfiyfyami7w4g59b62if7hd8w0zh8k1q3kqkwdxgnqsvyygw6wdaak93gzw5mixa"; + sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; }; }; "levn-0.3.0" = { @@ -5824,7 +5590,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz"; - sha512 = "13mmy8rws80fp5mw0b7qwq5zvvlwq8v20hykp1npzsc5i5sw426j6sgi77js3lrqzbc8b7gjxhsrf26bi8xnn7ii8q64p2wskrspj96"; + sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; }; }; "loader-utils-1.2.3" = { @@ -5833,16 +5599,7 @@ let version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"; - sha512 = "1j5jpk2rz5n0365vhmgknl49zq4sav613jn87b6khghcfsj3xvm2y0zil8zai7rr7wx0fvx1w78297fyiic1yydvq34776xx3qp6jky"; - }; - }; - "loader-utils-1.4.0" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; - sha512 = "1sdj0mw1y0adq9fpaafpv91yz2ijx06s6fpzjfs0db47cry0q2xjcahr5aksf6vlxp7ripisvjz21hjkkdzrwh8pc3zm7vdq141czd8"; + sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; }; }; "locate-path-2.0.0" = { @@ -5860,7 +5617,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; "lodash-4.17.15" = { @@ -5869,7 +5626,7 @@ let version = "4.17.15"; src = fetchurl { url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; "lodash.camelcase-4.3.0" = { @@ -5890,15 +5647,6 @@ let sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.memoize-4.1.2" = { - name = "lodash.memoize"; - packageName = "lodash.memoize"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; - }; - }; "lodash.sortby-4.7.0" = { name = "lodash.sortby"; packageName = "lodash.sortby"; @@ -5914,16 +5662,16 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; - sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm"; + sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; }; }; - "loglevel-1.6.7" = { + "loglevel-1.6.4" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.7"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; - sha512 = "3y57kcbhh98x86dpx7apanxgnkqf5chybr4jnwhzljd3k2n9knm5h7fp9aiv6bzpyvq1xg0qssgg3i47ddiz80h7vahfj6hb8n9x3bi"; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz"; + sha512 = "p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g=="; }; }; "loglevelnext-1.0.5" = { @@ -5932,16 +5680,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz"; - sha512 = "3l63lnbnnsg2dgy8c89m5fxgdnl56a04hyiabic65zj4p9dsbh4jykr9jblvn8v7c7wx1a12mjv9gq69zfdfif00mw6q9pf8fmggzjp"; - }; - }; - "long-4.0.0" = { - name = "long"; - packageName = "long"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz"; - sha512 = "0q7w59j4asw2i6n4hwbdrcigmaz042y2hsm31brmjfp3fg465mgqjmia2giil8kxbdh5ijdx00lv4a8n8lbj6srbziqczr22hmgxhsy"; + sha512 = "V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A=="; }; }; "longest-1.0.1" = { @@ -5959,25 +5698,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "3fhlaj5f55z0d4f45a5vsyz1r5k40qy6mfbxphjgnz8x4jx4d1g4pz4v2793viw0hk04a1a6zbiqxbjsjzhidp9jmmzhngzd8yb2awp"; - }; - }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; - }; - }; - "lowercase-keys-1.0.1" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; }; "lru-cache-4.1.5" = { @@ -5986,7 +5707,7 @@ let version = "4.1.5"; src = fetchurl { url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; - sha512 = "3k64s8pgffvqc84ar3r2jjvxnrll916m1q6s4m2k8pq2gqvlrzy11hdhvx2662fa4x7h1hcpn9wmy4kk28rgk3sj76w2fpn8dn6armi"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; "lru-cache-5.1.1" = { @@ -5995,7 +5716,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "3vjhn04mjkxbkfb4fh7xnlghlgmqffqp5i1w2vg1ndgh5izv7nwvr8lq1n1hypfs5pm3bvbk7wf3fjm2pavld1hipz0n8rp012l14ra"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; }; "make-dir-1.3.0" = { @@ -6004,7 +5725,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz"; - sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv"; + sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; }; }; "make-dir-2.1.0" = { @@ -6013,16 +5734,16 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; - sha512 = "12asfdw6jlwcqjli9xywj755wznjxadmh7q6abrhldss26wdsik8w39dqww20i3ilr9mjam1r80ickwzlp9w7dz15bvqa1wszwmfbrd"; + sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; - "make-error-1.3.6" = { + "make-error-1.3.5" = { name = "make-error"; packageName = "make-error"; - version = "1.3.6"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; - sha512 = "2glh9fqac2bycfy6gmvv1r03pr484iglvv5ry3pjm6iz43h6qnkkw2l4sz9ydyadq6hip4wyjpj9jllbshxchh8k6lg5g5vsya23idk"; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz"; + sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="; }; }; "makeerror-1.0.11" = { @@ -6040,7 +5761,7 @@ let version = "0.0.3"; src = fetchurl { url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz"; - sha512 = "1670fzjdl58zpljl3vblrzfz0805w0d99kdhf9rz4cgr1f2g01ibb5s5b1n7w7dqfv8lyig9zcqw2f0gsjlzxxwj4zc939fwn3k1hd8"; + sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA=="; }; }; "map-age-cleaner-0.1.3" = { @@ -6049,7 +5770,7 @@ let version = "0.1.3"; src = fetchurl { url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha512 = "3gk1kdfw4z4pjghrxyn53gyb40gbk71ycv5mi2mbidwxg76mbfgkxcn88zkcrjw38mq6vn5kcarw4n5zq79ligh5k1s6gr8fgmg373c"; + sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; }; }; "map-cache-0.2.2" = { @@ -6076,7 +5797,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; - sha512 = "29ds70y468n42xivsz4vrgy8rp2x4nxz52z1vkd1k49556gvn74pq998s510g3jgz9972m9yxs6yk1kw752blq97b9w8gaddkwlyay6"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; }; }; "media-typer-0.3.0" = { @@ -6094,7 +5815,7 @@ let version = "4.3.0"; src = fetchurl { url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; - sha512 = "3znrz98ggx92y1crm2y017k8lriwz4m9y4w451wm0h1jzsq7jgpafymdvgpznvx07l3xw8inznd78zzwyxdzhb0aq8scki9iwdrnzd9"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; }; }; "memory-fs-0.4.1" = { @@ -6106,15 +5827,6 @@ let sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; }; }; - "memory-fs-0.5.0" = { - name = "memory-fs"; - packageName = "memory-fs"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz"; - sha512 = "0cgni6pl3js3s6ylnj3j9sydf6z5sbnpyi42xdh4437rd6c7xgbapzdq84wn8dzxrcf7sva66z7m6mna61sdagfs41078aa9rsjn3cc"; - }; - }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -6130,7 +5842,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; - sha512 = "3gyvijjr3va5jwglqgv7sqxm4a6nhzhj32sl68ffjf8axkzi5z25g0nl2r2mvw1kjs3z49wxjdclljkk4whzpqka4vzjg9fwylgzfv9"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; }; }; "methods-1.1.2" = { @@ -6148,7 +5860,7 @@ let version = "3.1.10"; src = fetchurl { url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; - sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; "miller-rabin-4.0.1" = { @@ -6157,7 +5869,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; }; }; "mime-1.6.0" = { @@ -6166,7 +5878,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; "mime-2.4.4" = { @@ -6175,25 +5887,25 @@ let version = "2.4.4"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"; - sha512 = "0c4qs0w88nqz2v7441rw9bbsgrsh50cifwmqm2i7c96yz2ncdy35cb5g42zhr6z0wmqqcwq5la04nnf1n4y3zncvgyg8b721hvnc71d"; + sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; }; }; - "mime-db-1.43.0" = { + "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.43.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-types-2.1.26" = { + "mime-types-2.1.24" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.26"; + version = "2.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; "mimic-fn-1.2.0" = { @@ -6202,7 +5914,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; }; "mimic-fn-2.1.0" = { @@ -6211,16 +5923,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "1r8csnc32c6rrvy8d5d1g33gba52m1863wdwl7qbancmzn795726im9mrwp20k3d8pl4x4msp7n6wpldvcwkmk5y4cy0h84ka9wx9is"; - }; - }; - "mimic-response-1.0.1" = { - name = "mimic-response"; - packageName = "mimic-response"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; - sha512 = "32nwz24nh1f2nbpk8i638ff8hsg1ajmc6746abkssjr951z28362k5a92dd1cfr7bd1l9f507cn0pbam04ixfgsaygskv87g6v1r4cg"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; "minimalistic-assert-1.0.1" = { @@ -6229,7 +5932,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -6247,7 +5950,16 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.10" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; }; }; "minimist-0.0.8" = { @@ -6259,13 +5971,13 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minimist-1.2.5" = { + "minimist-1.2.0" = { name = "minimist"; packageName = "minimist"; - version = "1.2.5"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; "mississippi-2.0.0" = { @@ -6274,7 +5986,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz"; - sha512 = "2gnigixsj38hrqchkf6k8wqywihq6l14pg0qb23x3qpjn56vybljv3nz1z7cbzhl952h1xfw28vsqm09pjhpv9zs9sm43rdxazkqync"; + sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw=="; }; }; "mississippi-3.0.0" = { @@ -6283,7 +5995,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz"; - sha512 = "2895y9fw0xa9bmwbbkv3ziz5gnvr2b9k6kgh1b815ppwhgpcnbzsmn3bjvd2c1852hfakgnxw5hbn8kr8ff1pfbnm8x0lk3qm5gb3n7"; + sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA=="; }; }; "mixin-deep-1.3.2" = { @@ -6292,7 +6004,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"; - sha512 = "08fzp03g97vcq1dm4qs3kfjbazfs8h2m99bzdhn9caddpi4xr9bw9n9adlrv24qwfdw2jphwfhjszdwnykawd3ysj4ihp76zygh66jr"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; "mkdirp-0.5.1" = { @@ -6310,16 +6022,16 @@ let version = "2.24.0"; src = fetchurl { url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha512 = "111s7ki890wwh47hr44ps1q5vsh23jpp56dlgvyzz7hg71np9xkrc7k683qvfs7zyijb9fdcwzvinjcnbz36lhn0hg2hhknm7xxypkd"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; - "moment-timezone-0.5.28" = { + "moment-timezone-0.5.26" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.28"; + version = "0.5.26"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz"; - sha512 = "0zr752vsxhfbfh884hzz8xbqkvs2l5778qwrkl7gxihdasi2ni80w61hvp858xclvgmcqgl2v8z1pjkffj5cbcihdb8aa1jy1k68cjc"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz"; + sha512 = "sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g=="; }; }; "move-concurrently-1.0.1" = { @@ -6346,7 +6058,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; "ms-2.1.2" = { @@ -6355,7 +6067,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; "multicast-dns-6.2.3" = { @@ -6364,7 +6076,7 @@ let version = "6.2.3"; src = fetchurl { url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; - sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; + sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; }; }; "multicast-dns-service-types-1.1.0" = { @@ -6382,7 +6094,7 @@ let version = "2.7.0"; src = fetchurl { url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; + sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; "nan-2.14.0" = { @@ -6391,7 +6103,7 @@ let version = "2.14.0"; src = fetchurl { url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "115f4m91pjscflwskc29clsspd2z02gdbz0dbj63ja8bf67nraw14gvppl4872y9z2f5vbjlkpg1i4625zvalx3gp04vvn2gs7qblr0"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; }; }; "nanomatch-1.2.13" = { @@ -6400,7 +6112,7 @@ let version = "1.2.13"; src = fetchurl { url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; - sha512 = "04al0wvh9hw1p9bblk847c5nbi3lcjz2pg5yzpqdzgllk57firrqinn4yk169iddaagdf9s5l987xh43z87w3hm9h0pqv0i7pcix6ky"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; "natural-compare-1.4.0" = { @@ -6418,7 +6130,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "0xi79rad0khwah5v2k6pvh8ajjgi7hp3zlkg6gk11pv70ydcq7li0kzcv1gnaf13gmblzhvx7hxs2nhypphb0sp4cggiy4ympndr5c5"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; "neo-async-2.6.1" = { @@ -6427,7 +6139,7 @@ let version = "2.6.1"; src = fetchurl { url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; - sha512 = "1kvffl97cs76iidch6z424p50m0wdryx6h6b1jdgr71bfg035szlxcdl6dz9jy71aj8msvprdq2ilbs9jisbim3g1b4l2bfy3qsc9lb"; + sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; }; }; "next-tick-1.0.0" = { @@ -6445,25 +6157,16 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "0swp764n5mcgqfjbm3hsw9iayqy46490y4lvqyk6www0a02bw130mji8lvsvlr34sc29rai5i4vpwwhh76mzplf6ljrlvwyszjphy6n"; - }; - }; - "node-forge-0.8.5" = { - name = "node-forge"; - packageName = "node-forge"; - version = "0.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz"; - sha512 = "3nzl12m7r7d345xjm7a1kq3yjdwfa9x892djy3444h7jaav25zmzh0bcg2f24ympwh7qmyihgpx7b2dgpka52nw5k2zw9vydchi0lxw"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; - "node-forge-0.9.0" = { + "node-forge-0.8.2" = { name = "node-forge"; packageName = "node-forge"; - version = "0.9.0"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; - sha512 = "0lhlm8x38i28zwmjycgdcyzcqlb0x3z8scjx7vm3s4ypj99bfj7pmv18yxjsnz532z7g9li2aa1x54hbv61dmvbvm4yj3z9ml6rl17c"; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.2.tgz"; + sha512 = "mXQ9GBq1N3uDCyV1pdSzgIguwgtVpM7f5/5J4ipz12PKWElmPpVWLDuWl8iXmhysr21+WmX/OJ5UKx82wjomgg=="; }; }; "node-int64-0.4.0" = { @@ -6475,22 +6178,13 @@ let sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; }; }; - "node-jose-1.1.3" = { - name = "node-jose"; - packageName = "node-jose"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-jose/-/node-jose-1.1.3.tgz"; - sha512 = "3qb1g8mkwn2vfqj84a62sp2dfg52334f3dj7ab240w51qrf2wl2s62qjvjz46jid9r3dmasxs0hp1zbjgnqkbg9kiii8nl6if5mzslj"; - }; - }; "node-libs-browser-2.2.1" = { name = "node-libs-browser"; packageName = "node-libs-browser"; version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; - sha512 = "3jhlmpgvcnjkg1bh3qp6rqp4a4plsih4bcfqkg0by0acj58r2m1x1jlsgw1k114920vlsvwl563lfjh844mpm02ykcs14gxq47xrz47"; + sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; }; "node-modules-regexp-1.0.0" = { @@ -6508,16 +6202,16 @@ let version = "5.4.3"; src = fetchurl { url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz"; - sha512 = "3qq3cn12n130r2k8aldr2fn3afv21m8ichf87yj7nfp251ypmb5kv9vxs70k93g9nr6164l7crvyzmw4j6b3lr8yj5f739qrcch319k"; + sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q=="; }; }; - "nopt-4.0.3" = { + "nopt-4.0.1" = { name = "nopt"; packageName = "nopt"; - version = "4.0.3"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"; - sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha"; + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; "normalize-package-data-2.5.0" = { @@ -6526,7 +6220,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha512 = "1wbwhlsm965n61y23wrm50ric9l7rig90wvx7hjdl34np6n1bbqcc67wgm494z303s6y5aj4xjyism3n6kikp40iz9qaizlfhvqr47z"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; "normalize-path-2.1.1" = { @@ -6544,16 +6238,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "0n301s7qa4645iyk3zpcgin8r19p0p8h8g50c3mnnrl9n3m9rpyxv79hjl6miix9daq12s69am1sbskhqnzbabmn2id0nippgj6rrp9"; - }; - }; - "normalize-url-2.0.1" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; - sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; "npm-run-path-2.0.2" = { @@ -6574,13 +6259,13 @@ let sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; - "nwsapi-2.2.0" = { + "nwsapi-2.1.4" = { name = "nwsapi"; packageName = "nwsapi"; - version = "2.2.0"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"; - sha512 = "22vnwmwzxgzp9flhivwzrsa2jr754ysi133p4wdqdfgvg1mvhbjh1hv7ahbl7i2m7zv4vs6higga9c1gydywvwsi53y47qqvjsilq47"; + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz"; + sha512 = "iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="; }; }; "oauth-sign-0.9.0" = { @@ -6589,7 +6274,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; "object-assign-4.1.1" = { @@ -6610,22 +6295,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-hash-1.3.1" = { - name = "object-hash"; - packageName = "object-hash"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz"; - sha512 = "06crm6ynp4rxakk4frrb4kjmi758r38fs5h0f6b7giyxhj0dghb6mdx7sbp0nhnk2w8cyb1bli07d9nbm086i34j8yx641qjpzawarr"; - }; - }; - "object-inspect-1.7.0" = { + "object-inspect-1.6.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.7.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb"; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz"; + sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; }; }; "object-keys-1.1.1" = { @@ -6634,7 +6310,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; "object-visit-1.0.1" = { @@ -6652,16 +6328,16 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; }; - "object.getownpropertydescriptors-2.1.0" = { + "object.getownpropertydescriptors-2.0.3" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.0"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "1b08dy2xs3gqhwviks5245b0m3fa6kkdcqi8wldr5cfvkpgwbvdx474k9y5cjnsf2z075gysifxsc39i59fslxrl55kgpa03xmcx7b7"; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; }; }; "object.pick-1.3.0" = { @@ -6679,16 +6355,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; - sha512 = "0vcjqppr8sr1in2haifxl9q8v6kgn8pddc4ffkjbx5n2fasb3kdrx7mybkfxqdaqfch2hqrwa87rrwllqd5lrmx73md609682xp0z9x"; - }; - }; - "oidc-token-hash-3.0.2" = { - name = "oidc-token-hash"; - packageName = "oidc-token-hash"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-3.0.2.tgz"; - sha512 = "127wvn9pnb5jjxqhkr54w07z6s0njlqvrv4k8cnn2vf5y4hpbykcl2cyn8yw8zwqhzv6bqikhza5nkhmv1zm8kgpazddzgj9zryjg3m"; + sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; }; }; "on-finished-2.3.0" = { @@ -6706,7 +6373,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "2n6994y8y4b146a5wpzzgw779yc227cqkmwsifc3fbn2kc9dzypjigqf72bpgsqrk7gs93l6fk4iqdk752jnsnpr89j58sbabw09455"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; }; }; "once-1.4.0" = { @@ -6742,16 +6409,7 @@ let version = "1.5.1"; src = fetchurl { url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz"; - sha512 = "2yg0r89kjihas5gr319kw75b6bjalmhpy6yfabd8g7vnldsddnnwsdbzb3942c9c9zrbz8pwa17an3rkcb8nwdd8lw72l9njz5i51l2"; - }; - }; - "openid-client-2.5.0" = { - name = "openid-client"; - packageName = "openid-client"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openid-client/-/openid-client-2.5.0.tgz"; - sha512 = "339via1h7paxj3qwnzzs6p7x4r3p51k55pc6z85dpzk2gslhp84fnwa4scgcaib9xai7smcc5y7vgb88p20awllvda6v8a4ph7lay5p"; + sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="; }; }; "opn-5.5.0" = { @@ -6760,16 +6418,25 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"; - sha512 = "2qa90jg1bw4yx1an6vbx2cp7lpk6xwa94yrbr6mkpl2h95wl4iinlmlzzy2z5ihm79d4ypkjkf3w5m7cjl79775amsbav5x021fk89y"; + sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; }; }; - "optionator-0.8.3" = { + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; + "optionator-0.8.2" = { name = "optionator"; packageName = "optionator"; - version = "0.8.3"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; - sha512 = "1n905a6d9xvmaqhy1xvpk4m7amkpx4wmky0w9764biihzkgachffm975qq5yqy4qjri2pbrrck994dsnz4ipmv4kbb7b4wx02jbv1gq"; + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; "ora-3.4.0" = { @@ -6778,7 +6445,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz"; - sha512 = "1i331n8qj60jz6f51yfczwaspwsj57sykmgj34cwzhvlp761l2rx1iwqd247xys1749hhddfp6mmzznfp32dxqkjkl5ffsvsfwhgp3q"; + sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; }; }; "original-1.0.2" = { @@ -6787,7 +6454,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; - sha512 = "038qn5613vi5gjik4pmng7zf2ib4w81hjyzy9dhflj7kw1p1ll09nq63x9rnkyyflkv33lq8bx0fbw1gzlpp4asy24l7adam2bma847"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; }; }; "os-browserify-0.3.0" = { @@ -6814,7 +6481,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; - sha512 = "3frcfnhc4914snsnfqyqrz253i5dd31202gbx4dzkp6bvc8f7wnqhfyc89zp662v016gdqa7wb1z2g6p8nzk6cxzwscwn0qii3pgjb7"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; }; }; "os-tmpdir-1.0.2" = { @@ -6832,25 +6499,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; - sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; - }; - }; - "p-any-1.1.0" = { - name = "p-any"; - packageName = "p-any"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz"; - sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i"; - }; - }; - "p-cancelable-0.4.1" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; - sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; "p-defer-1.0.0" = { @@ -6880,22 +6529,13 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-is-promise-1.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; - sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; - }; - }; "p-is-promise-2.1.0" = { name = "p-is-promise"; packageName = "p-is-promise"; version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha512 = "0z3jpi001p4scg2h40kyy7mjvscz8l9mpdp79lhk9b19lyiz140gbwi8963dr5nrysmkrl0hy52v6ikg2wzfsmk8m6ccasgak1b8xb3"; + sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; }; }; "p-limit-1.3.0" = { @@ -6904,16 +6544,16 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "3sh18calqxbww99pxc84hldflmj0i915g8npihlmazw8wjqabihi9475v0ll3fhx44sxn35j014j1k5d2xr73q3mpwkmx09n2q1gxxy"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; }; }; - "p-limit-2.2.2" = { + "p-limit-2.2.1" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.2"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; - sha512 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q"; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz"; + sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg=="; }; }; "p-locate-2.0.0" = { @@ -6931,7 +6571,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; }; "p-map-2.1.0" = { @@ -6940,7 +6580,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; - sha512 = "0bx813aqd3627xffp035h9nimfd19i0l6may47yd0k7x2bngiyp8z31im58ac1nnxy3gdb3yiilagbyqlb7qwc8wdw06f3wjwmgqxnb"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; "p-reduce-1.0.0" = { @@ -6958,25 +6598,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz"; - sha512 = "3gknqxqyn23vmgcqsvnvspzynkbkfn74f3plq72wj54kcyy5f3mbq3lw8pj2gwpmbkqcv7w0wvk3vv54dlny5j5dgv48khkwviqckjw"; - }; - }; - "p-some-2.0.1" = { - name = "p-some"; - packageName = "p-some"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz"; - sha1 = "65d87c8b154edbcf5221d167778b6d2e150f6f06"; - }; - }; - "p-timeout-2.0.1" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; - sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk"; + sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; }; }; "p-try-1.0.0" = { @@ -6994,16 +6616,16 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; - "pako-1.0.11" = { + "pako-1.0.10" = { name = "pako"; packageName = "pako"; - version = "1.0.11"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; - sha512 = "1imm2ygnj1himskq6lblzdh3ngc6p9gkvhrbzivalqf3nwafzfglpmbh8wkaz0rsiaxh67jzxbb16m2ygapfcnfwqg9gkdqzkqc24p2"; + url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz"; + sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="; }; }; "parallel-transform-1.2.0" = { @@ -7012,7 +6634,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz"; - sha512 = "35gr4098wc5ibbrpckgva8l9v50z6mcii4y3kv6wc1ymz3aj2i444y3m2qm2ngf0k02ylqkg3gn7g6awkqfs56ppljy5wmpifcd4srz"; + sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="; }; }; "parse-asn1-5.1.5" = { @@ -7021,7 +6643,7 @@ let version = "5.1.5"; src = fetchurl { url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha512 = "16n59f599pq8832a6c5wyxnqdf4vrqrdnclzs6vp9m2z2h9qmxamjk6xcrl1aal758jyba0pvyz1bkf7npm7achfxxa29jwaygihhwf"; + sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; }; }; "parse-json-4.0.0" = { @@ -7048,7 +6670,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz"; - sha512 = "0a10cnny1cy9csxrw2736fjbhqp0jqv8hnghr7gz9jrlkclw91f8rzg1173b43b3dbc1qq68g7vy4hq4b45r3bmw5j52kvpwxw7pdjn"; + sha512 = "VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="; }; }; "parseurl-1.3.3" = { @@ -7057,7 +6679,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "2lzxqjq4zp60k9gbskpqz7pr1yvb0c6nygd42sia7n6km2gc0cc844nlc5d6r9sshrjhjvs284143jzvz9wzd4r6xr9dz2k24xrwb0a"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; "pascalcase-0.1.1" = { @@ -7075,7 +6697,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"; - sha512 = "2avzhwqw37c6l7a0f276z7qzchzhwppinxhgg6q7by5bskwb7q7sfhwijb6fx4ingbdzb4i1pw6la5pg0izb5s4z69268278gil1ah5"; + sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; }; "path-dirname-1.0.2" = { @@ -7129,7 +6751,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-to-regexp-0.1.7" = { @@ -7141,13 +6763,13 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "path-to-regexp-1.8.0" = { + "path-to-regexp-1.7.0" = { name = "path-to-regexp"; packageName = "path-to-regexp"; - version = "1.8.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; - sha512 = "1a1s16c1sx28yq8nh8sqkj9izaypszmxfk27x5hl1wid9611b5viffw9vbwqw6sik20ksgmh18dqndglbvq82dii4jl0aal353ck3cz"; + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; }; }; "path-type-3.0.0" = { @@ -7156,7 +6778,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; - sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; + sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; }; }; "pbkdf2-3.0.17" = { @@ -7165,7 +6787,7 @@ let version = "3.0.17"; src = fetchurl { url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz"; - sha512 = "2s4nd3yv3kkyywvh5rkrvbr6w2h6a4q786v548w895ralcq9cllqzyxr0jgxf911k3zpmzycimsg3ggww3lkrhd3bk9wribrgjaby2k"; + sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA=="; }; }; "performance-now-2.1.0" = { @@ -7201,7 +6823,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; - sha512 = "3d9a1zsv7ca8ffpp7ffl67vp0ahiq78ix1jl21b4nfklinh2ilwh6c45f93syclab0b49p3cfq8d4agpphrbmf6xgfxgzjv268387xq"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; }; }; "pinkie-2.0.4" = { @@ -7228,7 +6850,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz"; - sha512 = "0caxkzsq2j5ypg50bxyjcbyz66cpicl6gay0pzaskr5gwjf6m239v6qmydj5kwr15n1j5mdf8n24q22cnn4rxp7gmk7n8yc6qnnmqss"; + sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA=="; }; }; "pkg-dir-2.0.0" = { @@ -7246,7 +6868,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; - sha512 = "2znan90js3xrk8a8cvzv7vrjma5dgr9hkk4kpcgciyawbjz404a4rpdj6gngx1dc7f1xzmfm3q0an1rq69qyk2cmawhsy98i40pnkpw"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; }; }; "pn-1.1.0" = { @@ -7255,16 +6877,16 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz"; - sha512 = "2fgy9i99qaapk6lrqsf0i396i0hw5prvpn2wwsccs7j9jz8960r59vjz98kjhfiif2pyf4fiizrwpminc29rdhpld2v8m7n18hxm8fs"; + sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; }; }; - "portfinder-1.0.25" = { + "portfinder-1.0.24" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.25"; + version = "1.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz"; - sha512 = "0388smj2gw4cwp6pddy75jr5x6sha60s4w055dpxpag7fi9ql9vxrkidnzc1v5h2zp6ra350y8q4n6lqsg0dq12blsm1iavf2f4jjg8"; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz"; + sha512 = "ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg=="; }; }; "posix-character-classes-0.1.1" = { @@ -7285,22 +6907,13 @@ let sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; }; }; - "prepend-http-2.0.0" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; - }; - }; - "prettier-1.19.1" = { + "prettier-1.18.2" = { name = "prettier"; packageName = "prettier"; - version = "1.19.1"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz"; - sha512 = "1xv5n13ms7da26nl80isb703rvq4nwrpqsz4xh8z4bakjh79c631x9pnjrqfhyc77bcjr818yclpxzlq4k9qbh4dr78s87z7g4ficxk"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz"; + sha512 = "OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw=="; }; }; "pretty-2.0.0" = { @@ -7318,7 +6931,7 @@ let version = "24.9.0"; src = fetchurl { url = "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz"; - sha512 = "2f2qn4f43m108j6kw127wvywyyci2c5jdrnfb093ql7f626hwz0qh5z4nwllgpzs4gvdc7l5ljxy2xamzk85xsdgv6rls4791jlqink"; + sha512 = "00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA=="; }; }; "private-0.1.8" = { @@ -7327,7 +6940,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; - sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; + sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; }; }; "process-0.11.10" = { @@ -7345,7 +6958,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; "promise-7.3.1" = { @@ -7354,7 +6967,7 @@ let version = "7.3.1"; src = fetchurl { url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; - sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy"; + sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="; }; }; "promise-inflight-1.0.1" = { @@ -7366,13 +6979,13 @@ let sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; - "prompts-2.3.1" = { + "prompts-2.2.1" = { name = "prompts"; packageName = "prompts"; - version = "2.3.1"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz"; - sha512 = "0sdg37c3assj1gk6ybvyhzvkp891zqq7xqj34gcl41dnqgxyl5skijyf75pz5mhfi7cz8315id6430wnr4231yarpfqdhc21jazd0x8"; + url = "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz"; + sha512 = "VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw=="; }; }; "proto-list-1.2.4" = { @@ -7384,13 +6997,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "proxy-addr-2.0.6" = { + "proxy-addr-2.0.5" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "0xy6dm0910h3nsa0ik45yccdfm6f84nl3h9dpkb22crqhdr3mmiczcbrq9z53gq7l2ijxhxi3pzsfzafrzymw4c1nn68ml1y2pdy7vn"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; }; }; "prr-1.0.1" = { @@ -7411,13 +7024,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.7.0" = { + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "0whj0m29370fn3imrlj2dw0xmr33j2gn30kn96xpxckz7i1b21pj6vlgsn4ggxl79mz2ckng5mdxbkczcwkjry497s8xkgw7c815nz4"; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; "public-encrypt-4.0.3" = { @@ -7426,7 +7039,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; - sha512 = "3qnsvs746b98ifyv12qj1g6hl6fq25vip5mswhvn3gnl7r32fids6mw3jb0gdcqrrl5x9ik475sf0vx6mbhmif49idkwjwrhbr5lnnd"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; }; }; "pug-2.0.4" = { @@ -7435,7 +7048,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/pug/-/pug-2.0.4.tgz"; - sha512 = "2zis5am87x72261l3vnqzms2cybdk6bc8kqa6xdjxd337yayy3c4h3s3zm175iv61h3p2pvzpl40qs7g17vnrwg5wrx5s72bc71l6jy"; + sha512 = "XhoaDlvi6NIzL49nu094R2NA6P37ijtgMDuWE+ofekDChvfKnzFal60bhSdiy8y2PBO6fmz3oMEIcfpBVRUdvw=="; }; }; "pug-attrs-2.0.4" = { @@ -7444,7 +7057,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.4.tgz"; - sha512 = "08vr4ngaa625x9jh03hs5alwzwlbw9wpgsxppr9r1vl28y3f8kyr4xis9li3dxpinrqacz4vnnwqidms56qvw2xf74z0l6ncikpi9jd"; + sha512 = "TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ=="; }; }; "pug-code-gen-2.0.2" = { @@ -7453,7 +7066,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.2.tgz"; - sha512 = "05xmnv15k0jm1wyvk92ih7wlf6w3l17qja8f59gjl101lk1lp5hw34bqb2rzi1l8wlvi1cwnncbhvsaj6biha0q17yiy7y0zxd8a4wi"; + sha512 = "kROFWv/AHx/9CRgoGJeRSm+4mLWchbgpRzTEn8XCiwwOy6Vh0gAClS8Vh5TEJ9DBjaP8wCjS3J6HKsEsYdvaCw=="; }; }; "pug-error-1.3.3" = { @@ -7462,7 +7075,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.3.tgz"; - sha512 = "24id0x6g1wh6gq1b72ibrp653d0knzzlg0aqsfap9m7cqsx49vvn1ma5ghs67q98wbjfig18irgp42gdnkq0jf1b1069nlg8j2dhkd8"; + sha512 = "qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ=="; }; }; "pug-filters-3.1.1" = { @@ -7471,7 +7084,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.1.tgz"; - sha512 = "112912ajq0dfvbibdba458952wpd9cyl0na8fn7p40fyx4i5igki4z0f541aj8nvy679i1rj9m8p1cjmxnd25qww215bjc444vy6mwl"; + sha512 = "lFfjNyGEyVWC4BwX0WyvkoWLapI5xHSM3xZJFUhx4JM4XyyRdO8Aucc6pCygnqV2uSgJFaJWW3Ft1wCWSoQkQg=="; }; }; "pug-lexer-4.1.0" = { @@ -7480,7 +7093,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.1.0.tgz"; - sha512 = "0y1ljrsfpv6jacmhcghkn6s9n46vm0ziwrf55fyqb0g0afwhsx0bbmh5xhq9lz2xg1df3905zfy9bin02xf0mlrjqk6v3kd836757lb"; + sha512 = "i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA=="; }; }; "pug-linker-3.0.6" = { @@ -7489,7 +7102,7 @@ let version = "3.0.6"; src = fetchurl { url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.6.tgz"; - sha512 = "375crip8jzn5kx6lbx19nc12dyxqxc1wq0i3pmbjr8km8kc0p9j1kysysl69djiq0n663yxpqsjdv97in7dbcni02lh6zbdgfw1za3d"; + sha512 = "bagfuHttfQOpANGy1Y6NJ+0mNb7dD2MswFG2ZKj22s8g0wVsojpRlqveEQHmgXXcfROB2RT6oqbPYr9EN2ZWzg=="; }; }; "pug-load-2.0.12" = { @@ -7498,7 +7111,7 @@ let version = "2.0.12"; src = fetchurl { url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.12.tgz"; - sha512 = "2rdg2l72v2hwsiyiz0rvqff2vfd07dlxacs1qf3qhxcl861wgl96jrcjp6733nn53cc36bc83qiy8p90i5ypmyg4qh1cpdjkhd61ajj"; + sha512 = "UqpgGpyyXRYgJs/X60sE6SIf8UBsmcHYKNaOccyVLEuT6OPBIMo6xMPhoJnqtB3Q3BbO4Z3Bjz5qDsUWh4rXsg=="; }; }; "pug-parser-5.0.1" = { @@ -7507,7 +7120,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.1.tgz"; - sha512 = "30blpbplbbgh6xfirijjqbbfxkp3f70iz7scbspw6z56pw6g4nrkz9swd9bz1wadaij38mazdhybz212cwwpj637rzrxvilxhmylqcw"; + sha512 = "nGHqK+w07p5/PsPIyzkTQfzlYfuqoiGjaoqHv1LjOv2ZLXmGX1O+4Vcvps+P4LhxZ3drYSljjq4b+Naid126wA=="; }; }; "pug-runtime-2.0.5" = { @@ -7516,7 +7129,7 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.5.tgz"; - sha512 = "2vnj0qdc3rhxbi060mkcss7mwn6avl864vj16shbf9fwf97a2lblkd9g1g6pivqgxszzvrh3ilcaaqp5sbvdw5ycg88g7vfgwmdgsiz"; + sha512 = "P+rXKn9un4fQY77wtpcuFyvFaBww7/91f3jHa154qU26qFAnOe6SW1CbIDcxiG5lLK9HazYrMCCuDvNgDQNptw=="; }; }; "pug-strip-comments-1.0.4" = { @@ -7525,7 +7138,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.4.tgz"; - sha512 = "2zpmf1c507g195spdxrm7wsfaxrd3kjifxvkfgj7wlbva0vmfydnh8wjsajqph42qzdhmym1y51la62qyiqhybsqi95ij5q4ksgz64b"; + sha512 = "i5j/9CS4yFhSxHp5iKPHwigaig/VV9g+FgReLJWWHEHbvKsbqL0oP/K5ubuLco6Wu3Kan5p7u7qk8A4oLLh6vw=="; }; }; "pug-walk-1.1.8" = { @@ -7534,7 +7147,7 @@ let version = "1.1.8"; src = fetchurl { url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.8.tgz"; - sha512 = "1a288y26wmpn6f09g6z69xqmqazcvqn36fgrzwjm7wh9ik5pgqn44qvg06ibq2lvp9svz6nly5wni9v35y83plgpgipfbylk4rvgjqq"; + sha512 = "GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA=="; }; }; "pump-2.0.1" = { @@ -7543,7 +7156,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; - sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; + sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; }; }; "pump-3.0.0" = { @@ -7552,7 +7165,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; }; "pumpify-1.5.1" = { @@ -7561,7 +7174,7 @@ let version = "1.5.1"; src = fetchurl { url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"; - sha512 = "1sxm2mh7jmxhjqdrpdqrhc61ipk2cjyyyvsn9hmxlxnlpsasyzjdicl98pm63zv30012qhrxl57vdpdnnq2m2hl4w4ybgn7gqimjad0"; + sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; }; }; "punycode-1.3.2" = { @@ -7588,7 +7201,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; "qs-6.5.2" = { @@ -7597,7 +7210,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "qs-6.7.0" = { @@ -7606,16 +7219,7 @@ let version = "6.7.0"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; - sha512 = "34x6fm4dnq8m0kps5ann831k8fvx7jzlrcw8vvri0ki2g2ywdrjr8j5y14bvj9c0fd01ndsyx43y6ji51bfhnxk2gr5fpsks52429sl"; - }; - }; - "query-string-5.1.1" = { - name = "query-string"; - packageName = "query-string"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; - sha512 = "0kkwn38nmjd6n6byiz52gngvyiw46fbibx9c9p1vzn9g7l11f2jpbs39d4aqajk7kk2a6k69wx5bjgavbg1lh275ih6k84jdnr8wdc2"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; "querystring-0.2.0" = { @@ -7642,7 +7246,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; - sha512 = "1yd3j6k7rr39qm5zsh0k86znfksfcz9rbj48vv2dbsicnvvgzvw1vwl17vk2jlxszwqjiqsj9hy88r74wsdxf8by7a3wia2hk2cpdy3"; + sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; }; }; "randombytes-2.1.0" = { @@ -7651,7 +7255,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "2cimbs750ysa2wxsiw9mmc1xqjb8w0c4s22p2mv2n676s8hchvzcl1l5p78jnk62d2jzacpr9zbl9w64kaqnipcbaa25q7ywn47g2dx"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomfill-1.0.4" = { @@ -7660,7 +7264,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; - sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; }; }; "range-parser-1.2.1" = { @@ -7669,7 +7273,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "15b00vag4wijzsp0lwi9jznpz16n858vq5p1p3dgjrqqil9c6d4x55s1nl1fi4cbq8307bylbvkd9qkhyk6qib8ksh8raibxb3jrf0y"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; "raw-body-2.4.0" = { @@ -7678,25 +7282,16 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "3flyhj96ayiy8is22lwh9sp1yqq9ksym43x22yri2ikzladqqzxj6z657bc0xb5f2wl7qr2ja4byf57c9f7l2d3wqdglxih886zrv70"; - }; - }; - "raw-body-2.4.1" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz"; - sha512 = "1ngfzkci4v3yg989xbriv2giv775w4z9l34hyzfjhyh5ap8wdvc1sggkmqnkz19hgm5r3xyszrs7sppwslxi05r90sg14m6bql8hsgm"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; - "react-is-16.13.0" = { + "react-is-16.9.0" = { name = "react-is"; packageName = "react-is"; - version = "16.13.0"; + version = "16.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz"; - sha512 = "00g57i5q020lc9cdswy1ba9bqds0a5wbpy88abfcbnjf0v54fmv4qcch3ad3336sdkxy4mjq3zaf142agbc0vkryipj14n79cpjslqq"; + url = "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz"; + sha512 = "tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="; }; }; "read-pkg-3.0.0" = { @@ -7714,25 +7309,25 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz"; - sha512 = "28400v5dwid6mc9x40s2mwfbkn22vj0dzx0ix8n2bffjx4p2ivb9b60bh743c74kdp0v391rdmladhgvrjgzihns456n977gr451sz9"; + sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA=="; }; }; - "readable-stream-2.3.7" = { + "readable-stream-2.3.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.7"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.6.0" = { + "readable-stream-3.4.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "1s8hs6ax9jwmmw558j3hyfx5lfn7qf66xg0giplz9jci7d8zp2d8vh96dzlis6xzpxfa5b2zbm8nm4mgsr71r6rl3w3qyfanb5qfn05"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz"; + sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ=="; }; }; "readdirp-2.2.1" = { @@ -7741,7 +7336,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"; - sha512 = "2yzl88bp25ig1xnrzqmqiwpfxyqkmdw27h3p90a4a58q0964xcijcx4i948msnlvin9f6hn5hmpxj1s90jzkj8aqxr5d04mmzr3z5fl"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; "realpath-native-1.1.0" = { @@ -7750,7 +7345,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz"; - sha512 = "26fzz602hwidkkqwv7nk72xq07nlymik92psrcs5pifzqypr63pgz0sy8dzda0bpzl7abkz4kiy2z4f1w07xx5ch0yqh802lw1hyn62"; + sha512 = "wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA=="; }; }; "rechoir-0.6.2" = { @@ -7768,7 +7363,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz"; - sha512 = "0m5jil0f2yz4js80jxvwilkhq6im5h6h0pa4disk3fsv9lm23lz8ly5219518j47v4fn0h248s9jf5pqhxhcr6z5cmxvbnna0js6vnl"; + sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; }; }; "regenerator-runtime-0.11.1" = { @@ -7777,7 +7372,7 @@ let version = "0.11.1"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; "regenerator-transform-0.10.1" = { @@ -7786,7 +7381,7 @@ let version = "0.10.1"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz"; - sha512 = "3lxj64s9v2jksipiz0pphfy6m12cf7j96w64bqlzjwnasbpqhc5ws5bjzv3x9ld625v1z4f15l30izpv3p6l9w8h1qsvf6vy1pak5rw"; + sha512 = "PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q=="; }; }; "regex-not-1.0.2" = { @@ -7795,7 +7390,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; - sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; "regexpu-core-2.0.0" = { @@ -7840,7 +7435,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; - sha512 = "3dbpfrs4yh7dd9572m6dc8cxcgqacnvd24xm9licnw1hygqv51a18a84gm04sjssajbm437rq01raggrzmnzk4jnmbnxrnmk78sl4ba"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; }; }; "repeat-string-1.6.1" = { @@ -7861,31 +7456,31 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; - "request-2.88.2" = { + "request-2.88.0" = { name = "request"; packageName = "request"; - version = "2.88.2"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj"; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; - "request-promise-core-1.1.3" = { + "request-promise-core-1.1.2" = { name = "request-promise-core"; packageName = "request-promise-core"; - version = "1.1.3"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "00riv5nw32j70g67b1ll1h599bvdbnkgasnwl1m26pfdgdmgr6zaq500mprx5n77yrnhza27vs3c9icb4z5h6wnwmlha6f81bw3d2s0"; + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz"; + sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag=="; }; }; - "request-promise-native-1.0.8" = { + "request-promise-native-1.0.7" = { name = "request-promise-native"; packageName = "request-promise-native"; - version = "1.0.8"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha512 = "0qx1n06bjj430fidkma2dr90dmrixiza4ymk561v1xxpd5yp7r36lwirgsdn0nvra7s4xs9gs1xhd6fxvlps6q1wh5xq7m4d8n71akm"; + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz"; + sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w=="; }; }; "require-directory-2.1.1" = { @@ -7912,7 +7507,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "2d0gd2x49nz3hgfwms6326sjw5fx7gqf997dnggc7l084cibgang6wr6ryksky32fvdz1bq72xm73kfxd3lj2qnfyjsp57jq287k8rl"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; "requires-port-1.0.0" = { @@ -7933,13 +7528,13 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.15.1" = { + "resolve-1.11.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz"; + sha512 = "WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw=="; }; }; "resolve-cwd-2.0.0" = { @@ -7987,15 +7582,6 @@ let sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; }; }; - "responselike-1.0.2" = { - name = "responselike"; - packageName = "responselike"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; - }; - }; "restore-cursor-2.0.0" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -8011,7 +7597,7 @@ let version = "0.1.15"; src = fetchurl { url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; - sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; "retry-0.12.0" = { @@ -8038,7 +7624,7 @@ let version = "2.7.1"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; "ripemd160-2.0.2" = { @@ -8047,7 +7633,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; - sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; }; "rsvp-4.8.5" = { @@ -8056,7 +7642,7 @@ let version = "4.8.5"; src = fetchurl { url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz"; - sha512 = "2wdl1qh3bdrji9q0whkrhj7gzryfipskamagkg5dq54phmg5c7ifp8va0b8saxs4xmi6c5mlvkh6gbk6r4nqrld4v8ykx5f0ja0xwwx"; + sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; }; }; "run-queue-1.0.3" = { @@ -8068,13 +7654,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "rxjs-6.5.4" = { + "rxjs-6.5.2" = { name = "rxjs"; packageName = "rxjs"; - version = "6.5.4"; + version = "6.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz"; - sha512 = "3nzzg67sr57cc5n1065xsxjgrwa405bgbgqm9l8w01lnr660cy8zdjk99hm2n0did4kd75nwiz3843mfbrw7bs100n7g8q4r1fi18wx"; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz"; + sha512 = "HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg=="; }; }; "safe-buffer-5.1.2" = { @@ -8083,16 +7669,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; - }; - }; - "safe-buffer-5.2.0" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; "safe-regex-1.1.0" = { @@ -8110,7 +7687,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "sane-4.1.0" = { @@ -8119,7 +7696,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz"; - sha512 = "1jdy0h2kdi5d2lnxafnbxnqssf306v0pffvw10jspi9v899n7rxknzs78k7nnrgy1mgyfragq91y4ci7z7xksbp92xw6py80h1g65l6"; + sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA=="; }; }; "sax-1.2.4" = { @@ -8128,7 +7705,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; "schema-utils-1.0.0" = { @@ -8137,7 +7714,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz"; - sha512 = "3kgnvyq6cxrlx9xwba75z4wp364mf4y4d66d92zwhjdw8nqg5jxzp1bfl6n5srl0aircw32nmry28a4476cpb3ijqzz78hars4wqvlb"; + sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; }; "select-hose-2.0.0" = { @@ -8149,22 +7726,22 @@ let sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; }; }; - "selfsigned-1.10.7" = { + "selfsigned-1.10.6" = { name = "selfsigned"; packageName = "selfsigned"; - version = "1.10.7"; + version = "1.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; - sha512 = "165gijv79k6g333d52fwfnna4z0myalk0cywvf9b6pysjfwlib4cvldycwx6yiiy099v9s0yhgvhq1sn21dqy7r85kq4n6y5h2g1kgh"; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.6.tgz"; + sha512 = "i3+CeqxL7DpAazgVpAGdKMwHuL63B5nhJMh9NQ7xmChGkA3jNFflq6Jyo1LLJYcr3idWiNOPWHCrm4zMayLG4w=="; }; }; - "semver-5.7.1" = { + "semver-5.7.0" = { name = "semver"; packageName = "semver"; - version = "5.7.1"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi"; + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; "semver-6.3.0" = { @@ -8173,7 +7750,7 @@ let version = "6.3.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "17wg4dv63jhss5hwqd135zz67r5c30b7a1xz33kfa7knxr0wfypyb8mj2xmc3l71qkxrz569n89xwp5d77m7adn0sr5wzfjlh2m6zvg"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; "send-0.17.1" = { @@ -8182,7 +7759,7 @@ let version = "0.17.1"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "016qgvxg1si6vn34p7piyc8mhvmav1zscm294wkcjf221y1l9zk5kwk5z6yn1ixspj12df25bpazb2h3fdclcf59xqc2h4w46r4mi86"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; "serialize-javascript-1.9.1" = { @@ -8191,16 +7768,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz"; - sha512 = "3a0kvzr1rq0l6v4l587sv58i0xgajs9863srkhxxlzq3dk5mj8r5sag4yyxfidzsbwcbygbg7wdm2nja97kg5n4y9plxsl9hpkzymni"; - }; - }; - "serialize-javascript-2.1.2" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; - sha512 = "26vhlfjji0jk84cvbcpna4h1nfvdwj19g7rjmvz9mzlm277cpgz7xw9q61yrp3x4amas66fxrz0p2rrndv737j4imw4a5ql0614xkxf"; + sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="; }; }; "serve-index-1.9.1" = { @@ -8218,7 +7786,7 @@ let version = "1.14.1"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "0551vv6s1vgk5krzdn9cwnybsv6g4cyqpkk1dlkyv1pd8n7m8r7pi12r16bw12dzwl6ghj4qwizjsxc8vl26lv9c61fkq9r059yzji4"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; "set-blocking-2.0.0" = { @@ -8236,7 +7804,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"; - sha512 = "15idn47lw67wfq0qfva85xnphqxkzz5apix6gwcnylmqw4ch7bqhq4vzdh53f327agpcg6pdzkbj8m72wm887wd8lqaydw20zbxq497"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; }; "setimmediate-1.0.5" = { @@ -8254,7 +7822,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; }; }; "setprototypeof-1.1.1" = { @@ -8263,7 +7831,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "01qxzb0a6jrcxa6qh776v04ihqrmcy3qfbp9drfsjhfcsmaqd21mppr3ndj970ixfh6bpm8ai45jyqyzjfjw26pcyd82y6pyrcl1xr6"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; "sha.js-2.4.11" = { @@ -8272,7 +7840,7 @@ let version = "2.4.11"; src = fetchurl { url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; - sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; }; "shebang-command-1.2.0" = { @@ -8299,7 +7867,7 @@ let version = "0.8.3"; src = fetchurl { url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; - sha512 = "3ndzzikwq0c0084xy1s0v9q2msc8wc7qrmi0bi1llshsmlhfz4dn1k9i2r666ls7xmq62idmify0ksc1vq3mrjqcrqbm20na0m03kbx"; + sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; }; }; "shellwords-0.1.1" = { @@ -8308,7 +7876,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"; - sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w"; + sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="; }; }; "sigmund-1.0.1" = { @@ -8335,16 +7903,16 @@ let version = "1.96.0"; src = fetchurl { url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz"; - sha512 = "0ywlgw61ydavyi2sw2yvzlha4yaxcasrzzkfkvwhv51qm1pciagcmchampclwjrs40wnn0ydhbh1krn1krsrfr6rjyx46k9j76fw1gs"; + sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ=="; }; }; - "sisteransi-1.0.4" = { + "sisteransi-1.0.3" = { name = "sisteransi"; packageName = "sisteransi"; - version = "1.0.4"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz"; - sha512 = "25g5in0cfm4qpjw7rw3pnqyln8svln98bh34hiwmmk51wkfyb93sg52x9xc2nahx1lhvg4np6v5dq8vbsm2k7v4pii9y9qdrsh0rsgx"; + url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz"; + sha512 = "SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg=="; }; }; "slash-1.0.0" = { @@ -8362,7 +7930,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; - sha512 = "3sbrc1b1qf9m7lhlljmnc51k9bl7jbc9zfmdc4z55iafsck65d9ll77bifknvgvgbc0f0a7cvm1b785ab5d1avm27lm7kvnd3fs30k5"; + sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; }; }; "snapdragon-0.8.2" = { @@ -8371,7 +7939,7 @@ let version = "0.8.2"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; - sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; }; }; "snapdragon-node-2.1.1" = { @@ -8380,7 +7948,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; }; }; "snapdragon-util-3.0.1" = { @@ -8389,7 +7957,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; "sockjs-0.3.19" = { @@ -8398,25 +7966,16 @@ let version = "0.3.19"; src = fetchurl { url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz"; - sha512 = "0pn77r3rgi2blxla6ilhf4madx8n0cprzb295mw5knx2hyhiwn60z8n8n8clsb1l0wddcrjj5x4rn24ydf2wnxbrn63xwb5lsa293sp"; + sha512 = "V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw=="; }; }; - "sockjs-client-1.4.0" = { + "sockjs-client-1.3.0" = { name = "sockjs-client"; packageName = "sockjs-client"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; - sha512 = "3pa683q7x6az2iwmd2bh0d2zwdkgklkfi4vpkwnxw4b49mgfdjkal83i9lzxlz6f6sqybyvb0mlyw0mmg9mdd76fawvi7izxz48ndp7"; - }; - }; - "sort-keys-2.0.0" = { - name = "sort-keys"; - packageName = "sort-keys"; - version = "2.0.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz"; + sha512 = "R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg=="; }; }; "source-list-map-2.0.1" = { @@ -8425,7 +7984,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"; - sha512 = "0izwdwncwz4s14qn5ahkb2mpcdpxq2arn5185dlhljns4nylsw2xfm425zi115ik4kz1vfa97qyix3vf3i149dyi1ndq61iaf0knx5a"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; }; }; "source-map-0.5.7" = { @@ -8443,16 +8002,16 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-resolve-0.5.3" = { + "source-map-resolve-0.5.2" = { name = "source-map-resolve"; packageName = "source-map-resolve"; - version = "0.5.3"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; - sha512 = "2gq1flmkac2lzw8rs6vpch0sanmv8r9gv6bggwkgxzj3n7gw33lbqzk7nk9vvsckdjjkm132jzbl3nxc69cf9bb7xz4wnhpgd3gxp0y"; + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; + sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; }; }; "source-map-support-0.4.18" = { @@ -8461,16 +8020,16 @@ let version = "0.4.18"; src = fetchurl { url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"; - sha512 = "1n37icn5xpsxs2x8szv6ifajjf066fskm04xn6agr79sid57n0yws4n0cis7m9q5hr0hxzr8dv2fnmmpgb4mvz8kiyv2g5ikbyb9g5n"; + sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; }; }; - "source-map-support-0.5.16" = { + "source-map-support-0.5.13" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.16"; + version = "0.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "1ayqxcigra517ylxbrvri7jlw55cv0m6a8j9j6060c5xsh519ip69jjp4jk6bqcj5ra5y318k6la6lfhpsj0k8hhkyw1szbj128pz3r"; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz"; + sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w=="; }; }; "source-map-url-0.4.0" = { @@ -8488,7 +8047,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha512 = "3qslnh3c2x2g8lar94rladm2rz692d5ds1bp1cpl223jf67jnazl9ipy4n17n7vqvgwimij36gz740nfqr5pyxq8x6n02rd4xj89gcn"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; }; }; "spdx-exceptions-2.2.0" = { @@ -8497,7 +8056,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha512 = "12c442riig2hk7014ahh40chwirmmsl9dr4cnm2dr2bdbv1lnal8xxwsfx403pqkx7ib06gm2hyyd98kn30kxanjm92yai5y44h0x6r"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; }; }; "spdx-expression-parse-3.0.0" = { @@ -8506,7 +8065,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; "spdx-license-ids-3.0.5" = { @@ -8515,7 +8074,7 @@ let version = "3.0.5"; src = fetchurl { url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "3sk6sk6r05ikn5qslbh04h54mv4a34wn4d76s800h94padnjydfvvq73ij6jh81yrigspyr50ay878jjwpj2mcq38br371jkb6mdq97"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; }; }; "spdy-4.0.1" = { @@ -8524,7 +8083,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz"; - sha512 = "2h245q80im9phjaghcl16kb4sv4n7igk0ch8dsqkq32dsfhcqysjx19blvd45whyaqh9r6309wc6pf6885apd1bcnn0yc2xy3f55rhx"; + sha512 = "HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA=="; }; }; "spdy-transport-3.0.0" = { @@ -8533,7 +8092,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; - sha512 = "1rha3zyhardm434kr4h4y44wxpd49hqzzxqk1d9lqg91bkzfbp6qkh9nahdkkmpgbkc5021x8c8cy1aqnaph5ib1a9hx32j9qadbhl6"; + sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; }; }; "split-string-3.1.0" = { @@ -8542,7 +8101,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; - sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; }; "sprintf-js-1.0.3" = { @@ -8560,7 +8119,7 @@ let version = "1.16.1"; src = fetchurl { url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "ssri-5.3.0" = { @@ -8569,7 +8128,7 @@ let version = "5.3.0"; src = fetchurl { url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz"; - sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x"; + sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ=="; }; }; "ssri-6.0.1" = { @@ -8578,7 +8137,7 @@ let version = "6.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz"; - sha512 = "107yg08ib4232ppannc6fw8ml8p1fssnvcf88cpq3s5ybq3r5ppxnmc32rp40i0ppbgxcw9q04d5rc90if0q3xyp953swad93biws6x"; + sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="; }; }; "stack-utils-1.0.2" = { @@ -8587,7 +8146,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz"; - sha512 = "300alvgq7a9y0fyilyifhirpj9k0qvs6lx7g8msrs6lilcs8wjgl3jzckcs3mvp5v6bi2g7q6k1ml18zpgqvr5cf5wdylxrw4qzwd9i"; + sha512 = "MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA=="; }; }; "static-extend-0.1.2" = { @@ -8623,7 +8182,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; - sha512 = "2mfvadpwj9mzxps4arl1frxlkz96hfp0sc5pvq76s0ijf8fgw26mm3a721zq3iz1f8155w3a41wkixbdlwn1cavv0mzics796da2zlx"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; }; "stream-each-1.2.3" = { @@ -8632,7 +8191,7 @@ let version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz"; - sha512 = "0pxki70s41jg18b738qvcwxlcakp6658ksicxkcgg8wp9q97fwp3mv13c5k38k47vxkyyk951k7gzavs3r7b93ackdyznh8zzch4lxy"; + sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; }; }; "stream-http-2.8.3" = { @@ -8641,25 +8200,16 @@ let version = "2.8.3"; src = fetchurl { url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"; - sha512 = "19y2xbs1xzzpjwfdczl21d0d76ahd7013cr3mhfa6a8nbwwv9jpncng8idf0g8hnmnq2mcl3xh912rjlasl06wsz44qw3j7hdya8d7r"; + sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; }; - "stream-shift-1.0.1" = { + "stream-shift-1.0.0" = { name = "stream-shift"; packageName = "stream-shift"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; - sha512 = "1ai59bc5x8d6a1c37fp2d2gi6q7x6fhza2jsf1sblrdvbza8j14a4xnp20lg65b8lzm0s95m3pqizblbj6ks44qf73gdllhbahaqa02"; - }; - }; - "strict-uri-encode-1.1.0" = { - name = "strict-uri-encode"; - packageName = "strict-uri-encode"; - version = "1.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"; + sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; "string-length-2.0.0" = { @@ -8686,7 +8236,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; "string-width-3.1.0" = { @@ -8695,25 +8245,25 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "3bix3jva53vcp1im3aa1y2v1lywkm7ix81gkwkj4915s2675pmw1c9n5x98q1m985hzgwkk1fnc2q78qz7s0fixhf994md3lazxr9xx"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string.prototype.trimleft-2.1.1" = { + "string.prototype.trimleft-2.1.0" = { name = "string.prototype.trimleft"; packageName = "string.prototype.trimleft"; - version = "2.1.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha512 = "013lf0f398s2xb9jhq9acspdnnk52k7whcga9am4b8a2wrgpc2w7xgkydg4sg4ah9z3i1syimzqs7dc89390xmwlx8zxf6gvlcq1vca"; + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; + sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw=="; }; }; - "string.prototype.trimright-2.1.1" = { + "string.prototype.trimright-2.1.0" = { name = "string.prototype.trimright"; packageName = "string.prototype.trimright"; - version = "2.1.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha512 = "3x2qc2fc2fh9sj3vw9w45h246vspjfn88b0k356ldazylhap91vg825bppg73s9n63kwpql3gpw24lv8zx0b2arblcqhh7ygwpxcnx8"; + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; + sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg=="; }; }; "string_decoder-1.1.1" = { @@ -8722,7 +8272,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; "strip-ansi-3.0.1" = { @@ -8749,7 +8299,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; "strip-bom-3.0.0" = { @@ -8785,7 +8335,7 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; "supports-color-6.1.0" = { @@ -8794,7 +8344,7 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; - sha512 = "30pwyjmww4d54bf2m6lpw20ly4blhb88sy3gn6qcjih2rfq1s5zsl1nszzwgj2j1gqn3c8mw52df0z26rqyk8flzimb70scdmz67vd9"; + sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; }; }; "symbol-tree-3.2.4" = { @@ -8803,7 +8353,7 @@ let version = "3.2.4"; src = fetchurl { url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"; - sha512 = "17zjr1mhbpxi4zhrmghix8hw1pi9svlwzjxz51mj2hxx9qpjwn1z9rlyrmdn55hbdiqnl8m9gkci2294swkkwp3rxpy05q3mkj680zm"; + sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; }; }; "tapable-1.1.3" = { @@ -8812,25 +8362,25 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; - sha512 = "283f6rp3hhj0lvi5smcvh4mq56mifjchgv6qlnr4qb1xs2fsyb2vy71b308h1285nngcz8q7cbmjp8qqzh0im71mx5wr3v6hrnvyqp1"; + sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; }; }; - "terser-4.6.6" = { + "terser-4.3.3" = { name = "terser"; packageName = "terser"; - version = "4.6.6"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz"; - sha512 = "3b8jz65d3105j7jw1b5jv6ww4z89nr3zjvwzsv7sk6n6sn469bnwxf1x04n7cixyz2xrnlz24yx8sw30wmzzas4434dick6wg4hymp2"; + url = "https://registry.npmjs.org/terser/-/terser-4.3.3.tgz"; + sha512 = "Nzr7dpRjSzMEUS+z2UYQBtzE0LDm5k0Yy8RgLRPy85QUo1TjU5lIOBwzS5/FVAMaVyHZ3WTTU2BuQcMn8KXnNQ=="; }; }; - "terser-webpack-plugin-1.4.3" = { + "terser-webpack-plugin-1.4.1" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.4.3"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; - sha512 = "2n44cgqgz070skn207m3l6zg3q444p1db54g0j87fcjxwyhmlfvgg3kak5v1ffhg765cdxah1l99kjdcy74mc75nlq7907zbiq5xk20"; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz"; + sha512 = "ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg=="; }; }; "test-exclude-5.2.3" = { @@ -8839,7 +8389,7 @@ let version = "5.2.3"; src = fetchurl { url = "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz"; - sha512 = "3dgwbvh6yz24lh2kbdigw3j3kpxmmvlrqdhlc4innvrmyj0wvhs5ayckl00161sdx6a2pik344ggs49w9z1h6nh1v2fs542qyv33sik"; + sha512 = "M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g=="; }; }; "thenify-3.3.0" = { @@ -8875,25 +8425,16 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; - sha512 = "14xi6lbly1f37015ny2pzcnf5kaksjmpnhm61gfhwn686w5ac519qb1icxdda974n84f342g0y15kysj1hci2vl40z91aiivyhx2spy"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; - "thunky-1.1.0" = { + "thunky-1.0.3" = { name = "thunky"; packageName = "thunky"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"; - sha512 = "2n8ys98dmv1625inb52cdr421ry82ri2sninmss1njzy9hxrlblw3fkvgr3na4d69glygww3g80bj4pgr9ik1zcm10ki0gd2yf3nxkq"; - }; - }; - "timed-out-4.0.1" = { - name = "timed-out"; - packageName = "timed-out"; - version = "4.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; - sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + url = "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz"; + sha512 = "YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow=="; }; }; "timers-browserify-2.0.11" = { @@ -8902,7 +8443,7 @@ let version = "2.0.11"; src = fetchurl { url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha512 = "0lrwqck7qvpvxswx5kmydj9nmn2rwckzzfpdf5mf869fqrs9girj45i80hdv99b81m4g8fgwqx2lqk04k7zars7rldq3r89r3m9aipb"; + sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; }; }; "tmpl-1.0.4" = { @@ -8956,7 +8497,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; - sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; }; }; "to-regex-range-2.1.1" = { @@ -8974,7 +8515,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "1bip1yxcfy4c0yl2kwmj9jyzfg1ixyj564wd1aaf46rabdiasx62yznb8bwn9cki886f353axgca42zma7q9rb4b50lhm1zz7y8g8y9"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; "token-stream-0.0.1" = { @@ -8986,13 +8527,22 @@ let sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"; }; }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + }; + }; "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "tr46-1.0.1" = { @@ -9019,34 +8569,25 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz"; - sha512 = "0092ym5f8nqn9kwk6wczdd9g9cmyakl54rqrmrmhj1ncm4c5p8iy2sjxkxybnqp4y4bxsabar5kalggrz787665r6lnb49zpz4xlz3k"; + sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; }; }; - "ts-jest-24.3.0" = { + "ts-jest-24.0.2" = { name = "ts-jest"; packageName = "ts-jest"; - version = "24.3.0"; + version = "24.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz"; - sha512 = "1arvrclb8plyklschblbipqilv7gih7yh7my5flmpa6y50x0908x7viisbb5wj93v4r2d12xcbi9rm2n0jwljcraliqhi4hzw5pigqx"; + url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.0.2.tgz"; + sha512 = "h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw=="; }; }; - "tslib-1.11.1" = { + "tslib-1.10.0" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9"; - }; - }; - "tsscmp-1.0.6" = { - name = "tsscmp"; - packageName = "tsscmp"; - version = "1.0.6"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz"; - sha512 = "104f0vccp42fba9r2ij7ww4r7mazkmvqgj8is4ipg0jfx190n967qq5b1g0n77kcmm4d2m3l3q3cmh5kqgdmv886514akn38c16s61g"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz"; + sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="; }; }; "tty-browserify-0.0.0" = { @@ -9082,16 +8623,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; - sha512 = "1z2f06mzr855vwxwr0wkndnkn3fnjcwisd3iajkh6dmzz0dn1a5amq7m798j1ass4kiymz4gn3q0c573l21377dkq1ap2i703jfv6gv"; - }; - }; - "type-2.0.0" = { - name = "type"; - packageName = "type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.0.0.tgz"; - sha512 = "2iyk1bl159vr7i0r24jawi0lwrgns8xvsw72962lvzw6qshm5blls6p7spkpcqpgwb0p7liwdix0ph0j22dip1rg812xbw723rpj6r8"; + sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; "type-check-0.3.2" = { @@ -9109,7 +8641,7 @@ let version = "1.6.18"; src = fetchurl { url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "3r7402x79nilhdgk4z21yjh5y9vix8lwlll1kzcn8jd2m89vzksdb6wddia77cxv3iwhd6i5hkv6n7diwjbhpy7y03i2kqlvfplli2f"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; "typedarray-0.0.6" = { @@ -9127,16 +8659,16 @@ let version = "3.1.5"; src = fetchurl { url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha512 = "3cvrfgjsyvnh9fdyixjzx9mwkfcjfyhgsjizzxzmrsvb1pwch0y58crjh7p6b0ml9nl7jr55nx5dyslq3jn15qz555fl3a4qdfbrnyd"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typescript-3.8.3" = { + "typescript-3.5.2" = { name = "typescript"; packageName = "typescript"; - version = "3.8.3"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz"; - sha512 = "3rwcbg3l3w3l2zr5y9lszqs30s29jzvh1w594rbdljyr582yi6vajzs2fg04s9p79klh3iv0980b91mbr94sl77h9nb7b2mgrz4929i"; + url = "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz"; + sha512 = "7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA=="; }; }; "typical-4.0.0" = { @@ -9145,7 +8677,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz"; - sha512 = "13n01mbvkc5ikjpc69q3ixakq46pp2nbagrwz2a40ff7as9sandwzp51nhh6hy42l9yxq2pjv2y1whds49yq7akh9c3211vyhigh0al"; + sha512 = "VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw=="; }; }; "uglify-js-2.8.29" = { @@ -9157,6 +8689,15 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; + "uglify-js-3.6.0" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz"; + sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg=="; + }; + }; "uglify-to-browserify-1.0.2" = { name = "uglify-to-browserify"; packageName = "uglify-to-browserify"; @@ -9166,13 +8707,13 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "underscore-1.9.2" = { + "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; - version = "1.9.2"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz"; - sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; + sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; "union-value-1.0.1" = { @@ -9181,7 +8722,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"; - sha512 = "1g7i0bs3sa35zpsrr2l3wsz4j6bqpxgm77kg2fdz89irzw6nrk6j93j61wr134mg9rbf039xa4pp1dw0iqfsv15rkf8jn8y2fdxg5xl"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; }; }; "unique-filename-1.1.1" = { @@ -9190,7 +8731,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; - sha512 = "0sp2fs9gsv3l6mc9kdk09z835d54gw04x02dlz9q208mda3f6bmqd4vix4634kv9njvvxcz3iswcj6fwcmszvima7wpv5knia678sjn"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; }; "unique-slug-2.0.2" = { @@ -9199,7 +8740,16 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; - sha512 = "3dz3f3rqwqssr86c072j9m8m7l98l20b3i75diqrq5l871d647jmdf7pjjml7l83iqvjnb2frz7h6xbs8rpx3rkvk1h5i6swvsap1ff"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; "unpipe-1.0.0" = { @@ -9226,7 +8776,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; - sha512 = "230pbhzxv0jr9n43qhghbsdbsp1rwalc3rclaqscwjaazi35s6vzw9p66s3ypk6yn3jgpmqflda2yh8j2rlypz9vihasfw5m6jhd739"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; }; "uri-js-4.2.2" = { @@ -9235,16 +8785,16 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; }; }; - "urijs-1.19.2" = { + "urijs-1.19.1" = { name = "urijs"; packageName = "urijs"; - version = "1.19.2"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/urijs/-/urijs-1.19.2.tgz"; - sha512 = "3mmrbgqk7ihxy43py896gl9cv3q8bapnwfg5vcsd82b5mlkd3qa4i7vfdihpk5c2jxkhz5anm8qxxm31fahfi3xxkcr7q59ssmhixdk"; + url = "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz"; + sha512 = "xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg=="; }; }; "urix-0.1.0" = { @@ -9271,25 +8821,7 @@ let version = "1.4.7"; src = fetchurl { url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"; - sha512 = "2bdb8rqxq8xd530jx6q8awb1y9idrvd8cfznrlyc1h8j4ra1icxcssfg7qldhssj6dxvibkvx6rnn1ljkjbxi95l58dn1y35ibrlyvp"; - }; - }; - "url-parse-lax-3.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; - }; - }; - "url-to-options-1.0.1" = { - name = "url-to-options"; - packageName = "url-to-options"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; - sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg=="; }; }; "use-3.1.1" = { @@ -9298,7 +8830,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; - sha512 = "2hzzynss1cv7kn1lf40hqk16qmbf38g7a28m27pcg05mg6vpf7sj0gy175fdscz534fxdi14622rmq3sdpib9c5ypjympjfg5ai40bk"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; "util-0.10.3" = { @@ -9316,7 +8848,7 @@ let version = "0.11.1"; src = fetchurl { url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz"; - sha512 = "0fpzl6qczbzr5jniy99vgfxz1k4gdfl13lwwhlfysj22rm18ikfici89wpgv34v67ckays1d500fgk2dlzw95zncn9jvkdygjr40a0x"; + sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; }; }; "util-deprecate-1.0.2" = { @@ -9328,13 +8860,13 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "util.promisify-1.0.1" = { + "util.promisify-1.0.0" = { name = "util.promisify"; packageName = "util.promisify"; - version = "1.0.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz"; - sha512 = "2n8sxd1qdzc7pn348ayx8jm13kvi9wyjkshzwy1fam3aiy8phv8lbikbli433qvnq3ndnqj8yhcf9dgavm2xv6cvzk7cyy7zl5nkll3"; + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; + sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; }; }; "utils-merge-1.0.1" = { @@ -9346,22 +8878,22 @@ let sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; }; }; - "uuid-3.4.0" = { + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.4.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; - "v8-compile-cache-2.0.3" = { + "v8-compile-cache-2.1.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz"; - sha512 = "3givf3csckgfmf3aahy2cdnn1wanqnyjhxq52s8mi349v658g9izi20prr2y5m8gxrv69idkvvwp5njwqds49kbyhmkq1hc0iprvn88"; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; + sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="; }; }; "validate-npm-package-license-3.0.4" = { @@ -9370,7 +8902,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha512 = "09vn7gn5jp2c07pxplc11lvk7ybfaz0rp3qzflyiyhnahkfgh76bij31ll5rg01ranlmljrky2q25d1f6bbd0h23pzxxi5z93csd4hf"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; "vary-1.1.2" = { @@ -9391,13 +8923,13 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "vm-browserify-1.1.2" = { + "vm-browserify-1.1.0" = { name = "vm-browserify"; packageName = "vm-browserify"; - version = "1.1.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz"; - sha512 = "00japcjqx1df1bgck837ds0xvg5dr7g4j30a38zhbmanqss2kyxs4p7pgmldlnxpa31js50gydy8x9qi89s4x74iidf6k6nfgqsc5ns"; + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz"; + sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="; }; }; "void-elements-2.0.1" = { @@ -9409,13 +8941,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "w3c-hr-time-1.0.2" = { + "w3c-hr-time-1.0.1" = { name = "w3c-hr-time"; packageName = "w3c-hr-time"; - version = "1.0.2"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; - sha512 = "1ykk57cjg94sdr82b43a5q815xrd4yhvpqzdwlpvfi50zv5zw4cincppdbkmizdc4zkmym57s8rqmpj5fpyxjl12kla136dy07gkhyg"; + url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; + sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; }; }; "walker-1.0.7" = { @@ -9433,7 +8965,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz"; - sha512 = "34gp4bbaidicl7azgivrrxb9kvdz501gg0xyf88lya75j9wmrbd1rs5rlk2h5g07q5rb453fkjkck54j2qzsdam1qk36bijf5xlg9wb"; + sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA=="; }; }; "wbuf-1.7.3" = { @@ -9442,7 +8974,7 @@ let version = "1.7.3"; src = fetchurl { url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; - sha512 = "066j9njgvk6mkjalv1zf1p8w9m2hrl97vz1iw8q6g9zlplhphz54j5j0ma0x9053zhczbyi3k1nr493vgnx1lk22hdwp2glg8x11kiv"; + sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; "wcwidth-1.0.1" = { @@ -9460,52 +8992,52 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1"; + sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.42.0" = { + "webpack-4.35.0" = { name = "webpack"; packageName = "webpack"; - version = "4.42.0"; + version = "4.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz"; - sha512 = "3my3qykp4laavc26aad536i8n5h6isv7rnrsv092i7nbyy7dkpi59w3jsxrz7yhbrzwvyiqs78kv8q2plswm8camnc1ij0hzhg52chk"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.35.0.tgz"; + sha512 = "M5hL3qpVvtr8d4YaJANbAQBc4uT01G33eDpl/psRTBCfjxFTihdhin1NtAKB1ruDwzeVdcsHHV3NX+QsAgOosw=="; }; }; - "webpack-bundle-analyzer-3.6.1" = { + "webpack-bundle-analyzer-3.3.2" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; - version = "3.6.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz"; - sha512 = "13z3rjpds6nclkfxhf6pdnmp78a485psglljlmzibrlx4anhldzw2rvdwi9hzzjpfpi8d7ihhwc1w8s1k23zgh00xqisjqz7hf7rxrm"; + url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz"; + sha512 = "7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA=="; }; }; - "webpack-cli-3.3.11" = { + "webpack-cli-3.3.4" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.11"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz"; - sha512 = "3i5vq7c9hpjb8z9x68dq56cjmv5hs584vgci6zbc7n0m8y1fk4y1kv4pyrq4q9crlkwirwy6gh5w3q0a2xv43w5q42z1ikvd6x5yybm"; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.4.tgz"; + sha512 = "ubJGQEKMtBSpT+LiL5hXvn2GIOWiRWItR1DGUqJRhwRBeGhpRXjvF5f0erqdRJLErkfqS5/Ldkkedh4AL5Q1ZQ=="; }; }; - "webpack-dev-middleware-3.7.2" = { + "webpack-dev-middleware-3.7.1" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; - version = "3.7.2"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; - sha512 = "27qjisacr2wrfj7r3z5hh2x7nrhadc27vg4kcalrdc7rrn8gnnlk64zf1pqmlkffy8klh8r0dr259v1sf6fjm886j5qlqjvpkcbh46p"; + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz"; + sha512 = "5MWu9SH1z3hY7oHOV6Kbkz5x7hXbxK56mGHNqHTe6d+ewxOwKUxoUJBs7QIaJb33lPjl9bJZ3X0vCoooUzC36A=="; }; }; - "webpack-dev-server-3.10.3" = { + "webpack-dev-server-3.7.2" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "3.10.3"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; - sha512 = "1wl6ahwwfvm7620d70by2abmqgvw54mdhr8bxhdnnsvjzincy83rg80vffb1vwm2cvxwdc9qpp7ipq8bqrkf773fi6lbk0qzxxdd2bv"; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz"; + sha512 = "mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew=="; }; }; "webpack-log-1.2.0" = { @@ -9514,7 +9046,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz"; - sha512 = "0f0lcci53li31zhx7vhwaq4di0xvhd0n02rgy54kb4bcq6fzki0lz34s6ldzwf1ppaqw1n6jc3hp64blldhz8ianvbl3rzf54h2gl2k"; + sha512 = "U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA=="; }; }; "webpack-log-2.0.0" = { @@ -9523,7 +9055,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz"; - sha512 = "191qr8nb4rszy53q0ydqfxr1pirimc3k3bi7mhgin5f15cd7vd28maxanyb248kdivmajhji580fv3a1i584icz3cc9bwvzykd0czvi"; + sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; }; }; "webpack-sources-1.4.3" = { @@ -9532,16 +9064,16 @@ let version = "1.4.3"; src = fetchurl { url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"; - sha512 = "1wn7ixcv4b15kj3jn4c08n3pgrrd2kgzm2llh9viqx6a6k3j6rqzd5iksxdkalzaz6iic1q4fjj6wr9wfa07llf5a751mkgg3fx414n"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "websocket-1.0.31" = { + "websocket-1.0.28" = { name = "websocket"; packageName = "websocket"; - version = "1.0.31"; + version = "1.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz"; - sha512 = "22yr8a52nsijkqybp8fgzvh69wxrhmcqmcmjvmdwl6m9qix0lxdyakbvznj0wr90nl3mw5j4srhgxp6p8ihipil2j5gha66bfk2w2jl"; + url = "https://registry.npmjs.org/websocket/-/websocket-1.0.28.tgz"; + sha512 = "00y/20/80P7H4bCYkzuuvvfDvh+dgtXi5kzDf3UcZwN6boTYaKvsrtZ5lIYm1Gsg48siMErd9M4zjSYfYFHTrA=="; }; }; "websocket-driver-0.7.3" = { @@ -9550,7 +9082,7 @@ let version = "0.7.3"; src = fetchurl { url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz"; - sha512 = "0b5m603phj37lw5vb70ijc77g29cz7vn1w1bs7rhkx1ax3gil0wys841m14gnm3p95lc630hs370dngh68p7aaq69yqw1yvysb5d73f"; + sha512 = "bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg=="; }; }; "websocket-extensions-0.1.3" = { @@ -9559,7 +9091,7 @@ let version = "0.1.3"; src = fetchurl { url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; - sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy"; + sha512 = "nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="; }; }; "whatwg-encoding-1.0.5" = { @@ -9568,7 +9100,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; - sha512 = "09x9fa2rb8a6lmwy9hs7z4qn2bsyqw8l2hmfy50z3fa496x3p2xadmlccm8ad17nam5fz77z9mndw2yqp8jpvyw3ryz6f09ksdn56bg"; + sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -9577,7 +9109,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; - sha512 = "3zaycdfc1hh0i4r1c42vgkzwmlfv8j68d90f6i577735i40hk9p9m790g2z2dlmdkchn2z73yj0zs73fmpjdnx4xwrp80m6pv18r31k"; + sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; }; "whatwg-url-6.5.0" = { @@ -9586,16 +9118,16 @@ let version = "6.5.0"; src = fetchurl { url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz"; - sha512 = "36rzky2jm48j68kfvdhvr0cmbnvr2liaagpnnypc59mlvq4bbcwx9qbdb93hbi4vwx0w287zphiardpmfwyjl2ab58b4k3zmi35j55f"; + sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ=="; }; }; - "whatwg-url-7.1.0" = { + "whatwg-url-7.0.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "7.1.0"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz"; - sha512 = "1xa656b9abn0fnwqaybjm3h5gs9x26cc3zj7jkk5n3865l9d1wqpp461s4l3i2mgbwf90q6psgvbb80lbrmkihbl4xq7bj31m3bnjsr"; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz"; + sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ=="; }; }; "which-1.3.1" = { @@ -9604,7 +9136,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; "which-module-2.0.0" = { @@ -9634,15 +9166,6 @@ let sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe"; }; }; - "word-wrap-1.2.3" = { - name = "word-wrap"; - packageName = "word-wrap"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "2ykkqcs7vmimn8dsvs7xl55j0lbbrfj0nij9i7yqnxg9g759vqyrdis8w5n82k6xvas03x0xhgmbzjgsp7v803mzihx9d12vjnfcgqz"; - }; - }; "wordwrap-0.0.2" = { name = "wordwrap"; packageName = "wordwrap"; @@ -9652,13 +9175,22 @@ let sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; }; }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; "worker-farm-1.7.0" = { name = "worker-farm"; packageName = "worker-farm"; version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz"; - sha512 = "37m9wq9rvylb71n9kw3qghinwa3x4sggz82k29aall83izni78ijnh8rd6nhas8advw0lbnhby8z74vjlhp3sjsr4qm1wjw6r0kgz5f"; + sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; "wrap-ansi-2.1.0" = { @@ -9676,7 +9208,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "3nmsfqfd98a7bgjyhd334y5gzc98nnkipfkmk2z1v4m0acagmpq951d8brmrsxvpnk256fbrp7zkn5n8v02pn4q4zai7zgnvy47yba0"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; "wrappy-1.0.2" = { @@ -9694,7 +9226,7 @@ let version = "2.4.1"; src = fetchurl { url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz"; - sha512 = "2zcd4w8bmjv2qg25v2ysnj63r717jb6zmrh2f4c92r0dh0zwj3ybyzg5h619b4adxksn67cg8y5pgn43hq7wl8ih3z7nchrj5wwaqac"; + sha512 = "TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg=="; }; }; "ws-5.2.2" = { @@ -9703,7 +9235,7 @@ let version = "5.2.2"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "0f6ay7yn6xslzh3h66d5krqnp48d9g3ikwk0ijiyyxfkwaqxxf3b0qdswy6ych79mj44315qd16snlnk6m6npc5l0habgy5lc7wb8cd"; + sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; "ws-6.2.1" = { @@ -9712,7 +9244,7 @@ let version = "6.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; - sha512 = "2l27cfiaw6syjvy6vbpqf5c2swd37bqviizzck6842xlankppm9j1sg79x3m8jpda8v6khcpnm5ssab1b8vf34qpviv41ww5mf8130q"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; "xml-name-validator-3.0.0" = { @@ -9721,7 +9253,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; - sha512 = "0zzh3xf5vk49fghwrf83qvq6v98qin1brnwd7yyh7qs05gc1w3xni0w17sj33534jrkm2za7wkm4q5rhgpchds54i5grcj3vjk99403"; + sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; }; }; "xtend-4.0.2" = { @@ -9730,7 +9262,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; - sha512 = "08w1d6fg23v422cfwd55306pfs9n9cqpz6hycahq3adm3n29wmhl9bmpn4vk75rlzgwn7hp4n3idqxvw8c53zbr04h7a98p43b199ic"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; "y18n-4.0.0" = { @@ -9739,7 +9271,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; "yaeti-0.0.6" = { @@ -9760,13 +9292,13 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "yallist-3.1.1" = { + "yallist-3.1.0" = { name = "yallist"; packageName = "yallist"; - version = "3.1.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb"; + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.0.tgz"; + sha512 = "6gpP93MR+VOOehKbCPchro3wFZNSNmek8A2kbkOAZLIZAYx1KP/zAqwO0sOHi3xJEb+UBz8NaYt/17UNit1Q9w=="; }; }; "yargs-12.0.5" = { @@ -9775,25 +9307,16 @@ let version = "12.0.5"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; - sha512 = "1kjmh68p4rb4c04s0gk4ra20crfr32h6v9zhj4clrz61xanslza9g3drbf6471mmvqq3vmxk04grmgillx1rsp6v2zim7wqnr6gq71f"; - }; - }; - "yargs-13.2.4" = { - name = "yargs"; - packageName = "yargs"; - version = "13.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz"; - sha512 = "2ba88a0fmf5k7dddcbkyhlmh7pijzczza486f2vq9pyw739r7q4yy2xmv4hk8w4ibrj4sjgf6zw01phb89h4j9z3lkz1m2s09cc6vqw"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; }; }; - "yargs-13.3.2" = { + "yargs-13.3.0" = { name = "yargs"; packageName = "yargs"; - version = "13.3.2"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; - sha512 = "19rg5b2rhj2kg44as5vv9jxmpr39lw250885w6nlfwyhvwd5nxnnx7fc35v7h615i65cik7k3wi7ac20c91kcgfi5wy7blgk31xjz81"; + url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; + sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; }; }; "yargs-3.10.0" = { @@ -9811,7 +9334,7 @@ let version = "10.1.0"; src = fetchurl { url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz"; - sha512 = "1nj7f7y3kyrc1ijsgnaf4mdkxhxy38lnckavl6inh9wwzhx12xfmgq0n45x4fbj0y6rd1zhjv57l49qm07kqfd9a9cl1809bi3k48jl"; + sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; }; }; "yargs-parser-11.1.1" = { @@ -9820,16 +9343,25 @@ let version = "11.1.1"; src = fetchurl { url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; - sha512 = "14iaywclwncdp3p7878q12cqgdc5rbkl0f6ghi9g7k7f4f1bbqi41dc5ki6hnqmy6jbfk0kx88m47vk3igrql5j6i7ar2a3cbyh3a8b"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; }; }; - "yargs-parser-13.1.2" = { + "yargs-parser-13.1.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "13.1.2"; + version = "13.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; + sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; + }; + }; + "yarn-1.16.0" = { + name = "yarn"; + packageName = "yarn"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "375nan6m28q81h8q9a8vmcxgiq7s81yn1ql7zdikac0c4j2kmxdjzmbq14fcp9jm4ilcfzkd9ym4x7c80s7r6g488wf13zz2wsyqmny"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.16.0.tgz"; + sha512 = "cfemyGlnWKA1zopUUgebTPf8C4WkPIZ+TJmklwcEAJ4u6oWPtJeAzrsamaGGh/+b1XWe8W51yzAImC4AWbWR1g=="; }; }; "ylru-1.2.1" = { @@ -9838,68 +9370,61 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz"; - sha512 = "2yw1b7v991krvw6f597i39x9sqp12qxlfnqz8zd75x00m7jp2a08b2zivbx59b5ih7ka14swqmpfk9ni2inkdjh363z0w1ksfl2p93x"; + sha512 = "faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ=="; }; }; }; -in -{ - "spacegun-git+https://github.com/dvallin/spacegun.git#v0.3.3" = nodeEnv.buildNodePackage { + args = { name = "spacegun"; packageName = "spacegun"; version = "0.3.3"; - src = fetchgit { - url = "https://github.com/dvallin/spacegun.git"; - rev = "d32d2df34362f6744e8cff34c2d2bf6ce8b4662a"; - sha256 = "589bfc9e3e26af38989144e8551547cbeb5ffc9a0b668a7a4cb211a2ebf7a931"; - }; + src = ./.; dependencies = [ - sources."@babel/code-frame-7.8.3" - (sources."@babel/core-7.8.7" // { + sources."@babel/code-frame-7.5.5" + (sources."@babel/core-7.6.2" // { dependencies = [ sources."debug-4.1.1" - sources."json5-2.1.1" - sources."minimist-1.2.5" + sources."json5-2.1.0" + sources."lodash-4.17.15" sources."ms-2.1.2" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.8.8" // { + (sources."@babel/generator-7.6.2" // { dependencies = [ sources."jsesc-2.5.2" + sources."lodash-4.17.15" sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.8.3" - sources."@babel/helper-get-function-arity-7.8.3" - sources."@babel/helper-plugin-utils-7.8.3" - sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helpers-7.8.4" - (sources."@babel/highlight-7.8.3" // { + sources."@babel/helper-function-name-7.1.0" + sources."@babel/helper-get-function-arity-7.0.0" + sources."@babel/helper-plugin-utils-7.0.0" + sources."@babel/helper-split-export-declaration-7.4.4" + sources."@babel/helpers-7.6.2" + (sources."@babel/highlight-7.5.0" // { dependencies = [ sources."js-tokens-4.0.0" ]; }) - sources."@babel/parser-7.8.8" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/template-7.8.6" - (sources."@babel/traverse-7.8.6" // { + sources."@babel/parser-7.6.2" + sources."@babel/plugin-syntax-object-rest-spread-7.2.0" + sources."@babel/template-7.6.0" + (sources."@babel/traverse-7.6.2" // { dependencies = [ sources."debug-4.1.1" sources."globals-11.12.0" + sources."lodash-4.17.15" sources."ms-2.1.2" ]; }) - (sources."@babel/types-7.8.7" // { + (sources."@babel/types-7.6.1" // { dependencies = [ + sources."lodash-4.17.15" sources."to-fast-properties-2.0.0" ]; }) - (sources."@cnakazawa/watch-1.0.4" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."@cnakazawa/watch-1.0.3" (sources."@jest/console-24.9.0" // { dependencies = [ sources."slash-2.0.0" @@ -9907,7 +9432,9 @@ in }) (sources."@jest/core-24.9.0" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."slash-2.0.0" + sources."strip-ansi-5.2.0" ]; }) sources."@jest/environment-24.9.0" @@ -9926,65 +9453,62 @@ in ]; }) sources."@jest/types-24.9.0" - (sources."@kubernetes/client-node-0.10.3" // { + (sources."@kubernetes/client-node-0.10.1" // { dependencies = [ - sources."@types/node-10.17.17" + sources."@types/node-10.14.19" ]; }) - sources."@sindresorhus/is-0.7.0" sources."@types/accepts-1.3.5" sources."@types/axios-0.14.0" sources."@types/babel-types-7.0.7" - sources."@types/babel__core-7.1.6" - sources."@types/babel__generator-7.6.1" + sources."@types/babel__core-7.1.3" + sources."@types/babel__generator-7.6.0" sources."@types/babel__template-7.0.2" - sources."@types/babel__traverse-7.0.9" + sources."@types/babel__traverse-7.0.7" sources."@types/babylon-6.16.5" - sources."@types/body-parser-1.19.0" + sources."@types/body-parser-1.17.1" sources."@types/caseless-0.12.2" sources."@types/command-line-args-5.0.0" - sources."@types/connect-3.4.33" - sources."@types/cookies-0.7.4" - sources."@types/cron-1.7.2" + sources."@types/connect-3.4.32" + sources."@types/cookies-0.7.3" + sources."@types/cron-1.7.1" sources."@types/events-3.0.0" - sources."@types/express-4.17.3" - sources."@types/express-serve-static-core-4.17.2" + sources."@types/express-4.17.1" + sources."@types/express-serve-static-core-4.16.9" + sources."@types/form-data-2.5.0" sources."@types/formidable-1.0.31" sources."@types/glob-7.1.1" sources."@types/http-assert-1.5.1" sources."@types/istanbul-lib-coverage-2.0.1" - sources."@types/istanbul-lib-report-3.0.0" + sources."@types/istanbul-lib-report-1.1.1" sources."@types/istanbul-reports-1.1.1" - sources."@types/jest-24.9.1" - sources."@types/js-yaml-3.12.2" - sources."@types/keygrip-1.0.2" - sources."@types/koa-2.11.2" - sources."@types/koa-compose-3.2.5" - sources."@types/koa-router-7.4.0" + sources."@types/jest-24.0.15" + sources."@types/jest-diff-20.0.1" + sources."@types/js-yaml-3.12.1" + sources."@types/keygrip-1.0.1" + sources."@types/koa-2.0.48" + sources."@types/koa-compose-3.2.4" + sources."@types/koa-router-7.0.41" sources."@types/koa-send-4.1.2" sources."@types/koa-static-4.0.1" - sources."@types/koa-views-2.0.4" - sources."@types/lodash-4.14.149" + sources."@types/koa-views-2.0.3" + sources."@types/lodash-4.14.140" sources."@types/lodash.clonedeep-4.5.6" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-12.12.30" + sources."@types/node-12.0.8" sources."@types/ora-3.2.0" sources."@types/range-parser-1.2.3" - (sources."@types/request-2.48.4" // { - dependencies = [ - sources."form-data-2.5.1" - ]; - }) + sources."@types/request-2.48.1" sources."@types/serve-static-1.13.3" sources."@types/stack-utils-1.0.1" - sources."@types/tough-cookie-2.3.6" - sources."@types/underscore-1.9.4" + sources."@types/tough-cookie-2.3.5" + sources."@types/underscore-1.9.3" sources."@types/websocket-0.0.40" - sources."@types/ws-6.0.4" - sources."@types/yargs-13.0.8" - sources."@types/yargs-parser-15.0.0" + sources."@types/ws-6.0.3" + sources."@types/yargs-13.0.3" + sources."@types/yargs-parser-13.1.0" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -10005,25 +9529,25 @@ in sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."abab-2.0.3" + sources."abab-2.0.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."acorn-3.3.0" + sources."acorn-5.7.3" + sources."acorn-dynamic-import-4.0.0" (sources."acorn-globals-3.1.0" // { dependencies = [ sources."acorn-4.0.13" ]; }) sources."acorn-walk-6.2.0" - sources."aggregate-error-1.0.0" - sources."ajv-6.12.0" + sources."ajv-6.10.0" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."align-text-0.1.4" sources."ansi-colors-3.2.4" sources."ansi-escapes-3.2.0" sources."ansi-html-0.0.7" - sources."ansi-regex-4.1.0" + sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" sources."anymatch-2.0.0" @@ -10050,28 +9574,28 @@ in sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" - sources."async-2.6.3" + sources."async-1.5.2" sources."async-each-1.0.3" - sources."async-limiter-1.0.1" + sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."awesome-typescript-loader-5.2.1" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" - sources."axios-0.19.2" + sources."aws4-1.8.0" + (sources."axios-0.19.0" // { + dependencies = [ + sources."is-buffer-2.0.3" + ]; + }) sources."babel-6.23.0" (sources."babel-code-frame-6.26.0" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" ]; }) (sources."babel-core-6.26.3" // { dependencies = [ - sources."debug-2.6.9" sources."json5-0.5.1" sources."source-map-0.5.7" ]; @@ -10093,7 +9617,7 @@ in sources."babel-helper-remap-async-to-generator-6.24.1" sources."babel-helper-replace-supers-6.24.1" sources."babel-helpers-6.24.1" - (sources."babel-jest-24.9.0" // { + (sources."babel-jest-24.8.0" // { dependencies = [ sources."slash-2.0.0" ]; @@ -10141,38 +9665,28 @@ in }) sources."babel-runtime-6.26.0" sources."babel-template-6.26.0" - (sources."babel-traverse-6.26.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."babel-traverse-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."kind-of-6.0.2" ]; }) sources."base64-js-1.3.1" - sources."base64url-3.0.1" sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" sources."bfj-6.1.2" sources."big.js-5.2.2" sources."binary-extensions-1.13.1" - sources."bindings-1.5.0" - sources."bluebird-3.7.2" + sources."bluebird-3.5.5" sources."bn.js-4.11.8" - (sources."body-parser-1.19.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."http-errors-1.7.2" - sources."inherits-2.0.3" - sources."qs-6.7.0" - sources."raw-body-2.4.0" - ]; - }) + sources."body-parser-1.19.0" (sources."bonjour-3.5.0" // { dependencies = [ sources."array-flatten-2.1.2" @@ -10181,7 +9695,7 @@ in sources."brace-expansion-1.1.11" sources."braces-2.3.2" sources."brorand-1.1.0" - sources."browser-process-hrtime-1.0.0" + sources."browser-process-hrtime-0.1.3" (sources."browser-resolve-1.11.3" // { dependencies = [ sources."resolve-1.1.7" @@ -10195,35 +9709,27 @@ in sources."browserify-zlib-0.2.0" sources."browserslist-3.2.8" sources."bs-logger-0.2.6" - sources."bser-2.1.1" - sources."buffer-4.9.2" + sources."bser-2.1.0" + sources."buffer-4.9.1" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - sources."byline-5.0.0" sources."bytes-3.1.0" - (sources."cacache-10.0.4" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) + sources."cacache-10.0.4" sources."cache-base-1.0.1" sources."cache-content-type-1.0.1" - (sources."cacheable-request-2.1.4" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."lowercase-keys-1.0.0" - ]; - }) sources."callsites-3.1.0" - sources."camelcase-1.2.1" - sources."caniuse-lite-1.0.30001035" + sources."camelcase-5.3.1" + sources."caniuse-lite-1.0.30000997" sources."capture-exit-2.0.0" sources."caseless-0.12.0" sources."center-align-0.1.3" - sources."chalk-2.4.2" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) sources."character-parser-2.2.0" sources."check-types-8.0.3" (sources."chokidar-2.1.8" // { @@ -10231,34 +9737,25 @@ in sources."normalize-path-3.0.0" ]; }) - sources."chownr-1.1.4" + sources."chownr-1.1.3" sources."chrome-trace-event-1.0.2" sources."ci-info-2.0.0" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" ]; }) - sources."clean-css-4.2.3" - sources."clean-stack-1.3.0" + sources."clean-css-4.2.1" sources."cli-cursor-2.1.0" sources."cli-spinners-2.2.0" - sources."cliui-2.1.0" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."clone-1.0.4" - sources."clone-response-1.0.2" sources."co-4.6.0" sources."co-body-5.2.0" sources."code-point-at-1.1.0" @@ -10267,15 +9764,13 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.8" sources."command-line-args-5.1.1" - sources."commander-2.20.3" + sources."commander-2.20.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" - sources."compressible-2.0.18" + sources."compressible-2.0.17" (sources."compression-1.7.4" // { dependencies = [ sources."bytes-3.0.0" - sources."debug-2.6.9" - sources."safe-buffer-5.1.2" ]; }) sources."concat-map-0.0.1" @@ -10283,28 +9778,16 @@ in sources."condense-newlines-0.2.1" sources."config-chain-1.1.12" sources."connect-history-api-fallback-1.6.0" - sources."console-browserify-1.2.0" + sources."console-browserify-1.1.0" sources."consolidate-0.15.1" sources."constantinople-3.1.2" sources."constants-browserify-1.0.0" - (sources."content-disposition-0.5.3" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - (sources."convert-source-map-1.7.0" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."convert-source-map-1.6.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - (sources."cookies-0.8.0" // { - dependencies = [ - sources."depd-2.0.0" - ]; - }) + sources."cookies-0.7.3" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" (sources."copy-webpack-plugin-4.6.0" // { @@ -10313,12 +9796,12 @@ in sources."p-try-1.0.0" ]; }) - sources."core-js-2.6.11" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cron-1.8.2" + sources."cron-1.7.1" sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" sources."cssom-0.3.8" @@ -10328,19 +9811,26 @@ in sources."dashdash-1.14.1" (sources."data-urls-1.1.0" // { dependencies = [ - sources."whatwg-url-7.1.0" + sources."whatwg-url-7.0.0" ]; }) - sources."debug-3.1.0" + sources."date-now-0.1.4" + sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."decompress-response-3.3.0" sources."deep-equal-1.0.1" sources."deep-is-0.1.3" sources."default-gateway-4.2.0" sources."defaults-1.0.3" sources."define-properties-1.1.3" - sources."define-property-2.0.2" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."kind-of-6.0.2" + ]; + }) (sources."del-4.1.1" // { dependencies = [ (sources."globby-6.1.0" // { @@ -10354,7 +9844,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" - sources."des.js-1.0.1" + sources."des.js-1.0.0" sources."destroy-1.0.4" sources."detect-file-1.0.0" sources."detect-indent-4.0.0" @@ -10370,80 +9860,56 @@ in sources."domain-browser-1.2.0" sources."domexception-1.0.1" sources."duplexer-0.1.1" - sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - (sources."editorconfig-0.15.3" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) + sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.376" - sources."elliptic-6.5.2" + sources."ejs-2.7.1" + sources."electron-to-chromium-1.3.267" + sources."elliptic-6.5.1" sources."emoji-regex-7.0.3" - sources."emojis-list-3.0.0" + sources."emojis-list-2.1.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-4.1.1" + sources."enhanced-resolve-4.1.0" sources."errno-0.1.7" sources."error-ex-1.3.2" sources."error-inject-1.0.0" - sources."es-abstract-1.17.4" - sources."es-to-primitive-1.2.1" - sources."es5-ext-0.10.53" + sources."es-abstract-1.14.2" + sources."es-to-primitive-1.2.0" + sources."es5-ext-0.10.51" sources."es6-iterator-2.0.3" - sources."es6-promise-4.2.8" - sources."es6-symbol-3.1.3" + sources."es6-symbol-3.1.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.1" + (sources."escodegen-1.12.0" // { + dependencies = [ + sources."esprima-3.1.3" + ]; + }) sources."eslint-scope-4.0.3" sources."esprima-4.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" - sources."esutils-2.0.3" + sources."esutils-2.0.2" sources."etag-1.8.1" sources."eventemitter3-4.0.0" - sources."events-3.1.0" + sources."events-3.0.0" sources."eventsource-1.0.7" sources."evp_bytestokey-1.0.3" - sources."exec-sh-0.3.4" + sources."exec-sh-0.3.2" sources."execa-1.0.0" sources."exit-0.1.2" (sources."expand-brackets-2.1.4" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" ]; }) sources."expand-tilde-2.0.2" sources."expect-24.9.0" (sources."express-4.17.1" // { dependencies = [ - sources."debug-2.6.9" sources."path-to-regexp-0.1.7" - sources."qs-6.7.0" - sources."safe-buffer-5.1.2" - ]; - }) - (sources."ext-1.4.0" // { - dependencies = [ - sources."type-2.0.0" ]; }) sources."extend-3.0.2" @@ -10451,72 +9917,65 @@ in (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."kind-of-6.0.2" ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" - sources."fast-json-stable-stringify-2.1.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."faye-websocket-0.10.0" - sources."fb-watchman-2.0.1" + sources."fb-watchman-2.0.0" sources."figgy-pudding-3.5.1" - sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" sources."fill-range-4.0.0" - (sources."finalhandler-1.1.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."finalhandler-1.1.2" sources."find-cache-dir-1.0.0" sources."find-replace-3.0.0" sources."find-up-3.0.0" - sources."findup-sync-3.0.0" + (sources."findup-sync-2.0.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.5.10" + (sources."follow-redirects-1.5.10" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."for-in-1.0.2" sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."formidable-1.2.2" + sources."form-data-2.5.1" + sources."formidable-1.2.1" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" + sources."fs-extra-4.0.3" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.9" sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.1" sources."get-caller-file-2.0.5" - (sources."get-paths-0.0.7" // { - dependencies = [ - sources."pify-4.0.1" - ]; - }) + sources."get-paths-0.0.4" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.4" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" ]; }) - (sources."global-modules-2.0.0" // { - dependencies = [ - sources."global-prefix-3.0.0" - sources."kind-of-6.0.3" - ]; - }) + sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."globals-9.18.0" sources."globby-7.1.1" - (sources."got-8.3.2" // { - dependencies = [ - sources."get-stream-3.0.0" - ]; - }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.1.15" sources."growly-1.3.0" (sources."gzip-size-5.1.1" // { dependencies = [ @@ -10524,18 +9983,17 @@ in ]; }) sources."handle-thing-2.0.0" - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { + (sources."handlebars-4.3.3" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."uglify-js-3.6.0" ]; }) + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-1.0.3" + sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.1" - sources."has-to-string-tag-x-1.4.1" + sources."has-symbols-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -10548,15 +10006,13 @@ in sources."home-or-tmp-2.0.0" sources."homedir-polyfill-1.0.3" sources."hoopy-0.1.4" - sources."hosted-git-info-2.8.8" + sources."hosted-git-info-2.8.4" sources."hpack.js-2.1.6" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.2.1" - sources."html-escaper-2.0.0" sources."http-assert-1.4.1" - sources."http-cache-semantics-3.8.1" sources."http-deceiver-1.2.7" - sources."http-errors-1.7.3" + sources."http-errors-1.7.2" sources."http-parser-js-0.4.10" sources."http-proxy-1.18.0" sources."http-proxy-middleware-0.19.1" @@ -10572,40 +10028,29 @@ in ]; }) sources."imurmurhash-0.1.4" - sources."indent-string-3.2.0" sources."infer-owner-1.0.4" sources."inflation-2.0.0" sources."inflight-1.0.6" - sources."inherits-2.0.4" + sources."inherits-2.0.3" sources."ini-1.3.5" sources."internal-ip-4.3.0" sources."interpret-1.2.0" - sources."into-stream-3.1.0" sources."invariant-2.2.4" sources."invert-kv-2.0.0" sources."ip-1.1.5" sources."ip-regex-2.1.0" - sources."ipaddr.js-1.9.1" - sources."is-absolute-url-3.0.3" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."ipaddr.js-1.9.0" + sources."is-accessor-descriptor-0.1.6" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.5" + sources."is-callable-1.1.4" sources."is-ci-2.0.0" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - sources."is-date-object-1.0.2" - (sources."is-descriptor-1.0.2" // { + sources."is-data-descriptor-0.1.4" + sources."is-date-object-1.0.1" + (sources."is-descriptor-0.1.6" // { dependencies = [ - sources."kind-of-6.0.3" + sources."kind-of-5.1.0" ]; }) (sources."is-expression-3.0.0" // { @@ -10615,23 +10060,20 @@ in }) sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-finite-1.1.0" + sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" sources."is-generator-fn-2.1.0" sources."is-generator-function-1.0.7" sources."is-glob-4.0.1" sources."is-number-3.0.0" - sources."is-object-1.0.1" sources."is-path-cwd-2.2.0" sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" - sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" - sources."is-regex-1.0.5" - sources."is-retry-allowed-1.2.0" + sources."is-regex-1.0.4" sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-whitespace-0.3.0" sources."is-windows-1.0.2" @@ -10662,17 +10104,19 @@ in sources."pify-4.0.1" ]; }) - sources."istanbul-reports-2.2.7" - sources."isurl-1.0.0" - sources."jest-24.9.0" + sources."istanbul-reports-2.2.6" + (sources."jest-24.8.0" // { + dependencies = [ + sources."jest-cli-24.9.0" + ]; + }) sources."jest-changed-files-24.9.0" - (sources."jest-cli-24.9.0" // { + (sources."jest-config-24.9.0" // { dependencies = [ - sources."cliui-5.0.0" - sources."yargs-13.3.2" + sources."babel-jest-24.9.0" + sources."slash-2.0.0" ]; }) - sources."jest-config-24.9.0" sources."jest-diff-24.9.0" sources."jest-docblock-24.9.0" sources."jest-each-24.9.0" @@ -10696,9 +10140,7 @@ in sources."jest-runner-24.9.0" (sources."jest-runtime-24.9.0" // { dependencies = [ - sources."cliui-5.0.0" sources."slash-2.0.0" - sources."yargs-13.3.2" ]; }) sources."jest-serializer-24.9.0" @@ -10712,69 +10154,77 @@ in sources."slash-2.0.0" ]; }) - (sources."jest-validate-24.9.0" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."jest-validate-24.9.0" sources."jest-watcher-24.9.0" (sources."jest-worker-24.9.0" // { dependencies = [ sources."supports-color-6.1.0" ]; }) - sources."js-beautify-1.10.3" + sources."js-beautify-1.10.2" sources."js-stringify-1.0.2" sources."js-tokens-3.0.2" sources."js-yaml-3.13.1" sources."jsbn-0.1.1" (sources."jsdom-11.12.0" // { dependencies = [ - sources."acorn-5.7.4" (sources."acorn-globals-4.3.4" // { dependencies = [ - sources."acorn-6.4.1" + sources."acorn-6.3.0" ]; }) sources."ws-5.2.2" ]; }) sources."jsesc-1.3.0" - sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" + sources."json-stream-1.0.0" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" - (sources."json5-1.0.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-1.0.1" + sources."jsonfile-4.0.0" sources."jsonpath-plus-0.19.0" sources."jsprim-1.4.1" sources."jstransformer-1.0.0" - sources."keygrip-1.1.0" - sources."keyv-3.0.0" + sources."keygrip-1.0.3" sources."killable-1.0.1" sources."kind-of-3.2.2" sources."kleur-3.0.3" - sources."koa-2.11.0" - sources."koa-body-4.1.1" + (sources."koa-2.7.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."koa-body-4.1.0" sources."koa-compose-4.1.0" (sources."koa-convert-1.2.0" // { dependencies = [ sources."koa-compose-3.2.1" ]; }) + sources."koa-is-json-1.0.0" (sources."koa-router-7.4.0" // { dependencies = [ + sources."debug-3.2.6" sources."koa-compose-3.2.1" + sources."ms-2.1.2" + ]; + }) + (sources."koa-send-5.0.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + (sources."koa-static-5.0.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" ]; }) - sources."koa-send-5.0.0" - sources."koa-static-5.0.0" - (sources."koa-views-6.2.1" // { + (sources."koa-views-6.2.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -10787,23 +10237,24 @@ in sources."levn-0.3.0" sources."load-json-file-4.0.0" sources."loader-runner-2.4.0" - sources."loader-utils-1.4.0" + sources."loader-utils-1.2.3" sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" - sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" sources."log-symbols-2.2.0" - sources."loglevel-1.6.7" + sources."loglevel-1.6.4" sources."loglevelnext-1.0.5" - sources."long-4.0.0" sources."longest-1.0.1" sources."loose-envify-1.4.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-5.1.1" + (sources."lru-cache-4.1.5" // { + dependencies = [ + sources."yallist-2.1.2" + ]; + }) sources."make-dir-1.3.0" - sources."make-error-1.3.6" + sources."make-error-1.3.5" sources."makeerror-1.0.11" sources."mamacro-0.0.3" sources."map-age-cleaner-0.1.3" @@ -10811,13 +10262,8 @@ in sources."map-visit-1.0.0" sources."md5.js-1.3.5" sources."media-typer-0.3.0" - (sources."mem-4.3.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - sources."p-is-promise-2.1.0" - ]; - }) - sources."memory-fs-0.5.0" + sources."mem-4.3.0" + sources."memory-fs-0.4.1" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."methods-1.1.2" @@ -10825,19 +10271,18 @@ in dependencies = [ sources."extend-shallow-3.0.2" sources."is-extendable-1.0.1" - sources."kind-of-6.0.3" + sources."kind-of-6.0.2" ]; }) sources."miller-rabin-4.0.1" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" - sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.1" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.0" (sources."mississippi-2.0.0" // { dependencies = [ sources."pump-2.0.1" @@ -10848,9 +10293,13 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.1" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."moment-2.24.0" - sources."moment-timezone-0.5.28" + sources."moment-timezone-0.5.26" sources."move-concurrently-1.0.1" sources."ms-2.0.0" sources."multicast-dns-6.2.3" @@ -10861,7 +10310,7 @@ in dependencies = [ sources."extend-shallow-3.0.2" sources."is-extendable-1.0.1" - sources."kind-of-6.0.3" + sources."kind-of-6.0.2" ]; }) sources."natural-compare-1.4.0" @@ -10869,9 +10318,8 @@ in sources."neo-async-2.6.1" sources."next-tick-1.0.0" sources."nice-try-1.0.5" - sources."node-forge-0.8.5" + sources."node-forge-0.8.2" sources."node-int64-0.4.0" - sources."node-jose-1.1.3" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."punycode-1.4.1" @@ -10879,67 +10327,70 @@ in }) sources."node-modules-regexp-1.0.0" sources."node-notifier-5.4.3" - sources."nopt-4.0.3" + sources."nopt-4.0.1" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" - sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" - sources."nwsapi-2.2.0" + sources."nwsapi-2.1.4" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) ]; }) - sources."object-hash-1.3.1" - sources."object-inspect-1.7.0" + sources."object-inspect-1.6.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.getownpropertydescriptors-2.0.3" sources."object.pick-1.3.0" sources."obuf-1.1.2" - sources."oidc-token-hash-3.0.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-2.0.1" + (sources."onetime-2.0.1" // { + dependencies = [ + sources."mimic-fn-1.2.0" + ]; + }) sources."only-0.0.2" sources."opener-1.5.1" - sources."openid-client-2.5.0" sources."opn-5.5.0" - sources."optionator-0.8.3" - sources."ora-3.4.0" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + (sources."optionator-0.8.2" // { + dependencies = [ + sources."wordwrap-1.0.0" + ]; + }) + (sources."ora-3.4.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."original-1.0.2" sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-locale-3.1.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-any-1.1.0" - sources."p-cancelable-0.4.1" sources."p-defer-1.0.0" sources."p-each-series-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-limit-2.2.2" + sources."p-is-promise-2.1.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-map-2.1.0" sources."p-reduce-1.0.0" sources."p-retry-3.0.1" - sources."p-some-2.0.1" - sources."p-timeout-2.0.1" sources."p-try-2.2.0" - sources."pako-1.0.11" + sources."pako-1.0.10" sources."parallel-transform-1.2.0" sources."parse-asn1-5.1.5" sources."parse-json-4.0.0" @@ -10954,7 +10405,7 @@ in sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.6" - (sources."path-to-regexp-1.8.0" // { + (sources."path-to-regexp-1.7.0" // { dependencies = [ sources."isarray-0.0.1" ]; @@ -10976,29 +10427,27 @@ in ]; }) sources."pn-1.1.0" - (sources."portfinder-1.0.25" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.2" - ]; - }) + sources."portfinder-1.0.24" sources."posix-character-classes-0.1.1" sources."prelude-ls-1.1.2" - sources."prepend-http-2.0.0" - sources."prettier-1.19.1" + sources."prettier-1.18.2" sources."pretty-2.0.0" - sources."pretty-format-24.9.0" + (sources."pretty-format-24.9.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."private-0.1.8" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" sources."promise-inflight-1.0.1" - sources."prompts-2.3.1" + sources."prompts-2.2.1" sources."proto-list-1.2.4" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.5" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."psl-1.7.0" + sources."psl-1.1.32" sources."public-encrypt-4.0.3" sources."pug-2.0.4" sources."pug-attrs-2.0.4" @@ -11019,23 +10468,18 @@ in ]; }) sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."query-string-5.1.1" + sources."qs-6.7.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."querystringify-2.1.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - sources."raw-body-2.4.1" - sources."react-is-16.13.0" + sources."raw-body-2.4.0" + sources."react-is-16.9.0" sources."read-pkg-3.0.0" sources."read-pkg-up-4.0.0" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."readable-stream-2.3.6" sources."readdirp-2.2.1" sources."realpath-native-1.1.0" sources."rechoir-0.6.2" @@ -11059,29 +10503,30 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."repeating-2.0.1" - sources."request-2.88.2" - sources."request-promise-core-1.1.3" - sources."request-promise-native-1.0.8" + (sources."request-2.88.0" // { + dependencies = [ + sources."form-data-2.3.3" + sources."punycode-1.4.1" + sources."qs-6.5.2" + sources."tough-cookie-2.4.3" + ]; + }) + sources."request-promise-core-1.1.2" + sources."request-promise-native-1.0.7" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.11.0" sources."resolve-cwd-2.0.0" - (sources."resolve-dir-1.0.1" // { - dependencies = [ - sources."global-modules-1.0.0" - ]; - }) + sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" (sources."resolve-path-1.4.0" // { dependencies = [ sources."http-errors-1.6.3" - sources."inherits-2.0.3" sources."setprototypeof-1.1.0" ]; }) sources."resolve-url-0.2.1" - sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.12.0" @@ -11090,40 +10535,25 @@ in sources."ripemd160-2.0.2" sources."rsvp-4.8.5" sources."run-queue-1.0.3" - sources."rxjs-6.5.4" - sources."safe-buffer-5.2.0" + sources."rxjs-6.5.2" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sane-4.1.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."sane-4.1.0" sources."sax-1.2.4" sources."schema-utils-1.0.0" sources."select-hose-2.0.0" - (sources."selfsigned-1.10.7" // { - dependencies = [ - sources."node-forge-0.9.0" - ]; - }) - sources."semver-5.7.1" + sources."selfsigned-1.10.6" + sources."semver-5.7.0" (sources."send-0.17.1" // { dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) sources."ms-2.1.1" ]; }) sources."serialize-javascript-1.9.1" (sources."serve-index-1.9.1" // { dependencies = [ - sources."debug-2.6.9" sources."http-errors-1.6.3" - sources."inherits-2.0.3" sources."setprototypeof-1.1.0" ]; }) @@ -11139,47 +10569,42 @@ in sources."shellwords-0.1.1" sources."sigmund-1.0.1" sources."signal-exit-3.0.2" - sources."simple-git-1.96.0" - sources."sisteransi-1.0.4" + (sources."simple-git-1.96.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."sisteransi-1.0.3" sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."kind-of-6.0.2" ]; }) sources."snapdragon-util-3.0.1" sources."sockjs-0.3.19" - (sources."sockjs-client-1.4.0" // { + (sources."sockjs-client-1.3.0" // { dependencies = [ sources."debug-3.2.6" sources."faye-websocket-0.11.3" sources."ms-2.1.2" ]; }) - sources."sort-keys-2.0.0" 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.16" + sources."source-map-resolve-0.5.2" + sources."source-map-support-0.5.13" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" @@ -11195,7 +10620,7 @@ in dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.4.0" ]; }) (sources."split-string-3.1.0" // { @@ -11211,18 +10636,6 @@ in (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-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."statuses-1.5.0" @@ -11230,38 +10643,38 @@ in sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" - sources."stream-shift-1.0.1" - sources."strict-uri-encode-1.1.0" + sources."stream-shift-1.0.0" (sources."string-length-2.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."strip-ansi-4.0.0" ]; }) - sources."string-width-3.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" - (sources."string_decoder-1.1.1" // { + (sources."string-width-3.1.0" // { dependencies = [ - sources."safe-buffer-5.1.2" + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" ]; }) - sources."strip-ansi-5.2.0" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" - sources."supports-color-5.5.0" + sources."supports-color-2.0.0" sources."symbol-tree-3.2.4" sources."tapable-1.1.3" - sources."terser-4.6.6" - (sources."terser-webpack-plugin-1.4.3" // { + sources."terser-4.3.3" + (sources."terser-webpack-plugin-1.4.1" // { dependencies = [ sources."cacache-12.0.3" sources."find-cache-dir-2.1.0" + sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."mississippi-3.0.0" sources."pify-4.0.1" sources."pkg-dir-3.0.0" - sources."serialize-javascript-2.1.2" sources."ssri-6.0.1" ]; }) @@ -11270,8 +10683,7 @@ in sources."thenify-all-1.6.0" sources."throat-4.1.0" sources."through2-2.0.5" - sources."thunky-1.1.0" - sources."timed-out-4.0.1" + sources."thunky-1.0.3" sources."timers-browserify-2.0.11" sources."tmpl-1.0.4" sources."to-arraybuffer-1.0.1" @@ -11290,16 +10702,14 @@ in sources."tr46-1.0.1" sources."trim-right-1.0.1" sources."tryer-1.0.1" - (sources."ts-jest-24.3.0" // { + (sources."ts-jest-24.0.2" // { dependencies = [ sources."camelcase-4.1.0" - sources."json5-2.1.1" - sources."minimist-1.2.5" + sources."json5-2.1.0" sources."yargs-parser-10.1.0" ]; }) - sources."tslib-1.11.1" - sources."tsscmp-1.0.6" + sources."tslib-1.10.0" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -11308,18 +10718,22 @@ in sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."typescript-3.8.3" + sources."typescript-3.5.2" sources."typical-4.0.0" (sources."uglify-js-2.8.29" // { dependencies = [ + sources."camelcase-1.2.1" + sources."cliui-2.1.0" sources."source-map-0.5.7" + sources."yargs-3.10.0" ]; }) sources."uglify-to-browserify-1.0.2" - sources."underscore-1.9.2" + sources."underscore-1.9.1" sources."union-value-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" + sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -11333,7 +10747,7 @@ in }) sources."upath-1.2.0" sources."uri-js-4.2.2" - sources."urijs-1.19.2" + sources."urijs-1.19.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -11341,88 +10755,84 @@ in ]; }) sources."url-parse-1.4.7" - sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."util-0.11.1" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + sources."util.promisify-1.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.4.0" - sources."v8-compile-cache-2.0.3" + sources."uuid-3.3.2" + sources."v8-compile-cache-2.1.0" sources."validate-npm-package-license-3.0.4" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vm-browserify-1.1.2" + sources."vm-browserify-1.1.0" sources."void-elements-2.0.1" - sources."w3c-hr-time-1.0.2" + sources."w3c-hr-time-1.0.1" sources."walker-1.0.7" sources."watchpack-1.6.0" sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - (sources."webpack-4.42.0" // { + (sources."webpack-4.35.0" // { dependencies = [ - sources."acorn-6.4.1" - sources."memory-fs-0.4.1" + sources."acorn-6.3.0" ]; }) - (sources."webpack-bundle-analyzer-3.6.1" // { + (sources."webpack-bundle-analyzer-3.3.2" // { dependencies = [ - sources."acorn-7.1.1" - sources."acorn-walk-7.1.1" + sources."acorn-6.3.0" ]; }) - (sources."webpack-cli-3.3.11" // { + (sources."webpack-cli-3.3.4" // { dependencies = [ - sources."cliui-5.0.0" - sources."emojis-list-2.1.0" - sources."enhanced-resolve-4.1.0" - sources."loader-utils-1.2.3" - sources."memory-fs-0.4.1" - sources."supports-color-6.1.0" - sources."yargs-13.2.4" + sources."ansi-regex-3.0.0" + sources."cliui-4.1.0" + sources."get-caller-file-1.0.3" + sources."require-main-filename-1.0.1" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."supports-color-5.5.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" ]; }) - (sources."webpack-dev-middleware-3.7.2" // { + (sources."webpack-dev-middleware-3.7.1" // { dependencies = [ - sources."memory-fs-0.4.1" sources."mime-2.4.4" sources."webpack-log-2.0.0" ]; }) - (sources."webpack-dev-server-3.10.3" // { + (sources."webpack-dev-server-3.7.2" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."camelcase-5.3.1" + sources."ansi-regex-3.0.0" (sources."cliui-4.1.0" // { dependencies = [ - sources."ansi-regex-3.0.0" sources."strip-ansi-4.0.0" ]; }) sources."debug-4.1.1" sources."get-caller-file-1.0.3" - sources."is-fullwidth-code-point-1.0.0" sources."ms-2.1.2" sources."require-main-filename-1.0.1" sources."semver-6.3.0" (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" ]; }) - sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" sources."webpack-log-2.0.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ + sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" ]; }) @@ -11432,11 +10842,7 @@ in }) sources."webpack-log-1.2.0" sources."webpack-sources-1.4.3" - (sources."websocket-1.0.31" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."websocket-1.0.28" sources."websocket-driver-0.7.3" sources."websocket-extensions-0.1.3" sources."whatwg-encoding-1.0.5" @@ -11445,11 +10851,19 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."window-size-0.1.0" - sources."with-5.1.1" - sources."word-wrap-1.2.3" + (sources."with-5.1.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) sources."wordwrap-0.0.2" sources."worker-farm-1.7.0" - sources."wrap-ansi-5.1.0" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.1" sources."ws-6.2.1" @@ -11457,13 +10871,10 @@ in sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yaeti-0.0.6" - sources."yallist-3.1.1" - sources."yargs-3.10.0" - (sources."yargs-parser-13.1.2" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."yallist-3.1.0" + sources."yargs-13.3.0" + sources."yargs-parser-13.1.1" + sources."yarn-1.16.0" sources."ylru-1.2.1" ]; buildInputs = globalBuildInputs; @@ -11472,6 +10883,25 @@ in }; production = false; bypassCache = true; - reconstructLock = true; + reconstructLock = false; }; +in +{ + args = args; + sources = sources; + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; + nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { + src = stdenv.mkDerivation { + name = args.name + "-package-json"; + src = nix-gitignore.gitignoreSourcePure [ + "*" + "!package.json" + "!package-lock.json" + ] args.src; + dontBuild = true; + installPhase = "mkdir -p $out; cp -r ./* $out;"; + }; + }); } diff --git a/nixpkgs/pkgs/applications/networking/cluster/spacegun/package.json b/nixpkgs/pkgs/applications/networking/cluster/spacegun/package.json deleted file mode 100644 index 7d419edb74a2..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/spacegun/package.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - { "spacegun": "git+https://github.com/dvallin/spacegun.git#v0.3.3" } -] diff --git a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix b/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix index 80c8244bee1b..928fb351c6a0 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }: +{ lib, fetchFromGitHub, buildGoPackage, bash, makeWrapper }: buildGoPackage rec { pname = "amazon-ssm-agent"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index 3850eb756382..163deb1bef88 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KRVMgrJ7xtv2SYa249sSDV8PObStAe+UGEgZWv43sk4="; + sha256 = "sha256-ZIAdYuJ8LS8x2h+VXQrkgdmKkw9VKl7FcnOVZNSnXM0="; }; - vendorSha256 = "sha256-AIMa0lUXFGvhnt8v7l+NIhXLlik5cGYL1OqINNElnx0="; + vendorSha256 = "sha256-aVKQcRZgxhIph+y28HhR15DUjwiz/4+t1bMrYXjPW7Q="; subPackages = [ "cmd/starboard" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 29aa7d41f32a..962647993447 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "0fj6a52wb0jv5bz2j2wq3ljnlxnsj9bg3kbzgkz0vh0b63zyn782"; + sha256 = "sha256-8l/Tr+IxR3yPmt9hI70XuUQ4YEYzRTMLbo8BsngoU60="; }; - vendorSha256 = "14nrdaaby74bjbk777hr82p0ybzk3spc59lbrjn9z0q3hc0p4vaf"; + vendorSha256 = "sha256-pvFT4A7bDBvBf1odyv3z4inw1/IsvOA+++OPbfNjzxM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index 293cdb673711..44ad3dfd72c7 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "1f67b236njz1qdxjyf2568vkigjmpylqlra29jlgm6vhd5qky7ia"; + sha256 = "sha256-y2HhtYKgC9Y397dZ14eQoPZxqS1fTOXVD8B4wdLIHzM="; }; - vendorSha256 = "1pr265g11lcviqw974lf05q52qrfpwnpn9a64q6088g0nfp4ly06"; + vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index a2bb9da68054..581af59f0c8f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,30 +2,37 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "0xb2zlpkh9cwinp6zj2jpv4wlws042ad1fa0wkcnnkh0vjm6mnrl"; + sha256 = "sha256-IY9iJa4HcZ60jDPdP47jjC0FiOJesvf2vEENMAYVd4Q="; }; vendorSha256 = null; - doCheck = false; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" + ]; nativeBuildInputs = [ installShellFiles ]; - buildPhase = '' - make bin/tkn - ''; + # third_party/VENDOR-LICENSE breaks build/check as go files are still included + # docs is a tool for generating docs + excludedPackages = "\\(third_party\\|cmd/docs\\)"; - installPhase = '' - install bin/tkn -Dt $out/bin + preCheck = '' + # Change the golden files to match our desired version + sed -i "s/dev/${version}/" pkg/cmd/version/testdata/TestGetVersions-*.golden + ''; - mkdir -p "$out/share/man/man1" - cp docs/man/man1/* "$out/share/man/man1" + postInstall = '' + installManPage docs/man/man1/* installShellCompletion --cmd tkn \ --bash <($out/bin/tkn completion bash) \ @@ -34,14 +41,14 @@ buildGoModule rec { ''; meta = with lib; { - description = "The Tekton Pipelines cli project provides a CLI for interacting with Tekton"; homepage = "https://tekton.dev"; + changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}"; + description = "Provides a CLI for interacting with Tekton"; longDescription = '' The Tekton Pipelines cli project provides a CLI for interacting with Tekton! For your convenience, it is recommended that you install the Tekton CLI, tkn, together with the core component of Tekton, Tekton Pipelines. ''; license = licenses.asl20; - maintainers = with maintainers; [ jk mstrangfeld ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ jk mstrangfeld vdemeester ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix index 7b9bf354af75..085b504314ee 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub}: +{ lib, buildGoPackage, fetchFromGitHub}: buildGoPackage rec { pname = "terraform-inventory"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix index 14d411c02396..b8e3c1540e94 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "terraform-provider-ansible"; version = "1.0.3"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix index 0528bce81e3c..1ee986d20303 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-cloudfoundry"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 3570191fd84e..a08a3d336bf5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -56,14 +56,12 @@ let # Packages that don't fit the default model ansible = callPackage ./ansible {}; cloudfoundry = callPackage ./cloudfoundry {}; - elasticsearch = callPackage ./elasticsearch {}; gandi = callPackage ./gandi {}; hcloud = callPackage ./hcloud {}; keycloak = callPackage ./keycloak {}; libvirt = callPackage ./libvirt {}; linuxbox = callPackage ./linuxbox {}; lxd = callPackage ./lxd {}; - shell = callPackage ./shell {}; vpsadmin = callPackage ./vpsadmin {}; vercel = callPackage ./vercel {}; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix deleted file mode 100644 index 47e4f30d0092..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "terraform-provider-elasticsearch"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "phillbaker"; - repo = "terraform-provider-elasticsearch"; - rev = "v${version}"; - sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v"; - }; - - vendorSha256 = "1rdvyypdl3fk6af66gfjhyl271cnlx5xgrl1w68sc6sbvq00bqkd"; - - doCheck = false; - - subPackages = [ "." ]; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postInstall = "mv $out/bin/terraform-provider-elasticsearch{,_v${version}}"; - - meta = with lib; { - description = "Terraform provider for elasticsearch"; - homepage = "https://github.com/phillbaker/terraform-provider-elasticsearch"; - license = licenses.mpl20; - maintainers = with maintainers; [ basvandijk ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix index fe508f4fa2ef..13afa8d3818a 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "terraform-provider-gandi"; version = "1.0.0"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix index 97331e683efb..f9a848669344 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-hcloud"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix index f2244345a9c3..043e081d94ed 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildGoModule }: diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 6a1f895c053b..ed2409ead9a3 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, libvirt, pkg-config, makeWrapper, cdrtools }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch, libvirt, pkg-config, makeWrapper, cdrtools }: # USAGE: # install the following package globally or in nix-shell: diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix index f445d48eaee2..4f8c44aad3f1 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-linuxbox"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index 6ccc551b4d31..ab3d07a7f47b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-lxd"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "sl1pm4t"; repo = "terraform-provider-lxd"; rev = "v${version}"; - sha256 = "00gj7zj45wm9sf7a7nybjijdrdr00g2yf8h41c6j679a6nfnx0fd"; + sha256 = "sha256-ikI8LQ6qawdeUSb1Ee03H409DQw2M4QtsIxAESxXNRI="; }; - vendorSha256 = "0xq8zgx8h47pc88nkdvy5skpr8vk87b4212mm5msfxk8n7nl4fi2"; + vendorSha256 = "sha256-IjpC7bFodqdrqVUEQdZBc6N8py5+t2kRYvcQiPr7CHc="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index c015afb787df..198a05621a52 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -70,10 +70,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.20.0", - "sha256": "18zccjkdxzcprhpv3cn3b9fbp0h81pkj0dsygfz2islclljc3x17", - "vendorSha256": "0lalcp3wwjbwhp1rwidpndjmilfsc7cb79diicn02a207y277gji", - "version": "3.20.0" + "rev": "v3.27.0", + "sha256": "0hn55mpg64bibf10m7x7wpfkipvlm8q4avgqcf0rf8rmprwvdlxd", + "vendorSha256": "0ph106bqsy988s20adf6gyc5jfvvy9zsj74lkbciwx7mvw5f514s", + "version": "3.27.0" }, "azuread": { "owner": "terraform-providers", @@ -287,6 +287,15 @@ "sha256": "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48", "version": "1.2.0" }, + "elasticsearch": { + "owner": "phillbaker", + "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", + "repo": "terraform-provider-elasticsearch", + "rev": "v1.5.2", + "sha256": "1yfmlqab2jb679gbns04sdcjfihzsa0dfp7blhfk3v5zhgv1g7ys", + "vendorSha256": "15m9aqb2lqjv6g3k46zyha2m118wpbjrh4ap1bfps0fcxn20qvr5", + "version": "1.5.2" + }, "exoscale": { "owner": "terraform-providers", "repo": "terraform-provider-exoscale", @@ -342,9 +351,9 @@ "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.1.0", - "sha256": "1an34ckz7lz1k25lkjpbmls55zp9pacr46vjnjjpqx6bx5s95f5g", - "version": "3.1.0" + "rev": "v3.4.0", + "sha256": "03k3xjhxw70n00dvwd0fkdshff9hnicrah6rm6zqmksb4mb7wji3", + "version": "3.4.0" }, "google": { "owner": "hashicorp", @@ -475,6 +484,15 @@ "sha256": "04vz0m3z9rfw2hp0h3jhn625r2v37b319krznvhqylqzksv39dzf", "version": "1.1.0" }, + "kafka": { + "owner": "Mongey", + "provider-source-address": "registry.terraform.io/Mongey/kafka", + "repo": "terraform-provider-kafka", + "rev": "v0.2.12", + "sha256": "0jm592chliiph5643rymzpwnlcq7q6bpwg2h86x5qmbzbiyqsi83", + "vendorSha256": "08wg16g4mvn6kl8xwn89195a826cb132ijvrgf32c6p7zp4lgmjd", + "version": "0.2.12" + }, "ksyun": { "owner": "terraform-providers", "repo": "terraform-provider-ksyun", @@ -778,11 +796,13 @@ "version": "1.1.8" }, "rabbitmq": { - "owner": "terraform-providers", + "owner": "cyrilgdn", + "provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq", "repo": "terraform-provider-rabbitmq", - "rev": "v1.3.0", - "sha256": "1adkbfm0p7a9i1i53bdmb34g5871rklgqkx7kzmwmk4fvv89n6g8", - "version": "1.3.0" + "rev": "v1.5.1", + "sha256": "1yxvhzrp63wv5zbzj3ma2745g1marpj32b5h41ha27h0i42498ky", + "vendorSha256": null, + "version": "1.5.1" }, "rancher": { "owner": "terraform-providers", @@ -856,6 +876,15 @@ "sha256": "1fs96qd2b4glk8hhn5m9r04ap679g0kf3nnhjx1a2idqwrv71gcl", "version": "3.3.0" }, + "shell": { + "owner": "scottwinkler", + "provider-source-address": "registry.terraform.io/scottwinkler/shell", + "repo": "terraform-provider-shell", + "rev": "v1.6.0", + "sha256": "0jxb30vw93ibnwz8nfqapac7p9r2famzvsf2h4nfbmhkm6mpan4l", + "vendorSha256": "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg", + "version": "1.6.0" + }, "signalfx": { "owner": "terraform-providers", "repo": "terraform-provider-signalfx", @@ -1024,11 +1053,13 @@ "version": "1.0.1" }, "vsphere": { - "owner": "terraform-providers", + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", - "rev": "v1.18.3", - "sha256": "1cvfmkckigi80cvv826m0d8wzd98qny0r5nqpl7nkzz5kybkb5qp", - "version": "1.18.3" + "rev": "v1.24.3", + "sha256": "1sc60x3r4nb48p8yb7778fpk78acq808jzcd5ijnwxqakccml5kl", + "vendorSha256": null, + "version": "1.24.3" }, "vthunder": { "owner": "terraform-providers", diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix deleted file mode 100644 index 2bf767587528..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "terraform-provider-shell"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "scottwinkler"; - repo = pname; - rev = "v${version}"; - sha256 = "0jxb30vw93ibnwz8nfqapac7p9r2famzvsf2h4nfbmhkm6mpan4l"; - }; - - vendorSha256 = "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg"; - - doCheck = false; - - subPackages = [ "." ]; - - # Terraform allows checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postInstall = "mv $out/bin/${pname}{,_v${version}}"; - - passthru.provider-source-address = "registry.terraform.io/scottwinkler/shell"; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Terraform provider for executing shell commands and saving output to state file"; - changelog = "https://github.com/scottwinkler/terraform-provider-shell/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ mupdt ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix index f4cfe6ba02f7..f37d1ac5d87a 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-vercel"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix index 4f56070fa51c..93401dfc635b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-vpsadmin"; version = "0.1.0"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 9e01674eab2d..317666a2c7cd 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -157,9 +157,9 @@ in rec { }); terraform_0_14 = pluggable (generic { - version = "0.14.5"; - sha256 = "0drf049zghpm3ajrn006w621s7bw5r1s8gl77nd1cj2zcw2nzn1r"; - vendorSha256 = "0z9mkilazrkpbccnkws4hcc49djdwzn0cdbgqkm9bnp9fyg3rfvs"; + version = "0.14.6"; + sha256 = "0ba3vd6lswy4pd0qywdbx8cf71j5z3p8p8kdjs9m4qbyrzsbq0fk"; + vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 387165150ea3..9e2b9709afc2 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,27 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terragrunt"; - version = "0.27.1"; + version = "0.28.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YZ/3qtukPoCbgzy1qr0MJHSdqovzmP/AQixLq6GO27Q"; + sha256 = "sha256-LilIwg3Zu7Zi7AhJeW0j2qUmSOGy1HHjvvB07FUcEeI="; }; - vendorSha256 = "sha256-AMxBzUHRsq1HOMtvgYqIw22Cky7gQ7/2hI8wQnxaXb0="; + vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; doCheck = false; - buildInputs = [ makeWrapper ]; - - buildFlagsArray = [ "-ldflags=" "-X main.VERSION=v${version}" ]; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X main.VERSION=v${version}" + ]; meta = with lib; { + homepage = "https://terragrunt.gruntwork.io"; + changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}"; description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; - homepage = "https://github.com/gruntwork-io/terragrunt/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg jk ]; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index 9f2a223c4486..415a895e523f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "tilt"; /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.1"; + version = "0.18.8"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "1sdb2x06va0j9cxdwz95dklv2csq0s596wjsjqi4sq65y9bxjr7i"; + sha256 = "sha256-ICJrY4XUrxVeZlMx69SB/ounfIwLFSguf9bhLOpYP3E="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index ec95b090c2e5..6b878cec9279 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "velero"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "vmware-tanzu"; repo = "velero"; - sha256 = "1hfi1iipbval0c0c0nnf6fz5n76za0vwczm5lq86sddqnznbvsrz"; + sha256 = "sha256-DZ6phJxc8n9LCSsER09K3j+pUJxkYrBZQaI4h+bcV94="; }; buildFlagsArray = '' @@ -19,7 +19,7 @@ buildGoModule rec { -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean ''; - vendorSha256 = "1izl7z689jf3i3wax7rfpk0jjly7nsi7vzasy1j9v5cwjy2d5z4v"; + vendorSha256 = "sha256-m/zShJeclZ1k8Fr9faK2x1Mpwbwun674iMPJhMw/9Mc="; excludedPackages = [ "issue-template-gen" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix index 32a4aa373a49..3d62a1dcf29b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,45 +2,43 @@ buildGoModule rec { pname = "waypoint"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iGR2N1ZYA5G9K2cpfrwWRhSEfehRshx157ot1yq15AY="; + sha256 = "sha256-bCvi5xIL6xAtQ9mgf4feh076sAmog/3eGBlgvcLXJyc="; }; deleteVendor = true; vendorSha256 = "sha256-ArebHOjP3zvpASVAoaPXpSbrG/jq+Jbx7+EaQ1uHSVY="; - subPackages = ["."]; - nativeBuildInputs = [ go-bindata ]; + # GIT_{COMMIT,DIRTY} filled in blank to prevent trying to run git and ending up blank anyway buildPhase = '' - CGO_ENABLED=0 go build -ldflags '-s -w -extldflags "-static"' -o ./internal/assets/ceb/ceb ./cmd/waypoint-entrypoint - cd internal/assets - go-bindata -pkg assets -o prod.go -tags assetsembedded ./ceb - cd ../../ - CGO_ENABLED=0 go build -ldflags '-s -w -X github.com/hashicorp/waypoint/version.GitDescribe=v${version}' -tags assetsembedded -o ./waypoint ./cmd/waypoint - CGO_ENABLED=0 go build -ldflags '-s -w' -tags assetsembedded -o ./waypoint-entrypoint ./cmd/waypoint-entrypoint + make bin GIT_DESCRIBE="v${version}" GIT_COMMIT="" GIT_DIRTY="" ''; installPhase = '' - mkdir -p $out/bin - mv waypoint{,-entrypoint} $out/bin/ + install -D waypoint $out/bin/waypoint ''; + dontPatchELF = true; + dontPatchShebangs = true; + meta = with lib; { + homepage = "https://waypointproject.io"; + changelog = "https://github.com/hashicorp/waypoint/blob/v${version}/CHANGELOG.md"; description = "A tool to build, deploy, and release any application on any platform"; longDescription = '' - Waypoint allows developers to define their application build, deploy, and release lifecycle as code, reducing the - time to deliver deployments through a consistent and repeatable workflow. + Waypoint allows developers to define their application build, deploy, and + release lifecycle as code, reducing the time to deliver deployments + through a consistent and repeatable workflow. ''; - homepage = "https://waypointproject.io"; - platforms = platforms.linux; license = licenses.mpl20; maintainers = with maintainers; [ winpat jk ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/datovka/default.nix b/nixpkgs/pkgs/applications/networking/datovka/default.nix index ca675dd7836c..a48bd4ae44d5 100644 --- a/nixpkgs/pkgs/applications/networking/datovka/default.nix +++ b/nixpkgs/pkgs/applications/networking/datovka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchurl , libxml2 diff --git a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index c120ac09642b..55a16f42f16e 100644 --- a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "0bnsd1kx0ji2s3w1v7sskc3x82avaqjn2arnax55bmh1yjma6z8p"; + sha256 = "sha256-I1PaDHPocQuoSOyfnxDWwIR+7S9l/odX4SCeAae/jv8="; }; - vendorSha256 = "0ppcrp6jp23ycn70mcgi5bsa0hr20hk7044ldw304krawy2vjgz8"; + vendorSha256 = "sha256-H0i5MoVX5O0CgHOvefDEyzBWvBZvJZUrC9xBq9CHgeE="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix index 23f557a1e6da..dae9ad3bc33c 100644 --- a/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: with rustPlatform; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 39d9aa905961..729d12c1e5b9 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }: +{ lib, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }: python3Packages.buildPythonApplication rec { version = "0.9.9"; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index a67e0c3aed2b..5eb8c9d74379 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, }: +{ lib, fetchFromGitHub, python3Packages, }: python3Packages.buildPythonApplication rec { version = "0.9.8"; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/feeds/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/feeds/default.nix index 243999553e69..8b83762089d6 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/feeds/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/feeds/default.nix @@ -1,6 +1,6 @@ { lib , callPackage -, stdenv + , fetchFromGitLab , appstream diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix index d24e0fbf7170..f840c191f909 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { pname = "rawdog"; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index 93b7c62ad962..d0ce431be76b 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.8.3"; + version = "3.8.4"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "1704nj77h6s88l4by3wxl5l770gaig90mv3ix80r00nh8mhzq44q"; + sha256 = "sha256-2NC5Y8WxVYrzpuqDzhXXJ16b04Em1HqZaE2VK9tmfYk="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/nixpkgs/pkgs/applications/networking/flent/default.nix b/nixpkgs/pkgs/applications/networking/flent/default.nix index 5f9350b70cd8..bcff9e4f8b74 100644 --- a/nixpkgs/pkgs/applications/networking/flent/default.nix +++ b/nixpkgs/pkgs/applications/networking/flent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python +{ lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python , pythonPackages, qt5, sphinx, xvfb_run }: buildPythonApplication rec { diff --git a/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index 4c47c316753e..877cdec4ca8d 100644 --- a/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -12,7 +12,7 @@ , sqlite , tinyxml , wxGTK30-gtk3 -, xdg_utils +, xdg-utils }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { tinyxml wxGTK30-gtk3 wxGTK30-gtk3.gtk - xdg_utils + xdg-utils ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/networking/gdrive/default.nix b/nixpkgs/pkgs/applications/networking/gdrive/default.nix index b51512332c5a..b62bda3c469f 100644 --- a/nixpkgs/pkgs/applications/networking/gdrive/default.nix +++ b/nixpkgs/pkgs/applications/networking/gdrive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gdrive"; diff --git a/nixpkgs/pkgs/applications/networking/gns3/server.nix b/nixpkgs/pkgs/applications/networking/gns3/server.nix index c2ca0f580c35..5ba6b57d5bd7 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -1,6 +1,6 @@ { stable, branch, version, sha256Hash, mkOverride, commonOverrides }: -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: let defaultOverrides = commonOverrides ++ [ @@ -34,10 +34,8 @@ in python.pkgs.buildPythonPackage { }; postPatch = '' - # yarl 1.4+ only requires Python 3.6+ substituteInPlace requirements.txt \ - --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \ - --replace "yarl==1.3.0" "" + --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" ''; propagatedBuildInputs = with python.pkgs; [ diff --git a/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix b/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix index a3ead49c69f3..046ae42ebcb7 100644 --- a/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix +++ b/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "sacc"; - version = "1.02"; + version = "1.03"; src = fetchurl { url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz"; - sha512 = "18ja95cscgjaj1xqn70dj0482f76d0561bdcc47flqfsjh4mqckjqr65qv7awnw6rzm03i5cp45j1qx12y0y83skgsar4pplmy8q014"; + sha512 = "sha512-vOjAGBM2+080JZv4C4b5dNRTTX45evWFEJfK1DRaWCYrHRCAe07QdEIrHhbaIxhSYfrBd3D1y75rmDnuPC4THA=="; }; inherit patches; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix index 9dd6754af0cb..7ed3b1673831 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchdarcs, pythonPackages, libvncserver, zlib +{ lib, fetchdarcs, pythonPackages, libvncserver, zlib , gnutls, libvpx, makeDesktopItem, mkDerivationWith }: mkDerivationWith pythonPackages.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 2360b2442f54..d80ccf0a8fab 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day"; homepage = "https://www.bluejeans.com"; license = licenses.unfree; - maintainers = with maintainers; [ veprbl ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix index 5d95eddb6b63..a906c46c4aef 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cordless"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix index 0de7e264ec41..31896f20184f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkg-config, +{ lib, buildGoPackage, fetchFromGitHub, pkg-config, cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 570fe463c5ae..c7ddc495546d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.116"; + version = "0.0.119"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "14kg85gz91f9mvvnl5p1lwz40rm47bca3a8dwv4618zv6vncgmkp"; + sha256 = "0bzrilag7mjfhr84l956xisbaz8mmkmqizg22f9gabgcv85vwzsi"; }; }; }.${branch} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index f6fa30e91e5b..a5f21f11dfed 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.17", + "version": "1.7.20", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -30,19 +30,19 @@ "hak": "node scripts/hak/index.js" }, "dependencies": { - "auto-launch": "^5.0.1", - "electron-store": "^2.0.0", - "electron-window-state": "^4.1.0", + "auto-launch": "^5.0.5", + "electron-store": "^6.0.1", + "electron-window-state": "^5.0.3", "minimist": "^1.2.3", - "png-to-ico": "^2.1.0", + "png-to-ico": "^2.1.1", "request": "^2.88.2" }, "devDependencies": { "asar": "^2.0.1", - "electron-builder": "^22.7.0", - "electron-builder-squirrel-windows": "^22.7.0", - "electron-devtools-installer": "^2.2.4", - "electron-notarize": "^0.2.0", + "electron-builder": "22.9.1", + "electron-builder-squirrel-windows": "22.9.1", + "electron-devtools-installer": "^3.1.1", + "electron-notarize": "^1.0.0", "eslint": "7.3.1", "eslint-config-matrix-org": "^0.1.2", "find-npm-prefix": "^1.0.2", @@ -51,10 +51,10 @@ "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", - "npm": "^6.14.6", + "npm": "^6.14.11", "rimraf": "^3.0.2", - "semver": "^7.1.3", - "tar": "^6.0.1" + "semver": "^7.3.4", + "tar": "^6.1.0" }, "hakDependencies": { "matrix-seshat": "^2.2.3", diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 08c3d2554c9a..a0fb802ac042 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -10,14 +10,6 @@ }; } { - name = "7zip___7zip_0.0.6.tgz"; - path = fetchurl { - name = "7zip___7zip_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz"; - sha1 = "9cafb171af82329490353b4816f03347aa150a30"; - }; - } - { name = "_babel_code_frame___code_frame_7.5.5.tgz"; path = fetchurl { name = "_babel_code_frame___code_frame_7.5.5.tgz"; @@ -146,251 +138,251 @@ }; } { - name = "_jimp_bmp___bmp_0.9.8.tgz"; + name = "_jimp_bmp___bmp_0.16.1.tgz"; path = fetchurl { - name = "_jimp_bmp___bmp_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.9.8.tgz"; - sha1 = "5933ab8fb359889bec380b0f7802163374933624"; + name = "_jimp_bmp___bmp_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.16.1.tgz"; + sha1 = "6e2da655b2ba22e721df0795423f34e92ef13768"; }; } { - name = "_jimp_core___core_0.9.8.tgz"; + name = "_jimp_core___core_0.16.1.tgz"; path = fetchurl { - name = "_jimp_core___core_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/core/-/core-0.9.8.tgz"; - sha1 = "b2b74263a80559c0ee244e0f2d1052b36a358b85"; + name = "_jimp_core___core_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/core/-/core-0.16.1.tgz"; + sha1 = "68c4288f6ef7f31a0f6b859ba3fb28dae930d39d"; }; } { - name = "_jimp_custom___custom_0.9.8.tgz"; + name = "_jimp_custom___custom_0.16.1.tgz"; path = fetchurl { - name = "_jimp_custom___custom_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.9.8.tgz"; - sha1 = "1e9d904b1b05aa22b00b899baba2be7c0704a5d1"; + name = "_jimp_custom___custom_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.16.1.tgz"; + sha1 = "28b659c59e20a1d75a0c46067bd3f4bd302cf9c5"; }; } { - name = "_jimp_gif___gif_0.9.8.tgz"; + name = "_jimp_gif___gif_0.16.1.tgz"; path = fetchurl { - name = "_jimp_gif___gif_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.9.8.tgz"; - sha1 = "513aff511634c338d1ab33a7bba1ba3412220b5b"; + name = "_jimp_gif___gif_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.16.1.tgz"; + sha1 = "d1f7c3a58f4666482750933af8b8f4666414f3ca"; }; } { - name = "_jimp_jpeg___jpeg_0.9.8.tgz"; + name = "_jimp_jpeg___jpeg_0.16.1.tgz"; path = fetchurl { - name = "_jimp_jpeg___jpeg_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.9.8.tgz"; - sha1 = "8c086f69d0e8c46e43a7db9725576edc30925cb1"; + name = "_jimp_jpeg___jpeg_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.16.1.tgz"; + sha1 = "3b7bb08a4173f2f6d81f3049b251df3ee2ac8175"; }; } { - name = "_jimp_plugin_blit___plugin_blit_0.9.8.tgz"; + name = "_jimp_plugin_blit___plugin_blit_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_blit___plugin_blit_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.9.8.tgz"; - sha1 = "916bf6f261e6a91dbecca0ca866b8d9cba563753"; + name = "_jimp_plugin_blit___plugin_blit_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.16.1.tgz"; + sha1 = "09ea919f9d326de3b9c2826fe4155da37dde8edb"; }; } { - name = "_jimp_plugin_blur___plugin_blur_0.9.8.tgz"; + name = "_jimp_plugin_blur___plugin_blur_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_blur___plugin_blur_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.9.8.tgz"; - sha1 = "00055d54b90532b7951dae377b3e40352c187f07"; + name = "_jimp_plugin_blur___plugin_blur_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.16.1.tgz"; + sha1 = "e614fa002797dcd662e705d4cea376e7db968bf5"; }; } { - name = "_jimp_plugin_circle___plugin_circle_0.9.8.tgz"; + name = "_jimp_plugin_circle___plugin_circle_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_circle___plugin_circle_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.9.8.tgz"; - sha1 = "5de8735f32f931d9160d0f5211e9aab6413a1d4b"; + name = "_jimp_plugin_circle___plugin_circle_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.16.1.tgz"; + sha1 = "20e3194a67ca29740aba2630fd4d0a89afa27491"; }; } { - name = "_jimp_plugin_color___plugin_color_0.9.8.tgz"; + name = "_jimp_plugin_color___plugin_color_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_color___plugin_color_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.9.8.tgz"; - sha1 = "3c633f22955a4f5013025e9e9e78a267ac4c3a88"; + name = "_jimp_plugin_color___plugin_color_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.16.1.tgz"; + sha1 = "0f298ba74dee818b663834cd80d53e56f3755233"; }; } { - name = "_jimp_plugin_contain___plugin_contain_0.9.8.tgz"; + name = "_jimp_plugin_contain___plugin_contain_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_contain___plugin_contain_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.9.8.tgz"; - sha1 = "f892fb7fc87134a47b37281f0ff17d608f3e51af"; + name = "_jimp_plugin_contain___plugin_contain_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.16.1.tgz"; + sha1 = "3c5f5c495fd9bb08a970739d83694934f58123f2"; }; } { - name = "_jimp_plugin_cover___plugin_cover_0.9.8.tgz"; + name = "_jimp_plugin_cover___plugin_cover_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_cover___plugin_cover_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.9.8.tgz"; - sha1 = "37474b19027ac0155100b71ca17266aab19e50fc"; + name = "_jimp_plugin_cover___plugin_cover_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.16.1.tgz"; + sha1 = "0e8caec16a40abe15b1b32e5383a603a3306dc41"; }; } { - name = "_jimp_plugin_crop___plugin_crop_0.9.8.tgz"; + name = "_jimp_plugin_crop___plugin_crop_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_crop___plugin_crop_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.9.8.tgz"; - sha1 = "2308696597a8bcb528d09eeebbbadb22248e7c1c"; + name = "_jimp_plugin_crop___plugin_crop_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.16.1.tgz"; + sha1 = "b362497c873043fe47ba881ab08604bf7226f50f"; }; } { - name = "_jimp_plugin_displace___plugin_displace_0.9.8.tgz"; + name = "_jimp_plugin_displace___plugin_displace_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_displace___plugin_displace_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.9.8.tgz"; - sha1 = "00331047039cb2d0d9d5f7c3d8ce542e07eea791"; + name = "_jimp_plugin_displace___plugin_displace_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.16.1.tgz"; + sha1 = "4dd9db518c3e78de9d723f86a234bf98922afe8d"; }; } { - name = "_jimp_plugin_dither___plugin_dither_0.9.8.tgz"; + name = "_jimp_plugin_dither___plugin_dither_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_dither___plugin_dither_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.9.8.tgz"; - sha1 = "9cca12997f2917f27d5681275b32affdb3083450"; + name = "_jimp_plugin_dither___plugin_dither_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.16.1.tgz"; + sha1 = "b47de2c0bb09608bed228b41c3cd01a85ec2d45b"; }; } { - name = "_jimp_plugin_fisheye___plugin_fisheye_0.9.8.tgz"; + name = "_jimp_plugin_fisheye___plugin_fisheye_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_fisheye___plugin_fisheye_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.9.8.tgz"; - sha1 = "e3f5f616ec06a9ef99aa268446f0096eac863437"; + name = "_jimp_plugin_fisheye___plugin_fisheye_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.1.tgz"; + sha1 = "f625047b6cdbe1b83b89e9030fd025ab19cdb1a4"; }; } { - name = "_jimp_plugin_flip___plugin_flip_0.9.8.tgz"; + name = "_jimp_plugin_flip___plugin_flip_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_flip___plugin_flip_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.9.8.tgz"; - sha1 = "c00559a8543a684c7cff4d1128b7152e598fbb1c"; + name = "_jimp_plugin_flip___plugin_flip_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.16.1.tgz"; + sha1 = "7a99ea22bde802641017ed0f2615870c144329bb"; }; } { - name = "_jimp_plugin_gaussian___plugin_gaussian_0.9.8.tgz"; + name = "_jimp_plugin_gaussian___plugin_gaussian_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_gaussian___plugin_gaussian_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.8.tgz"; - sha1 = "d1666167ce1b947b65db5093bb9a00d319bcfe4d"; + name = "_jimp_plugin_gaussian___plugin_gaussian_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.1.tgz"; + sha1 = "0845e314085ccd52e34fad9a83949bc0d81a68e8"; }; } { - name = "_jimp_plugin_invert___plugin_invert_0.9.8.tgz"; + name = "_jimp_plugin_invert___plugin_invert_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_invert___plugin_invert_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.9.8.tgz"; - sha1 = "41d6e87faf01a5d8fe7554e322d2aad25f596ab1"; + name = "_jimp_plugin_invert___plugin_invert_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.16.1.tgz"; + sha1 = "7e6f5a15707256f3778d06921675bbcf18545c97"; }; } { - name = "_jimp_plugin_mask___plugin_mask_0.9.8.tgz"; + name = "_jimp_plugin_mask___plugin_mask_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_mask___plugin_mask_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.9.8.tgz"; - sha1 = "fe92132db1a2b9f7718226bc3c37794dd148ce36"; + name = "_jimp_plugin_mask___plugin_mask_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.16.1.tgz"; + sha1 = "e7f2460e05c3cda7af5e76f33ccb0579f66f90df"; }; } { - name = "_jimp_plugin_normalize___plugin_normalize_0.9.8.tgz"; + name = "_jimp_plugin_normalize___plugin_normalize_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_normalize___plugin_normalize_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.9.8.tgz"; - sha1 = "05646aa15b6a789c4ba447edcad77c83c1d51f16"; + name = "_jimp_plugin_normalize___plugin_normalize_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.16.1.tgz"; + sha1 = "032dfd88eefbc4dedc8b1b2d243832e4f3af30c8"; }; } { - name = "_jimp_plugin_print___plugin_print_0.9.8.tgz"; + name = "_jimp_plugin_print___plugin_print_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_print___plugin_print_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.9.8.tgz"; - sha1 = "808f723176d0a57186d7558290c7e53a7a8bf812"; + name = "_jimp_plugin_print___plugin_print_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.16.1.tgz"; + sha1 = "66b803563f9d109825970714466e6ab9ae639ff6"; }; } { - name = "_jimp_plugin_resize___plugin_resize_0.9.8.tgz"; + name = "_jimp_plugin_resize___plugin_resize_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_resize___plugin_resize_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.9.8.tgz"; - sha1 = "eef750b77f1cc06e8bcf9b390860c95c489dcc02"; + name = "_jimp_plugin_resize___plugin_resize_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.16.1.tgz"; + sha1 = "65e39d848ed13ba2d6c6faf81d5d590396571d10"; }; } { - name = "_jimp_plugin_rotate___plugin_rotate_0.9.8.tgz"; + name = "_jimp_plugin_rotate___plugin_rotate_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_rotate___plugin_rotate_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.9.8.tgz"; - sha1 = "5eba01f75a397777c6782b7999c9ac6c7ed8a411"; + name = "_jimp_plugin_rotate___plugin_rotate_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.16.1.tgz"; + sha1 = "53fb5d51a4b3d05af9c91c2a8fffe5d7a1a47c8c"; }; } { - name = "_jimp_plugin_scale___plugin_scale_0.9.8.tgz"; + name = "_jimp_plugin_scale___plugin_scale_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_scale___plugin_scale_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.9.8.tgz"; - sha1 = "c875d5e0b377b15b8b398ee402f45e3fc43fea40"; + name = "_jimp_plugin_scale___plugin_scale_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.16.1.tgz"; + sha1 = "89f6ba59feed3429847ed226aebda33a240cc647"; }; } { - name = "_jimp_plugin_shadow___plugin_shadow_0.9.8.tgz"; + name = "_jimp_plugin_shadow___plugin_shadow_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_shadow___plugin_shadow_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.9.8.tgz"; - sha1 = "ca2d18afa29a1027b77b3e1fb2ce7d4e073a7170"; + name = "_jimp_plugin_shadow___plugin_shadow_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.16.1.tgz"; + sha1 = "a7af892a740febf41211e10a5467c3c5c521a04c"; }; } { - name = "_jimp_plugin_threshold___plugin_threshold_0.9.8.tgz"; + name = "_jimp_plugin_threshold___plugin_threshold_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_threshold___plugin_threshold_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.9.8.tgz"; - sha1 = "2d1dde0791f70b2ff2d0b915cab8d40b0e446594"; + name = "_jimp_plugin_threshold___plugin_threshold_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.16.1.tgz"; + sha1 = "34f3078f9965145b7ae26c53a32ad74b1195bbf5"; }; } { - name = "_jimp_plugins___plugins_0.9.8.tgz"; + name = "_jimp_plugins___plugins_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugins___plugins_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.9.8.tgz"; - sha1 = "5279dfe22d0d27633f4201ab36103e587b32eb85"; + name = "_jimp_plugins___plugins_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.16.1.tgz"; + sha1 = "9f08544c97226d6460a16ced79f57e85bec3257b"; }; } { - name = "_jimp_png___png_0.9.8.tgz"; + name = "_jimp_png___png_0.16.1.tgz"; path = fetchurl { - name = "_jimp_png___png_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/png/-/png-0.9.8.tgz"; - sha1 = "f88dacc9b9da1c2ea8e91026a9530d0fb45c4409"; + name = "_jimp_png___png_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/png/-/png-0.16.1.tgz"; + sha1 = "f24cfc31529900b13a2dd9d4fdb4460c1e4d814e"; }; } { - name = "_jimp_tiff___tiff_0.9.8.tgz"; + name = "_jimp_tiff___tiff_0.16.1.tgz"; path = fetchurl { - name = "_jimp_tiff___tiff_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.9.8.tgz"; - sha1 = "91dc3eab2f222e23414f139e917f3407caa73560"; + name = "_jimp_tiff___tiff_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.16.1.tgz"; + sha1 = "0e8756695687d7574b6bc73efab0acd4260b7a12"; }; } { - name = "_jimp_types___types_0.9.8.tgz"; + name = "_jimp_types___types_0.16.1.tgz"; path = fetchurl { - name = "_jimp_types___types_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/types/-/types-0.9.8.tgz"; - sha1 = "46980a4a7bfcadf2f0484d187c32b4e7d6d61b8e"; + name = "_jimp_types___types_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/types/-/types-0.16.1.tgz"; + sha1 = "0dbab37b3202315c91010f16c31766d35a2322cc"; }; } { - name = "_jimp_utils___utils_0.9.8.tgz"; + name = "_jimp_utils___utils_0.16.1.tgz"; path = fetchurl { - name = "_jimp_utils___utils_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.9.8.tgz"; - sha1 = "6a6f47158ec6b424f03df0f55f0baff5b4b5e096"; + name = "_jimp_utils___utils_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.16.1.tgz"; + sha1 = "2f51e6f14ff8307c4aa83d5e1a277da14a9fe3f7"; }; } { @@ -466,11 +458,11 @@ }; } { - name = "_types_node___node_13.13.21.tgz"; + name = "_types_node___node_14.14.21.tgz"; path = fetchurl { - name = "_types_node___node_13.13.21.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.13.21.tgz"; - sha1 = "e48d3c2e266253405cf404c8654d1bcf0d333e5c"; + name = "_types_node___node_14.14.21.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz"; + sha1 = "d934aacc22424fe9622ebf6857370c052eae464e"; }; } { @@ -626,6 +618,14 @@ }; } { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { name = "ajv___ajv_6.12.5.tgz"; path = fetchurl { name = "ajv___ajv_6.12.5.tgz"; @@ -738,19 +738,19 @@ }; } { - name = "app_builder_bin___app_builder_bin_3.5.9.tgz"; + name = "app_builder_bin___app_builder_bin_3.5.10.tgz"; path = fetchurl { - name = "app_builder_bin___app_builder_bin_3.5.9.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz"; - sha1 = "a3ac0c25286bac68357321cb2eaf7128b0bc0a4f"; + name = "app_builder_bin___app_builder_bin_3.5.10.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz"; + sha1 = "4a7f9999fccc0c435b6284ae1366bc76a17c4a7d"; }; } { - name = "app_builder_lib___app_builder_lib_22.7.0.tgz"; + name = "app_builder_lib___app_builder_lib_22.9.1.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.7.0.tgz"; - sha1 = "ccd3e7ece2d46bc209423a77aa142f74aaf65db0"; + name = "app_builder_lib___app_builder_lib_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz"; + sha1 = "ccb8f1a02b628514a5dfab9401fa2a976689415c"; }; } { @@ -786,11 +786,11 @@ }; } { - name = "archiver___archiver_4.0.1.tgz"; + name = "archiver___archiver_5.2.0.tgz"; path = fetchurl { - name = "archiver___archiver_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/archiver/-/archiver-4.0.1.tgz"; - sha1 = "3f722b121777e361ca9fad374ecda38e77e63c7f"; + name = "archiver___archiver_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz"; + sha1 = "25aa1b3d9febf7aec5b0f296e77e69960c26db94"; }; } { @@ -898,11 +898,11 @@ }; } { - name = "async___async_2.6.3.tgz"; + name = "async___async_3.2.0.tgz"; path = fetchurl { - name = "async___async_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; - sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + name = "async___async_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; + sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; }; } { @@ -922,6 +922,14 @@ }; } { + name = "atomically___atomically_1.7.0.tgz"; + path = fetchurl { + name = "atomically___atomically_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz"; + sha1 = "c07a0458432ea6dbc9a3506fffa424b48bccaafe"; + }; + } + { name = "auto_launch___auto_launch_5.0.5.tgz"; path = fetchurl { name = "auto_launch___auto_launch_5.0.5.tgz"; @@ -986,6 +994,14 @@ }; } { + name = "bin_links___bin_links_1.1.8.tgz"; + path = fetchurl { + name = "bin_links___bin_links_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.8.tgz"; + sha1 = "bd39aadab5dc4bdac222a07df5baf1af745b2228"; + }; + } + { name = "bl___bl_4.0.3.tgz"; path = fetchurl { name = "bl___bl_4.0.3.tgz"; @@ -1074,19 +1090,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_8.7.1.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.7.1.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.1.tgz"; - sha1 = "23c808cddd650d4376a7a1518ec1e80e85c10f00"; + name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz"; + sha1 = "d93afc71428a12789b437e13850e1fa7da956d72"; }; } { - name = "builder_util___builder_util_22.7.0.tgz"; + name = "builder_util___builder_util_22.9.1.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.7.0.tgz"; - sha1 = "0776a66e6d6e408a78bed7f17a7ad22516d9e7f0"; + name = "builder_util___builder_util_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz"; + sha1 = "b7087a5cde477f90d718ca5d7fafb6ae261b16af"; }; } { @@ -1218,11 +1234,11 @@ }; } { - name = "chownr___chownr_1.1.3.tgz"; + name = "chownr___chownr_2.0.0.tgz"; path = fetchurl { - name = "chownr___chownr_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz"; - sha1 = "42d837d5239688d55f303003a508230fa6727142"; + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; }; } { @@ -1314,19 +1330,19 @@ }; } { - name = "cliui___cliui_4.1.0.tgz"; + name = "cliui___cliui_5.0.0.tgz"; path = fetchurl { - name = "cliui___cliui_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz"; - sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; }; } { - name = "cliui___cliui_6.0.0.tgz"; + name = "cliui___cliui_7.0.4.tgz"; path = fetchurl { - name = "cliui___cliui_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; - sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1"; + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; }; } { @@ -1426,11 +1442,11 @@ }; } { - name = "compress_commons___compress_commons_3.0.0.tgz"; + name = "compress_commons___compress_commons_4.0.2.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-3.0.0.tgz"; - sha1 = "833944d84596e537224dd91cf92f5246823d4f1d"; + name = "compress_commons___compress_commons_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz"; + sha1 = "d6896be386e52f37610cef9e6fa5defc58c31bd7"; }; } { @@ -1450,11 +1466,11 @@ }; } { - name = "conf___conf_2.2.0.tgz"; + name = "conf___conf_7.1.2.tgz"; path = fetchurl { - name = "conf___conf_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/conf/-/conf-2.2.0.tgz"; - sha1 = "ee282efafc1450b61e205372041ad7d866802d9a"; + name = "conf___conf_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/conf/-/conf-7.1.2.tgz"; + sha1 = "d9678a9d8f04de8bf5cd475105da8fdae49c2ec4"; }; } { @@ -1506,14 +1522,6 @@ }; } { - name = "core_js___core_js_3.6.5.tgz"; - path = fetchurl { - name = "core_js___core_js_3.6.5.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz"; - sha1 = "7395dc273af37fb2e50e9bd3d9fe841285231d1a"; - }; - } - { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; @@ -1522,19 +1530,19 @@ }; } { - name = "crc32_stream___crc32_stream_3.0.1.tgz"; + name = "crc_32___crc_32_1.2.0.tgz"; path = fetchurl { - name = "crc32_stream___crc32_stream_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz"; - sha1 = "cae6eeed003b0e44d739d279de5ae63b171b4e85"; + name = "crc_32___crc_32_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz"; + sha1 = "cb2db6e29b88508e32d9dd0ec1693e7b41a18208"; }; } { - name = "crc___crc_3.8.0.tgz"; + name = "crc32_stream___crc32_stream_4.0.1.tgz"; path = fetchurl { - name = "crc___crc_3.8.0.tgz"; - url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + name = "crc32_stream___crc32_stream_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz"; + sha1 = "0f047d74041737f8a55e86837a1b826bd8ab0067"; }; } { @@ -1570,14 +1578,6 @@ }; } { - name = "cross_unzip___cross_unzip_0.0.2.tgz"; - path = fetchurl { - name = "cross_unzip___cross_unzip_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz"; - sha1 = "5183bc47a09559befcf98cc4657964999359372f"; - }; - } - { name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; path = fetchurl { name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; @@ -1618,6 +1618,14 @@ }; } { + name = "debounce_fn___debounce_fn_4.0.0.tgz"; + path = fetchurl { + name = "debounce_fn___debounce_fn_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz"; + sha1 = "ed76d206d8a50e60de0dd66d494d82835ffe61c7"; + }; + } + { name = "debug___debug_3.1.0.tgz"; path = fetchurl { name = "debug___debug_3.1.0.tgz"; @@ -1650,11 +1658,11 @@ }; } { - name = "debug___debug_4.2.0.tgz"; + name = "debug___debug_4.3.1.tgz"; path = fetchurl { - name = "debug___debug_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz"; - sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1"; + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; }; } { @@ -1690,14 +1698,6 @@ }; } { - name = "deep_equal___deep_equal_1.1.1.tgz"; - path = fetchurl { - name = "deep_equal___deep_equal_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; - sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; - }; - } - { name = "deep_extend___deep_extend_0.6.0.tgz"; path = fetchurl { name = "deep_extend___deep_extend_0.6.0.tgz"; @@ -1786,11 +1786,11 @@ }; } { - name = "dmg_builder___dmg_builder_22.7.0.tgz"; + name = "dmg_builder___dmg_builder_22.9.1.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.7.0.tgz"; - sha1 = "ead7e7c046cbdc52d29d302a4455f6668cdf7d45"; + name = "dmg_builder___dmg_builder_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz"; + sha1 = "64647224f37ee47fc9bd01947c21cc010a30511f"; }; } { @@ -1898,67 +1898,67 @@ }; } { - name = "ejs___ejs_3.1.3.tgz"; + name = "ejs___ejs_3.1.5.tgz"; path = fetchurl { - name = "ejs___ejs_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.3.tgz"; - sha1 = "514d967a8894084d18d3d47bd169a1c0560f093d"; + name = "ejs___ejs_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz"; + sha1 = "aed723844dc20acb4b170cd9ab1017e476a0d93b"; }; } { - name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.7.0.tgz"; + name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.9.1.tgz"; path = fetchurl { - name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.7.0.tgz"; - sha1 = "8d6f09d541c039f52202935c66d592c38575ceff"; + name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.9.1.tgz"; + sha1 = "d9ad65a8f5abd1011ac1dbd01492623fb5466a32"; }; } { - name = "electron_builder___electron_builder_22.7.0.tgz"; + name = "electron_builder___electron_builder_22.9.1.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.7.0.tgz"; - sha1 = "a42d08a1654ffc2f7d9e2860829d3cc55d4a0c81"; + name = "electron_builder___electron_builder_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz"; + sha1 = "a2962db6f2757bc01d02489f38fafe0809f68f60"; }; } { - name = "electron_devtools_installer___electron_devtools_installer_2.2.4.tgz"; + name = "electron_devtools_installer___electron_devtools_installer_3.1.1.tgz"; path = fetchurl { - name = "electron_devtools_installer___electron_devtools_installer_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.4.tgz"; - sha1 = "261a50337e37121d338b966f07922eb4939a8763"; + name = "electron_devtools_installer___electron_devtools_installer_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-3.1.1.tgz"; + sha1 = "7b56c8c86475c5e4e10de6917d150c53c9ceb55e"; }; } { - name = "electron_notarize___electron_notarize_0.2.1.tgz"; + name = "electron_notarize___electron_notarize_1.0.0.tgz"; path = fetchurl { - name = "electron_notarize___electron_notarize_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.2.1.tgz"; - sha1 = "759e8006decae19134f82996ed910db26d9192cc"; + name = "electron_notarize___electron_notarize_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz"; + sha1 = "bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"; }; } { - name = "electron_publish___electron_publish_22.7.0.tgz"; + name = "electron_publish___electron_publish_22.9.1.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.7.0.tgz"; - sha1 = "d92ba7c4007c9ac1dd070593e48028184fb2dc19"; + name = "electron_publish___electron_publish_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz"; + sha1 = "7cc76ac4cc53efd29ee31c1e5facb9724329068e"; }; } { - name = "electron_store___electron_store_2.0.0.tgz"; + name = "electron_store___electron_store_6.0.1.tgz"; path = fetchurl { - name = "electron_store___electron_store_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/electron-store/-/electron-store-2.0.0.tgz"; - sha1 = "1035cca2a95409d1f54c7466606345852450d64a"; + name = "electron_store___electron_store_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/electron-store/-/electron-store-6.0.1.tgz"; + sha1 = "2178b9dc37aeb749d99cf9d1d1bc090890b922dc"; }; } { - name = "electron_window_state___electron_window_state_4.1.1.tgz"; + name = "electron_window_state___electron_window_state_5.0.3.tgz"; path = fetchurl { - name = "electron_window_state___electron_window_state_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-4.1.1.tgz"; - sha1 = "6b34fdc31b38514dfec8b7c8f7b5d4addb67632d"; + name = "electron_window_state___electron_window_state_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-5.0.3.tgz"; + sha1 = "4f36d09e3f953d87aff103bf010f460056050aa8"; }; } { @@ -2002,14 +2002,6 @@ }; } { - name = "env_paths___env_paths_1.0.0.tgz"; - path = fetchurl { - name = "env_paths___env_paths_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz"; - sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; - }; - } - { name = "env_paths___env_paths_2.2.0.tgz"; path = fetchurl { name = "env_paths___env_paths_2.2.0.tgz"; @@ -2082,6 +2074,14 @@ }; } { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { name = "escape_goat___escape_goat_2.1.1.tgz"; path = fetchurl { name = "escape_goat___escape_goat_2.1.1.tgz"; @@ -2346,14 +2346,6 @@ }; } { - name = "execa___execa_1.0.0.tgz"; - path = fetchurl { - name = "execa___execa_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; - }; - } - { name = "exif_parser___exif_parser_0.1.12.tgz"; path = fetchurl { name = "exif_parser___exif_parser_0.1.12.tgz"; @@ -2362,6 +2354,14 @@ }; } { + name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; + path = fetchurl { + name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692"; + }; + } + { name = "extend___extend_3.0.2.tgz"; path = fetchurl { name = "extend___extend_3.0.2.tgz"; @@ -2490,14 +2490,6 @@ }; } { - name = "find_up___find_up_4.1.0.tgz"; - path = fetchurl { - name = "find_up___find_up_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; - }; - } - { name = "flat_cache___flat_cache_2.0.1.tgz"; path = fetchurl { name = "flat_cache___flat_cache_2.0.1.tgz"; @@ -2658,6 +2650,14 @@ }; } { + name = "gentle_fs___gentle_fs_2.3.1.tgz"; + path = fetchurl { + name = "gentle_fs___gentle_fs_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.1.tgz"; + sha1 = "11201bf66c18f930ddca72cf69460bdfa05727b1"; + }; + } + { name = "get_caller_file___get_caller_file_1.0.3.tgz"; path = fetchurl { name = "get_caller_file___get_caller_file_1.0.3.tgz"; @@ -2706,6 +2706,14 @@ }; } { + name = "gifwrap___gifwrap_0.9.2.tgz"; + path = fetchurl { + name = "gifwrap___gifwrap_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/gifwrap/-/gifwrap-0.9.2.tgz"; + sha1 = "348e286e67d7cf57942172e1e6f05a71cee78489"; + }; + } + { name = "glob_parent___glob_parent_5.1.1.tgz"; path = fetchurl { name = "glob_parent___glob_parent_5.1.1.tgz"; @@ -2882,11 +2890,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_3.0.4.tgz"; + name = "hosted_git_info___hosted_git_info_3.0.7.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.4.tgz"; - sha1 = "be4973eb1fd2737b11c9c7c19380739bb249f60d"; + name = "hosted_git_info___hosted_git_info_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz"; + sha1 = "a30727385ea85acfcee94e0aad9e368c792e036c"; }; } { @@ -2946,11 +2954,11 @@ }; } { - name = "iconv_lite___iconv_lite_0.5.1.tgz"; + name = "iconv_lite___iconv_lite_0.6.2.tgz"; path = fetchurl { - name = "iconv_lite___iconv_lite_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz"; - sha1 = "b2425d3c7b18f7219f2ca663d103bddb91718d64"; + name = "iconv_lite___iconv_lite_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz"; + sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"; }; } { @@ -2994,6 +3002,22 @@ }; } { + name = "image_q___image_q_1.1.1.tgz"; + path = fetchurl { + name = "image_q___image_q_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/image-q/-/image-q-1.1.1.tgz"; + sha1 = "fc84099664460b90ca862d9300b6bfbbbfbf8056"; + }; + } + { + name = "immediate___immediate_3.0.6.tgz"; + path = fetchurl { + name = "immediate___immediate_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz"; + sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; + }; + } + { name = "import_fresh___import_fresh_3.2.1.tgz"; path = fetchurl { name = "import_fresh___import_fresh_3.2.1.tgz"; @@ -3082,14 +3106,6 @@ }; } { - name = "invert_kv___invert_kv_2.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz"; - sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02"; - }; - } - { name = "ip_regex___ip_regex_2.1.0.tgz"; path = fetchurl { name = "ip_regex___ip_regex_2.1.0.tgz"; @@ -3106,14 +3122,6 @@ }; } { - name = "is_arguments___is_arguments_1.0.4.tgz"; - path = fetchurl { - name = "is_arguments___is_arguments_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; - sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; - }; - } - { name = "is_arrayish___is_arrayish_0.2.1.tgz"; path = fetchurl { name = "is_arrayish___is_arrayish_0.2.1.tgz"; @@ -3402,19 +3410,19 @@ }; } { - name = "jimp___jimp_0.9.8.tgz"; + name = "jimp___jimp_0.16.1.tgz"; path = fetchurl { - name = "jimp___jimp_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/jimp/-/jimp-0.9.8.tgz"; - sha1 = "2ee87b81b42e723ad74c73b8012f879c0abe5b04"; + name = "jimp___jimp_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/jimp/-/jimp-0.16.1.tgz"; + sha1 = "192f851a30e5ca11112a3d0aa53137659a78ca7a"; }; } { - name = "jpeg_js___jpeg_js_0.3.7.tgz"; + name = "jpeg_js___jpeg_js_0.4.2.tgz"; path = fetchurl { - name = "jpeg_js___jpeg_js_0.3.7.tgz"; - url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.7.tgz"; - sha1 = "471a89d06011640592d314158608690172b1028d"; + name = "jpeg_js___jpeg_js_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.2.tgz"; + sha1 = "8b345b1ae4abde64c2da2fe67ea216a114ac279d"; }; } { @@ -3482,6 +3490,14 @@ }; } { + name = "json_schema_typed___json_schema_typed_7.0.3.tgz"; + path = fetchurl { + name = "json_schema_typed___json_schema_typed_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz"; + sha1 = "23ff481b8b4eebcd2ca123b4fa0409e66469a2d9"; + }; + } + { name = "json_schema___json_schema_0.2.3.tgz"; path = fetchurl { name = "json_schema___json_schema_0.2.3.tgz"; @@ -3522,14 +3538,6 @@ }; } { - name = "jsonfile___jsonfile_2.4.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; - }; - } - { name = "jsonfile___jsonfile_4.0.0.tgz"; path = fetchurl { name = "jsonfile___jsonfile_4.0.0.tgz"; @@ -3570,6 +3578,14 @@ }; } { + name = "jszip___jszip_3.5.0.tgz"; + path = fetchurl { + name = "jszip___jszip_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz"; + sha1 = "b4fd1f368245346658e781fec9675802489e15f6"; + }; + } + { name = "keyv___keyv_3.1.0.tgz"; path = fetchurl { name = "keyv___keyv_3.1.0.tgz"; @@ -3626,14 +3642,6 @@ }; } { - name = "lcid___lcid_2.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz"; - sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; - }; - } - { name = "levn___levn_0.3.0.tgz"; path = fetchurl { name = "levn___levn_0.3.0.tgz"; @@ -3650,11 +3658,11 @@ }; } { - name = "libcipm___libcipm_4.0.7.tgz"; + name = "libcipm___libcipm_4.0.8.tgz"; path = fetchurl { - name = "libcipm___libcipm_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/libcipm/-/libcipm-4.0.7.tgz"; - sha1 = "76cd675c98bdaae64db88b782b01b804b6d02c8a"; + name = "libcipm___libcipm_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/libcipm/-/libcipm-4.0.8.tgz"; + sha1 = "dcea4919e10dfbce420327e63901613b9141bc89"; }; } { @@ -3722,11 +3730,19 @@ }; } { - name = "libnpx___libnpx_10.2.2.tgz"; + name = "libnpx___libnpx_10.2.4.tgz"; + path = fetchurl { + name = "libnpx___libnpx_10.2.4.tgz"; + url = "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.4.tgz"; + sha1 = "ef0e3258e29aef2ec7ee3276115e20e67f67d4ee"; + }; + } + { + name = "lie___lie_3.3.0.tgz"; path = fetchurl { - name = "libnpx___libnpx_10.2.2.tgz"; - url = "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.2.tgz"; - sha1 = "5a4171b9b92dd031463ef66a4af9f5cbd6b09572"; + name = "lie___lie_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz"; + sha1 = "dcf82dee545f46074daf200c7c1c5a08e0f40f6a"; }; } { @@ -3762,14 +3778,6 @@ }; } { - name = "locate_path___locate_path_5.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; - }; - } - { name = "lock_verify___lock_verify_2.2.0.tgz"; path = fetchurl { name = "lock_verify___lock_verify_2.2.0.tgz"; @@ -3930,6 +3938,14 @@ }; } { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { name = "make_dir___make_dir_1.3.0.tgz"; path = fetchurl { name = "make_dir___make_dir_1.3.0.tgz"; @@ -3946,27 +3962,27 @@ }; } { - name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; + name = "make_dir___make_dir_3.1.0.tgz"; path = fetchurl { - name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz"; - sha1 = "aa8387104f2687edca01c8687ee45013d02d19bd"; + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; }; } { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; + name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; path = fetchurl { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; + name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz"; + sha1 = "aa8387104f2687edca01c8687ee45013d02d19bd"; }; } { - name = "meant___meant_1.0.1.tgz"; + name = "meant___meant_1.0.3.tgz"; path = fetchurl { - name = "meant___meant_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz"; - sha1 = "66044fea2f23230ec806fb515efea29c44d2115d"; + name = "meant___meant_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/meant/-/meant-1.0.3.tgz"; + sha1 = "67769af9de1d158773e928ae82c456114903554c"; }; } { @@ -3978,14 +3994,6 @@ }; } { - name = "mem___mem_4.3.0.tgz"; - path = fetchurl { - name = "mem___mem_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz"; - sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178"; - }; - } - { name = "mime_db___mime_db_1.42.0.tgz"; path = fetchurl { name = "mime_db___mime_db_1.42.0.tgz"; @@ -4010,11 +4018,11 @@ }; } { - name = "mime___mime_2.4.6.tgz"; + name = "mime___mime_2.5.0.tgz"; path = fetchurl { - name = "mime___mime_2.4.6.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; - sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; + name = "mime___mime_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz"; + sha1 = "2b4af934401779806ee98026bb42e8c1ae1876b1"; }; } { @@ -4034,6 +4042,14 @@ }; } { + name = "mimic_fn___mimic_fn_3.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz"; + sha1 = "65755145bbf3e36954b949c16450427451d5ca74"; + }; + } + { name = "mimic_response___mimic_response_1.0.1.tgz"; path = fetchurl { name = "mimic_response___mimic_response_1.0.1.tgz"; @@ -4106,11 +4122,11 @@ }; } { - name = "minizlib___minizlib_2.1.0.tgz"; + name = "minizlib___minizlib_2.1.2.tgz"; path = fetchurl { - name = "minizlib___minizlib_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz"; - sha1 = "fd52c645301ef09a63a2c209697c294c6ce02cf3"; + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; }; } { @@ -4274,11 +4290,11 @@ }; } { - name = "npm_audit_report___npm_audit_report_1.3.2.tgz"; + name = "npm_audit_report___npm_audit_report_1.3.3.tgz"; path = fetchurl { - name = "npm_audit_report___npm_audit_report_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.2.tgz"; - sha1 = "303bc78cd9e4c226415076a4f7e528c89fc77018"; + name = "npm_audit_report___npm_audit_report_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.3.tgz"; + sha1 = "8226deeb253b55176ed147592a3995442f2179ed"; }; } { @@ -4314,6 +4330,14 @@ }; } { + name = "npm_lifecycle___npm_lifecycle_3.1.5.tgz"; + path = fetchurl { + name = "npm_lifecycle___npm_lifecycle_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz"; + sha1 = "9882d3642b8c82c815782a12e6a1bfeed0026309"; + }; + } + { name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; path = fetchurl { name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; @@ -4378,11 +4402,11 @@ }; } { - name = "npm_registry_fetch___npm_registry_fetch_4.0.5.tgz"; + name = "npm_registry_fetch___npm_registry_fetch_4.0.7.tgz"; path = fetchurl { - name = "npm_registry_fetch___npm_registry_fetch_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz"; - sha1 = "cb87cf7f25bfb048d6c3ee19d115bebf93ea5bfa"; + name = "npm_registry_fetch___npm_registry_fetch_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz"; + sha1 = "57951bf6541e0246b34c9f9a38ab73607c9449d7"; }; } { @@ -4402,11 +4426,11 @@ }; } { - name = "npm___npm_6.14.6.tgz"; + name = "npm___npm_6.14.11.tgz"; path = fetchurl { - name = "npm___npm_6.14.6.tgz"; - url = "https://registry.yarnpkg.com/npm/-/npm-6.14.6.tgz"; - sha1 = "1a81ce1fac2bf5457dbf6342ceed503627ff228f"; + name = "npm___npm_6.14.11.tgz"; + url = "https://registry.yarnpkg.com/npm/-/npm-6.14.11.tgz"; + sha1 = "e0b5598d7b9a42d275e61d8bd28cd7eee0074a3b"; }; } { @@ -4450,14 +4474,6 @@ }; } { - name = "object_is___object_is_1.0.1.tgz"; - path = fetchurl { - name = "object_is___object_is_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz"; - sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"; - }; - } - { name = "object_keys___object_keys_1.1.1.tgz"; path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; @@ -4530,11 +4546,11 @@ }; } { - name = "opener___opener_1.5.1.tgz"; + name = "opener___opener_1.5.2.tgz"; path = fetchurl { - name = "opener___opener_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz"; - sha1 = "6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"; + name = "opener___opener_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz"; + sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598"; }; } { @@ -4570,14 +4586,6 @@ }; } { - name = "os_locale___os_locale_3.1.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz"; - sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a"; - }; - } - { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; path = fetchurl { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; @@ -4602,14 +4610,6 @@ }; } { - name = "p_defer___p_defer_1.0.0.tgz"; - path = fetchurl { - name = "p_defer___p_defer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - } - { name = "p_finally___p_finally_1.0.0.tgz"; path = fetchurl { name = "p_finally___p_finally_1.0.0.tgz"; @@ -4618,14 +4618,6 @@ }; } { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - path = fetchurl { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e"; - }; - } - { name = "p_limit___p_limit_1.3.0.tgz"; path = fetchurl { name = "p_limit___p_limit_1.3.0.tgz"; @@ -4642,14 +4634,6 @@ }; } { - name = "p_limit___p_limit_2.2.2.tgz"; - path = fetchurl { - name = "p_limit___p_limit_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; - sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; - }; - } - { name = "p_locate___p_locate_2.0.0.tgz"; path = fetchurl { name = "p_locate___p_locate_2.0.0.tgz"; @@ -4666,14 +4650,6 @@ }; } { - name = "p_locate___p_locate_4.1.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; - }; - } - { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { name = "p_try___p_try_1.0.0.tgz"; @@ -4786,14 +4762,6 @@ }; } { - name = "path_exists___path_exists_4.0.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; - }; - } - { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; @@ -4890,19 +4858,19 @@ }; } { - name = "pkg_up___pkg_up_2.0.0.tgz"; + name = "pkg_up___pkg_up_3.1.0.tgz"; path = fetchurl { - name = "pkg_up___pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + name = "pkg_up___pkg_up_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz"; + sha1 = "100ec235cc150e4fd42519412596a28512a0def5"; }; } { - name = "png_to_ico___png_to_ico_2.1.0.tgz"; + name = "png_to_ico___png_to_ico_2.1.1.tgz"; path = fetchurl { - name = "png_to_ico___png_to_ico_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-2.1.0.tgz"; - sha1 = "b7a59bc7e95093f6dd4dc85f27b9048e12d2fe71"; + name = "png_to_ico___png_to_ico_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-2.1.1.tgz"; + sha1 = "35be46f93c1ac8d77025f6f4b60c1fa567c1d47c"; }; } { @@ -4946,6 +4914,14 @@ }; } { + name = "printj___printj_1.1.2.tgz"; + path = fetchurl { + name = "printj___printj_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz"; + sha1 = "d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"; + }; + } + { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; path = fetchurl { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; @@ -5234,6 +5210,14 @@ }; } { + name = "readdir_glob___readdir_glob_1.1.1.tgz"; + path = fetchurl { + name = "readdir_glob___readdir_glob_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz"; + sha1 = "f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"; + }; + } + { name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; path = fetchurl { name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; @@ -5250,14 +5234,6 @@ }; } { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha1 = "6b30724e306a27833eeb171b66ac8890ba37e41c"; - }; - } - { name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; path = fetchurl { name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; @@ -5538,14 +5514,6 @@ }; } { - name = "semver___semver_7.1.3.tgz"; - path = fetchurl { - name = "semver___semver_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz"; - sha1 = "e4345ce73071c53f336445cfc19efb1c311df2a6"; - }; - } - { name = "semver___semver_7.3.2.tgz"; path = fetchurl { name = "semver___semver_7.3.2.tgz"; @@ -5554,6 +5522,14 @@ }; } { + name = "semver___semver_7.3.4.tgz"; + path = fetchurl { + name = "semver___semver_7.3.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; + sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + }; + } + { name = "set_blocking___set_blocking_2.0.0.tgz"; path = fetchurl { name = "set_blocking___set_blocking_2.0.0.tgz"; @@ -5562,6 +5538,14 @@ }; } { + name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz"; + path = fetchurl { + name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; + sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; + }; + } + { name = "sha___sha_3.0.0.tgz"; path = fetchurl { name = "sha___sha_3.0.0.tgz"; @@ -5994,11 +5978,11 @@ }; } { - name = "tar_stream___tar_stream_2.1.2.tgz"; + name = "tar_stream___tar_stream_2.2.0.tgz"; path = fetchurl { - name = "tar_stream___tar_stream_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz"; - sha1 = "6d5ef1a7e5783a95ff70b69b97455a5968dc1325"; + name = "tar_stream___tar_stream_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; + sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; }; } { @@ -6010,11 +5994,11 @@ }; } { - name = "tar___tar_6.0.1.tgz"; + name = "tar___tar_6.1.0.tgz"; path = fetchurl { - name = "tar___tar_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.0.1.tgz"; - sha1 = "7b3bd6c313cb6e0153770108f8d70ac298607efa"; + name = "tar___tar_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz"; + sha1 = "d1724e9bcc04b977b18d5c573b333a2207229a83"; }; } { @@ -6234,6 +6218,14 @@ }; } { + name = "type_fest___type_fest_0.16.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.16.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz"; + sha1 = "3240b891a78b0deae910dbeb86553e552a148860"; + }; + } + { name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { name = "type_fest___type_fest_0.8.1.tgz"; @@ -6346,6 +6338,14 @@ }; } { + name = "unzip_crx_3___unzip_crx_3_0.2.0.tgz"; + path = fetchurl { + name = "unzip_crx_3___unzip_crx_3_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/unzip-crx-3/-/unzip-crx-3-0.2.0.tgz"; + sha1 = "d5324147b104a8aed9ae8639c95521f6f7cda292"; + }; + } + { name = "unzip_response___unzip_response_2.0.1.tgz"; path = fetchurl { name = "unzip_response___unzip_response_2.0.1.tgz"; @@ -6362,11 +6362,11 @@ }; } { - name = "update_notifier___update_notifier_4.1.0.tgz"; + name = "update_notifier___update_notifier_4.1.3.tgz"; path = fetchurl { - name = "update_notifier___update_notifier_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz"; - sha1 = "4866b98c3bc5b5473c020b1250583628f9a328f3"; + name = "update_notifier___update_notifier_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz"; + sha1 = "be86ee13e8ce48fb50043ff72057b5bd598e1ea3"; }; } { @@ -6578,11 +6578,19 @@ }; } { - name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; path = fetchurl { - name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; }; } { @@ -6690,6 +6698,22 @@ }; } { + name = "y18n___y18n_5.0.5.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; + sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; + }; + } + { + name = "yaku___yaku_0.16.7.tgz"; + path = fetchurl { + name = "yaku___yaku_0.16.7.tgz"; + url = "https://registry.yarnpkg.com/yaku/-/yaku-0.16.7.tgz"; + sha1 = "1d195c78aa9b5bf8479c895b9504fd4f0847984e"; + }; + } + { name = "yallist___yallist_2.1.2.tgz"; path = fetchurl { name = "yallist___yallist_2.1.2.tgz"; @@ -6714,43 +6738,43 @@ }; } { - name = "yargs_parser___yargs_parser_18.1.3.tgz"; + name = "yargs_parser___yargs_parser_15.0.1.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_18.1.3.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz"; - sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; + name = "yargs_parser___yargs_parser_15.0.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz"; + sha1 = "54786af40b820dcb2fb8025b11b4d659d76323b3"; }; } { - name = "yargs_parser___yargs_parser_7.0.0.tgz"; + name = "yargs_parser___yargs_parser_20.2.4.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz"; - sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha1 = "b42890f14566796f85ae8e3a25290d205f154a54"; }; } { - name = "yargs_parser___yargs_parser_9.0.2.tgz"; + name = "yargs_parser___yargs_parser_7.0.0.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_9.0.2.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz"; - sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; + name = "yargs_parser___yargs_parser_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; }; } { - name = "yargs___yargs_11.1.1.tgz"; + name = "yargs___yargs_14.2.3.tgz"; path = fetchurl { - name = "yargs___yargs_11.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz"; - sha1 = "5052efe3446a4df5ed669c995886cc0f13702766"; + name = "yargs___yargs_14.2.3.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz"; + sha1 = "1a1c3edced1afb2a2fea33604bc6d1d8d688a414"; }; } { - name = "yargs___yargs_15.3.1.tgz"; + name = "yargs___yargs_16.2.0.tgz"; path = fetchurl { - name = "yargs___yargs_15.3.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz"; - sha1 = "9505b472763963e54afe60148ad27a330818e98b"; + name = "yargs___yargs_16.2.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; + sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; }; } { @@ -6762,11 +6786,11 @@ }; } { - name = "zip_stream___zip_stream_3.0.1.tgz"; + name = "zip_stream___zip_stream_4.0.4.tgz"; path = fetchurl { - name = "zip_stream___zip_stream_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-3.0.1.tgz"; - sha1 = "cb8db9d324a76c09f9b76b31a12a48638b0b9708"; + name = "zip_stream___zip_stream_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz"; + sha1 = "3a8f100b73afaa7d1ae9338d910b321dec77ff3a"; }; } ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index fcd06326e213..7da0186022a7 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage , electron, element-web }: @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.17"; + version = "1.7.20"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-3GFfldQoD5plIeuAOd4OcB/q7m8tKU6so+M8MlB6Uuc="; + sha256 = "sha256-kQMswcEGsefQ8HCWxYPgvxOKP5cgvXx8oCl5Inh6sOg="; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index 173977155e81..6ee48d53288c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.17"; + version = "1.7.20"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-9DyA3h0sQCzOFZ9gEReJrMQOnygFvEB7PeIpkG/F5H4="; + sha256 = "sha256-8R7l/Pmymd5+/Fri7z2/TDj1h2FL0QgLICoXajePing="; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 458808c832da..e4f8d3c99ee9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkFranzDerivation, fetchurl }: +{ lib, mkFranzDerivation, fetchurl }: mkFranzDerivation rec { pname = "ferdi"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix index a72ff17abcd4..9f772bf3f6d7 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkFranzDerivation, fetchurl }: +{ lib, mkFranzDerivation, fetchurl }: mkFranzDerivation rec { pname = "franz"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix index 96865374bed1..7bbad7982332 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -22,7 +22,7 @@ , expat , udev , libnotify -, xdg_utils +, xdg-utils }: # Helper function for building a derivation for Franz and forks. @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/opt/${name}/${pname} \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ - --prefix PATH : ${xdg_utils}/bin \ + --prefix PATH : ${xdg-utils}/bin \ "''${gappsWrapperArgs[@]}" ''; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 323a2521b0fd..f3736bfc64f6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, libGL, xcbutilkeysyms, xdg_utils, libtool }: +, libGL, xcbutilkeysyms, xdg-utils, libtool }: let version = "4.30.5.1682"; rpath = lib.makeLibraryPath [ - xdg_utils + xdg-utils xorg.libXext xorg.libSM xorg.libICE diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 7cb614f1d413..feffbe312d5e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -2,19 +2,19 @@ , fetchurl , appimageTools , makeWrapper -, electron_9 +, electron_10 }: let - electron = electron_9; + electron = electron_10; in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.3.1"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "0af87lvqw3sagi2cayripm62q17nfd841xz0ghvbixzfnqkvgf7x"; + sha256 = "1lv3ca9qlggyb8vcg8zlxv46i8fgx5qrx7i7y71dlqblajalf42p"; name = "${pname}-${version}.AppImage"; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix index a3df74a00161..f0846fc63f7e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -45,7 +45,7 @@ , readline , speex , sqlite -, stdenv + , udev , zlib }: diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index bca999f5762a..aadb18606e11 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit +{ lib, fetchgit , buildPythonApplication, buildPythonPackage , pygobject3, pytestrunner, requests, responses, pytest, python-olm , canonicaljson, olm diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix index 7229218a704d..c8f24e72a9ae 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchgit }: buildGoModule { pname = "mm"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix index bcd6fdc9f3e4..cd456b336dd6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, lib, stdenv +, lib , fetchFromGitLab , pkg-config , cmake diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index 9febaeee93f4..57db6a0750e9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -27,13 +27,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "00d6wx3lcgbks74jkdyifqxf8nlravqh88fyljd0sy7kzbah9msf"; + sha256 = "1v7k3ifzi05fdr06hmws1wkfl1bmhrnam3dbwahp086vkj0r8524"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 06f02fa80946..279eea2f2d7b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, openssl }: +{ lib, fetchFromGitHub, python2Packages, openssl }: python2Packages.buildPythonApplication rec { pname = "pybitmessage"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 7051799a2775..827cac7c2970 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -4,14 +4,14 @@ let mkRambox = opts: callPackage (import ./rambox.nix opts) { }; in mkRambox rec { pname = "rambox-pro"; - version = "1.4.1"; + version = "1.5.0"; desktopName = "Rambox Pro"; src = { x86_64-linux = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.AppImage"; - sha256 = "18383v3g26hd1czvw06gmjn8bdw2w9c7zb04zkfl6szgakrv26x4"; + sha256 = "1g7lrjm8yxklqpc2mp8gy0g61wfilr15dl80r3sh6pa5b4k5spir"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/rambox.nix index 6881ae270f9b..56930f561c78 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/rambox.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/rambox.nix @@ -1,6 +1,6 @@ { pname, version, src, meta, desktopName ? "Rambox" }: -{ appimageTools, stdenv, lib, fetchurl, makeDesktopItem }: +{ appimageTools, lib, fetchurl, makeDesktopItem }: let name = "${pname}-${version}"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 2a234edaa08b..97d8d39f6567 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkg-config, makeDesktopItem +{ mkDerivation, lib, fetchurl, pkg-config, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 9055b51d9756..e5221d861d36 100755 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "ripcord"; - version = "0.4.26"; + version = "0.4.28"; src = let appimage = fetchurl { url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; - sha256 = "0i9l21gyqga27ainzqp6icn8vbc22v1knq01pglgg1lg3p504ikq"; + sha256 = "0bczqp4kny7jlp06f4bh1xg0x17g8980dj6pk4waqc7qk88i6sfv"; name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 55935f69e1c8..29d4c3600c39 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages }: +{ lib, fetchurl, python3Packages }: let version = "1.63"; in python3Packages.buildPythonPackage { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 93ab78c439a6..601489d4532d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre_headless, libmatthew_java, dbus, dbus_java }: +{ stdenv, lib, fetchurl, makeWrapper, openjdk11_headless, libmatthew_java, dbus, dbus_java }: stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.12"; + version = "0.7.4"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "0i1y2p5qi2bwhkm8sv0wkb0lfi2vm26qalnpg6kn0ikcxkqkq5bc"; + sha256 = "18dv2944nsryl6372jqgb52z3s1grvgfc5sb1b1rgn0y84g8g46n"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; @@ -18,15 +18,15 @@ stdenv.mkDerivation rec { cp -r lib $out/lib cp bin/signal-cli $out/bin/signal-cli '' + (if stdenv.isLinux then '' - makeWrapper ${jre_headless}/bin/java $out/bin/signal-cli \ - --set JAVA_HOME "${jre_headless}" \ + makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \ + --set JAVA_HOME "${openjdk11_headless}" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \ --add-flags "org.asamk.signal.Main" '' else '' wrapProgram $out/bin/signal-cli \ - --prefix PATH : ${lib.makeBinPath [ jre_headless ]} \ - --set JAVA_HOME ${jre_headless} + --prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \ + --set JAVA_HOME ${openjdk11_headless} ''); # Execution in the macOS (10.13) sandbox fails with diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 09452aa90b6c..fe7a2e3ba0f3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.66.0.74"; + version = "8.68.0.100"; rpath = lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "11bpzr3j6fa5x62xrx2q2sr1wxjrn0a37053j4prxjcvdrc5in8f"; + sha256 = "gHjgQRdNABO+R+fcDurHDAQtZpckIxLbODM6Txz+LH4="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 66d59346c4b1..30cc7396c562 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { # https://github.com/erroneousboat/slack-term diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 54c652aab6a8..44642ab8a930 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -31,7 +31,7 @@ , nss , pango , systemd -, xdg_utils +, xdg-utils , xorg }: @@ -151,7 +151,7 @@ let rm $out/bin/slack makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --prefix PATH : ${xdg_utils}/bin + --prefix PATH : ${xdg-utils}/bin # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix index e964c654c708..71693485a1b0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix @@ -1,19 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "ssh-chat"; - version = "1.10"; - - goPackagePath = "github.com/shazow/ssh-chat"; + version = "1.10.1"; src = fetchFromGitHub { owner = "shazow"; repo = "ssh-chat"; rev = "v${version}"; - sha256 = "e4COAyheY+mE5zltR1Ms2OJ3I8iG/N1CZ6D7I9PDW5U="; + sha256 = "LgrqIuM/tLC0JqDai2TLu6G/edZ5Q7WFXjX5bzc0Bcc="; }; - goDeps = ./deps.nix; + vendorSha256 = "QTUBorUAsWDOpNP3E/Y6ht7ZXZViWBbrMPtLl7lHtgE="; meta = with lib; { description = "Chat over SSH"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/deps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/deps.nix deleted file mode 100644 index 4fc4b4b4909b..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/deps.nix +++ /dev/null @@ -1,84 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alexcesaro/log"; - fetch = { - type = "git"; - url = "https://github.com/alexcesaro/log"; - rev = "61e686294e58"; - sha256 = "1ckd5crq9rd12wpclahg2q0wprfg0whd6k9zbfzzkr6l1qpmmfam"; - }; - } - { - goPackagePath = "github.com/howeyc/gopass"; - fetch = { - type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "7cb4b85ec19c"; - sha256 = "1qyhjd6wx409g9cq3xbpbl2xl41nm00mxzcxm5gbqdlwsd0z80rv"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "v1.4.0"; - sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a"; - }; - } - { - goPackagePath = "github.com/shazow/rateio"; - fetch = { - type = "git"; - url = "https://github.com/shazow/rateio"; - rev = "4461efc8bdc4"; - sha256 = "1isy75cmm71q18mvs6xaizgdjqnn6pllkj4yvd42brfgfj84qz0w"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "884d27f42877"; - sha256 = "1ka5kqpw3wr3iawwxq4swmrwbww6v1cmds86z1nm0qb8fvhvpslk"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "eb5bcb51f2a3"; - sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "1957bb5e6d1f"; - sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; - }; - } -] diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix index 1dadc728eeef..58335bed4218 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qttools, sconsPackages +{ mkDerivation, lib, fetchurl, pkg-config, qttools, sconsPackages , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib }: diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index af3235bbdc7c..1625878a2d07 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -10,7 +10,7 @@ , at-spi2-atk , coreutils , gawk -, xdg_utils +, xdg-utils , systemd }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg_utils}/bin") + gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg-utils}/bin") ''; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 190e05158969..676902d68ef6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja -, qtbase, qtimageformats, libdbusmenu, hunspell, xdg_utils, ffmpeg_3, openalSoft +, qtbase, qtimageformats, libdbusmenu, hunspell, xdg-utils, ffmpeg_3, openalSoft , lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , range-v3 }: @@ -26,7 +26,7 @@ mkDerivation rec { ]; qtWrapperArgs = [ - "--prefix PATH : ${xdg_utils}/bin" + "--prefix PATH : ${xdg-utils}/bin" ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 20da2a65dc26..693a01f5d89a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -5,7 +5,7 @@ , tl-expected, hunspell # TODO: Shouldn't be required: , pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst -, xdg_utils +, xdg-utils }: with lib; @@ -22,12 +22,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.5.1"; + version = "2.5.8"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1qpap599h2c4hlmr00k82r6138ym4zqrbfpvm97gm97adn3mxk7i"; + sha256 = "0zj1g24fi4m84p6zj9yk55v8sbhn0jdpdhp33y12d2msz0qwp2cw"; }; postPatch = '' @@ -44,7 +44,7 @@ in mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash + qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 tl-expected hunspell tg_owt @@ -83,7 +83,7 @@ in mkDerivation rec { wrapProgram $out/bin/telegram-desktop \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ - --prefix PATH : ${xdg_utils}/bin \ + --prefix PATH : ${xdg-utils}/bin \ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 2853418da0e3..b5a6579db57c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -3,8 +3,8 @@ }: let - rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39"; - sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64"; + rev = "be23804afce3bb2e80a1d57a7c1318c71b82b7de"; + sha256 = "0avdxkig8z1ainzyxkm9vmlvkyqbjalwb4h9s9kcail82mnldnhc"; in stdenv.mkDerivation { pname = "tg_owt"; @@ -25,5 +25,10 @@ in stdenv.mkDerivation { libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf ]; + cmakeFlags = [ + # Building as a shared library isn't officially supported and currently broken: + "-DBUILD_SHARED_LIBS=OFF" + ]; + meta.license = lib.licenses.bsd3; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix index 93b3315c1eff..114b3ab8f4d1 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: +{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: # we now have libqmatrixclient so a future version of tensor that supports it # should use that diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix index e59e58644322..fc6c78a4f673 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1v9cdpy6i3xl70g75zg33sqi4aqp20by0pyjhjg5iz24fxvfaw6c"; + sha256 = "sha256-EElDi/VEYgYPpoDNatxcKQC1pnCU8kOcj0bAFojD9fU="; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix index 4c49f41f623b..256e026a060e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, python3Packages }: +{ lib, fetchpatch, python3Packages }: with lib; with python3Packages; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 004a4dab8236..8b306c075062 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , cmake , libxml2 diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix index f90269fc83e3..ba0f867b2aa1 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -1,5 +1,5 @@ { alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify -, makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg_utils +, makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg-utils , xorg }: @@ -54,7 +54,7 @@ in stdenv.mkDerivation { postFixup = '' makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \ - --prefix PATH : ${xdg_utils}/bin + --prefix PATH : ${xdg-utils}/bin ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index fb1f5a0a69c6..4367230f7756 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "xmpp-client"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 089f0b327af3..c431b5d0ce66 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, mkDerivation , makeWrapper , fetchFromGitHub # Dynamic libraries @@ -32,11 +31,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.4.57862.0110"; + version = "5.5.7011.0206"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "sha256-ZAwXhbZ3nT6PGkSC1vnX2y/XUOZfped0r3OuedI62gY="; + sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02"; }; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index bda9c5ae0a07..6ef9ec32538f 100755 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -3,6 +3,8 @@ set -eu -o pipefail -version="$(curl -Ls https://zoom.us/download\?os\=linux | pup '.linux-ver-text text{}' | cut -d' ' -f2)" +version="$(curl -Ls https://zoom.us/download\?os\=linux | \ + pup '.linux-ver-text text{}' | \ + awk -F'[ ().]' '{printf $2"."$3"."$6"."$7"\n"}')" update-source-version zoom-us "$version" diff --git a/nixpkgs/pkgs/applications/networking/insync/v3.nix b/nixpkgs/pkgs/applications/networking/insync/v3.nix new file mode 100644 index 000000000000..0c18ec60ab65 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/insync/v3.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchurl +, makeWrapper +, dpkg +, glibc +, glib +, libxcb +, libGL +, nss +, libthai +, wayland +, alsaLib +, qtvirtualkeyboard +, qtwebchannel +, qtwebsockets +, qtlocation +, qtwebengine +, autoPatchelfHook +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "insync"; + version = "3.2.4.40856"; + + src = fetchurl { + url = "http://s.insynchq.com/builds/${pname}_${version}-focal_amd64.deb"; + sha256 = "1bvqbbrfn5784nmb2qaflm1rzczqhvghhb6y5zaxrapyhygxbcis"; + }; + + postPatch = '' + substituteInPlace usr/bin/insync --replace /usr/lib/insync $out/usr/lib/insync + ''; + + buildInputs = [ + alsaLib + libGL + libthai + libxcb + nss + qtlocation + qtvirtualkeyboard + qtwebchannel + qtwebengine + qtwebsockets + wayland + ]; + + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapQtAppsHook ]; + + unpackPhase = '' + dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib $out/share + cp -R usr/* $out/ + rm $out/lib/insync/libGLX.so.0 + rm $out/lib/insync/libQt5* + sed -i 's|/usr/lib/insync|/lib/insync|' "$out/bin/insync" + wrapQtApp "$out/lib/insync/insync" + ''; + + dontConfigure = true; + dontBuild = true; + + meta = with lib; { + platforms = ["x86_64-linux"]; + license = licenses.unfree; + maintainers = with maintainers; [ benley ]; + homepage = "https://www.insynchq.com"; + description = "Google Drive sync and backup with multiple account support"; + longDescription = '' + Insync is a commercial application that syncs your Drive files to your + computer. It has more advanced features than Google's official client + such as multiple account support, Google Doc conversion, symlink support, + and built in sharing. + + There is a 15-day free trial, and it is a paid application after that. + ''; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index dcb25c736570..67d45c44868d 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipfs-cluster"; diff --git a/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix index 8d83c27e6208..abc81e213d7d 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs-migrator"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "ipfs"; repo = "fs-repo-migrations"; rev = "v${version}"; - sha256 = "0s2mmprhhb04i8pa3lfgb61wvlrp44xnb4d08y7vd2i82lmh234b"; + sha256 = "sha256-MxEKmoveIpuxBkGGGJHp9T11i3Py8a1fLpF0fWk0ftg="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/ipfs/default.nix b/nixpkgs/pkgs/applications/networking/ipfs/default.nix index fd9d8bd0d347..c54b4428819c 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchurl, nixosTests }: +{ lib, buildGoModule, fetchurl, nixosTests }: buildGoModule rec { pname = "ipfs"; diff --git a/nixpkgs/pkgs/applications/networking/ipget/default.nix b/nixpkgs/pkgs/applications/networking/ipget/default.nix index ded83f30a1af..8817d90dd6ed 100644 --- a/nixpkgs/pkgs/applications/networking/ipget/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipget"; diff --git a/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix index 842e160677e8..b72e28929e3e 100644 --- a/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix @@ -20,7 +20,6 @@ }: let - inherit (stdenv) lib; buildClient = monolithic || client; buildCore = monolithic || enableDaemon; in diff --git a/nixpkgs/pkgs/applications/networking/irc/qweechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/qweechat/default.nix index 18a4872a44fa..c4a67c8098a3 100644 --- a/nixpkgs/pkgs/applications/networking/irc/qweechat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/qweechat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python27Packages }: +{ lib, fetchFromGitHub, python27Packages }: python27Packages.buildPythonApplication rec { version = "2016-07-29"; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 66f48114546f..384a8b0dff39 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -27,12 +27,12 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.0"; + version = "3.0.1"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0ciddvyhyp38fnfsi1plj3z8d76f28lbzbxib2857vw7rzyqfcky"; + sha256 = "0f50kib8l99vlp9wqszq2r2g5panzphsgs7viga8lyc83v229b33"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index a2d52dbbb0fa..c42fe55169ea 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , python , fetchFromGitHub , pyopenssl diff --git a/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix b/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix index a4802c31ed2c..3b1fa79aa266 100644 --- a/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix @@ -1,9 +1,6 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: -with stdenv; -with lib; - -mkDerivation rec { +stdenv.mkDerivation rec { pname = "wraith"; version = "1.4.7"; src = fetchurl { @@ -25,7 +22,7 @@ mkDerivation rec { ln -s wraith $out/bin/hub ''; - meta = { + meta = with lib; { description = "An IRC channel management bot written purely in C/C++"; longDescription = '' Wraith is an IRC channel management bot written purely in C/C++. It has diff --git a/nixpkgs/pkgs/applications/networking/jmeter/default.nix b/nixpkgs/pkgs/applications/networking/jmeter/default.nix index 995070066e0f..d52d00f9a056 100644 --- a/nixpkgs/pkgs/applications/networking/jmeter/default.nix +++ b/nixpkgs/pkgs/applications/networking/jmeter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jmeter"; - version = "5.4"; + version = "5.4.1"; src = fetchurl { url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz"; - sha256 = "1hbyvh0hrvfvrsf7wpnwqsry5gaziac632s0bwb5zbq6y5b0z41a"; + sha256 = "sha256-TtrpmIHRzbUEiYesy9ArPzza3qShCNFtB/sVJe9hLPM="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/nixpkgs/pkgs/applications/networking/lieer/default.nix b/nixpkgs/pkgs/applications/networking/lieer/default.nix index aee21dca6458..3ad2762a2cfc 100644 --- a/nixpkgs/pkgs/applications/networking/lieer/default.nix +++ b/nixpkgs/pkgs/applications/networking/lieer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "lieer"; diff --git a/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix b/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix index dbcae7a0ec37..b568775481c1 100644 --- a/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix +++ b/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3 , wrapQtAppsHook diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix index b01ec9ef2cd4..b43e6bb093c4 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchurl +{ lib, buildGoModule, fetchurl , go, ncurses, notmuch, scdoc , python3, perl, w3m, dante , fetchFromGitHub diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch index 91978753ae96..e08161e61eb6 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch +++ b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch @@ -1,6 +1,6 @@ -From 6cf3c2e42d219b9665a43ca65f321c653b0aa102 Mon Sep 17 00:00:00 2001 +From c715a96c693baa0e6c8ab3c96b6c10e0a40bf7af Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak <me@tadeo.ca> -Date: Mon, 28 Oct 2019 08:36:36 -0600 +Date: Thu, 21 Jan 2021 10:40:49 +0100 Subject: [PATCH] Fix aerc breaking every time the package is rebuilt. On NixOS, the SHAREDIR changes on every rebuild to the package, but aerc @@ -8,28 +8,28 @@ fills it in as part of the default config and then installs that config to the users home folder. Fix this by not substituting @SHAREDIR@ in the default config until runtime. --- - Makefile | 2 +- - config/config.go | 8 ++++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) + Makefile | 2 +- + config/config.go | 13 +++++++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index d1c755d..1185a96 100644 +index 77f5e61..98cbc11 100644 --- a/Makefile +++ b/Makefile -@@ -24,7 +24,7 @@ aerc: $(GOSRC) +@@ -23,7 +23,7 @@ aerc: $(GOSRC) -o $@ - + aerc.conf: config/aerc.conf.in - sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < config/aerc.conf.in + cat config/aerc.conf.in > $@ - - DOCS := \ - aerc.1 \ + + debug: $(GOSRC) + GOFLAGS="-tags=notmuch" \ diff --git a/config/config.go b/config/config.go -index 32d07fc..8ffd3e8 100644 +index 87d183a..cb6611a 100644 --- a/config/config.go +++ b/config/config.go -@@ -472,6 +472,11 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { +@@ -470,6 +470,16 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { return nil, err } } @@ -38,11 +38,15 @@ index 32d07fc..8ffd3e8 100644 + sec.NewKey("template-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir)) + } + } ++ if sec, err := file.GetSection("ui"); err == nil { ++ if key, err := sec.GetKey("stylesets-dirs"); err == nil { ++ sec.NewKey("stylesets-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir)) ++ } ++ } file.NameMapper = mapName config := &AercConfig{ Bindings: BindingConfig{ -@@ -546,6 +428,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { - if err = config.LoadConfig(file); err != nil { +@@ -547,6 +557,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { return nil, err } @@ -52,6 +56,5 @@ index 32d07fc..8ffd3e8 100644 if ui, err := file.GetSection("general"); err == nil { if err := ui.MapTo(&config.General); err != nil { return nil, err --- -2.23.0 - +-- +2.30.0 diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix index dbc55850f9fd..8a5f607dd32c 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, notmuch }: +{ lib, python3Packages, notmuch }: python3Packages.buildPythonApplication rec { pname = "afew"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index b745a842b9f4..7eaefdd91c42 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -31,11 +31,11 @@ with lib; stdenv.mkDerivation rec { pname = "claws-mail"; - version = "3.17.7"; + version = "3.17.8"; src = fetchurl { url = "https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0"; + sha256 = "sha256-zbeygUmV1vSpw7HwvBRn7Vw88qXg2hcwqqJaisyv3a8="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 8deb7e84a2c6..3471795b435b 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.36.5"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0h1wz4hxsasihdvvsaxnmzka4afjw7603gn0qcw8rxpw114ib1bl"; + sha256 = "1s2jpviliazmhnpkh8dc57ga3c3612f2rnc0nfya5ndbi6lpzxhi"; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index c9fdbf3a9133..b8aaabca0fb0 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.38.2"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1whjgfhcxpb5yhhvyqb8pv71vprw6fv02czin4k4z6dxrxsq32qx"; + sha256 = "1kfshljvkpbh965rjlyy1qjjm0ic3rdxisyy9c5jjvv2qlk65b3z"; }; nativeBuildInputs = [ @@ -120,7 +120,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = "evolution"; - attrPath = "gnome3.evolution"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix index 2cb1fd56ecca..1d1dc030c314 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: +{ lib, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: python2Packages.buildPythonApplication rec { pname = "mailpile"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix index 2ced5e60db43..ec50e913176e 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchgit , rustPlatform , pkg-config diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index ea10bf892488..6cd0b3db7863 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, notmuch }: +{ lib, python3, notmuch }: python3.pkgs.buildPythonApplication rec { pname = "mlarchive2maildir"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index 104e0da9a81e..c0ebb3d8078f 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "20201127"; + version = "20210205"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-BkDGKZmpwahDw1vD67CyWfxD93H83kcpv5JBGVL5F/o="; + sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 5caaa9ce6e1e..48a212b4ffb1 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ optional sslSupport "--enable-ssl"; meta = { - homepage = "http://sylpheed.sraoss.jp/en/"; + homepage = "https://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index faf4fd7b452c..e86e847e8f37 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.6.1"; + version = "78.7.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/af/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/af/thunderbird-78.7.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f6fb6e449dbfb7478b5faffa0118845a2e55fb09e27f6b4bc63c4d8abd2f5db5"; + sha256 = "b9d7bacd982db97e531775ceca569e011603dbd2806a64bce43ef2ff30e6c8f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ar/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ar/thunderbird-78.7.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "33f0010135377291851e06fd43fe797fc331d93e018e4410b878ea7056e149b9"; + sha256 = "144647297e15556de5273e4f41712fc348b3dd401d71356d556c1ed09221037d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ast/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ast/thunderbird-78.7.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a5b4e9007b68abb9100f757d62ab976a4ecd8e7f389f896411b9957ecc175b62"; + sha256 = "9adb0d16ab633e4ffa3628969ccb542488fc299da5250c058828144f6f773781"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/be/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/be/thunderbird-78.7.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ed9846f9e06dcbc60b6dfb08814d19111558f91e96181b73338af8dc30b89ad7"; + sha256 = "3e54fa9ca34bcc11d411a979ed6bcd0a68b67da08cdba49e1f8a59794bc2dff0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/bg/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/bg/thunderbird-78.7.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c45a472030b9c42931966a8f90e0d9de9364a4bcca721678090a6702480a1a27"; + sha256 = "d576d3193c8e263d44942043b7e13c8861b2234ebb66969ac2cd20f84d6d769f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/br/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/br/thunderbird-78.7.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "37cda6ed4d6296d58b18b8325eeeeccc24088029999c4146ce429ff131eefab0"; + sha256 = "cd85058134a3b1364049d11a32bd964f8f9488fb48ece65d32fbb9005831b1d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ca/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ca/thunderbird-78.7.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "be91d650c2e8e26afe64373c8ad9213c9b3f903c0037ef9fe215ac4b46b2fe4b"; + sha256 = "5bf9ac27b8401f7c1479cacddc48e6310e6ac52e038f824193788dd6883512a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cak/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cak/thunderbird-78.7.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "5dab8ad6ab718855237fa5b43ac687e117e7eaeabc1702fe3cfc49af2f62fdf7"; + sha256 = "dfa2f97ee07f80adc5ded391bf01aea36e2aaf5a12ca9a510c5842756d9b9f8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cs/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cs/thunderbird-78.7.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a6c4afa14cefb505aade5a9d8b48a12d9d4f4823c8db7356eb635dc1c492f592"; + sha256 = "c76d755c9b54921a4edc9521aea2c51aa6301d954154fa6228195193000be56f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cy/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cy/thunderbird-78.7.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f45e222a10bdfe13c51a49e834d10f00320d7cd4093160d7b3616fce01a208ff"; + sha256 = "09475639dec1e370360c1c257b88ab45fbf2251bd22d1d50e9df078b035b8560"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/da/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/da/thunderbird-78.7.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "618d582a161d7ee6e7d304e200486b0af7df6cb1a0d154de9fd5ed208e71ef07"; + sha256 = "74cc98d1d99e9fd101e86051cf9aee26b40cfcb6203892adf6fd45fad5934926"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/de/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/de/thunderbird-78.7.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "79f86cc42efb58ba5b1da6d99c4f17ecbeafe235ed6fe03d772d48e3a4f9f4b1"; + sha256 = "509648ba2c7d9ef4db1755ae5e017d3dc1c73c5a3a94a293bbc9a505b5349e2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/dsb/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/dsb/thunderbird-78.7.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "13a929d9848809c9e44fe6d564fdd796fd3aa87103f6c9cbe5797d73ba4a858a"; + sha256 = "03dff2bbcb39d967c96934675134acd3ec74b39df3b6cc76846229ff92653483"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/el/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/el/thunderbird-78.7.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "fb520853ca5aac6380411e86858f58040369100ef1602452d0b1d12dafa4bd89"; + sha256 = "d6ec9ccdd2945d6de1718f32b551e922da1808d59acec937a16addaa0004e94a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-CA/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-CA/thunderbird-78.7.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ca00e11b378e00a1c551b45608e8261ca5cef088975925030b1c3294f8cd6935"; + sha256 = "bc97cadcf95bd0273708e1ea5cc8cdddd29f11b280213c1bd4f35a50d446763e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-GB/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-GB/thunderbird-78.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "fb792943477dfb5210b071832474e27a66290af49ed3204adbaef301bf97b9a8"; + sha256 = "82fd7e16cc8d5df4e775187d7f3e32b9b1dab3647cd766cec1649c39d08d5165"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-US/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-US/thunderbird-78.7.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "442cd017c9aa5321b7f59ca165f4a687e3619d2d5fefcb9af3127d2d8d0a69f7"; + sha256 = "463c1164b80f0f8bcb72f04fb0c17e32a637df988c0ea14d90469b1d7a958f82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/es-AR/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/es-AR/thunderbird-78.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c3b14e63e75efa1411480a8fb9df4e5f57c733f1782f122514c324d2cb943cbf"; + sha256 = "1ce69e73e8326e316d056a98efe601e7300714f1b65f69e2fcd175123fdca96b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/es-ES/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/es-ES/thunderbird-78.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f0aad6c895034cd01d55a9e17f3ec81912767b46b3d1db65da24884ee2dfe532"; + sha256 = "a04161f56944527f8537d46e046fbed715a554e4dc581aa636f1cec3fb1e1351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/et/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/et/thunderbird-78.7.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "07b29082709f888febae991196c05fc3de3b87a5b7371000d002ac59870c7d45"; + sha256 = "36c2e7ae029b65976b92cff62c3c3a97e8c44a73c2f5e48415260b23a23ff653"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/eu/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/eu/thunderbird-78.7.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0b49e505114f24832f337d265a9bf092d25e653790c595c698f3e11a82fd11d3"; + sha256 = "538a42bb6eb11360fa70bd06058dbd47f2a3eec53fbbfe0232ddfbbeb4a4187c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fa/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fa/thunderbird-78.7.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b333b2a40b4c57ed00c9833bb32a88a72a4db3e4b376db07b84fc146df9fc6c3"; + sha256 = "6e2b18166237fdf0d020570957ee7d0815d846a0aca8df2036cdf99e651cfce9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fi/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fi/thunderbird-78.7.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5e484dc76a50f77fbc24fac3c8d11f2b4501a3488b8dcc7cb5517b263833966c"; + sha256 = "1769213bf789a21572014d4d97c823db14e11f7a32b91d57d98bebe39a80786d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fr/thunderbird-78.7.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "63e95323a8b93831516ce0015a052d316a6d501f6c7a4a0b1bed6dd367367aee"; + sha256 = "60017c2151aed3782567d9c10817e89c738d6bce322fd33f1188bc25dc12ac3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fy-NL/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fy-NL/thunderbird-78.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d05e85a3fa9a212160821bcf26cde73eab17ddd1f879c4e1e5d46d28f27bdf17"; + sha256 = "3878ce39135e30a76c67182765f5fa7fc38b7019021aa86f0806028f67a7dfd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ga-IE/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ga-IE/thunderbird-78.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "475f4176d529afcc25b5480762ac0cfddaf61e0bd95fffc3761c152b10094ba1"; + sha256 = "b2e66dd3fe5a78d2eb6691bc91521b3f22fbb5be88c556e2d5158057db0d6cfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/gd/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/gd/thunderbird-78.7.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "13bbd007cab49ab1f37862392e3c02c5418deece6894fb2ddb1f15e9ce811bbf"; + sha256 = "c4722ceb4eca2afaa3502f2bc419b0ffc6cd2600100c5a91bf2cb7cdda60cd66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/gl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/gl/thunderbird-78.7.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8cb71820ff19c7a7c9186aefcd80cf27d0ace5331b320e2e4660d982921b6d96"; + sha256 = "0f34fd28523062c90c521b40b0a67ad23e3b2ba05fe5c03cc1da29d480fde1e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/he/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/he/thunderbird-78.7.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "12092b25ae77177bac52dd0555136b041dc409507401566d8f0f0973a59eabce"; + sha256 = "8cf8a0b5e1bd3ed116ac1dcbcb1857db9ccff8452ff0d1f3ac2957cada5883c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hr/thunderbird-78.7.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b9cff4319fb62af844d278c93a649b85c64469aaaf9881a6788aa25498afe5ec"; + sha256 = "827d0c46d404d871661af45d301645a1c888941741c1b6cad27c7c37aed52800"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hsb/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hsb/thunderbird-78.7.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3bb8f6d9989270197e5b99fce18e2558daf19317b47bea50d8a30a7934c68859"; + sha256 = "83e965004f0293c324393914cc931ccfa608360982d338859da1e7e2ae0f333f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hu/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hu/thunderbird-78.7.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "253c65d5a1a0b8780f8add3fa532d10290d7aa86e99efa8ed1c881f6ff76e4ec"; + sha256 = "120ca3f7b356c57d7fa2af63ebcb974ad0ba313fe9c615afa5553b2e7ab75e62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hy-AM/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hy-AM/thunderbird-78.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8dd61e4cbaddb8f97e466402e474adb6c22f2ac9b3d7ddeac53aecbb21ac1129"; + sha256 = "7d0c2c5854f0a5a2288cacb6bf0d2f8ecd838dffcc8ccd040f993af94cb92d13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/id/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/id/thunderbird-78.7.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b03444c14c9f73dce2620f1acfa975e165b2ee33d27a8bf359dd3b3a0a22199e"; + sha256 = "29462ae0dd0eaa8ac9370b8fc46ad8ad679ef44996a7f80468890b8a75ce4a29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/is/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/is/thunderbird-78.7.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "4d4e355365b20561b50f72027c160c2d0d3742a09654f6a2b5db80af4aa0b794"; + sha256 = "084aee31331bb0bbdf466d3c3a6bb1834dfbdddaefe0e8c6e1d4a91eec0725ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/it/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/it/thunderbird-78.7.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1ea72c07428ab4cff56541b6b18e571f1e0f0f22bd161071548d38746eee1015"; + sha256 = "f180ceb0cd9f2e1d3e975f30fffa968e938b18ebb3c45108b6758d36989918e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ja/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ja/thunderbird-78.7.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1983ca2ffd9a2c53a8ac46ee36757375f53d2f6c2ac519ce7fde004e11a6f48f"; + sha256 = "662f124e3a32ab9e6b6fbefed9b58779060d927558bbc9527d83936191e3e044"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ka/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ka/thunderbird-78.7.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "339b7be89dfda68efb30c6f72036f94fbaba9b230977b27506edf9f1e70b572f"; + sha256 = "2faece980493b0071e5d62a579f4e1c4d792a63293949d81fa96e70468044acc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/kab/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/kab/thunderbird-78.7.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5163897a19f9303a32dc69ad6697b458040ef09eb5b1b954617bd9833d66e491"; + sha256 = "7382fc4e006bcb05c0db2dc88f8aad32a3abbce2bcb32f28d6271658caf934b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/kk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/kk/thunderbird-78.7.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "aa93b34afbe38389722959e5e8bfe788d158b2a186768bcd1a3469c5ab728d88"; + sha256 = "c8c52e06cd3ac3a02dc0081a82b25223a1da5a918335f770660122c8a6ba750c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ko/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ko/thunderbird-78.7.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "06fac9843688e278a56d3bd4d650cb9f2a369c09343663cbfd79054c80a24dde"; + sha256 = "67928b2f6861b1071ff76c457f6aef4a9eb0d80f896331bdb847543c62b0dd11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/lt/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/lt/thunderbird-78.7.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "6bb215f78165bd0377c983c544a84e4bd41053af475a544e61c78bb2ee0272b6"; + sha256 = "aec1acfb847cea57772197d81d122e97915b03358c984293d40f6ce759b9e77a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ms/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ms/thunderbird-78.7.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "59b93cc98131bd462279d36d2449176d1c4f546b4512a7316e88063ffcb1d66a"; + sha256 = "9a4411e932789040abc939a64b9ad979104ffe868a969dabc27022dc9ff822fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nb-NO/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nb-NO/thunderbird-78.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "1d6f1b6d8db512d4ca330e4fd303efd2165cd7dea4055381b85d5c57534ad45c"; + sha256 = "c7cfcd78108d931c60e9a061ed459da9df0cee27b16085fd1c6f3d71d54cd2fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nl/thunderbird-78.7.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "30693fe9a43221a3afe5755257e0dc0820fdbdb6fc6fcff2ae39475a70a8f9dd"; + sha256 = "44e9a143f00636a9287b2f0774720fd372de25fff9de8ceb468bc81de1d7ade3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nn-NO/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nn-NO/thunderbird-78.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "dd27afaba1b3354a8a865e297e107f7717a00f83156c92b22ee18a08d6b2ba2f"; + sha256 = "75269ac3171d14ca6145c3d00ba004489f89fc9210cf3af0d4e0248e24dac273"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pa-IN/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pa-IN/thunderbird-78.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "90ca962ae6585842191bdbb8495b37b10fdd0b477760565369457e1945dcab6d"; + sha256 = "ef98d53446ad294eaa861919cc8e9e70f4f6458d3a4210a43ec37bd919db8aa7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pl/thunderbird-78.7.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1eb445495e9ff8b4f18eea7ce86655a6470b1d33b524c7eeb8938ecf030f1f20"; + sha256 = "682c6b2a5e808e65e1e233fb48bbd68058a7f2745648d01d6342c90316b8135c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pt-BR/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pt-BR/thunderbird-78.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2b45cf19695837209ddb6e079a1c05d449962dee94afd5bfb62ba22124b6eaf9"; + sha256 = "761988b180f3077cd9710324fd87ec577de5f5ee11c79404b416c64ba322c65a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pt-PT/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pt-PT/thunderbird-78.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "bf4d215bc674ffdc43f80a63f8a19e675209254e08e843b7ef447e488ce416ae"; + sha256 = "9182a7064d0f98a49b34b9bf78ae4d63fe6b588c51ceb48ffe0974455e767867"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/rm/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/rm/thunderbird-78.7.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "aa9ac4a13278437b400035205baf92556e09d3a333a8ce9a3c3df7b241851717"; + sha256 = "33a8bec5ee7240fb44e350139f60e1d7c92361020bba2857634af03e40ee0f87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ro/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ro/thunderbird-78.7.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "edf568ef69d3b8444469d00d9295e377d4b7e8e1df5257b6a13b83cdc4c18b13"; + sha256 = "a50168d1b5e62d7bec9d75714612614b9d2342fdc6b8f89959d50d1505cbf7d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ru/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ru/thunderbird-78.7.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "22b27fbf138272264ee643fd6b55eb803fcce68682150daedde303ea6d297062"; + sha256 = "555e630090fbc41711e88d0a8e822febf0619333c2bcace5bdfbfdfdddfbb0dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/si/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/si/thunderbird-78.7.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "477906e0205fd6961a0b2ab2bff27577cc02ee3bf90c66329221b666cd726ba2"; + sha256 = "f977bd3fb4caaefb03eb8c967ae4850c0b7b2b8dfa0f7d7cedfba0847788cdb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sk/thunderbird-78.7.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "df25d31d5fc75ffb4e961f8cdbde64183cc507efb2833e58f13ea9e3b849105d"; + sha256 = "f1e5c9787a2ae8f8aaceef1ca2963884031a6cb8dc0ab3c3230fa0021156cfc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sl/thunderbird-78.7.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4a2e66d474f2a8fee6e7a7158145c9474f9f03173e9b3e0c78f906ba612af99d"; + sha256 = "59a97046285bca3e5b8ba396d3afef69fe2cb5a41347e4e0a21e9ff66c03ae12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sq/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sq/thunderbird-78.7.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fb602510a4b58e7a4574987638794a423991a147284babd6b40d3a8b4a859b19"; + sha256 = "ed0cf7d341d42dedeaa224f7f1f8e005172134da591f65664a4aca717e6db44a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sr/thunderbird-78.7.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "12e203abd18020c9e22eb0142c916d084bc61afe3be55bd0555c1aeb8d11f086"; + sha256 = "fd61b2e8e048f162e59a1a428100e6d0556d7120de1f8b46decdfe60509de0d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sv-SE/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sv-SE/thunderbird-78.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "deef0110e1157c3a7521d1671cb54b8414d09b6cc2898f2bd3ba9f60e184ecd8"; + sha256 = "87afa3b4b12848de156ea61d1727dea1ef5b86bc83b583df55f089bd1d1bec1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/th/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/th/thunderbird-78.7.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2c963e0e3804b0e93b6e1c11d09974049f134c36f55f5d57f57449bdc6008326"; + sha256 = "0e9b959424106680bced6d924c184d1306f7f1fd34fb4d3e4d8a54cb191500bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/tr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/tr/thunderbird-78.7.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "8e4daca1bb4d4f93fa6f834c8d8269b91c0fb07f5310e7bccdae202b868c9758"; + sha256 = "f2d037cea39d2698e71a0885587302644450149434ac7c3234c7ae32c5f4d103"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/uk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/uk/thunderbird-78.7.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "57c1aeaeae081a253557e558c79fd8f85591495a56e9f1bec9153dd51214abf2"; + sha256 = "663aa8509cc75c074697509981bf54ab00eeddc50c53acc0221225c3d7c63f9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/uz/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/uz/thunderbird-78.7.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "6fcd73f96acf99decaa639cb0d1adf99d65be2dc75b9ca8ba2d15308ee524990"; + sha256 = "892209fbe5d48532710feab4ad8f38f9387e10b088d91a12c9778bc465af194c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/vi/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/vi/thunderbird-78.7.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "108b21717a42c94ea38f46186f5ee3d570da56d9bacfb4eca9d9b14779e74237"; + sha256 = "a66d1d470f4a76cfa8b31fa3d60acb91cc7657455f9aebf930e127c2acbf4c8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/zh-CN/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/zh-CN/thunderbird-78.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "09546642bc79c74a965e4700957c295527b7462d64744a651d5575127ce5c944"; + sha256 = "10830b4a84ca22c19ee329cb00b92816e9b74f99c99a1ba6cfc86171470d655d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/zh-TW/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/zh-TW/thunderbird-78.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "25f082fdf2051ceda74b12f3c6da76a18b66c928e204e9ce5364545540eee2a5"; + sha256 = "b88200643a70ba3391cfd3be6cbc7bb178c6170f26041d4153021736d03365f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/af/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/af/thunderbird-78.7.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "cc01b60e44a2449458af74acc1774266e7cb44ed4eadb9cea766195974694676"; + sha256 = "e78e2ef7411b3e6c0f2ed5c0729dfdc144f94e8575f2f30ae1cbaeb7c73188dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ar/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ar/thunderbird-78.7.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a51eca5032e0beb9dd16bb18e1efe3dde8343ad964dabd25457fc5deea61f858"; + sha256 = "42c3f3b177a50afd6640db6815e7c159048cebb6dd5613c2fdf9ef18871d40cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ast/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ast/thunderbird-78.7.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b6fed93d30de5635539e2a2f38e78b6e90df82ed79e9e3190f60389b598b928b"; + sha256 = "b8fb786756051169d96a4fecf05cdabf4becc8fbcabd56ba676e96286a80b9d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/be/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/be/thunderbird-78.7.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "7d8e58062d885a35be4cb5e66ed9e1752ba7d1b21c615f255766cde5d737fedd"; + sha256 = "4e3f8f26b1321d130fb16b5eb30c3b3c3a7863e6d43ee9604f1a6da97228c85f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/bg/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/bg/thunderbird-78.7.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "daa18d443e9772f5d956f2b1aceb2186a20b39f18376d4a0ca021adc2436426e"; + sha256 = "0385b615dfb21f33b3e84b6c9213d3d8980379bb4be07967f5309888078ac177"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/br/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/br/thunderbird-78.7.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3d9fb8cb96a670225b30f898b83d7ceebf9a43b639e1e60d38478c2d9e1bb8f3"; + sha256 = "e338d6b439577af562c4dbcd2951176d2c6cf87254203e6d20602de4563484c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ca/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ca/thunderbird-78.7.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "624f313e09d8ec67ec08ee57a4ee78105e05d378c474d1cc005d12061e55f629"; + sha256 = "71f1b5f1b35a9c5712ba6cedbf3de96f4a3814655c44ed1cda48d4e5a56c3e03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cak/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cak/thunderbird-78.7.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "bd483d57306326d61b8bae407a4e4fffca4a6f6a6f57b6ebc4ee9f1b0bd2b38f"; + sha256 = "0f616eb61c0de3e38d2092ae215613ba104be279027259def8bca4082bd74cd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cs/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cs/thunderbird-78.7.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "0262e549c966460469ac870492587c66114bdb96ef92e48ce50d9f28ba3f3e5c"; + sha256 = "8de26b3daa7b087fb94a349e909da703867665fb2b4add360584c8d61f0c84ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cy/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cy/thunderbird-78.7.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3a22886e71d3eb8fa6aa683322db0cf19f14b80b4e97a2226dacfbcce7aa0574"; + sha256 = "74e28fb04e08bcfd68215eec443fde725077850e412798c1f0870e776ecbeeb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/da/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/da/thunderbird-78.7.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5c008c00784ac37ecf56fe24f38952b111d531936de00f47034fbc5a46ba2158"; + sha256 = "d50f37a31e4e5805084fa14bf639057b543deac99738871c402ad9af9684ce20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/de/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/de/thunderbird-78.7.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f3a1f1bc1b8ec9701050440c9312440a29392118cb680d6485836197c07ba44d"; + sha256 = "7aa84ada2e6cb6b467a618b234a7cd0370f5d71fd1eb0f5da1addb6478665ad3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/dsb/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/dsb/thunderbird-78.7.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "fb4df74e6c293123fed6f1b7fc776cb2e1009f8655d27acc9c0cf6d5872190f8"; + sha256 = "e273b80d5039097a34e7e2c96f65aca112e68d72a82782e783ea9412e49ab21f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/el/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/el/thunderbird-78.7.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "452ecc706867078d54190da0e25d346ee120ea4ebd6be6ac494f67709ffd1975"; + sha256 = "f31dfc543cca8d8f3c6e1cc40f8a07ead7b231222c8e04e5e2202c315c4708d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-CA/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-CA/thunderbird-78.7.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "941852cf3463df6d80686b1808f341a2e21206dfebcbcfd6bdea25adbae5580c"; + sha256 = "534f8008886a3028c09afb1c030923359f8ee0c85c6e961faa4c974b6c2c30da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-GB/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-GB/thunderbird-78.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "83e49ecdebe816c02244d6c5db84ccf9953b2b7349e8e880c3febca7de7ffa09"; + sha256 = "c9c138e5d92847c0c0ec82d1799fddf1267b95a5f6ef2cae7820f560aff53732"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-US/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-US/thunderbird-78.7.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "9a93ebefdca24266b55568538d834e139da78f5aea9f3e264c4feb40f8c4f820"; + sha256 = "6ec06f3a432301745ed24607b0549602ae31bf6e051ca9a4079f4cd6caf2041f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/es-AR/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/es-AR/thunderbird-78.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "88e1c5c7b4bc77005bcb384f578a99288bddd99877a10e95920a994767537f05"; + sha256 = "8debebc56ee0fbcbf2507f98f28f7807b55d4d768bd40c7820aa9e4f7dc9f0ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/es-ES/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/es-ES/thunderbird-78.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6ef1618adf242f6f1aad30d4d872f85d0135a3a86e3783b6ff5bd742c06e6806"; + sha256 = "58ac431d1b48a1c8224e414577a7405f20336cd990f6e4d8399e304cc5f38a3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/et/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/et/thunderbird-78.7.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "701e0fe34fddbd85369550e3ac6aa099d93aff19207c750b74f0ea36e86857a6"; + sha256 = "a80917893c189acbd745e56820b7f4fce1ebf14e99be8700db75817ffa3eccf5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/eu/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/eu/thunderbird-78.7.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "08904babb0a69cd3bc19575d8e533804525b5786e1aebd3236785e7c574b113e"; + sha256 = "f305db54f9cc504777ee9d329ca1da97a8642f7505903b2744cb7d86382b0ccf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fa/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fa/thunderbird-78.7.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "083c128daf6fd05d325282fb7c4648d6cb7c86209a6b940a07f2df730ca25906"; + sha256 = "0a90e573bf94097f790dec0ef2771266bf115c0c4768c3952758f8c17f7cfb70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fi/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fi/thunderbird-78.7.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ffe71bf498ba41b5fc97f67a99e838b4fafbe383333b0dbc4ec306b362529574"; + sha256 = "264104b86cd034927586520b6c4df25b1c75da4d97ea18bffd74261e553b4eb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fr/thunderbird-78.7.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0160e46be32847dd1c4e597bd1dbd0734aa32a327df93b6d7266879b6c54733e"; + sha256 = "2cbca14d94252f24dd50c971fd5ad367b4b3c0d3ccfd2d9ce8b18cb1df62a82c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fy-NL/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fy-NL/thunderbird-78.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e3292054a4c7d10add34480a828f35b09e103277ad754d4e45869c72a662ed5a"; + sha256 = "d60c543f59ebdb539b9d3799d77f4ad1d05738cc5d1b78d016a7d2f036d72095"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ga-IE/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ga-IE/thunderbird-78.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "071efc85f1461c2bfee5c77222c117363b0f37714c25c65f0a6d1637df791aa3"; + sha256 = "2d0a19e3a702a72866af8c8e9aac64e9c41b3b1bc44de53ec42b56efd657cd63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/gd/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/gd/thunderbird-78.7.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "731768809717bb73432deff720252af855e71e7f7743f7316f60fd25f0ce046a"; + sha256 = "93eaaf7d5c6cdf1947e25fbd053185f09f60329ba729a53f12d272f24dca6bf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/gl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/gl/thunderbird-78.7.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0d7f6686fc184f0c0efe3a44793e511c8e229265bf43aacecf766a7189ba323e"; + sha256 = "02d78333abaed79e7a2fccc6af3edef3077e08cadcc83fa2856779b6d24e9113"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/he/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/he/thunderbird-78.7.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "dc2dc901c86b5b0af5612e80ea8bb145e33670fbfe338599e3995c43115622a7"; + sha256 = "d4dd60245672fc23e114d2cfef40ff69faf08a2f188969deff7d084d8aebd64f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hr/thunderbird-78.7.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c720e60e7e0c6ea7bde01111a0bee647c05c17f6fd05a7e87d5733a55b4ab7e8"; + sha256 = "0aba235af4ebdd924d9d909755dd059025c1b502ab0056a24ef0eb5aea05b9ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hsb/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hsb/thunderbird-78.7.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f96276ffad03bfbe04ea7424e9d2fdbd2f3af89da54f2f48e5a36267f8b6a26d"; + sha256 = "acc53828d809a21b3a5bc6b00cf5681b376284e4818c8db250f61a3117573f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hu/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hu/thunderbird-78.7.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "2376d64c5c2ea53ddf07bac4712e8375d91dc92e4c22eb123d6bea4258f5c194"; + sha256 = "39aac6a7e96fbc71c9e537f4312fa528c0f3b56a5d669638ca2a4ff2a4823cb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hy-AM/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hy-AM/thunderbird-78.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "31a4d4fe82eb5b1dfc949728c9fc386b7a8f64a3c31428aafb58bd3eb3439253"; + sha256 = "bb1fdc6084ca5d761823b5391aa237d14d62f783007cbb2d6ccff1b69a7b3142"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/id/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/id/thunderbird-78.7.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c47d68876d3dc1789cfe921ba05096e45351c8df9bfcda01f9d5d7b40c484cd2"; + sha256 = "340b91be60235a91b1a130d68e9b5ddc16d63eba381cc59efd2d396764bf2327"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/is/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/is/thunderbird-78.7.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7bf6cf429ffaa4567180c56033666287e10c8a09478a077ba1ddd9b94f13d048"; + sha256 = "4f3b255119669de976714089d11532342eb6c1ede95e98d8de09413cdaf28c4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/it/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/it/thunderbird-78.7.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ea1659937f1a9453513c3ce92e36fdf8c194dd1253bc723c4e0e0c2797c97a3f"; + sha256 = "1fdda6110ef1eec5702490dfb786fadeb6bbb73fa849526327baebdf3aeaf348"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ja/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ja/thunderbird-78.7.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c6fc0d5fa9d6eefbe8a8d867b96c1f4230ca3a8604c83eb963330212a6c8d633"; + sha256 = "fd10c2307c71e143d76dfba7d26ea15a6a211878bcf1287128d5706018fb3083"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ka/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ka/thunderbird-78.7.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d05682cfcd90fc8072890e63fe3b9817b57759d0592876b53dbb1a1e9d024fa5"; + sha256 = "b796f8b6aaa28a23726afe915b741b7c89ed73f4e731bf7fad3848aade16001c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/kab/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/kab/thunderbird-78.7.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "74a8edb8be388cf7a32904a123bd4bf6f98fbea229327eb38843900769dafb2f"; + sha256 = "35941699918a3177b092c650a73d8bc8f6d06bdf8cbc5c33e492d93f6cb0f198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/kk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/kk/thunderbird-78.7.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b4c1c9e4e7107ea47d5a4c271b581afd98be4f04c6fe9d427f30e7bea4d70fbf"; + sha256 = "3ea99defb54f2e672d48b424e842c876ad0ceacd87cd19cc643acb55586948ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ko/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ko/thunderbird-78.7.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "de1d69f07f087fbbe0b085fbcf57fdf77baea36f09ad95594e9f3eabde835365"; + sha256 = "4cfa908b81773b57486b8144eb61c949c70615eafc1b3d050b6ceb6292958769"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/lt/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/lt/thunderbird-78.7.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a2b4dafb34e35da9d7ad939fcd00c1d8730aba99ba71efb1c62dac95cb873209"; + sha256 = "0d668e8a27f7044c610cff1028f245d2952abf6320ce905365bd42a39df85c23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ms/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ms/thunderbird-78.7.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b8d998101f30ae03a94e6b9c802d41d0c7afe2f837f92be7ffb9ac37998c1ab6"; + sha256 = "a632e60198e189d33e87a01c084179bdfb8f8c1d1547dfa4747dec325d1c04c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nb-NO/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nb-NO/thunderbird-78.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5b2b419b1a79ff1ac28af11a9649a5f68c0eb06a813687280a8d01edf09db4e6"; + sha256 = "d0336060f8e8b632462df91dc0e3ba33f2a7dbf1da6084d41961c05fbbedd46b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nl/thunderbird-78.7.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "428e422214e706c5cfcbbcf2bf1e9190168d9cbaaf7a9aa94dfbe078ca1fa38c"; + sha256 = "4e9c1921dac5ce0008b7380d810d5ee4530c4d336c79c6a274c657ea338a4ca1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nn-NO/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nn-NO/thunderbird-78.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "0fb80dd45a0f7ddfcfe55d7f99d47279a083a4ca6d813d3791c21c14c759b1fe"; + sha256 = "c33045aaa5d9054022431cf66f03ba2485ea7c68553ea245b73c8cf33b4458fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pa-IN/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pa-IN/thunderbird-78.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d4e17383fd04a300b416a291a1b50071284593e635c5c4cb101362dbb1602612"; + sha256 = "8b3810587f61e029a2536cb0eceb8b0b26656adf9ce17e8a7f020ed41b6e5724"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pl/thunderbird-78.7.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c76deda25f28bc43489ef5c13c03f95c52c49b7c58311ea173c853ffe6de0a06"; + sha256 = "01c8e6ba91037b8e5f713fd7d0dc9b6025aa3dc83fd8b13f1490dd849ec5e87f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pt-BR/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pt-BR/thunderbird-78.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e7a29a78acd5a7daf2366f2b79f7a51df37f19687e84213de61af2065a011e8a"; + sha256 = "9ab3d18699c6de55a198028592da01b576d67920375cbc2154d356bdf7fd4ccc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pt-PT/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pt-PT/thunderbird-78.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "23cb3cab0228b1290d9315b2416940293df21a53231726937af133a20a102a7c"; + sha256 = "3446b5b82aeb058ff880d82fa7da923231a7104bcef77bc08f640490c79b24b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/rm/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/rm/thunderbird-78.7.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "0c2175e117964deb87949a3047ce72a11ba7781581f6dcd583fecf51680a1573"; + sha256 = "0e1ba7a270021b2df2f189715ddd6b0d540c35dbfb3f45d8216b24e29c6ecd25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ro/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ro/thunderbird-78.7.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3b3395c39fa032ced0af7508c20a24341b1e893b26ac6430dfebd771ed86478b"; + sha256 = "9845b2e33d758474c44e46804c7c49255f3acf9f25c8afa299320828cefb3ec8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ru/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ru/thunderbird-78.7.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "9933df6138ccf8042e82181e629b97166f7661d26dbeb524d0954ac13c9795be"; + sha256 = "60dc7072a6dfa0723972522d4a06be75c99e6e1b423e68e91af276f2a325913b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/si/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/si/thunderbird-78.7.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b50d48a71acd7c399877c5b6507bd0228c3ca88b3f7ee57748167d579d76c2a1"; + sha256 = "fd08c36b8143196ca73aade09e3a8292bab0ce8b6e6d18705eed2594f342ce86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sk/thunderbird-78.7.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "9a84aec070338c33eec3e617e19f7452c9436c4671cfca6374b45c4d146b7258"; + sha256 = "068d927b94908224c7a789bfe33d1e884228d82d3f30e573a0006136d5841c5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sl/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sl/thunderbird-78.7.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e8398068668cad4f0a0070d2545523c6d3cce2352e753355e8a195a90b3daaed"; + sha256 = "27d3a7f5549c48fa2724dc98b8df72bf2b843b0cc34d55371f050ca217cd2ed3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sq/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sq/thunderbird-78.7.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "91aa97a9ac1951bd43a46e7c2b36f7d865d307685b20c5dabe48c83714a82bc1"; + sha256 = "b8d3ca545ff88c854b13e1ee89793b33df39f3d6713aae8fb4a2fa3be2d6f73f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sr/thunderbird-78.7.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "ef6b30e33e1ad8f771ef4b5a76305369e5cfeed47982a65996c9ceb23409f76a"; + sha256 = "10d0f70e52bbb8b0978ff6c26359120bb537cc9f15b47a93744ad8ee6dbd7b96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sv-SE/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sv-SE/thunderbird-78.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "48b9733a90ed561d7439369c115d9a2778bfbe83222e786564c98f7c5396de89"; + sha256 = "15fd51de4cd82eaadfb0c9a5231cd6c8f83a58eca1eb66acafa037ca8ae76767"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/th/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/th/thunderbird-78.7.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "9759c011a43e0622d4a42ac3462039d70eef678f633863ed24f3cb5736b4b8ed"; + sha256 = "07a6289101aa3d105c2a358ea53d1045bfc3616cd909e57b5a577bcba38dba0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/tr/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/tr/thunderbird-78.7.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5f9e153ca23c3ff3b9bcae816176cfb4c89845a05481d98b538254603e981896"; + sha256 = "6253f5e59cf07cfe8bbdd566b27ad9cd56aab29f40c42df1368d7e14d064a27a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/uk/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/uk/thunderbird-78.7.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "cde508d6b9e7590b50902afe6497328cf087cb7519ea4df2de0a5d47ee8e6034"; + sha256 = "e4e37d8194d8df48810afc47463d044e4b4b9fdd0752b0199e4c6a7aa1b46d60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/uz/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/uz/thunderbird-78.7.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "0a533d7788c957aab3615a04eb0bc6db12acf92d4ccdef5d1763f0e8bf4f3dc3"; + sha256 = "983d9701e367017ada3b6583d9e6985a73609c642968f1c82ec9b08644fe82b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/vi/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/vi/thunderbird-78.7.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4e30ead1cf49a7716c25759fd5e84efe3edc8dd5722367d50417f2b28e3fb376"; + sha256 = "b743d0c18257880cf0d7c463a0e39f6029fede79a534bef9dbd5ffe6ba3b10e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/zh-CN/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/zh-CN/thunderbird-78.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c673aead55f3762b68a9c692d422d61a407bca31cd9dbfbe63d8ec4292c24ed8"; + sha256 = "8cc5d4a05eef0498fe12476e7ee7a91dce0c69234b78278cc7985505708ff8ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/zh-TW/thunderbird-78.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/zh-TW/thunderbird-78.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9c5d7cc03df92efa4be3dfc2f9521f77253fba4abd961a21e4d20ac19495244e"; + sha256 = "5070474b2ac89d09e45bced9513b0f317d4dce76c57ce5f82c75feafb6d49ec3"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index ddc4b7c58fb6..819fa25b86d7 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.6.1"; + version = "78.7.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1vzka0msy6gqyxgwyp2dknp6rmgzhcjsyq2hf798wf4wrb7rrrsyrgqrd8skss929wakda0slqng505lhig79za7wyyh531f7i9qbv7"; + "328p14mgcam4dxx0asbgp4v2v559bwbw7z2kxd5yfwkna040r9ccrkkirma5580z9vkwb0rcjlmai9wrbacxrg8hg65d8vylvnkampy"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index 8b78c49a2f57..82140f2d77d8 100644 --- a/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, fetchurl, dpkg +{ stdenv, lib, fetchurl, dpkg , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3 , xorg, autoPatchelfHook, systemd, libnotify, libappindicator @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2020.7"; + version = "2021.1"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "07vryz1nq8r4m5y9ry0d0v62ykz1cnnsv628x34yvwiyazbav4ri"; + sha256 = "1ksa327zaiwmcmzv4n4ycfzc4sqhj2492c5ir0mqlx7x2nnhx6q7"; }; nativeBuildInputs = [ @@ -84,9 +84,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mullvad/mullvadvpn-app"; description = "Client for Mullvad VPN"; changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne ymarkus ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/mumble/default.nix b/nixpkgs/pkgs/applications/networking/mumble/default.nix index d93e5fbb9637..2eeb151bebeb 100644 --- a/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap -, alsaLib, python +, alsaLib, python3 , rnnoise , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null @@ -25,7 +25,7 @@ let patches = (source.patches or []) ++ [ ./fix-rnnoise-argument.patch ]; - nativeBuildInputs = [ pkg-config python qt5.qmake ] + nativeBuildInputs = [ pkg-config python3 qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); buildInputs = [ boost protobuf avahi ] @@ -133,14 +133,14 @@ let } source; source = rec { - version = "1.3.3"; + version = "1.3.4"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; rev = version; - sha256 = "1jaq5bl5gdpzd4pskpcd2j93g2w320znn4s8ck8f4jz5f46da1bj"; + sha256 = "sha256-njovShQpW0JNeeE8VugdmGzDk3fKG8/fcJoBgdyTZug="; fetchSubmodules = true; }; }; diff --git a/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix b/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix index f6cfb2cd2e45..64326c6b2160 100644 --- a/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix +++ b/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/applications/networking/n8n/node-env.nix b/nixpkgs/pkgs/applications/networking/n8n/node-env.nix index 759fa71c5aab..c2b723195b77 100644 --- a/nixpkgs/pkgs/applications/networking/n8n/node-env.nix +++ b/nixpkgs/pkgs/applications/networking/n8n/node-env.nix @@ -1,8 +1,11 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + python = if nodejs ? python then nodejs.python else python2; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise @@ -242,8 +245,8 @@ let if(fs.existsSync("./package-lock.json")) { var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - if(packageLock.lockfileVersion !== 1) { - process.stderr.write("Sorry, I only understand lock file version 1!\n"); + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); process.exit(1); } @@ -445,8 +448,8 @@ let ''; } // extraArgs); - # Builds a development shell - buildNodeShell = + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = { name , packageName , version @@ -465,8 +468,8 @@ let let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ + in + stdenv.mkDerivation ({ name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] @@ -512,6 +515,27 @@ let ln -s $out/lib/node_modules/.bin $out/bin ''; } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; in stdenv.mkDerivation { name = "node-shell-${name}-${version}"; @@ -538,5 +562,6 @@ in { buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeDependencies = lib.makeOverridable buildNodeDependencies; buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix index 09d2fc5ccdf4..b497190b1887 100644 --- a/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix +++ b/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -13,13 +13,13 @@ let sha512 = "l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA=="; }; }; - "@azure/ms-rest-js-1.9.0" = { + "@azure/ms-rest-js-1.9.1" = { name = "_at_azure_slash_ms-rest-js"; packageName = "@azure/ms-rest-js"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz"; - sha512 = "cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA=="; + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.1.tgz"; + sha512 = "F1crHKhmsvFLM9fsnDyCGFd2E2KR9GEZm5oBVV5D5k2EBQ7u7idtSJlSF6RDLDIrGWtc4NnFdYwsoiW8NLlBQg=="; }; }; "@azure/ms-rest-nodeauth-2.0.2" = { @@ -31,6 +31,15 @@ let sha512 = "KmNNICOxt3EwViAJI3iu2VH8t8BQg5J2rSAyO4IUYLF9ZwlyYsP419pdvl4NBUhluAP2cgN7dfD2V6E6NOMZlQ=="; }; }; + "@dabh/diagnostics-2.0.2" = { + name = "_at_dabh_slash_diagnostics"; + packageName = "@dabh/diagnostics"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; + sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; + }; + }; "@icetee/ftp-0.3.15" = { name = "_at_icetee_slash_ftp"; packageName = "@icetee/ftp"; @@ -40,31 +49,31 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@nodelib/fs.scandir-2.1.3" = { + "@nodelib/fs.scandir-2.1.4" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; }; }; - "@nodelib/fs.stat-2.0.3" = { + "@nodelib/fs.stat-2.0.4" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; }; }; - "@nodelib/fs.walk-1.2.4" = { + "@nodelib/fs.walk-1.2.6" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; }; }; "@oclif/command-1.8.0" = { @@ -112,13 +121,13 @@ let sha512 = "yojzeEfmSxjjkAvMRj0KzspXlMjCfBzNRPkWw8ZwOSoNWoJn+OCS/m/S+yfV6BvAM4u2lTzX9Y5rCbrFIgkJLg=="; }; }; - "@oclif/plugin-help-3.2.0" = { + "@oclif/plugin-help-3.2.1" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.0.tgz"; - sha512 = "7jxtpwVWAVbp1r46ZnTK/uF+FeZc6y4p1XcGaIUuPAp7wx6NJhIRN/iMT9UfNFX/Cz7mq+OyJz+E+i0zrik86g=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.1.tgz"; + sha512 = "vq7rn16TrQmjX3Al/k1Z5iBZWZ3HE8fDXs52OmDJmmTqryPSNvURH9WCAsqr0PODYCSR17Hy1VTzS0x7vVVLEQ=="; }; }; "@servie/events-1.0.0" = { @@ -166,13 +175,13 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; - "@types/connect-3.4.33" = { + "@types/connect-3.4.34" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.33"; + version = "3.4.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz"; - sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz"; + sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; }; }; "@types/debug-4.1.5" = { @@ -184,13 +193,13 @@ let sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; }; }; - "@types/express-4.17.9" = { + "@types/express-4.17.11" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.9"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.9.tgz"; - sha512 = "SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; + sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; }; }; "@types/express-jwt-0.0.42" = { @@ -202,13 +211,13 @@ let sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; }; }; - "@types/express-serve-static-core-4.17.14" = { + "@types/express-serve-static-core-4.17.18" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.14"; + version = "4.17.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz"; - sha512 = "uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz"; + sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA=="; }; }; "@types/express-unless-0.5.1" = { @@ -247,13 +256,13 @@ let sha512 = "9bVao7LvyorRGZCw0VmH/dr7Og+NdjYSsKAxB43OQoComFbBgsEpoR9JW6+qSq/ogwVBg8GI2MfAlk4SYI4OLg=="; }; }; - "@types/mime-2.0.3" = { + "@types/mime-1.3.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.3"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz"; - sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; + sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; "@types/minimatch-3.0.3" = { @@ -265,22 +274,22 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-12.19.8" = { + "@types/node-12.19.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.19.8"; + version = "12.19.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.19.8.tgz"; - sha512 = "D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz"; + sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw=="; }; }; - "@types/node-14.14.10" = { + "@types/node-14.14.22" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.10"; + version = "14.14.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz"; - sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz"; + sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw=="; }; }; "@types/node-8.10.66" = { @@ -337,13 +346,22 @@ let sha512 = "sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw=="; }; }; - "@types/serve-static-1.13.8" = { + "@types/serve-static-1.13.9" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.8"; + version = "1.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz"; - sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz"; + sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; + }; + }; + "@types/snowflake-sdk-1.5.1" = { + name = "_at_types_slash_snowflake-sdk"; + packageName = "@types/snowflake-sdk"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.5.1.tgz"; + sha512 = "0RPrY9NZZn3botFzmW+Yo7Qx8J0KbIRfrWOzVFqG9iN6qo9WfpZwoqApC8Y6y9htZBdpfAweeVQdyMOm6B8Z9w=="; }; }; "@types/tough-cookie-2.3.7" = { @@ -409,6 +427,24 @@ let sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25"; }; }; + "agent-base-2.1.1" = { + name = "agent-base"; + packageName = "agent-base"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; + sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + }; + }; + "agent-base-4.3.0" = { + name = "agent-base"; + packageName = "agent-base"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz"; + sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg=="; + }; + }; "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; @@ -418,6 +454,15 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; + "amqplib-0.6.0" = { + name = "amqplib"; + packageName = "amqplib"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/amqplib/-/amqplib-0.6.0.tgz"; + sha512 = "zXCh4jQ77TBZe1YtvZ1n7sUxnTjnNagpy8MVi2yc1ive239pS3iLwm4e4d5o4XZGx1BdTKQ/U0ZmaDU3c8MxYQ=="; + }; + }; "ansi-escapes-4.3.1" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -445,15 +490,6 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; - "ansi-regex-4.1.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; - }; - }; "ansi-regex-5.0.0" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -589,13 +625,67 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "assert-options-0.6.2" = { + "asn1.js-4.10.1" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "4.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; + }; + }; + "asn1.js-5.4.1" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"; + sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; + }; + }; + "asn1.js-rfc2560-4.0.6" = { + name = "asn1.js-rfc2560"; + packageName = "asn1.js-rfc2560"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js-rfc2560/-/asn1.js-rfc2560-4.0.6.tgz"; + sha512 = "ysf48ni+f/efNPilq4+ApbifUPcSW/xbDeQAh055I+grr2gXgNRQqHew7kkO70WSMQ2tEOURVwsK+dJqUNjIIg=="; + }; + }; + "asn1.js-rfc2560-5.0.1" = { + name = "asn1.js-rfc2560"; + packageName = "asn1.js-rfc2560"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js-rfc2560/-/asn1.js-rfc2560-5.0.1.tgz"; + sha512 = "1PrVg6kuBziDN3PGFmRk3QrjpKvP9h/Hv5yMrFZvC1kpzP6dQRzf5BpKstANqHBkaOUmTpakJWhicTATOA/SbA=="; + }; + }; + "asn1.js-rfc5280-2.0.1" = { + name = "asn1.js-rfc5280"; + packageName = "asn1.js-rfc5280"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js-rfc5280/-/asn1.js-rfc5280-2.0.1.tgz"; + sha512 = "1e2ypnvTbYD/GdxWK77tdLBahvo1fZUHlQJqAVUuZWdYj0rdjGcf2CWYUtbsyRYpYUMwMWLZFUtLxog8ZXTrcg=="; + }; + }; + "asn1.js-rfc5280-3.0.0" = { + name = "asn1.js-rfc5280"; + packageName = "asn1.js-rfc5280"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js-rfc5280/-/asn1.js-rfc5280-3.0.0.tgz"; + sha512 = "Y2LZPOWeZ6qehv698ZgOGGCZXBQShObWnGthTrIFlIQjuV1gg2B8QOhWFRExq/MR1VnPpIIe7P9vX2vElxv+Pg=="; + }; + }; + "assert-options-0.7.0" = { name = "assert-options"; packageName = "assert-options"; - version = "0.6.2"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz"; - sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw=="; + url = "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz"; + sha512 = "7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ=="; }; }; "assert-plus-1.0.0" = { @@ -607,6 +697,15 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + }; "async-3.2.0" = { name = "async"; packageName = "async"; @@ -643,22 +742,22 @@ let sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "axios-0.19.0" = { + "axios-0.19.2" = { name = "axios"; packageName = "axios"; - version = "0.19.0"; + version = "0.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz"; - sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ=="; + url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; + sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; }; }; - "axios-0.19.2" = { + "axios-0.21.1" = { name = "axios"; packageName = "axios"; - version = "0.19.2"; + version = "0.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; - sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"; + sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; }; }; "balanced-match-1.0.0" = { @@ -706,6 +805,33 @@ let sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; }; }; + "big-integer-1.6.48" = { + name = "big-integer"; + packageName = "big-integer"; + version = "1.6.48"; + src = fetchurl { + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz"; + sha512 = "j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="; + }; + }; + "bignumber.js-2.4.0" = { + name = "bignumber.js"; + packageName = "bignumber.js"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz"; + sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; + }; + }; + "bitsyntax-0.1.0" = { + name = "bitsyntax"; + packageName = "bitsyntax"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.1.0.tgz"; + sha512 = "ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q=="; + }; + }; "bl-2.2.1" = { name = "bl"; packageName = "bl"; @@ -742,6 +868,24 @@ let sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; }; }; + "bluebird-3.7.2" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; + }; + }; + "bn.js-4.11.9" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.9"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz"; + sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="; + }; + }; "body-parser-1.19.0" = { name = "body-parser"; packageName = "body-parser"; @@ -787,6 +931,15 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; + "browser-request-0.3.3" = { + name = "browser-request"; + packageName = "browser-request"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; + sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; + }; + }; "bson-1.1.5" = { name = "bson"; packageName = "bson"; @@ -823,6 +976,15 @@ let sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; + "buffer-more-ints-1.0.0" = { + name = "buffer-more-ints"; + packageName = "buffer-more-ints"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-1.0.0.tgz"; + sha512 = "EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg=="; + }; + }; "buffer-writer-2.0.0" = { name = "buffer-writer"; packageName = "buffer-writer"; @@ -859,6 +1021,15 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; + "cacheable-lookup-5.0.4" = { + name = "cacheable-lookup"; + packageName = "cacheable-lookup"; + version = "5.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; + sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; + }; + }; "callback-stream-1.1.0" = { name = "callback-stream"; packageName = "callback-stream"; @@ -967,13 +1138,22 @@ let sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; - "cheerio-1.0.0-rc.3" = { + "cheerio-1.0.0-rc.5" = { name = "cheerio"; packageName = "cheerio"; - version = "1.0.0-rc.3"; + version = "1.0.0-rc.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.5.tgz"; + sha512 = "yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw=="; + }; + }; + "cheerio-select-tmp-0.1.1" = { + name = "cheerio-select-tmp"; + packageName = "cheerio-select-tmp"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz"; - sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA=="; + url = "https://registry.npmjs.org/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz"; + sha512 = "YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ=="; }; }; "chownr-1.1.4" = { @@ -1003,13 +1183,13 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; - "cli-highlight-2.1.9" = { + "cli-highlight-2.1.10" = { name = "cli-highlight"; packageName = "cli-highlight"; - version = "2.1.9"; + version = "2.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.9.tgz"; - sha512 = "t8RNIZgiI24i/mslZ8XT8o660RUj5ZbUJpEZrZa/BNekTzdC2LfMRAnt0Y7sgzNM4FGW5tmWg/YnbTH8o1eIOQ=="; + url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.10.tgz"; + sha512 = "CcPFD3JwdQ2oSzy+AMG6j3LRTkNjM82kzcSKzoVw6cLanDCJNlsLjeqVTOTfOfucnWv5F0rmBemVf1m9JiIasw=="; }; }; "cli-width-3.0.0" = { @@ -1030,24 +1210,6 @@ let sha512 = "k8AvUYJon0vv75ufoVo4nALYb/qwFFicO3I0+39C6xEdflqVtr+f9cy+0ZxAduoVSTfhP5DX2tY2XICAd5hy6Q=="; }; }; - "cliui-5.0.0" = { - name = "cliui"; - packageName = "cliui"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; - }; - }; - "cliui-6.0.0" = { - name = "cliui"; - packageName = "cliui"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; - sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; - }; - }; "cliui-7.0.4" = { name = "cliui"; packageName = "cliui"; @@ -1138,6 +1300,15 @@ let sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; }; }; + "colors-1.4.0" = { + name = "colors"; + packageName = "colors"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; + }; + }; "colorspace-1.1.2" = { name = "colorspace"; packageName = "colorspace"; @@ -1354,22 +1525,22 @@ let sha512 = "uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w=="; }; }; - "css-select-1.2.0" = { + "css-select-3.1.2" = { name = "css-select"; packageName = "css-select"; - version = "1.2.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; - sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + url = "https://registry.npmjs.org/css-select/-/css-select-3.1.2.tgz"; + sha512 = "qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA=="; }; }; - "css-what-2.1.3" = { + "css-what-4.0.0" = { name = "css-what"; packageName = "css-what"; - version = "2.1.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz"; - sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; + url = "https://registry.npmjs.org/css-what/-/css-what-4.0.0.tgz"; + sha512 = "teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A=="; }; }; "d-1.0.1" = { @@ -1426,22 +1597,22 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.1.1" = { + "debug-4.3.1" = { name = "debug"; packageName = "debug"; - version = "4.1.1"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; + sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; }; }; - "debug-4.3.1" = { + "debug-4.3.2" = { name = "debug"; packageName = "debug"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; - sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; "decamelize-1.2.0" = { @@ -1480,13 +1651,13 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "denque-1.4.1" = { + "denque-1.5.0" = { name = "denque"; packageName = "denque"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz"; - sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="; + url = "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz"; + sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="; }; }; "depd-1.1.2" = { @@ -1543,13 +1714,22 @@ let sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; }; - "dom-serializer-0.1.1" = { + "dom-serializer-0.2.2" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "0.1.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz"; - sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; + }; + }; + "dom-serializer-1.2.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz"; + sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA=="; }; }; "domelementtype-1.3.1" = { @@ -1561,6 +1741,15 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; + "domelementtype-2.1.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; + sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; + }; + }; "domhandler-2.4.2" = { name = "domhandler"; packageName = "domhandler"; @@ -1570,13 +1759,31 @@ let sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; }; }; - "domutils-1.5.1" = { + "domhandler-4.0.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz"; + sha512 = "KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA=="; + }; + }; + "domutils-1.7.0" = { name = "domutils"; packageName = "domutils"; - version = "1.5.1"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; + sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; + }; + }; + "domutils-2.4.4" = { + name = "domutils"; + packageName = "domutils"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + url = "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz"; + sha512 = "jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA=="; }; }; "dot-case-3.0.4" = { @@ -1642,15 +1849,6 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "emoji-regex-7.0.3" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; - }; - }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -1669,6 +1867,15 @@ let sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; }; }; + "enabled-2.0.0" = { + name = "enabled"; + packageName = "enabled"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"; + sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; + }; + }; "encodeurl-1.0.2" = { name = "encodeurl"; packageName = "encodeurl"; @@ -1714,6 +1921,15 @@ let sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; + "entities-2.2.0" = { + name = "entities"; + packageName = "entities"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + }; "env-variable-0.0.6" = { name = "env-variable"; packageName = "env-variable"; @@ -1750,6 +1966,24 @@ let sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; }; }; + "es6-promise-4.2.8" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"; + sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="; + }; + }; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + }; "es6-set-0.1.5" = { name = "es6-set"; packageName = "es6-set"; @@ -1921,13 +2155,13 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-glob-3.2.4" = { + "fast-glob-3.2.5" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; - sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; + sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -1939,13 +2173,31 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fastq-1.9.0" = { + "fast-safe-stringify-2.0.7" = { + name = "fast-safe-stringify"; + packageName = "fast-safe-stringify"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; + sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; + }; + }; + "fastq-1.10.1" = { name = "fastq"; packageName = "fastq"; - version = "1.9.0"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz"; + sha512 = "AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA=="; + }; + }; + "fecha-4.2.0" = { + name = "fecha"; + packageName = "fecha"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz"; - sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w=="; + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz"; + sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; }; }; "fflate-0.3.11" = { @@ -1957,6 +2209,15 @@ let sha512 = "Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A=="; }; }; + "fflate-0.4.8" = { + name = "fflate"; + packageName = "fflate"; + version = "0.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz"; + sha512 = "FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA=="; + }; + }; "figlet-1.5.0" = { name = "figlet"; packageName = "figlet"; @@ -2002,24 +2263,6 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "find-up-3.0.0" = { - name = "find-up"; - packageName = "find-up"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; - }; - }; - "find-up-4.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; - sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; - }; - }; "flatted-2.0.2" = { name = "flatted"; packageName = "flatted"; @@ -2029,6 +2272,24 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; + "fn.name-1.1.0" = { + name = "fn.name"; + packageName = "fn.name"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"; + sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; + }; + }; + "follow-redirects-1.13.2" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz"; + sha512 = "6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="; + }; + }; "follow-redirects-1.5.10" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -2209,13 +2470,13 @@ let sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; }; }; - "globby-11.0.1" = { + "globby-11.0.2" = { name = "globby"; packageName = "globby"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz"; - sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; + sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; }; }; "gm-1.23.1" = { @@ -2326,13 +2587,13 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "highlight.js-10.4.1" = { + "highlight.js-10.5.0" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.4.1"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz"; - sha512 = "yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.5.0.tgz"; + sha512 = "xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw=="; }; }; "html-to-text-5.1.1" = { @@ -2353,6 +2614,15 @@ let sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; }; }; + "htmlparser2-6.0.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.0.tgz"; + sha512 = "numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw=="; + }; + }; "http-errors-1.7.2" = { name = "http-errors"; packageName = "http-errors"; @@ -2371,6 +2641,15 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "https-proxy-agent-3.0.1" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz"; + sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg=="; + }; + }; "iconv-lite-0.4.24" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -2488,13 +2767,13 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ini-1.3.5" = { + "ini-1.3.8" = { name = "ini"; packageName = "ini"; - version = "1.3.5"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; "inquirer-7.3.3" = { @@ -2542,15 +2821,6 @@ let sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; - "is-buffer-2.0.5" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz"; - sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; - }; - }; "is-docker-2.1.1" = { name = "is-docker"; packageName = "is-docker"; @@ -2659,6 +2929,15 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -2722,13 +3001,13 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "iso-639-1-2.1.4" = { + "iso-639-1-2.1.7" = { name = "iso-639-1"; packageName = "iso-639-1"; - version = "2.1.4"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.4.tgz"; - sha512 = "pwJRHnpz1sCR5saQ+Hm1E2YESw2eLGKP5TzsYKXuQ7SIfvKWMRb9CHhptqunYpCIcRCpq3LgLuhYG5hiLPRbFQ=="; + url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.7.tgz"; + sha512 = "vPBh9Exxv0c430dRYiKtRt6TgErlsKy22Nkz473HFkzRkWTZeM7RLfX2raDoD7g74kA7HB4S2giwu6ZwiisQtg=="; }; }; "isstream-0.1.2" = { @@ -2740,13 +3019,13 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "js-yaml-3.14.0" = { + "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.14.0"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; - sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; "jsbi-3.1.4" = { @@ -2884,6 +3163,15 @@ let sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ=="; }; }; + "kuler-2.0.0" = { + name = "kuler"; + packageName = "kuler"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"; + sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; + }; + }; "leven-2.1.0" = { name = "leven"; packageName = "leven"; @@ -2947,31 +3235,13 @@ let sha512 = "gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ=="; }; }; - "localtunnel-2.0.0" = { + "localtunnel-2.0.1" = { name = "localtunnel"; packageName = "localtunnel"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.0.tgz"; - sha512 = "g6E0aLgYYDvQDxIjIXkgJo2+pHj3sGg4Wz/XP3h2KtZnRsWPbOQY+hw1H8Z91jep998fkcVE9l+kghO+97vllg=="; - }; - }; - "locate-path-3.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; - }; - }; - "locate-path-5.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "5.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.1.tgz"; + sha512 = "LiaI5wZdz0xFkIQpXbNI62ZnNn8IMsVhwxHmhA+h4vj8R9JG/07bQHWwQlyy7b95/5fVOCHJfIHv+a5XnkvaJA=="; }; }; "lodash-4.17.20" = { @@ -3109,6 +3379,15 @@ let sha1 = "370d1d3e85b72a7e1b0cdf2d272121306f23e4ed"; }; }; + "logform-2.2.0" = { + name = "logform"; + packageName = "logform"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz"; + sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; + }; + }; "long-4.0.0" = { name = "long"; packageName = "long"; @@ -3163,13 +3442,13 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-memoizer-2.1.2" = { + "lru-memoizer-2.1.4" = { name = "lru-memoizer"; packageName = "lru-memoizer"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.2.tgz"; - sha512 = "N5L5xlnVcbIinNn/TJ17vHBZwBMt9t7aJDz2n97moWubjNl6VO9Ao2XuAGBBddkYdjrwR9HfzXbT6NfMZXAZ/A=="; + url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz"; + sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; }; }; "mailparser-2.8.1" = { @@ -3280,22 +3559,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.44.0" = { + "mime-db-1.45.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.44.0"; + version = "1.45.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; - sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; + sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; }; }; - "mime-types-2.1.27" = { + "mime-types-2.1.28" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.27"; + version = "2.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; - sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; + sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; }; }; "mimic-fn-2.1.0" = { @@ -3307,6 +3586,15 @@ let sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; + "minimalistic-assert-1.0.1" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + }; + }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -3406,13 +3694,13 @@ let sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg=="; }; }; - "mqtt-packet-6.6.0" = { + "mqtt-packet-6.7.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "6.6.0"; + version = "6.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.6.0.tgz"; - sha512 = "LvghnKMFC70hKWMVykmhJarlO5e7lT3t9s9A2qPCUx+lazL3Mq55U+eCV0eLi7/nRRQYvEUWo/2tTo89EjnCJQ=="; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.7.0.tgz"; + sha512 = "GzgeeCirQpB59FyhHvf8BLiIYgxctPSxuSyaF2vWnkt7paX7jtuQ8Gpl+DkHCxZmYuv7GQE6zcUAegpafd0MqQ=="; }; }; "ms-2.0.0" = { @@ -3442,13 +3730,13 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; - "mssql-6.2.3" = { + "mssql-6.3.1" = { name = "mssql"; packageName = "mssql"; - version = "6.2.3"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-6.2.3.tgz"; - sha512 = "4TW/fA9UgzmVTNgjl65r6ISr6aL5QHnlptEt1A3jIpdzkNbFPIkRbUNz90324HIdE+5pKc3VqikOImcTrhd4og=="; + url = "https://registry.npmjs.org/mssql/-/mssql-6.3.1.tgz"; + sha512 = "ammxrhbdDpcBWhiZLiy6miiU7ELt9qFbGvwmPbiufn+tBHAYUFR/AgwE4/v4jzPzbatowscmhFx1U61L91uVzQ=="; }; }; "mute-stream-0.0.8" = { @@ -3478,40 +3766,40 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.54.0" = { + "n8n-core-0.62.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.54.0"; + version = "0.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.54.0.tgz"; - sha512 = "07Fts2MSm5acbsFPEVU7RXx38K5ryGVy6OE1g+Nbr8B0LuQiTEhCzC7x+AIfFDQlt/cQQEiPejaBGDZZm0kdpA=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.62.0.tgz"; + sha512 = "07RkPn6V5dCov3yt5zu5ASq2ibflji+dSGrSk7wnVrklGPBieuUjpZQuA7QrfQyjy5JUNDDp/Js+XGO8Vx3tew=="; }; }; - "n8n-editor-ui-0.66.0" = { + "n8n-editor-ui-0.75.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.66.0"; + version = "0.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.66.0.tgz"; - sha512 = "BZTaiYffZ2+dbPOp0JjV+pZ4S7iD7r2oYTylwFbNRpEbIc4a0l8JbU0HRqHESdPR3yYDdUTmVXqk1fWfc8IgYw=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.75.0.tgz"; + sha512 = "YWwiqGwTXxpuXjVB5d9qnjxoz55um27zwEfoXS63mNTDfDdIeuxHKQCY2pMWIjwXeYnx0x31NDhoSfjb8YRffA=="; }; }; - "n8n-nodes-base-0.91.0" = { + "n8n-nodes-base-0.102.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.91.0"; + version = "0.102.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.91.0.tgz"; - sha512 = "75DVfQS/AkZBB6lIAAWHhM4wRkhHXCNf/30Fi0Cc+cihw7GW3O4bdXNhZKFwDTf70DYNATM0kBBEbSHvQusuCw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.102.0.tgz"; + sha512 = "WDUh2c0qCNDf2c8ZwkA/9RrkU/64A364P2t3wE1c66a8E/n/QJyiLnd4BJAu96cdcm+n2A0DwO9+gX1F50EU5A=="; }; }; - "n8n-workflow-0.47.0" = { + "n8n-workflow-0.51.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.47.0"; + version = "0.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.47.0.tgz"; - sha512 = "1CbSOvVSf1KNM5izOEVsuMMEkuwiqezVH4hWS1Ts7pSdgSi8TrFCi4CE1J8qA0KBmWq5APh3vEJGFyvkLX6BOg=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.51.0.tgz"; + sha512 = "KLjbJ10QhXc7clzmVRO60mftzZTeYR/MSC/RSobJBCzYGbAtnEp38YDg6a3ekznlwd6eIyTcD68xmv4EbSb2dQ=="; }; }; "named-placeholders-1.1.2" = { @@ -3541,13 +3829,13 @@ let sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0"; }; }; - "needle-2.5.2" = { + "needle-2.6.0" = { name = "needle"; packageName = "needle"; - version = "2.5.2"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz"; - sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ=="; + url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz"; + sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg=="; }; }; "negotiator-0.6.2" = { @@ -3613,13 +3901,13 @@ let sha512 = "BVZBDi+aJV4O38rxsUh164Dk1NCqgh6Cm0rQSb9SK/DHGll/DrCMnycVDD7msJgZCnmVa8ASo8EZzR7jsgTukQ=="; }; }; - "nodemailer-6.4.16" = { + "nodemailer-6.4.17" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.4.16"; + version = "6.4.17"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.16.tgz"; - sha512 = "68K0LgZ6hmZ7PVmwL78gzNdjpj5viqBdFqKrTtr9bZbJYj6BRj5W6WGkxXrEnUl3Co3CBXi3CZBUlpV/foGnOQ=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.17.tgz"; + sha512 = "89ps+SBGpo0D4Bi5ZrxcrCiRFaMmkCt+gItMXQGzEtZVR3uAD3QAQIDoxTWnx3ky0Dwwy/dhFrQ+6NNGXpw/qQ=="; }; }; "nopt-4.0.3" = { @@ -3667,13 +3955,13 @@ let sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; - "nth-check-1.0.2" = { + "nth-check-2.0.0" = { name = "nth-check"; packageName = "nth-check"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; - sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; + url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz"; + sha512 = "i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q=="; }; }; "number-is-nan-1.0.1" = { @@ -3712,6 +4000,15 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; + "ocsp-1.2.0" = { + name = "ocsp"; + packageName = "ocsp"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ocsp/-/ocsp-1.2.0.tgz"; + sha1 = "469a1776b457dee67eb0201408c1946bac4076cc"; + }; + }; "on-finished-2.3.0" = { name = "on-finished"; packageName = "on-finished"; @@ -3739,6 +4036,15 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "one-time-1.0.0" = { + name = "one-time"; + packageName = "one-time"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz"; + sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; + }; + }; "onetime-5.1.2" = { name = "onetime"; packageName = "onetime"; @@ -3748,13 +4054,13 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "open-7.3.0" = { + "open-7.4.0" = { name = "open"; packageName = "open"; - version = "7.3.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.3.0.tgz"; - sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw=="; + url = "https://registry.npmjs.org/open/-/open-7.4.0.tgz"; + sha512 = "PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA=="; }; }; "openurl-1.1.1" = { @@ -3820,42 +4126,6 @@ let sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; }; }; - "p-limit-2.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; - }; - }; - "p-locate-3.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; - }; - }; - "p-locate-4.1.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; - sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; - }; - }; - "p-try-2.2.0" = { - name = "p-try"; - packageName = "p-try"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; - }; - }; "packet-reader-1.0.0" = { name = "packet-reader"; packageName = "packet-reader"; @@ -3883,15 +4153,6 @@ let sha1 = "746a167638083a860b0eef6732cb27ed46c32977"; }; }; - "parse5-3.0.3" = { - name = "parse5"; - packageName = "parse5"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz"; - sha512 = "rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA=="; - }; - }; "parse5-5.1.1" = { name = "parse5"; packageName = "parse5"; @@ -3955,24 +4216,6 @@ let sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; }; }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; - }; - }; - "path-exists-4.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; - }; - }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -4009,13 +4252,13 @@ let sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A=="; }; }; - "peek-readable-3.1.0" = { + "peek-readable-3.1.3" = { name = "peek-readable"; packageName = "peek-readable"; - version = "3.1.0"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.0.tgz"; - sha512 = "KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz"; + sha512 = "mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg=="; }; }; "performance-now-2.1.0" = { @@ -4054,13 +4297,13 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-minify-1.6.1" = { + "pg-minify-1.6.2" = { name = "pg-minify"; packageName = "pg-minify"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.1.tgz"; - sha512 = "ujanxJJB9CSDUvlAOshtjdKAywOPR2vY0a7D+vvgk5rbrYcthZA7TjpN+Z+UwZsz/G/bUexYDT6huE33vYVN0g=="; + url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.2.tgz"; + sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; "pg-pool-3.2.2" = { @@ -4072,13 +4315,13 @@ let sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="; }; }; - "pg-promise-10.8.1" = { + "pg-promise-10.9.2" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.8.1"; + version = "10.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.8.1.tgz"; - sha512 = "xRW3PBopAAPlSmOutfpxwrd0i1wfiVoJjkRC2xYzwk0PwWGLEOVKoDEHX4VoqjfIJ+SEEiILy5B5nUVvXpFFVA=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.9.2.tgz"; + sha512 = "ewelfzZeSPe5sbgd5ylB6edVXqoD8AH/fqZj4wPLL0242vXtkFY3JuUqt3mfvTruOqZHhoINpoXTfmC9UXbZ7A=="; }; }; "pg-protocol-1.4.0" = { @@ -4153,13 +4396,13 @@ let sha512 = "XCpzVjVk7tty+IJnSdqWevmOr1n8HNDhL86v7mZ6T1JIIf2KGybxUk9mm7ZFOhWMkGB0e8XkacHip7BV8AQWQA=="; }; }; - "popsicle-transport-http-1.0.9" = { + "popsicle-transport-http-1.1.1" = { name = "popsicle-transport-http"; packageName = "popsicle-transport-http"; - version = "1.0.9"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle-transport-http/-/popsicle-transport-http-1.0.9.tgz"; - sha512 = "55Os0JdCs35FI8cAsgMoKG6XXKR4Wh8qZIbL3rY5+IZqqjMIo3/3q3wSE98mUhHyLgjg9HQ6ep5wNfhbYCI7GQ=="; + url = "https://registry.npmjs.org/popsicle-transport-http/-/popsicle-transport-http-1.1.1.tgz"; + sha512 = "RNbifrl5ckXLk1X6YGhjDb0gL5yAH1nvultmboiVGLTnWDbwaoxhEP8He9epMFOPuSDuNJ//TMRoN+XfpN0KCw=="; }; }; "popsicle-transport-xhr-2.0.0" = { @@ -4522,6 +4765,15 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; + "requestretry-4.1.2" = { + name = "requestretry"; + packageName = "requestretry"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/requestretry/-/requestretry-4.1.2.tgz"; + sha512 = "N1WAp+8eOy8NfsVBChcSxNCKvPY1azOpliQ4Sby4WDe0HFEhdKywlNZeROMBQ+BI3Jpc0eNOT1KVFGREawtahA=="; + }; + }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -4531,15 +4783,6 @@ let sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; - "require-main-filename-2.0.0" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; - }; - }; "require_optional-1.0.1" = { name = "require_optional"; packageName = "require_optional"; @@ -4639,13 +4882,13 @@ let sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; }; }; - "rss-parser-3.9.0" = { + "rss-parser-3.10.0" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.9.0.tgz"; - sha512 = "wlRSfGrotOXuWo19Dtl2KmQt7o9i5zzCExUrxpechE0O54BAx7JD+xhWyGumPPqiJj771ndflV3sE3bTHen0HQ=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.10.0.tgz"; + sha512 = "TC6FNvEmdFeaW6r/60MSJT7cp4d95X4M9As+mvNtxRx7YXHxpV95syMnWZthZSeD1BRN7SEKdq6c3nxMLQRopw=="; }; }; "run-async-2.4.1" = { @@ -4720,6 +4963,15 @@ let sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; + "semver-5.0.3" = { + name = "semver"; + packageName = "semver"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; + sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + }; + }; "semver-5.3.0" = { name = "semver"; packageName = "semver"; @@ -4837,6 +5089,15 @@ let sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; + "simple-lru-cache-0.0.2" = { + name = "simple-lru-cache"; + packageName = "simple-lru-cache"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + }; + }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -4864,6 +5125,15 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; + "snowflake-sdk-1.5.3" = { + name = "snowflake-sdk"; + packageName = "snowflake-sdk"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.5.3.tgz"; + sha512 = "Env7ebuWyaPWLIsGbFf/AH8IdeSCshAfHg9cH6F9AHAG0uwtJEO4XPdNeOkxyV/xjykx69s1L4mHWwPksgj8VA=="; + }; + }; "sparse-bitfield-3.0.3" = { name = "sparse-bitfield"; packageName = "sparse-bitfield"; @@ -4873,13 +5143,13 @@ let sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; }; }; - "spex-3.0.2" = { + "spex-3.2.0" = { name = "spex"; packageName = "spex"; - version = "3.0.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/spex/-/spex-3.0.2.tgz"; - sha512 = "ZNCrOso+oNv5P01HCO4wuxV9Og5rS6ms7gGAqugfBPjx1QwfNXJI3T02ldfaap1O0dlT1sB0Rk+mhDqxt3Z27w=="; + url = "https://registry.npmjs.org/spex/-/spex-3.2.0.tgz"; + sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg=="; }; }; "split2-3.2.2" = { @@ -4981,6 +5251,15 @@ let sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; + "stack-trace-0.0.10" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + }; + }; "statuses-1.5.0" = { name = "statuses"; packageName = "statuses"; @@ -5035,15 +5314,6 @@ let sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; - "string-width-3.1.0" = { - name = "string-width"; - packageName = "string-width"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; - }; - }; "string-width-4.2.0" = { name = "string-width"; packageName = "string-width"; @@ -5071,6 +5341,15 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; + "string_decoder-1.3.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; + }; + }; "strip-ansi-3.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -5089,15 +5368,6 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; - "strip-ansi-5.2.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; - }; - }; "strip-ansi-6.0.0" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -5116,13 +5386,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strtok3-6.0.4" = { + "strtok3-6.0.8" = { name = "strtok3"; packageName = "strtok3"; - version = "6.0.4"; + version = "6.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.4.tgz"; - sha512 = "rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz"; + sha512 = "QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw=="; }; }; "supports-color-2.0.0" = { @@ -5305,13 +5575,13 @@ let sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; - "token-types-2.0.0" = { + "token-types-2.1.1" = { name = "token-types"; packageName = "token-types"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-2.0.0.tgz"; - sha512 = "WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw=="; + url = "https://registry.npmjs.org/token-types/-/token-types-2.1.1.tgz"; + sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; "tough-cookie-2.5.0" = { @@ -5332,6 +5602,15 @@ let sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; }; }; + "triple-beam-1.3.0" = { + name = "triple-beam"; + packageName = "triple-beam"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz"; + sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; + }; + }; "ts-expect-1.1.0" = { name = "ts-expect"; packageName = "ts-expect"; @@ -5359,13 +5638,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.0.3" = { + "tslib-2.1.0" = { name = "tslib"; packageName = "tslib"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz"; - sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; + sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; }; }; "tsscmp-1.0.6" = { @@ -5458,13 +5737,13 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typeorm-0.2.29" = { + "typeorm-0.2.30" = { name = "typeorm"; packageName = "typeorm"; - version = "0.2.29"; + version = "0.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.29.tgz"; - sha512 = "ih1vrTe3gEAGKRcWlcsTRxTL7gNjacQE498wVGuJ3ZRujtMqPZlbAWuC7xDzWCRjQnkZYNwZQeG9UgKfxSHB5g=="; + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.30.tgz"; + sha512 = "qpr8AO3Phi6ZF7qMHOrRdNisVt8jE1KfmW0ooLFcXscA87aJ12aBPyB9cJfxGNjNwd7B3WIK9ZlBveWiqd74QA=="; }; }; "uc.micro-1.0.6" = { @@ -5548,13 +5827,13 @@ let sha512 = "514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg=="; }; }; - "uri-js-4.4.0" = { + "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; - sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; "url-parse-1.4.7" = { @@ -5656,6 +5935,15 @@ let sha512 = "nzyFmHdy2FMg7mYraRytc2jr4QBaUY3TEGe3q3bK8EgS9WC98wxn2jrPxS/ruWm+JGzrEIIeufKweQzVoQEd+Q=="; }; }; + "when-3.7.8" = { + name = "when"; + packageName = "when"; + version = "3.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; + sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; + }; + }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -5665,15 +5953,6 @@ let sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -5692,6 +5971,24 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; + "winston-3.3.3" = { + name = "winston"; + packageName = "winston"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz"; + sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; + }; + }; + "winston-transport-4.4.0" = { + name = "winston-transport"; + packageName = "winston-transport"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz"; + sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw=="; + }; + }; "wmf-1.0.2" = { name = "wmf"; packageName = "wmf"; @@ -5719,24 +6016,6 @@ let sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg=="; }; }; - "wrap-ansi-5.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; - }; - }; - "wrap-ansi-6.2.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; - }; - }; "wrap-ansi-7.0.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -5755,13 +6034,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.4.1" = { + "ws-7.4.2" = { name = "ws"; packageName = "ws"; - version = "7.4.1"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz"; - sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ=="; + url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz"; + sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="; }; }; "xlsx-0.16.9" = { @@ -5827,15 +6106,6 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-4.0.1" = { - name = "y18n"; - packageName = "y18n"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; - sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; - }; - }; "y18n-5.0.5" = { name = "y18n"; packageName = "y18n"; @@ -5881,31 +6151,13 @@ let sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA=="; }; }; - "yargs-13.3.0" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; - sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; - }; - }; - "yargs-15.4.1" = { + "yargs-16.2.0" = { name = "yargs"; packageName = "yargs"; - version = "15.4.1"; + version = "16.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"; - sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; - }; - }; - "yargs-16.1.1" = { - name = "yargs"; - packageName = "yargs"; - version = "16.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-16.1.1.tgz"; - sha512 = "hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w=="; + url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; + sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; "yargs-parser-13.0.0" = { @@ -5917,24 +6169,6 @@ let sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw=="; }; }; - "yargs-parser-13.1.2" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; - }; - }; - "yargs-parser-18.1.3" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "18.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; - sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; - }; - }; "yargs-parser-20.2.4" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -5950,33 +6184,30 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.96.0"; + version = "0.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.96.0.tgz"; - sha512 = "HllfTHaD5g98YeGRsGQEeOg1WUUxQr5jnYEWD1qjIWkTVYqVrtEWaEdOxDxnko3Fw7sh2XqtWk1HZHNCRSTQuA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.105.0.tgz"; + sha512 = "Ry4JODQbj5vLsen5RTAyQdwstYFZ6KaMZhNzsnSQIm2qwzW+HS7hOm8r44WHzNrc5sMFHCPful2waMis8g81pA=="; }; dependencies = [ sources."@azure/ms-rest-azure-env-1.1.2" - (sources."@azure/ms-rest-js-1.9.0" // { + (sources."@azure/ms-rest-js-1.9.1" // { dependencies = [ + sources."axios-0.21.1" + sources."follow-redirects-1.13.2" sources."tough-cookie-2.5.0" ]; }) sources."@azure/ms-rest-nodeauth-2.0.2" - (sources."@icetee/ftp-0.3.15" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@dabh/diagnostics-2.0.2" + sources."@icetee/ftp-0.3.15" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."@oclif/errors-1.3.4" // { @@ -5989,30 +6220,31 @@ in }) sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.5" - sources."@oclif/plugin-help-3.2.0" + sources."@oclif/plugin-help-3.2.1" sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.2" sources."@tokenizer/token-0.1.1" sources."@types/bluebird-3.5.33" sources."@types/body-parser-1.19.0" - sources."@types/connect-3.4.33" + sources."@types/connect-3.4.34" sources."@types/debug-4.1.5" - sources."@types/express-4.17.9" + sources."@types/express-4.17.11" sources."@types/express-jwt-0.0.42" - sources."@types/express-serve-static-core-4.17.14" + sources."@types/express-serve-static-core-4.17.18" sources."@types/express-unless-0.5.1" sources."@types/ftp-0.3.31" sources."@types/glob-7.1.3" sources."@types/jsonwebtoken-8.5.0" - sources."@types/mime-2.0.3" + sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.10" + sources."@types/node-14.14.22" sources."@types/promise-ftp-1.3.4" sources."@types/promise-ftp-common-1.1.0" sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" sources."@types/readable-stream-2.3.9" - sources."@types/serve-static-1.13.8" + sources."@types/serve-static-1.13.9" + sources."@types/snowflake-sdk-1.5.1" sources."@types/tough-cookie-2.3.7" sources."@types/tunnel-0.0.0" sources."abbrev-1.1.1" @@ -6024,7 +6256,13 @@ in ]; }) sources."adler-32-1.2.0" + (sources."agent-base-2.1.1" // { + dependencies = [ + sources."semver-5.0.3" + ]; + }) sources."ajv-6.12.6" + sources."amqplib-0.6.0" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -6032,7 +6270,13 @@ in sources."any-promise-1.3.0" sources."app-root-path-3.0.0" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) (sources."argparse-1.0.10" // { dependencies = [ sources."sprintf-js-1.0.3" @@ -6043,7 +6287,10 @@ in sources."array-series-0.1.5" sources."array-union-2.1.0" sources."asn1-0.2.4" - sources."assert-options-0.6.2" + sources."asn1.js-5.4.1" + sources."asn1.js-rfc2560-5.0.1" + sources."asn1.js-rfc5280-3.0.0" + sources."assert-options-0.7.0" sources."assert-plus-1.0.0" sources."async-3.2.0" sources."asynckit-0.4.0" @@ -6055,8 +6302,23 @@ in sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."bl-2.2.1" - sources."bluebird-2.11.0" + sources."big-integer-1.6.48" + sources."bignumber.js-2.4.0" + (sources."bitsyntax-0.1.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."bl-2.2.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."bluebird-3.7.2" + sources."bn.js-4.11.9" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" @@ -6067,23 +6329,26 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."browser-request-0.3.3" sources."bson-1.1.5" sources."buffer-5.7.1" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.1" + sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" sources."byte-length-1.0.2" sources."bytes-3.1.0" + sources."cacheable-lookup-5.0.4" sources."callback-stream-1.1.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."camelcase-5.3.1" (sources."capital-case-1.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."cardinal-2.1.1" @@ -6092,11 +6357,12 @@ in sources."chalk-2.4.2" (sources."change-case-4.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."chardet-0.7.0" - sources."cheerio-1.0.0-rc.3" + sources."cheerio-1.0.0-rc.5" + sources."cheerio-select-tmp-0.1.1" sources."chownr-1.1.4" (sources."clean-stack-3.0.1" // { dependencies = [ @@ -6104,23 +6370,15 @@ in ]; }) sources."cli-cursor-3.1.0" - (sources."cli-highlight-2.1.9" // { + (sources."cli-highlight-2.1.10" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."find-up-4.1.0" sources."has-flag-4.0.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" sources."parse5-5.1.1" - sources."path-exists-4.0.0" sources."supports-color-7.2.0" - sources."wrap-ansi-6.2.0" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" ]; }) sources."cli-width-3.0.0" @@ -6129,14 +6387,12 @@ in sources."safe-buffer-5.2.1" ]; }) - (sources."cliui-5.0.0" // { + (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."wrap-ansi-5.1.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-7.0.0" ]; }) sources."code-point-at-1.1.0" @@ -6150,6 +6406,7 @@ in sources."color-name-1.1.3" sources."color-string-1.5.4" sources."colornames-1.1.1" + sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" sources."commander-2.17.1" @@ -6163,12 +6420,18 @@ in ]; }) sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" + (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."connect-history-api-fallback-1.6.0" sources."console-control-strings-1.1.0" (sources."constant-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."content-disposition-0.5.3" @@ -6187,47 +6450,60 @@ in }) sources."crypto-js-4.0.0" sources."csrf-3.1.0" - sources."css-select-1.2.0" - sources."css-what-2.1.3" + sources."css-select-3.1.2" + sources."css-what-4.0.0" sources."d-1.0.1" sources."dashdash-1.14.1" sources."date-utils-1.2.21" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."denque-1.4.1" + sources."denque-1.5.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."detect-libc-1.0.3" - sources."diagnostics-1.1.1" + (sources."diagnostics-1.1.1" // { + dependencies = [ + sources."enabled-1.0.2" + sources."kuler-1.0.1" + ]; + }) sources."dir-glob-3.0.1" - sources."dom-serializer-0.1.1" - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.5.1" + sources."dom-serializer-1.2.0" + sources."domelementtype-2.1.0" + sources."domhandler-4.0.0" + sources."domutils-2.4.4" (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."dotenv-8.2.0" sources."double-ended-queue-2.1.0-0" - sources."duplexify-3.7.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."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" - sources."enabled-1.0.2" + sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."encoding-japanese-1.0.30" sources."end-of-stream-1.4.4" - sources."entities-1.1.2" + sources."entities-2.1.0" sources."env-variable-0.0.6" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -6258,10 +6534,12 @@ in sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.9.0" - sources."fflate-0.3.11" + sources."fast-safe-stringify-2.0.7" + sources."fastq-1.10.1" + sources."fecha-4.2.0" + sources."fflate-0.4.8" sources."figlet-1.5.0" sources."figures-3.2.0" sources."file-type-14.7.1" @@ -6272,8 +6550,8 @@ in sources."ms-2.0.0" ]; }) - sources."find-up-3.0.0" sources."flatted-2.0.2" + sources."fn.name-1.1.0" (sources."follow-redirects-1.5.10" // { dependencies = [ sources."debug-3.1.0" @@ -6308,9 +6586,12 @@ in dependencies = [ sources."glob-parent-3.1.0" sources."is-glob-3.1.0" + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" ]; }) - sources."globby-11.0.1" + sources."globby-11.0.2" (sources."gm-1.23.1" // { dependencies = [ sources."debug-3.2.7" @@ -6330,35 +6611,48 @@ in sources."he-1.2.0" (sources."header-case-2.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."help-me-1.1.0" - sources."highlight.js-10.4.1" - sources."html-to-text-5.1.1" - (sources."htmlparser2-3.10.1" // { + sources."highlight.js-10.5.0" + (sources."html-to-text-5.1.1" // { dependencies = [ + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.1.0" + sources."entities-2.2.0" + ]; + }) + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.7.0" + sources."entities-1.1.2" + sources."htmlparser2-3.10.1" sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" ]; }) + sources."htmlparser2-6.0.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" + (sources."https-proxy-agent-3.0.1" // { + dependencies = [ + sources."agent-base-4.3.0" + sources."debug-3.2.7" + ]; + }) sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."ignore-walk-3.0.3" - (sources."imap-0.8.19" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) + sources."imap-0.8.19" sources."imap-simple-4.3.0" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -6373,7 +6667,6 @@ in sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-arrayish-0.3.2" - sources."is-buffer-2.0.5" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -6383,15 +6676,16 @@ in sources."is-promise-1.0.1" sources."is-property-1.0.2" sources."is-relative-1.0.0" + sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" - sources."isarray-1.0.0" + sources."isarray-0.0.1" sources."isexe-2.0.0" - sources."iso-639-1-2.1.4" + sources."iso-639-1-2.1.7" sources."isstream-0.1.2" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbi-3.1.4" sources."jsbn-0.1.1" sources."json-schema-0.2.3" @@ -6410,7 +6704,7 @@ in sources."jwks-rsa-1.9.0" sources."jws-3.2.2" sources."kafkajs-1.15.0" - sources."kuler-1.0.1" + sources."kuler-2.0.0" sources."leven-2.1.0" sources."libbase64-1.2.1" (sources."libmime-5.0.0" // { @@ -6421,13 +6715,13 @@ in sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-3.0.2" - (sources."localtunnel-2.0.0" // { + (sources."localtunnel-2.0.1" // { dependencies = [ - sources."axios-0.19.0" - sources."debug-4.1.1" + sources."axios-0.21.1" + sources."debug-4.3.1" + sources."follow-redirects-1.13.2" ]; }) - sources."locate-path-3.0.0" sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" @@ -6443,14 +6737,15 @@ in sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.unset-4.5.2" + sources."logform-2.2.0" sources."long-4.0.0" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."lru-cache-6.0.0" - (sources."lru-memoizer-2.1.2" // { + (sources."lru-memoizer-2.1.4" // { dependencies = [ sources."lru-cache-4.0.2" sources."yallist-2.1.2" @@ -6478,9 +6773,10 @@ in sources."micromatch-4.0.2" sources."millisecond-0.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" + sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { @@ -6489,20 +6785,28 @@ in ]; }) sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-1.0.4" sources."moment-2.24.0" sources."moment-timezone-0.5.32" sources."mongodb-3.6.3" - sources."mqtt-4.2.1" - (sources."mqtt-packet-6.6.0" // { + (sources."mqtt-4.2.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + (sources."mqtt-packet-6.7.0" // { dependencies = [ sources."bl-4.0.3" sources."inherits-2.0.4" sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" ]; }) sources."ms-2.1.2" - sources."mssql-6.2.3" + sources."mssql-6.3.1" sources."mute-stream-0.0.8" (sources."mysql2-2.1.0" // { dependencies = [ @@ -6512,14 +6816,14 @@ in ]; }) sources."mz-2.7.0" - sources."n8n-core-0.54.0" - sources."n8n-editor-ui-0.66.0" - (sources."n8n-nodes-base-0.91.0" // { + sources."n8n-core-0.62.0" + sources."n8n-editor-ui-0.75.0" + (sources."n8n-nodes-base-0.102.0" // { dependencies = [ sources."moment-2.28.0" ]; }) - sources."n8n-workflow-0.47.0" + sources."n8n-workflow-0.51.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -6528,7 +6832,7 @@ in }) sources."nan-2.14.2" sources."native-duplexpair-1.0.0" - (sources."needle-2.5.2" // { + (sources."needle-2.6.0" // { dependencies = [ sources."debug-3.2.7" ]; @@ -6537,69 +6841,77 @@ in sources."next-tick-1.0.0" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."node-ensure-0.0.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ + sources."mkdirp-0.5.5" sources."rimraf-2.7.1" sources."semver-5.7.1" ]; }) sources."nodeify-1.0.1" - sources."nodemailer-6.4.16" + sources."nodemailer-6.4.17" sources."nopt-4.0.3" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" sources."npmlog-4.1.2" - sources."nth-check-1.0.2" + sources."nth-check-2.0.0" sources."number-is-nan-1.0.1" sources."oauth-1.0a-2.2.6" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" + (sources."ocsp-1.2.0" // { + dependencies = [ + sources."asn1.js-4.10.1" + sources."asn1.js-rfc2560-4.0.6" + sources."asn1.js-rfc5280-2.0.1" + sources."async-1.5.2" + ]; + }) sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" + sources."one-time-1.0.0" sources."onetime-5.1.2" - sources."open-7.3.0" + sources."open-7.4.0" sources."openurl-1.1.1" - sources."ordered-read-streams-1.0.1" + (sources."ordered-read-streams-1.0.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."original-1.0.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-2.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" sources."packet-reader-1.0.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."parent-require-1.0.0" - sources."parse5-3.0.3" - (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { - dependencies = [ - sources."parse5-6.0.1" - ]; - }) + sources."parse5-6.0.1" + sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."path-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" @@ -6608,14 +6920,14 @@ in sources."debug-3.2.7" ]; }) - sources."peek-readable-3.1.0" + sources."peek-readable-3.1.3" sources."performance-now-2.1.0" sources."pg-8.5.1" sources."pg-connection-string-2.4.0" sources."pg-int8-1.0.1" - sources."pg-minify-1.6.1" + sources."pg-minify-1.6.2" sources."pg-pool-3.2.2" - sources."pg-promise-10.8.1" + sources."pg-promise-10.9.2" sources."pg-protocol-1.4.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" @@ -6624,7 +6936,7 @@ in sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" sources."popsicle-redirects-1.1.0" - sources."popsicle-transport-http-1.0.9" + sources."popsicle-transport-http-1.1.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" sources."postgres-array-2.0.0" @@ -6634,7 +6946,11 @@ in sources."printj-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-1.3.0" - sources."promise-ftp-1.3.5" + (sources."promise-ftp-1.3.5" // { + dependencies = [ + sources."bluebird-2.11.0" + ]; + }) sources."promise-ftp-common-1.1.5" sources."proxy-addr-2.0.6" sources."pseudomap-1.0.2" @@ -6653,7 +6969,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."readable-stream-2.3.7" + sources."readable-stream-1.1.14" sources."readable-web-to-node-stream-2.0.0" sources."redeyed-2.1.1" sources."redis-2.8.0" @@ -6674,8 +6990,8 @@ in sources."tough-cookie-2.5.0" ]; }) + sources."requestretry-4.1.2" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" (sources."require_optional-1.0.1" // { dependencies = [ sources."semver-5.7.1" @@ -6694,11 +7010,7 @@ in sources."rimraf-3.0.2" sources."riot-tmpl-3.0.8" sources."rndm-1.2.0" - (sources."rss-parser-3.9.0" // { - dependencies = [ - sources."entities-2.1.0" - ]; - }) + sources."rss-parser-3.10.0" sources."run-async-2.4.1" sources."run-parallel-1.1.10" sources."rxjs-6.6.3" @@ -6719,7 +7031,7 @@ in }) (sources."sentence-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."seq-queue-0.0.5" @@ -6730,18 +7042,26 @@ in sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" sources."signal-exit-3.0.3" + sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."snake-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" + ]; + }) + (sources."snowflake-sdk-1.5.3" // { + dependencies = [ + sources."debug-3.2.7" ]; }) sources."sparse-bitfield-3.0.3" - sources."spex-3.0.2" + sources."spex-3.2.0" (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" ]; }) sources."sprintf-js-1.1.2" @@ -6754,40 +7074,52 @@ in dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" ]; }) sources."ssh2-streams-0.4.10" sources."sshpk-1.16.1" + sources."stack-trace-0.0.10" sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."stream-shift-1.0.1" sources."streamsearch-0.1.2" sources."string-width-4.2.0" - sources."string_decoder-1.1.1" + sources."string_decoder-0.10.31" sources."strip-ansi-6.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.0.4" + sources."strtok3-6.0.8" sources."supports-color-5.5.0" (sources."tar-4.4.13" // { dependencies = [ + sources."mkdirp-0.5.5" sources."yallist-3.1.1" ]; }) sources."tarn-1.1.5" (sources."tedious-6.7.0" // { dependencies = [ - sources."@types/node-12.19.8" + sources."@types/node-12.19.15" sources."bl-3.0.1" sources."depd-2.0.0" sources."iconv-lite-0.5.2" sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" ]; }) sources."text-hex-1.0.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."through-2.3.8" - sources."through2-2.0.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."through2-filter-3.0.0" sources."throwback-4.1.0" sources."tlds-1.208.0" @@ -6800,8 +7132,9 @@ in sources."to-absolute-glob-2.0.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."token-types-2.0.0" + sources."token-types-2.1.1" sources."tough-cookie-3.0.1" + sources."triple-beam-1.3.0" sources."ts-expect-1.1.0" sources."tslib-1.11.2" sources."tsscmp-1.0.6" @@ -6813,21 +7146,15 @@ in sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - (sources."typeorm-0.2.29" // { + (sources."typeorm-0.2.30" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."mkdirp-1.0.4" sources."supports-color-7.2.0" sources."tslib-1.14.1" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.5" - sources."yargs-16.1.1" - sources."yargs-parser-20.2.4" ]; }) sources."uc.micro-1.0.6" @@ -6839,15 +7166,15 @@ in sources."unpipe-1.0.0" (sources."upper-case-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."upper-case-first-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-1.4.7" (sources."utf7-1.0.2" // { dependencies = [ @@ -6863,8 +7190,8 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."vm2-3.9.2" + sources."when-3.7.8" sources."which-1.3.1" - sources."which-module-2.0.0" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -6874,6 +7201,20 @@ in ]; }) sources."widest-line-3.1.0" + (sources."winston-3.3.3" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + (sources."winston-transport-4.4.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."wmf-1.0.2" sources."word-0.3.0" (sources."wrap-ansi-4.0.0" // { @@ -6885,15 +7226,19 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.1" - sources."xlsx-0.16.9" + sources."ws-7.4.2" + (sources."xlsx-0.16.9" // { + dependencies = [ + sources."fflate-0.3.11" + ]; + }) sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.4.0" sources."xpath.js-1.1.0" sources."xregexp-2.0.0" sources."xtend-4.0.2" - sources."y18n-4.0.1" + sources."y18n-5.0.5" sources."yallist-4.0.0" (sources."yargonaut-1.1.4" // { dependencies = [ @@ -6904,14 +7249,9 @@ in sources."supports-color-2.0.0" ]; }) - (sources."yargs-13.3.0" // { + (sources."yargs-16.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."yargs-parser-13.1.2" + sources."yargs-parser-20.2.4" ]; }) sources."yargs-parser-13.0.0" @@ -6919,7 +7259,7 @@ in buildInputs = globalBuildInputs; meta = { description = "n8n Workflow Automation Tool"; - homepage = https://n8n.io/; + homepage = "https://n8n.io"; license = "SEE LICENSE IN LICENSE.md"; }; production = true; diff --git a/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/nixpkgs/pkgs/applications/networking/nextdns/default.nix index 366ed9408ef2..b65ba8d94cf1 100644 --- a/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.9.6"; + version = "1.10.1"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-TIXckwesu6BTPr3GBRTgegLplwTKHtmjv3yl1c0nvbY="; + sha256 = "sha256-hMI6zq176p7MI4cjMSeQ8T8UvibJW60lzsPmeAOi3ow="; }; vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc="; diff --git a/nixpkgs/pkgs/applications/networking/openbazaar/client.nix b/nixpkgs/pkgs/applications/networking/openbazaar/client.nix index 6029842ad391..e7a19fa7825f 100644 --- a/nixpkgs/pkgs/applications/networking/openbazaar/client.nix +++ b/nixpkgs/pkgs/applications/networking/openbazaar/client.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "openbazaar-client"; - version = "2.4.9"; + version = "2.4.10"; src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "1l6l72kb5h5f32dl5wqv31sigl3fh2byixv0h0d3icmjf558c39p"; + sha256 = "sha256-X0iTTLOJsZeyVZwNU3y39cFMHnxlnYXmqQERE26CLTY="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix index 452acc1c7ca3..761d0e6b2440 100644 --- a/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: +{ lib, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: mkDerivation rec { pname = "owncloud-client"; diff --git a/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix b/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix index 068776fe17a6..4587da48a4a0 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages +{ lib, fetchurl, intltool, libtorrent-rasterbar, pythonPackages , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { diff --git a/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index ace528494bc5..4c0d391ccaab 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.3.1"; + version = "4.3.3"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "17ih00q7idrpl3b2vgh4smva6lazs5jw06pblriscn1lrwdvrc38"; + sha256 = "0y8vrvfv8n6zg6pgg5a9hmvxi2z9rrfd9k8zv04nv5js91b99ncq"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported diff --git a/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix index 7deddf8578bb..4440b24a2b17 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "zeronet"; diff --git a/nixpkgs/pkgs/applications/networking/protocol/default.nix b/nixpkgs/pkgs/applications/networking/protocol/default.nix index 70723f486460..6690a75485bd 100644 --- a/nixpkgs/pkgs/applications/networking/protocol/default.nix +++ b/nixpkgs/pkgs/applications/networking/protocol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonApplication, fetchFromGitHub }: buildPythonApplication { pname = "protocol-unstable"; diff --git a/nixpkgs/pkgs/applications/networking/protonvpn-cli/default.nix b/nixpkgs/pkgs/applications/networking/protonvpn-cli/default.nix index 1c72d4ef88c0..a13f84096863 100644 --- a/nixpkgs/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/protonvpn-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "protonvpn-linux-cli"; - version = "2.2.4"; + version = "2.2.6"; src = fetchFromGitHub { owner = "protonvpn"; repo = "linux-cli"; rev = "v${version}"; - sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw"; + sha256 = "0y7v9ikrmy5dbjlpbpacp08gy838i8z54m8m4ps7ldk1j6kyia3n"; }; propagatedBuildInputs = (with python3Packages; [ @@ -29,8 +29,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Linux command-line client for ProtonVPN"; homepage = "https://github.com/protonvpn/linux-cli"; - maintainers = with maintainers; [ jtcoolen jefflabonte ]; + maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; license = licenses.gpl3; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix b/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix index c2d7fbd10b15..8029264fdaa7 100644 --- a/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix @@ -76,6 +76,9 @@ in python3Packages.buildPythonApplication rec { done ''; + # no tests + doCheck = false; + meta = with lib; { description = "Linux GUI for ProtonVPN, written in Python"; homepage = "https://github.com/ProtonVPN/linux-gui"; diff --git a/nixpkgs/pkgs/applications/networking/pyload/default.nix b/nixpkgs/pkgs/applications/networking/pyload/default.nix index dcfa88d9d4cd..f70359cf7ac2 100644 --- a/nixpkgs/pkgs/applications/networking/pyload/default.nix +++ b/nixpkgs/pkgs/applications/networking/pyload/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }: +{ lib, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }: let beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { diff --git a/nixpkgs/pkgs/applications/networking/qv2ray/default.nix b/nixpkgs/pkgs/applications/networking/qv2ray/default.nix index 7c3c23a89ee6..7b97bd8543df 100644 --- a/nixpkgs/pkgs/applications/networking/qv2ray/default.nix +++ b/nixpkgs/pkgs/applications/networking/qv2ray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , qmake diff --git a/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index a28c68a65831..c742d076f9da 100644 --- a/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -4,16 +4,6 @@ , pulseaudio }: let - sha256 = { - x86_64-linux = "19751ygq1ng79aniqx91qawc0cw07cwdjdjd88azc9ww6z6nv0mp"; - i386-linux = "0dwc7v4p1dz51444zwn0kds23yi87r4h2d3isfj9xwkn90pxb7in"; - }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); - - arch = { - x86_64-linux = "amd64"; - i386-linux = "i386"; - }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); - description = "Desktop sharing application, providing remote support and online meetings"; desktopItem = makeDesktopItem { @@ -28,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { urls = [ - "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz" - "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-${arch}.tar.gz" + "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - inherit sha256; + sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r"; }; buildInputs = [ @@ -83,7 +73,7 @@ in stdenv.mkDerivation rec { inherit description; homepage = "https://www.anydesk.com"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ shyim ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index c0dc438daacd..0437a108d893 100644 --- a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more +{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more , file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 @@ -11,8 +11,6 @@ }: let - inherit (stdenv) lib; - openssl' = symlinkJoin { name = "openssl-backwards-compat"; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix index eb59f90e6ddb..75eb4645f4fb 100644 --- a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -65,6 +65,17 @@ let x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf"; x64suffix = "12"; x86suffix = "12"; + homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html"; + }; + + "21.01.0" = { + major = "21"; + minor = "1"; + patch = "0"; + x64hash = "01m9g1bs6iiqbd778gjps2zznvqijlyn3mfw38aa0w1rr6ms326a"; + x86hash = "1mmx5r3wi9i6bwh4kdlpw446m8kijkaar8shi0q1n21fv0ygg3r5"; + x64suffix = "14"; + x86suffix = "14"; homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index c556ce35b2de..30bd5346ace6 100644 --- a/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus +{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus , qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc , libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes , wrapQtAppsHook @@ -36,7 +36,7 @@ mkDerivation rec { ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications ln -s /var/lib/teamviewer $out/share/teamviewer/config ln -s /var/log/teamviewer $out/share/teamviewer/logfiles - ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils + ln -s ${xdg-utils}/bin $out/share/teamviewer/tv_bin/xdg-utils for i in 16 20 24 32 48 256; do size=$i"x"$i diff --git a/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index 7d5b965e60fe..a9ddf48bae60 100644 --- a/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -1,24 +1,56 @@ -{ lib, stdenv, buildFHSUserEnv, fetchurl, makeWrapper, makeDesktopItem, libxslt, atk -, fontconfig, freetype, gdk-pixbuf, glib, gtk2, libudev0-shim, libxml2 -, pango, pixman, libX11, libXext, libXinerama, libXrandr , libXrender -, libXtst, libXcursor, libXi, libxkbfile , libXScrnSaver, zlib, liberation_ttf -, libtiff, dbus, at-spi2-atk, harfbuzz, gtk3-x11, libuuid, pcsclite +{ stdenv +, lib +, at-spi2-atk +, atk +, buildFHSUserEnv +, dbus +, fetchurl +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gsettings-desktop-schemas +, gtk2 +, gtk3-x11 +, harfbuzz +, liberation_ttf +, libjpeg +, libtiff +, libudev0-shim +, libuuid +, libX11 +, libXcursor +, libXext +, libXi +, libXinerama +, libxkbfile +, libxml2 +, libXrandr +, libXrender +, libXScrnSaver +, libxslt +, libXtst +, makeDesktopItem +, makeWrapper +, pango +, pcsclite +, pixman +, zlib }: - let - version = "2006"; + version = "2012"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - # The downloaded archive also contains i386 and ARM binaries, but these have not been tested. + # The downloaded archive also contains i386 and ARM binaries, but these have not been tested. vmwareHorizonClientFiles = stdenv.mkDerivation { name = "vmwareHorizonClientFiles"; inherit version; src = fetchurl { - url = https://download3.vmware.com/software/view/viewclients/CART21FQ2/vmware-view-client-linux-2006-8.0.0-16522670.tar.gz; - sha256 = "8c46d49fea42f8c1f7cf32a5f038f5a47d2b304743b1e4f4c68c658621b0e79c"; + url = "https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-Linux-2012-8.1.0-17349998.tar.gz"; + sha256 = "0afda1f3116e75a4e7f89990d8ee60ccea5f3bb8a2360652162fa11c795724ce"; }; buildInputs = [ makeWrapper ]; installPhase = '' @@ -30,12 +62,16 @@ let # when it cannot detect a new enough version already present on the system. # The checks are distribution-specific and do not function correctly on NixOS. # Deleting the bundled library is the simplest way to force it to use our version. - rm -f "$out/lib/vmware/gcc/libstdc++.so.6" + rm "$out/lib/vmware/gcc/libstdc++.so.6" + + # This libjpeg library interferes with Chromium, so we will be using ours instead. + rm $out/lib/vmware/libjpeg.* # Force the default GTK theme (Adwaita) because Horizon is prone to # UI usability issues when using non-default themes, such as Adwaita-dark. makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \ --set GTK_THEME Adwaita \ + --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ --suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware" ''; }; @@ -46,10 +82,37 @@ let runScript = "${vmwareHorizonClientFiles}/bin/vmware-view_wrapper"; targetPkgs = pkgs: [ - pcsclite dbus vmwareHorizonClientFiles atk fontconfig freetype gdk-pixbuf glib gtk2 - libudev0-shim libxml2 pango pixman liberation_ttf libX11 libXext libXinerama - libXrandr libXrender libXtst libXcursor libXi libxkbfile at-spi2-atk libXScrnSaver - zlib libtiff harfbuzz gtk3-x11 libuuid + at-spi2-atk + atk + dbus + fontconfig + freetype + gdk-pixbuf + glib + gtk2 + gtk3-x11 + harfbuzz + liberation_ttf + libjpeg + libtiff + libudev0-shim + libuuid + libX11 + libXcursor + libXext + libXi + libXinerama + libxkbfile + libxml2 + libXrandr + libXrender + libXScrnSaver + libXtst + pango + pcsclite + pixman + vmwareHorizonClientFiles + zlib ]; }; @@ -61,15 +124,22 @@ let mimeType = "x-scheme-handler/vmware-view"; }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { name = "vmware-view"; + dontUnpack = true; + installPhase = '' mkdir -p $out/bin $out/share/applications cp "${desktopItem}"/share/applications/* $out/share/applications/ ln -s "${vmwareFHSUserEnv}/bin/vmware-view" "$out/bin/" ''; + unwrapped = vmwareHorizonClientFiles; + + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Allows you to connect to your VMware Horizon virtual desktop"; homepage = "https://www.vmware.com/go/viewclients"; diff --git a/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/update.sh b/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/update.sh new file mode 100755 index 000000000000..126cb17a7c28 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p curl -p jq -p common-updater-scripts -i bash +set -e + +entryPointURL='https://my.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY' + +function getTarballMetaUrl { + curl "$entryPointURL" | jq -r ' + .dlgEditionsLists | .[] | select(.name | contains("Client for Linux")) | + .dlgList | .[] | select(.name | contains("tarball version")) | + @uri "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=\(.code)&productId=\(.productId)&rPId=\(.releasePackageId)" + ' +} + +meta="$( curl "$(getTarballMetaUrl)" | jq ".downloadFiles | .[]" )" + +ver="$( echo "$meta" | jq -r .version )" +url="$( echo "$meta" | jq -r .thirdPartyDownloadUrl )" +sum="$( echo "$meta" | jq -r .sha256checksum )" + +echo +echo "version: $ver" +echo "tar url: $url" +echo " sha256: $sum" + +cd "$(dirname "$0")/../../../../.." +update-source-version vmware-horizon-client.unwrapped "$ver" "$sum" "$url" diff --git a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix index 7441cdf4eef7..4156c82f91b9 100644 --- a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh +{ lib, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: mkDerivation { diff --git a/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index e38acf244d9e..b4f6f96e5878 100644 --- a/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.14"; + version = "2.24"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "1sfchh5qiylxxmph0hgjfaj80mv5pnrm1s34g5lx0vj64jxr5nzb"; + sha256 = "sha256-nz45vCRhWhgVG2pMA6TZVUIS4d9qBWW7NtTHuEsn4pg="; }; - vendorSha256 = "0g344dj325d35i0myrzhg5chspqnly40qp910ml6zrmp7iszc1mw"; + vendorSha256 = "sha256-v0wFlwODZt3LC+yTuNS1hAAkoedVPfTeEIvs6rUGUa4="; subPackages = [ "weed" ]; diff --git a/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index db9e112a0639..7e7206883d9f 100644 --- a/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , genericUpdater @@ -7,18 +7,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "0cd41ing1pcf1bdaaq00w5h7lih5j2kcaa0m41g3ikm3vd1w5qna"; + sha256 = "1vg236vc2v4g47lb68hb1vy3phamhsyb383fdbblh3vc4vf46j8a"; }; modRoot = "./agent"; - vendorSha256 = "19gsfhh6idqysdxhpq45sq35gw19adz9lp83krjlhzj1vqm59qma"; + vendorSha256 = "1l8x9cvisjb8smnsg91v04j1vvawpjzp0lcq0ahw8slz8rfdm80c"; buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; diff --git a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index 55789401c143..5c5bb1ff96e1 100644 --- a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.4.2"; + version = "3.4.3"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1i548w6zv6ni5n22rs90a12aakyq811493dxmadlcsj2krr6i66y"; + sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl"; }; cmakeFlags = [ @@ -45,13 +45,7 @@ in stdenv.mkDerivation { ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); - patches = [ ./wireshark-lookup-dumpcap-in-path.patch ] - # https://code.wireshark.org/review/#/c/23728/ - ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "fix-timeout.patch"; - url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0"; - sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv"; - }); + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; postPatch = '' sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt diff --git a/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 7cfe9ddfc971..045120813f0d 100644 --- a/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python27Packages, geoip }: +{ lib, fetchFromGitHub, python27Packages, geoip }: with lib; diff --git a/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix b/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix index 2f83873fbf8e..49fc578377c2 100644 --- a/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, fuse +{ lib, fetchFromGitHub, buildPythonApplication, fuse , appdirs, colorama, dateutil, requests, requests_toolbelt , fusepy, sqlalchemy }: diff --git a/nixpkgs/pkgs/applications/networking/sync/desync/default.nix b/nixpkgs/pkgs/applications/networking/sync/desync/default.nix index 689a2b3fddaa..bc2776657c20 100644 --- a/nixpkgs/pkgs/applications/networking/sync/desync/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/desync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "desync"; diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix index 8dbbc0cf2218..1917fc40c0ee 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, wrapQtAppsHook, qtbase }: stdenv.mkDerivation rec { pname = "rclone-browser"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33"; }; + patches = [ + # patch for Qt 5.15, https://github.com/kapitainsky/RcloneBrowser/pull/126 + (fetchpatch { + url = "https://github.com/kapitainsky/RcloneBrowser/commit/ce9cf52e9c584a2cc85a5fa814b0fd7fa9cf0152.patch"; + sha256 = "0nm42flmaq7mva9j4dpp18i1xcv8gr08zfyb9apz1zwn79h1w0c8"; + }) + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index ef130d003295..e2199cfcfb92 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.53.4"; + version = "1.54.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1w6dsf8hw0wap4090ixl01p64yn53xidfdbpy6rc3xaifypj185d"; + sha256 = "sha256-A0c5bHP5W/NTwAh1ifGaw4AG37qYXK9P/Fjk68gkUNk="; }; - vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88"; + vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix b/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix index a7f9c5f9f4be..015033d6ca56 100644 --- a/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall +{ lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas diff --git a/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/nixpkgs/pkgs/applications/networking/syncthing/default.nix index c6767f2e0ae1..9d9be8966ca6 100644 --- a/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.12.1"; + version = "1.13.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1jyqkprb9ps8xc86qnf140wbx5kvshyihxxgym409kfks6dk3cq5"; + sha256 = "1jvmcpyj4k43s4hv753pr9a1qg930nac90d5c8haqv30v1rw5pws"; }; - vendorSha256 = "1xlkc47wfhsf6gzq9sgimlzqnrqdsjgc1zzfkjp3xzbbv5ay7wca"; + vendorSha256 = "140b0wqp5ayyyan7ml12jqd72s00cawhmdf8g699j5sav8j6hppi"; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/twtxt/default.nix b/nixpkgs/pkgs/applications/networking/twtxt/default.nix index 98877880255a..ff6e61c614f9 100644 --- a/nixpkgs/pkgs/applications/networking/twtxt/default.nix +++ b/nixpkgs/pkgs/applications/networking/twtxt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "twtxt"; diff --git a/nixpkgs/pkgs/applications/networking/umurmur/default.nix b/nixpkgs/pkgs/applications/networking/umurmur/default.nix index 05aa66eb39cb..bf45db92098a 100644 --- a/nixpkgs/pkgs/applications/networking/umurmur/default.nix +++ b/nixpkgs/pkgs/applications/networking/umurmur/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "umurmur"; - version = "0.2.17"; + version = "0.2.19"; src = fetchFromGitHub { owner = "umurmur"; repo = "umurmur"; rev = version; - sha256 = "074px4ygmv4ydy2pqwxwnz17f0hfswqkz5kc9qfz0iby3h5i3fyl"; + sha256 = "sha256-86wveYlM493RIuU8aKac6XTOMPv0JxlZL4qH2N2AqRU="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/applications/networking/versus/default.nix b/nixpkgs/pkgs/applications/networking/versus/default.nix index 5e1b1e873c93..1e3dd2113269 100644 --- a/nixpkgs/pkgs/applications/networking/versus/default.nix +++ b/nixpkgs/pkgs/applications/networking/versus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "versus"; diff --git a/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix b/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix index c07b4c5e1aa1..4e8bcaee019e 100644 --- a/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix +++ b/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, installShellFiles, +{ lib, mkDerivation, fetchFromGitHub, installShellFiles, qmake, qtbase, poppler, qtmultimedia }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/office/espanso/default.nix b/nixpkgs/pkgs/applications/office/espanso/default.nix index 808811e20e84..d20e19c68592 100644 --- a/nixpkgs/pkgs/applications/office/espanso/default.nix +++ b/nixpkgs/pkgs/applications/office/espanso/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform , pkg-config diff --git a/nixpkgs/pkgs/applications/office/fava/default.nix b/nixpkgs/pkgs/applications/office/fava/default.nix index fd5f3b8d7c55..b070683e6f2a 100644 --- a/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/nixpkgs/pkgs/applications/office/fava/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, beancount }: +{ lib, python3, beancount }: let inherit (python3.pkgs) buildPythonApplication fetchPypi; diff --git a/nixpkgs/pkgs/applications/office/gnucash/default.nix b/nixpkgs/pkgs/applications/office/gnucash/default.nix index 6bca8f2e9e6c..959aa30c0371 100644 --- a/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.2"; + version = "4.4"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "020k1mm909dcgs52ls4v7xx3yn8gqazi9awyr81l6y7pkq1spn2n"; + sha256 = "sha256-2R4NEmtGHXHeG8GyDZzxQnBDU97AfT5lmdE4QidZ5no="; }; nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ]; diff --git a/nixpkgs/pkgs/applications/office/grisbi/default.nix b/nixpkgs/pkgs/applications/office/grisbi/default.nix index 4bf3081cde14..9d085b6c8830 100644 --- a/nixpkgs/pkgs/applications/office/grisbi/default.nix +++ b/nixpkgs/pkgs/applications/office/grisbi/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "grisbi"; - version = "1.2.2"; + version = "2.0.1"; src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha256 = "1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw"; + sha256 = "sha256-hFLiVHyEekCP9btO75e5ni70ZcLhjbBGCBjF2gERIqs="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/office/gtg/default.nix b/nixpkgs/pkgs/applications/office/gtg/default.nix index 52558df5da81..4c892b2605bb 100644 --- a/nixpkgs/pkgs/applications/office/gtg/default.nix +++ b/nixpkgs/pkgs/applications/office/gtg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , meson , python3Packages diff --git a/nixpkgs/pkgs/applications/office/homebank/default.nix b/nixpkgs/pkgs/applications/office/homebank/default.nix index 03c9445fe249..17c72e8a3306 100644 --- a/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.4.3"; + name = "homebank-5.5"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"; + sha256 = "sha256-3tqmsCxQXNAsDsLdiyuk4MydH0WgHqsNpgqxvCp+bHU="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/office/jabref/default.nix b/nixpkgs/pkgs/applications/office/jabref/default.nix index 3974e75a2f73..4eb39f4d1f82 100644 --- a/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas -, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, libav, cairo, freetype, pango, gdk-pixbuf, glib }: +, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, cairo, freetype, pango, gdk-pixbuf, glib }: stdenv.mkDerivation rec { version = "5.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs; - systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib libav cairo freetype pango gdk-pixbuf glib ]; + systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib cairo freetype pango gdk-pixbuf glib ]; systemLibPaths = lib.makeLibraryPath systemLibs; installPhase = '' diff --git a/nixpkgs/pkgs/applications/office/kbibtex/default.nix b/nixpkgs/pkgs/applications/office/kbibtex/default.nix new file mode 100644 index 000000000000..861ec4d99ef0 --- /dev/null +++ b/nixpkgs/pkgs/applications/office/kbibtex/default.nix @@ -0,0 +1,74 @@ +{ lib +, mkDerivation +, fetchurl +# build-time +, extra-cmake-modules +, shared-mime-info +# Qt +, qtxmlpatterns +, qtwebengine +, qca-qt5 +# KDE +, ki18n +, kxmlgui +, kio +, kiconthemes +, kitemviews +, kparts +, kcoreaddons +, kservice +, ktexteditor +, kdoctools +, kwallet +, kcrash +# other +, poppler +, bibutils +}: + +mkDerivation rec { + pname = "kbibtex"; + version = "0.9.2"; + + src = fetchurl { + url = "mirror://kde/stable/KBibTeX/${version}/kbibtex-${version}.tar.xz"; + sha256 = "09xcdx363z9hps3wbr1kx96a6q6678y8pg8r3apyps4xm7xm31nr"; + }; + + nativeBuildInputs = [ + extra-cmake-modules + shared-mime-info + ]; + + buildInputs = [ + qtxmlpatterns + qtwebengine + qca-qt5 + # TODO qtoauth + ki18n + kxmlgui + kio + kiconthemes + kitemviews + kparts + kcoreaddons + kservice + ktexteditor + kdoctools + kwallet + kcrash + poppler + ]; + + qtWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ bibutils ]}" + ]; + + meta = with lib; { + description = "Bibliography editor for KDE"; + homepage = "https://userbase.kde.org/KBibTeX"; + changelog = "https://invent.kde.org/office/kbibtex/-/raw/v${version}/ChangeLog"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/applications/office/keepnote/default.nix b/nixpkgs/pkgs/applications/office/keepnote/default.nix index 30b4d5fa690b..14f48da22309 100644 --- a/nixpkgs/pkgs/applications/office/keepnote/default.nix +++ b/nixpkgs/pkgs/applications/office/keepnote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication { name = "keepnote-0.7.8"; diff --git a/nixpkgs/pkgs/applications/office/kmymoney/default.nix b/nixpkgs/pkgs/applications/office/kmymoney/default.nix index 093d20906a4d..1d8a214c8183 100644 --- a/nixpkgs/pkgs/applications/office/kmymoney/default.nix +++ b/nixpkgs/pkgs/applications/office/kmymoney/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "kmymoney"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0l8kywq77yaf1bqgdqswrai9ws6a2l11drg0wgyi7f8js7qnif9d"; + sha256 = "sha256-33ufeOhZb5nSgpXKc4cI8GVe4Fd4nf2SHHsbq5ZXgpg="; }; # Hidden dependency that wasn't included in CMakeLists.txt: diff --git a/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix b/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix index 81e49e6e0aa9..90e5995669e8 100644 --- a/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix +++ b/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: +{ lib, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 7b3e630233f6..c917c4396913 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, gettext +{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which @@ -58,18 +58,13 @@ in (mkDrv rec { outputs = [ "out" "dev" ]; - # For some reason librdf_redland sometimes refers to rasqal.h instead - # of rasqal/rasqal.h NIX_CFLAGS_COMPILE = [ - "-I${librdf_rasqal}/include/rasqal" - ] ++ lib.optionals stdenv.isx86_64 [ "-mno-fma" "-mno-avx" ] - # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 - ++ [ "-fno-visibility-inlines-hidden" ]; - - patches = [ - ./xdg-open-brief.patch + "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h + "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 ]; + patches = [ ./xdg-open-brief.patch ]; + tarballPath = "external/tarballs"; postUnpack = '' @@ -378,7 +373,7 @@ in (mkDrv rec { "--enable-kf5" "--enable-qt5" "--enable-gtk3-kde5" - ] ++ lib.optional (lib.versionOlder version "6.4") "--disable-gtk"; # disables GTK2, GTK3 is still there + ]; checkPhase = '' make unitcheck @@ -391,7 +386,7 @@ in (mkDrv rec { ++ lib.optional kdeIntegration wrapQtAppsHook; buildInputs = with xorg; - [ ant ArchiveZip boost cairo clucene_core + [ ant ArchiveZip boost box2d cairo clucene_core IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig freetype getopt gperf gtk3 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix index d956a3b08a61..ea6fc1d777e9 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -35,6 +35,13 @@ md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } { + name = "box2d-2.3.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz"; + sha256 = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c"; + md5 = ""; + md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz"; + } + { name = "breakpad.zip"; url = "https://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; @@ -329,11 +336,11 @@ md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { - name = "gpgme-1.9.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; - sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; + name = "gpgme-1.13.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2"; + sha256 = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46"; md5 = ""; - md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; + md5name = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46-gpgme-1.13.1.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -371,18 +378,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-67_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; - sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; + name = "icu4c-68_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz"; + sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d"; md5 = ""; - md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; + md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz"; } { - name = "icu4c-67_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; - sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; + name = "icu4c-68_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip"; + sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510"; md5 = ""; - md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; + md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -483,18 +490,18 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.9.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; - sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; + name = "lcms2-2.11.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.11.tar.gz"; + sha256 = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e"; md5 = ""; - md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; + md5name = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e-lcms2-2.11.tar.gz"; } { - name = "libassuan-2.5.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; - sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; + name = "libassuan-2.5.3.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2"; + sha256 = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702"; md5 = ""; - md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; + md5name = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702-libassuan-2.5.3.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; @@ -525,11 +532,11 @@ md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; } { - name = "libgpg-error-1.27.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; - sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; + name = "libgpg-error-1.37.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2"; + sha256 = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"; md5 = ""; - md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; + md5name = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763-libgpg-error-1.37.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; @@ -595,11 +602,11 @@ md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.6.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; - sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; + name = "mdds-1.7.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-1.7.0.tar.bz2"; + sha256 = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf"; md5 = ""; - md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; + md5name = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf-mdds-1.7.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -616,11 +623,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; - sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; + name = "libmwaw-0.3.17.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz"; + sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c"; md5 = ""; - md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; + md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -630,11 +637,11 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.30.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; - sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; + name = "neon-0.31.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz"; + sha256 = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d"; md5 = ""; - md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; + md5name = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d-neon-0.31.1.tar.gz"; } { name = "nss-3.55-with-nspr-4.27.tar.gz"; @@ -672,18 +679,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2t.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; - sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; + name = "openssl-1.1.1i.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.1.1i.tar.gz"; + sha256 = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242"; md5 = ""; - md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; + md5name = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242-openssl-1.1.1i.tar.gz"; } { - name = "liborcus-0.15.4.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; - sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; + name = "liborcus-0.16.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.16.1.tar.bz2"; + sha256 = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4"; md5 = ""; - md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; + md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -721,11 +728,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.82.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; - sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; + name = "poppler-21.01.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz"; + sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3"; md5 = ""; - md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; + md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -735,11 +742,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.7.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; - sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; + name = "Python-3.8.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.4.tar.xz"; + sha256 = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37"; md5 = ""; - md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; + md5name = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37-Python-3.8.4.tar.xz"; } { name = "QR-Code-generator-1.4.0.tar.gz"; @@ -798,11 +805,11 @@ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; - sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760"; + name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301"; md5 = ""; - md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -854,11 +861,11 @@ md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.11.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; - sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; + name = "libwps-0.4.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz"; + sha256 = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb"; md5 = ""; - md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; + md5name = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb-libwps-0.4.12.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix index 8586fa1f673b..0141b74c3890 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kdeIntegration, ... }: +{ lib, kdeIntegration, ... }: attrs: { postConfigure = attrs.postConfigure + '' diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix index c9b182647114..6fbc8c5cfc60 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "7"; - minor = "0"; - patch = "4"; - tweak = "2"; + minor = "1"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz"; + sha256 = "1rpk90g1g8m70nrj4lwkg50aiild73d29yjlgyrgg8wx6hzq7l4y"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl"; + sha256 = "0m6cxyrxig8akv9183xdn6ialmjddicn676149nm506yc5y0szmi"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb"; + sha256 = "1kvsi28n8x3gxpiszxh84x05aw23i3z4id63pgw2s7mfclby52k9"; }; } diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix index 78482326be23..d956a3b08a61 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix @@ -1,854 +1,882 @@ [ { name = "libabw-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; md5 = ""; md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; md5 = ""; md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; md5 = ""; md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_69_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; - sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; + name = "boost_1_71_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; + sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; md5 = ""; - md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; + md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } { name = "breakpad.zip"; - url = "http://dev-www.libreoffice.org/src/breakpad.zip"; + url = "https://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; md5 = ""; md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; - url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; md5 = "beeca87be45ec87d241ddd0e1bad80c1"; md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { name = "bzip2-1.0.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { name = "cairo-1.16.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; md5 = ""; md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz"; - sha256 = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48"; + name = "libcdr-0.1.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; + sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; md5 = ""; - md5name = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48-libcdr-0.1.5.tar.xz"; + md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"; md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } { + name = "dtoa-20180411.tgz"; + url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; + sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; + md5 = ""; + md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; + } + { name = "libcmis-0.5.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2"; md5 = ""; md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz"; } { name = "CoinMP-1.7.6.tgz"; - url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; + url = "https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; md5 = ""; md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { - name = "cppunit-1.14.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; - sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; + name = "cppunit-1.15.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"; + sha256 = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7"; md5 = ""; - md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; + md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; - url = "http://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + url = "https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3"; md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.65.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; - sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; + name = "curl-7.71.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; + sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772"; md5 = ""; - md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; + md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"; md5 = ""; md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { name = "libepoxy-1.5.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; md5 = ""; md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; } { name = "epm-3.7.tar.gz"; - url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + url = "https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91"; md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { name = "libepubgen-0.1.1.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad"; md5 = ""; md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { name = "libetonyek-0.1.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; md5 = ""; md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { name = "expat-2.2.8.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; md5 = ""; md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.12.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2"; - sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017"; + name = "fontconfig-2.13.91.tar.gz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; + sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5"; md5 = ""; - md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2"; + md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz"; } { name = "crosextrafonts-20130214.tar.gz"; - url = "http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + url = "https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09"; md5 = "368f114c078f94214a308a74c7e991bc"; md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; } { name = "crosextrafonts-carlito-20130920.tar.gz"; - url = "http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + url = "https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a"; md5 = "c74b7223abe75949b4af367942d96c7a"; md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; } { name = "dejavu-fonts-ttf-2.37.zip"; - url = "http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; + url = "https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; sha256 = "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a"; md5 = "33e1e61fab06a547851ed308b4ffef42"; md5name = "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; } { name = "GentiumBasic_1102.zip"; - url = "http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; + url = "https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; sha256 = "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc"; md5 = "1725634df4bb3dcb1b2c91a6175f8789"; md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; } { name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; sha256 = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3"; md5 = ""; md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { name = "liberation-fonts-ttf-2.00.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; md5 = ""; md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; - url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + url = "https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5"; md5 = "e7a384790b13c29113e22e596ade9687"; md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } { name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; md5 = "907d6e99f241876695c19ff3db0b8923"; md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; } { name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - url = "http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; md5 = "edc4d741888bc0d38e32dbaa17149596"; md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { name = "source-serif-pro-3.000R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; md5 = ""; md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; } { name = "noto-fonts-20171024.tar.gz"; - url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; + url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; md5 = ""; md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { name = "culmus-0.131.tar.gz"; - url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; md5 = ""; md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a"; md5 = ""; md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz"; } { name = "alef-1.001.tar.gz"; - url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; + url = "https://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52"; md5 = ""; md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { name = "Amiri-0.111.zip"; - url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-0.111.zip"; sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166"; md5 = ""; md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip"; } { name = "ttf-kacst_2.01+mry.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; + url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; md5 = ""; md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; } { name = "ReemKufi-0.7.zip"; - url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f"; md5 = ""; md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip"; } { name = "Scheherazade-2.100.zip"; - url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; + url = "https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"; md5 = ""; md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; } { name = "libfreehand-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"; md5 = ""; md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { name = "freetype-2.9.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { - name = "glm-0.9.4.6-libreoffice.zip"; - url = "http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; - sha256 = "d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a"; - md5 = "bae83fa5dc7f081768daace6e199adc3"; - md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + name = "glm-0.9.9.7.zip"; + url = "https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; + sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95"; + md5 = ""; + md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { name = "gpgme-1.9.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; md5 = ""; md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.13.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; - sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; + name = "graphite2-minimal-1.3.14.tgz"; + url = "https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz"; + sha256 = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc"; md5 = ""; - md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; + md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-2.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; - sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; + name = "harfbuzz-2.6.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; + sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; md5 = ""; - md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; + md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; - url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + url = "https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370"; md5 = "17410483b5b5f267aa18b7e00b65e6e0"; md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { name = "hunspell-1.7.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; md5 = ""; md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-63_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; - sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; + name = "icu4c-67_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; + sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; md5 = ""; - md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; + md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; } { - name = "icu4c-63_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; - sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; + name = "icu4c-67_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; + sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; md5 = ""; - md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; + md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; - url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + url = "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; md5 = "ba2930200c9f019c2d93a8c88c651a0f"; md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; } { name = "flute-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133"; md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; } { name = "libbase-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba"; md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; } { name = "libfonts-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743"; md5 = "3bdf40c0d199af31923e900d082ca2dd"; md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; } { name = "libformula-1.1.7.zip"; - url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b"; md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; } { name = "liblayout-0.2.10.zip"; - url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + url = "https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772"; md5 = "db60e4fde8dd6d6807523deb71ee34dc"; md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; } { name = "libloader-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8"; md5 = "97b2d4dba862397f446b217e2b623e71"; md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; } { name = "librepository-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095"; md5 = "8ce2fcd72becf06c41f7201d15373ed9"; md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; } { name = "libserializer-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343"; md5 = "f94d9870737518e3b597f9265f4e9803"; md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; } { name = "libxml-1.1.7.zip"; - url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66"; md5 = "ace6ab49184e329db254e454a010f56d"; md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; } { name = "sacjava-1.3.zip"; - url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + url = "https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045"; md5 = "39bb3fcea1514f1369fcfc87542390fd"; md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { name = "libjpeg-turbo-1.5.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"; md5 = ""; md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-09-16.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; - sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; + name = "language-subtag-registry-2020-09-29.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2"; + sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f"; md5 = ""; - md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; + md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d"; md5 = "b63e6340a02ff1cacfeadb2c42286161"; md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { name = "lcms2-2.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; md5 = ""; md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; } { name = "libassuan-2.5.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; md5 = ""; md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665"; md5 = ""; md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz"; } { name = "libeot-0.01.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; md5 = ""; md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { name = "libexttextcat-3.4.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; md5 = ""; md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { + name = "libffi-3.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; + sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"; + md5 = ""; + md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; + } + { name = "libgpg-error-1.27.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; md5 = ""; md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; md5 = ""; md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz"; - sha256 = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7"; + name = "libnumbertext-1.0.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; + sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57"; md5 = ""; - md5name = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7-libnumbertext-1.0.5.tar.xz"; + md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz"; } { name = "ltm-1.0.zip"; - url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; + url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; md5 = ""; md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.28.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; - sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; + name = "xmlsec1-1.2.30.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; + sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; md5 = ""; - md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; + md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; } { name = "libxml2-2.9.10.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { name = "libxslt-1.1.34.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; - url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695"; md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { name = "lxml-4.1.1.tgz"; - url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; + url = "https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; md5 = ""; md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; } { - name = "mariadb_client-2.0.0-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; - sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60"; - md5 = "a233181e03d3c307668b4c722d881661"; - md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + name = "mariadb-connector-c-3.1.8-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz"; + sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b"; + md5 = ""; + md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.4.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; - sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; + name = "mdds-1.6.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; + sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; md5 = ""; - md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; + md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; - url = "http://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0"; md5 = ""; md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } { name = "libmspub-0.1.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"; md5 = ""; md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.15.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; - sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; + name = "libmwaw-0.3.16.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; + sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; md5 = ""; - md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; + md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { name = "neon-0.30.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; md5 = ""; md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.47.1-with-nspr-4.23.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; - sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; + name = "nss-3.55-with-nspr-4.27.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.55-with-nspr-4.27.tar.gz"; + sha256 = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45"; md5 = ""; - md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; + md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; md5 = ""; md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; - sha256 = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504"; + name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + sha256 = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0"; md5 = ""; - md5name = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; } { name = "officeotron-0.7.4-master.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770"; md5 = "8249374c274932a21846fa7629c2aa9b"; md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { name = "openldap-2.4.45.tgz"; - url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; md5 = ""; md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { name = "openssl-1.0.2t.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { - name = "liborcus-0.14.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; - sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; + name = "liborcus-0.15.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; + sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; md5 = ""; - md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; + md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; md5 = ""; md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { name = "libpagemaker-0.0.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; md5 = ""; md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3794.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; - sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; + name = "pdfium-4306.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2"; + sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8"; md5 = ""; - md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; + md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; sha256 = "21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e"; md5 = "e80ebae4da01e77f68744319f01d52a3"; md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { name = "libpng-1.6.37.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; md5 = ""; md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { name = "poppler-0.82.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; md5 = ""; md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz"; - sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049"; + name = "Python-3.7.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; + sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; + md5 = ""; + md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; + } + { + name = "QR-Code-generator-1.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; + sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; md5 = ""; - md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz"; + md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; } { name = "libqxp-0.0.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; sha256 = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c"; md5 = ""; md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; } { name = "rasqal-0.9.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; + url = "https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; sha256 = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c"; md5 = "1f5def51ca0026cd192958ef07228b52"; md5name = "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; } { name = "redland-1.0.17.tar.gz"; - url = "http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; md5 = "e5be03eda13ef68aabab6e42aa67715e"; md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; } { name = "librevenge-0.0.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; md5 = ""; md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; - url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { name = "serf-1.2.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; md5 = ""; md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"; - sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4"; + name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760"; + md5 = ""; + md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + } + { + name = "libstaroffice-0.0.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz"; + sha256 = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db"; md5 = ""; - md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz"; + md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } { name = "swingExSrc.zip"; - url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; md5 = "35c94d2df8893241173de1d16b6034c0"; md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; } { name = "twaindsm_2.4.1.orig.tar.gz"; - url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; + url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6"; md5 = ""; md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { name = "ucpp-1.3.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; md5 = "0168229624cfac409e766913506961a8"; md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { name = "libvisio-0.1.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; sha256 = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"; md5 = ""; md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { name = "libwpg-0.3.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; md5 = ""; md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.10.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz"; - sha256 = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca"; + name = "libwps-0.4.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; + sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; md5 = ""; - md5name = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca-libwps-0.4.10.tar.xz"; + md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; } { name = "xsltml_2.1.2.zip"; - url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + url = "https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870"; md5 = "a7983f859eafb2677d7ff386a023bc40"; md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { name = "zlib-1.2.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; md5 = ""; md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { name = "libzmf-0.0.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22"; md5 = ""; md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix index 119b5a645d6e..0141b74c3890 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,19 +1,10 @@ -{ lib, stdenv, kdeIntegration, fetchpatch, ... }: +{ lib, kdeIntegration, ... }: attrs: { - patches = attrs.patches or [ ] ++ [ - (fetchpatch { - url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008"; - name = "poppler-0.86.patch"; - sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j"; - }) - ]; postConfigure = attrs.postConfigure + '' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' ''; - configureFlags = lib.remove "--without-system-qrcodegen" - (attrs.configureFlags ++ [ - (lib.enableFeature kdeIntegration "kde5") - ]); - meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; + configureFlags = attrs.configureFlags ++ [ + (lib.enableFeature kdeIntegration "kf5") + ]; } diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix index 36deae53670a..c9b182647114 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -6,9 +6,9 @@ rec { inherit sha256; }; - major = "6"; - minor = "3"; - patch = "5"; + major = "7"; + minor = "0"; + patch = "4"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz"; + sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv"; + sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6"; + sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb"; }; } diff --git a/nixpkgs/pkgs/applications/office/mytetra/default.nix b/nixpkgs/pkgs/applications/office/mytetra/default.nix index f48ec3fb237c..3e2383fb3565 100644 --- a/nixpkgs/pkgs/applications/office/mytetra/default.nix +++ b/nixpkgs/pkgs/applications/office/mytetra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: +{ lib, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg-utils }: let version = "1.44.55"; @@ -26,7 +26,7 @@ in mkDerivation { postFixup = '' wrapProgram $out/bin/mytetra \ - --prefix PATH : ${xdg_utils}/bin + --prefix PATH : ${xdg-utils}/bin ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix index c470a56b8a11..f8b91a94ccc7 100644 --- a/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ b/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix @@ -1,15 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pytest_4, pytest-django, django }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-django +, django +}: -buildPythonPackage { +buildPythonPackage rec { pname = "django-crispy-forms"; - version = "2019.04.21"; + version = "1.10.0"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; - rev = "e25a5326697e5b545689b3a914e516404a6911bb"; - sha256 = "12zqa76q6i7j47aqvhilivpbdplgp9zw2q8zfcjzlgclrqafaj39"; + rev = version; + sha256 = "0y6kskfxgckb9npcgwx4zrs5n9px159zh9zhinhxi3i7wlriqpf5"; }; # For reasons unknown, the source dir must contain a dash @@ -19,12 +24,10 @@ buildPythonPackage { export sourceRoot=source- ''; - checkInputs = [ pytest_4 pytest-django django ]; + checkInputs = [ django pytest-django pytestCheckHook ]; - checkPhase = '' - PYTHONPATH="$(pwd):$PYTHONPATH" \ - DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings \ - pytest crispy_forms/tests + preCheck = '' + export DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/office/planner/default.nix b/nixpkgs/pkgs/applications/office/planner/default.nix deleted file mode 100644 index f0237c4cecff..000000000000 --- a/nixpkgs/pkgs/applications/office/planner/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib, stdenv -, fetchFromGitLab -, pkg-config -, intltool -, automake111x -, autoconf -, libtool -, gnome2 -, libxslt -, python2 -}: - -let version = "unstable-2019-02-13"; - -in stdenv.mkDerivation { - pname = "planner"; - inherit version; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "planner"; - rev = "76d31defae4979aa51dd37e8888f61e9a6a51367"; - sha256 = "0lbch4drg6005216hgcys93rq92p7zd20968x0gk254kckd9ag5w"; - }; - - nativeBuildInputs = with gnome2; [ - pkg-config - intltool - automake111x - autoconf - libtool - gnome-common - gtk-doc - scrollkeeper - ]; - - buildInputs = with gnome2; [ - GConf - gtk - libgnomecanvas - libgnomeui - libglade - libxslt - python2.pkgs.pygtk - ]; - - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - - preConfigure = "./autogen.sh"; - configureFlags = [ - "--enable-python" - "--enable-python-plugin" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Planner"; - description = "Project management application for GNOME"; - longDescription = '' - Planner is the GNOME project management tool. - Its goal is to be an easy-to-use no-nonsense cross-platform - project management application. - - Planner is a GTK application written in C and licensed under the - GPLv2 or any later version. It can store its data in either xml - files or in a postgresql database. Projects can also be printed - to PDF or exported to HTML for easy viewing from any web browser. - - Planner was originally created by Richard Hult and Mikael Hallendal - at Imendio. - ''; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ rasendubi amiloradovsky ]; - }; -} diff --git a/nixpkgs/pkgs/applications/office/portfolio/default.nix b/nixpkgs/pkgs/applications/office/portfolio/default.nix index ad52e75ac358..47cda0518219 100644 --- a/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.50.2"; + version = "0.50.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-n5tLYrqqM0KUQrlJWZtKGClKONAz3EXBAlEqIrdPBpI="; + sha256 = "sha256-8sFBxcs3tnIQQ4S39aF8r9SGm9VOHPpgQYyLkUaOscw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/qnotero/default.nix b/nixpkgs/pkgs/applications/office/qnotero/default.nix index 6ffdd5fefedd..414312f24e51 100644 --- a/nixpkgs/pkgs/applications/office/qnotero/default.nix +++ b/nixpkgs/pkgs/applications/office/qnotero/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonPackage rec { pname = "qnotero"; @@ -26,6 +26,9 @@ python3Packages.buildPythonPackage rec { wrapQtApp "$out"/bin/qnotero ''; + # no tests executed + doCheck = false; + meta = { description = "Quick access to Zotero references"; homepage = "http://www.cogsci.nl/software/qnotero"; diff --git a/nixpkgs/pkgs/applications/office/scribus/unstable.nix b/nixpkgs/pkgs/applications/office/scribus/unstable.nix index 7f4054bfb4ed..f83ce8b39b1c 100644 --- a/nixpkgs/pkgs/applications/office/scribus/unstable.nix +++ b/nixpkgs/pkgs/applications/office/scribus/unstable.nix @@ -22,7 +22,7 @@ , qtbase , qtimageformats , qttools -, lib, stdenv +, lib }: let @@ -43,6 +43,13 @@ mkDerivation rec { sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s="; }; + patches = [ + (fetchpatch { # fix build with podofo 0.9.7 + url = "https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch"; + sha256 = "0vp275xfbd4xnj5s55cgzsihgihby5mmjlbmrc7sa6jbrsm8aa2c"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/nixpkgs/pkgs/applications/office/skanlite/default.nix b/nixpkgs/pkgs/applications/office/skanlite/default.nix index 7436054715d8..89cf2add212c 100644 --- a/nixpkgs/pkgs/applications/office/skanlite/default.nix +++ b/nixpkgs/pkgs/applications/office/skanlite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, +{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets, libksane }: diff --git a/nixpkgs/pkgs/applications/office/timeular/default.nix b/nixpkgs/pkgs/applications/office/timeular/default.nix index 63f86171dce9..6c1068d45844 100644 --- a/nixpkgs/pkgs/applications/office/timeular/default.nix +++ b/nixpkgs/pkgs/applications/office/timeular/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchurl, appimageTools, libsecret diff --git a/nixpkgs/pkgs/applications/office/todoman/default.nix b/nixpkgs/pkgs/applications/office/todoman/default.nix index dc788a6f1957..4011879ddb83 100644 --- a/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3 , glibcLocales , installShellFiles diff --git a/nixpkgs/pkgs/applications/office/trilium/default.nix b/nixpkgs/pkgs/applications/office/trilium/default.nix index 499aa1e5faf5..cb0781f74e19 100644 --- a/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill ]; }; - version = "0.43.3"; + version = "0.43.4"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1k9vcs7pwa89bzivqp0gfs45jzqw216fpypg3ja4n2dzn4qkv2as"; + sha256 = "0kjysam5alsmnj93fcqq1ivawnra42gn7dch99rrfmvbkxp7hhr8"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1n3v7wdav6mvgcy72mmfhncsa74i0ax1ij5rjczgfjjyiyc5y0rk"; + sha256 = "128mvmp15mjpb5ipkmr0yn7ahby26shbix3f8q094f4zpxjp83zx"; }; in { diff --git a/nixpkgs/pkgs/applications/office/tryton/default.nix b/nixpkgs/pkgs/applications/office/tryton/default.nix index 6b49a27a08a5..65eb48f3b2d9 100644 --- a/nixpkgs/pkgs/applications/office/tryton/default.nix +++ b/nixpkgs/pkgs/applications/office/tryton/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3Packages , pkg-config , librsvg diff --git a/nixpkgs/pkgs/applications/office/watson/default.nix b/nixpkgs/pkgs/applications/office/watson/default.nix index 30992e60a6fc..18c1b9469e75 100644 --- a/nixpkgs/pkgs/applications/office/watson/default.nix +++ b/nixpkgs/pkgs/applications/office/watson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, installShellFiles }: +{ lib, fetchFromGitHub, pythonPackages, installShellFiles }: with pythonPackages; diff --git a/nixpkgs/pkgs/applications/radio/chirp/default.nix b/nixpkgs/pkgs/applications/radio/chirp/default.nix index 6b84e47909dd..e9b446dc5847 100644 --- a/nixpkgs/pkgs/applications/radio/chirp/default.nix +++ b/nixpkgs/pkgs/applications/radio/chirp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , python2 }: diff --git a/nixpkgs/pkgs/applications/radio/fldigi/default.nix b/nixpkgs/pkgs/applications/radio/fldigi/default.nix index 51728bfb403e..d14e0017f6d3 100644 --- a/nixpkgs/pkgs/applications/radio/fldigi/default.nix +++ b/nixpkgs/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.17"; + version = "4.1.18"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1gzff60sn3h05279f9mdi1rkdws52m28shcil16911lvlq6ki13m"; + sha256 = "sha256-PH/YSrOoS6RSWyUenVYSDa7mJqODFoSpdP2tR2+QJw0="; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/nixpkgs/pkgs/applications/radio/flrig/default.nix b/nixpkgs/pkgs/applications/radio/flrig/default.nix index 276581d80e52..c927d77bef44 100644 --- a/nixpkgs/pkgs/applications/radio/flrig/default.nix +++ b/nixpkgs/pkgs/applications/radio/flrig/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.53"; + version = "1.3.54"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "1m0fa891scpaf719002w9gpg1famx84kpzav1mw1fafmbzyvjw1i"; + sha256 = "sha256-zw0xi4AVnm8Vi/oWkh13C9BjabOKUtZaVmLN++zKGug="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix index 94556561439d..8d6e8509772c 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix @@ -1,10 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio -, makeWrapper, cppunit, gr-osmosdr, log4cpp -, pythonSupport ? true, python, swig +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, boost +, gnuradio +, makeWrapper +, cppunit +, gr-osmosdr +, log4cpp +, pythonSupport ? true +, python +, swig +, fetchpatch }: -assert pythonSupport -> python != null && swig != null; - stdenv.mkDerivation { pname = "gr-ais"; version = "2015-12-20"; @@ -12,14 +22,20 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "bistromath"; repo = "gr-ais"; - # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 - rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; - sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; + rev = "cdc1f52745853f9c739c718251830eb69704b26e"; + sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; }; + patches = [ + (fetchpatch { + url = "https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054.patch"; + sha256 = "1cwalphldvf6dbhzwz1gi53z0cb4921qsvlz4138q7m6dxccvssg"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] - ++ lib.optionals pythonSupport [ python swig ]; + ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/nixpkgs/pkgs/applications/radio/gqrx/default.nix index 8a6123099097..217818f67c29 100644 --- a/nixpkgs/pkgs/applications/radio/gqrx/default.nix +++ b/nixpkgs/pkgs/applications/radio/gqrx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr +{ lib, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr , mkDerivation # drivers (optional): , rtl-sdr, hackrf diff --git a/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix b/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix index 2524b48c9c27..aea0944b29b4 100644 --- a/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix +++ b/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation { ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW ''; homepage = "https://github.com/EliasOenal/multimon-ng"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; }; } diff --git a/nixpkgs/pkgs/applications/radio/qsstv/default.nix b/nixpkgs/pkgs/applications/radio/qsstv/default.nix index d92cf9e25cdb..e6fa95b5dc78 100644 --- a/nixpkgs/pkgs/applications/radio/qsstv/default.nix +++ b/nixpkgs/pkgs/applications/radio/qsstv/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw, +{ mkDerivation, lib, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw, libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/radio/quisk/default.nix b/nixpkgs/pkgs/applications/radio/quisk/default.nix index c0dab8773c71..19a4e715013d 100644 --- a/nixpkgs/pkgs/applications/radio/quisk/default.nix +++ b/nixpkgs/pkgs/applications/radio/quisk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python38Packages, fetchPypi +{ lib, python38Packages, fetchPypi , fftw, alsaLib, pulseaudio, wxPython_4_0 }: python38Packages.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index b4a6cb775cc3..6f723971c8e6 100644 --- a/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -9,7 +9,7 @@ fftwFloat, glew, hackrf, lib, -libav, +ffmpeg, libiio, libopus, libpulseaudio, @@ -44,7 +44,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio + glew opencv3 libusb1 boost libopus limesuite ffmpeg libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2 cm256cc serialdv qtserialport libbladeRF uhd soapysdr-with-plugins diff --git a/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix b/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix index 9c0ad38eb598..dca5b7702c31 100644 --- a/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/pothosware/SoapyBladeRF"; description = "SoapySDR plugin for BladeRF devices"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/radio/urh/default.nix b/nixpkgs/pkgs/applications/radio/urh/default.nix index 3a51f77d7bd6..00d3431b6e37 100644 --- a/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages +{ lib, fetchFromGitHub, python3Packages , hackrf, rtl-sdr, airspy, limesuite, libiio , qt5 , USRPSupport ? false, uhd }: diff --git a/nixpkgs/pkgs/applications/radio/welle-io/default.nix b/nixpkgs/pkgs/applications/radio/welle-io/default.nix index be154d6cee3a..97bf84a2bf39 100644 --- a/nixpkgs/pkgs/applications/radio/welle-io/default.nix +++ b/nixpkgs/pkgs/applications/radio/welle-io/default.nix @@ -43,7 +43,7 @@ in mkDerivation { description = "A DAB/DAB+ Software Radio"; homepage = "https://www.welle.io/"; maintainers = with maintainers; [ ck3d markuskowa ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; }; } diff --git a/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix index 4cda15e516d4..3f82ff7b52a8 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the NORAD Keplerian elements. ''; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; homepage = "http://gpredict.oz9aec.net/"; maintainers = [ maintainers.markuskowa maintainers.cmcdragonkai ]; diff --git a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 4c773208d560..235d06a9cd6f 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.20.3"; + version = "0.20.4"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "08abrshrzhdfcg3b2vzfmnq8fhzrasadg1ajs81kcw96yjc59vak"; + sha256 = "sha256-EhlcaMxlDyX2RneBrpbmLScc9vd77Tf7RPblbQqAqZ0="; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/science/biology/blast/default.nix b/nixpkgs/pkgs/applications/science/biology/blast/default.nix index 6fd061f1402d..877b5b7d34c0 100644 --- a/nixpkgs/pkgs/applications/science/biology/blast/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/blast/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, perl, cpio, gawk, coreutils, ApplicationServices }: +{ lib, stdenv, buildPackages, fetchurl, zlib, bzip2, perl, cpio, gawk, coreutils, ApplicationServices }: stdenv.mkDerivation rec { pname = "blast"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; - sha256 = "09nry5knj5hhxpn0a5ww1gb1704grd4r1y7adbjl6kqwq37dkk9s"; + url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; + sha256 = "0m0r9vkw631ky1za1wilsfk9k9spwqh22nkrb9a57rbwmrc1i3nq"; }; sourceRoot = "ncbi-blast-${version}+-src/c++"; @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { --replace /bin/date ${coreutils}/bin/date ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; # perl is necessary in buildInputs so that installed perl scripts get patched diff --git a/nixpkgs/pkgs/applications/science/biology/blast/no_slash_bin.patch b/nixpkgs/pkgs/applications/science/biology/blast/no_slash_bin.patch index 9b78ac579264..851e37fa905d 100644 --- a/nixpkgs/pkgs/applications/science/biology/blast/no_slash_bin.patch +++ b/nixpkgs/pkgs/applications/science/biology/blast/no_slash_bin.patch @@ -171,14 +171,8 @@ diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/strip_for_install. GREP = @GREP@ --- ncbi-blast-2.9.0+-src/src/build-system/configure 2019-03-05 00:49:08.000000000 +0800 +++ ncbi-blast-2.9.0+-src.patched/src/build-system/configure 2019-05-15 16:55:40.711795042 +0800 -@@ -10417,10 +10417,6 @@ - echo "${ECHO_T}no, using $LN_S" >&6; } - fi - +@@ -10417,4 +10417,0 @@ -case "$LN_S" in - /*) ;; - * ) LN_S=/bin/$LN_S ;; -esac - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. diff --git a/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix b/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix index c6defb245c7f..7eb3afd437af 100644 --- a/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: +{ lib, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: python27Packages.buildPythonApplication rec { pname = "eggnog-mapper"; diff --git a/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix b/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix index 55a9612c62d0..082a779e12bf 100644 --- a/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, cmake, python3 }: +{ lib, fetchurl, python3Packages, cmake, python3 }: let pythonPackages = python3Packages; diff --git a/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 4a3816c4d4af..52a17e8d01cd 100644 --- a/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.24.1"; + version = "2.25.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-acCsYHyZ358hYqa2haOxR+g6FQGtK+hstYfLBvHLwR8="; + sha256 = "sha256-+vJDTahP4htRbVeBd2eSD97fwZ69wB2cro1tMxT36Jc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/biology/poretools/default.nix b/nixpkgs/pkgs/applications/science/biology/poretools/default.nix index 454843e2f324..b2cefefb5cb5 100755 --- a/nixpkgs/pkgs/applications/science/biology/poretools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/poretools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchFromGitHub }: +{ lib, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonPackage rec { pname = "poretools"; diff --git a/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix b/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix index 2efa39ac489d..11530c6a7226 100644 --- a/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/"; maintainers = with maintainers; [ luispedro ]; + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/applications/science/biology/star/default.nix b/nixpkgs/pkgs/applications/science/biology/star/default.nix index a7fe948ecfd6..345863847377 100644 --- a/nixpkgs/pkgs/applications/science/biology/star/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.6a"; + version = "2.7.7a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "1zw9f4jbhz0y51namnmid42pa7pviviy94q9db8w0774nksdf8is"; + sha256 = "sha256-0K49yjcnTzC56ZIB20OeTiMJ5EW8mRx+xEpyWEfFcts="; }; sourceRoot = "source/source"; diff --git a/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix b/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix index b70ac29e38f7..cb606a6b3463 100644 --- a/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa +{ lib, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa , samtools, findutils, python }: python3Packages.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/applications/science/chemistry/chemtool/default.nix b/nixpkgs/pkgs/applications/science/chemistry/chemtool/default.nix new file mode 100644 index 000000000000..3b5d144ba22b --- /dev/null +++ b/nixpkgs/pkgs/applications/science/chemistry/chemtool/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, libX11 +, gtk2 +, fig2dev +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "chemtool"; + version = "1.6.14"; + + src = fetchurl { + url = "http://ruby.chemie.uni-freiburg.de/~martin/${pname}/${pname}-${version}.tar.gz"; + sha256 = "hhYaBGE4azNKX/sXzfCUpJGUGIRngnL0V0mBNRTdr8s="; + }; + + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + buildInputs = [ + libX11 + gtk2 + fig2dev + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}") + ''; + + meta = with lib; { + homepage = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"; + description = "Draw chemical structures"; + longDescription = '' + Chemtool is a program for drawing organic molecules. It runs under the X + Window System using the GTK widget set. + + Most operations in chemtool can be accomplished using the mouse - the + first (usually the left) button is used to select or place things, the + middle button modifies properties (e.g. reverses the direction of a bond), + and the right button is used to delete objects. + + The program offers essentially unlimited undo/redo, two text fonts plus + symbols, seven colors, drawing at several zoom scales, and square and + hexagonal backdrop grids for easier alignment. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/nixpkgs/pkgs/applications/science/chemistry/d-seams/default.nix b/nixpkgs/pkgs/applications/science/chemistry/d-seams/default.nix index cbe73bb7edc2..f5e21db4b55a 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/d-seams/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, stdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake +{ clangStdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }: clangStdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix index d90c55466f85..23635f8e6c6a 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.21.0"; + version = "21.2.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-OMT6t8bNeFRWFlpyg0iKt2SMNfAmIUvVKiW+cfjfBuI="; + sha256 = "sha256-CLvMspk7HqrtNM5TD45mZIz6vsS32eUuxFDJiBDs9VY="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix b/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix index 32e8f6ee56e2..9595639d381e 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "molden"; src = fetchurl { - url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; + url = "ftp://ftp.cmbi.umcn.nl/pub/molgraph/molden/molden${version}.tar.gz"; sha256 = "02qi16pz2wffn3cc47dpjqhfafzwfmb79waw4nnhfyir8a4h3cq1"; }; @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Display and manipulate molecular structures"; - homepage = "http://www.cmbi.ru.nl/molden/"; + homepage = "http://www3.cmbi.umcn.nl/molden/"; license = { fullName = "Free for academic/non-profit use"; - url = "http://www.cmbi.ru.nl/molden/CopyRight.html"; + url = "http://www3.cmbi.umcn.nl/molden/CopyRight.html"; free = false; }; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix b/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix index 4bd88456b8f6..cc9202493b1d 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation { description = "Advanced quantum chemistry software package"; homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix b/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix index 474986901225..2df8b0e6d473 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, makeDesktopItem +{ lib, fetchurl, fetchFromGitHub, makeDesktopItem , python3, python3Packages , glew, glm, freeglut, libpng, libxml2, tk, freetype, msgpack }: diff --git a/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix b/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix index 14c654bd6978..6a9a491af1ee 100644 --- a/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: mkDerivation rec { pname = "caneda"; diff --git a/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix b/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix index b25f76800e87..79c01d3ec718 100644 --- a/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkg-config +{ mkDerivation, lib, fetchpatch, fetchFromGitHub, qmake, pkg-config , qtbase, qtsvg, qttools, qtserialport, boost, libgit2 }: diff --git a/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix index 8e4241b3ea99..ef68eb999fac 100644 --- a/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "13c4p60vrmwmnrv2jcr2gc1cxnimy7j8yp1p6434pbbk2py9k8mx"; + sha256 = "0mra6kf1c2qixfzqva6r01qms5kdabbhhblhk5is6h6nq78i8640"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix b/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix index dd76e9364c53..4cb8048df675 100644 --- a/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix @@ -38,7 +38,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # tests try to access /proc/ which does not exist on darwin + # Cannot locate IVL modules : couldn't get command path from OS. + doCheck = !stdenv.isDarwin; installCheckInputs = [ perl ]; diff --git a/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix b/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix index f3049a659d11..2a8c058a80bb 100644 --- a/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix +++ b/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.0.3"; src = fetchzip { - url = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip"; + url = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip"; sha256 = "10kmlg4m572qwfzi6hkyb0ypb643xw8sfb55xx7866lyh37w1q3s"; stripRoot = false; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Resolution-based theorem prover for Coalition Logic implemented in C++"; - homepage = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/"; + homepage = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/"; license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3 maintainers = with maintainers; [ mgttlinger ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/nixpkgs/pkgs/applications/science/logic/coq/default.nix index a2ff8382947b..62600ea90c20 100644 --- a/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -13,7 +13,8 @@ , csdp ? null , version, coq-version ? null, }@args: -let lib = import ../../../../build-support/coq/extra-lib.nix {inherit (stdenv) lib;}; in +let lib' = lib; in +let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in with builtins; with lib; let release = { @@ -40,11 +41,11 @@ let "8.12.0".sha256 = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz"; "8.12.1".sha256 = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q"; "8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; - "8.13+beta1".sha256 = "1v4a6dpj41flspa4ihcr7m5ahqz10kbn62fmrldmv7gzq6jsyfyq"; + "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix - { inherit stdenv fetchzip; } + { inherit lib stdenv fetchzip; } { inherit release releaseRev; location = { owner = "coq"; repo = "coq";}; } args.version; version = fetched.version; diff --git a/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix b/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix index 6c22c949483f..a0f81a543f18 100644 --- a/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, nettools, java, polyml, z3, rlwrap }: +{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, rlwrap }: # nettools needed for hostname stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3"; }; - buildInputs = [ perl polyml z3 ] + buildInputs = [ perl polyml z3 makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ nettools java ]; sourceRoot = dirname; @@ -64,6 +64,8 @@ stdenv.mkDerivation rec { mv $TMP/$dirname $out cd $out/$dirname bin/isabelle install $out/bin + + wrapProgram $out/$dirname/src/HOL/Tools/ATP/scripts/remote_atp --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.LWP ]} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/nixpkgs/pkgs/applications/science/logic/lean/default.nix index 1f3f7afa9d1b..7749f4fd72dd 100644 --- a/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.25.0"; + version = "3.26.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "sha256-/TlVoqgTGhRfC8d70kXc+VsEkURUksKNGRjYcww+F8g="; + sha256 = "sha256-xCULu6ljfyrA/Idr/BJ+3rLVmQqJZPoo+a7s++u50zU="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix b/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix index 5118795978d1..38039f61fda6 100644 --- a/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,6 +1,6 @@ { mkDerivation, callPackage, buildPackages , async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, lib, stdenv, stm, transformers +, parallel-io, parsec, lib, stm, transformers }: let z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; }; diff --git a/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix index 96e216417df1..f0c8dd249048 100644 --- a/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix +++ b/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix @@ -1,7 +1,7 @@ { mkDerivation, array, async, base, bytestring, containers , crackNum, deepseq, directory, doctest, filepath, generic-deriving , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random -, lib, stdenv, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck +, lib, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck , template-haskell, time, z3 }: mkDerivation { diff --git a/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix b/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix index 3574954c376c..a20ccea16dc7 100644 --- a/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix +++ b/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix @@ -1,5 +1,5 @@ { mkDerivation, fetchpatch -, base, containers, gomp, hspec, QuickCheck, lib, stdenv +, base, containers, gomp, hspec, QuickCheck, lib , transformers, z3 }: mkDerivation { diff --git a/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix b/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix index 1dd6dc1cfc89..3eabc9422e38 100644 --- a/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { meta = { description = "Tools for software verification and analysis"; homepage = "https://saw.galois.com"; - license = lib.licenses.unfreeRedistributable; + license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.thoughtpolice ]; }; diff --git a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix index 1f2ad4634de2..118bb8ecd206 100644 --- a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation { substituteInPlace sbysrc/sby_core.py \ --replace '##yosys-program-prefix##' '"${yosys}/bin/"' + + substituteInPlace sbysrc/sby.py \ + --replace '/usr/bin/env python3' '${python3}/bin/python' ''; buildPhase = "true"; diff --git a/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/nixpkgs/pkgs/applications/science/logic/z3/default.nix index cd58740186fe..cfef5960bd9c 100644 --- a/nixpkgs/pkgs/applications/science/logic/z3/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/z3/default.nix @@ -1,9 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, python, fixDarwinDylibNames +{ lib +, stdenv +, fetchFromGitHub +, python +, fixDarwinDylibNames , javaBindings ? false , ocamlBindings ? false , pythonBindings ? true , jdk ? null -, ocaml ? null, findlib ? null, zarith ? null +, ocaml ? null +, findlib ? null +, zarith ? null }: assert javaBindings -> jdk != null; @@ -13,19 +19,19 @@ with lib; stdenv.mkDerivation rec { pname = "z3"; - version = "4.8.9"; + version = "4.8.10"; src = fetchFromGitHub { - owner = "Z3Prover"; - repo = pname; - rev = "z3-${version}"; - sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"; + owner = "Z3Prover"; + repo = pname; + rev = "z3-${version}"; + sha256 = "1w1ym2l0gipvjx322npw7lhclv8rslq58gnj0d9i96masi3gbycf"; }; nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ python ] - ++ optional javaBindings jdk - ++ optionals ocamlBindings [ ocaml findlib zarith ] + ++ optional javaBindings jdk + ++ optionals ocamlBindings [ ocaml findlib zarith ] ; propagatedBuildInputs = [ python.pkgs.setuptools ]; enableParallelBuilding = true; @@ -35,16 +41,17 @@ stdenv.mkDerivation rec { mkdir -p $OCAMLFIND_DESTDIR/stublibs ''; - configurePhase = concatStringsSep " " ( - [ "${python.interpreter} scripts/mk_make.py --prefix=$out" ] - ++ optional javaBindings "--java" - ++ optional ocamlBindings "--ml" - ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" - ) + "\n" + "cd build"; + configurePhase = concatStringsSep " " + ( + [ "${python.interpreter} scripts/mk_make.py --prefix=$out" ] + ++ optional javaBindings "--java" + ++ optional ocamlBindings "--ml" + ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" + ) + "\n" + "cd build"; postInstall = '' mkdir -p $dev $lib - mv $out/lib $lib/lib + mv $out/lib $lib/lib mv $out/include $dev/include '' + optionalString pythonBindings '' mkdir -p $python/lib @@ -53,14 +60,13 @@ stdenv.mkDerivation rec { ''; outputs = [ "out" "lib" "dev" "python" ] - ++ optional ocamlBindings "ocaml" - ; + ++ optional ocamlBindings "ocaml"; - meta = { + meta = with lib; { description = "A high-performance theorem prover and SMT solver"; - homepage = "https://github.com/Z3Prover/z3"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ thoughtpolice ttuegel ]; + homepage = "https://github.com/Z3Prover/z3"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ttuegel ]; }; } diff --git a/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix index 4bfd4b9421f6..50d0aa6f9d1d 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, qt5 }: +{ lib, python3Packages, fetchFromGitHub, qt5 }: python3Packages.buildPythonApplication rec { pname = "labelImg"; version = "1.8.3"; diff --git a/nixpkgs/pkgs/applications/science/math/almonds/default.nix b/nixpkgs/pkgs/applications/science/math/almonds/default.nix index 7271b6d8755c..ec3891667c58 100644 --- a/nixpkgs/pkgs/applications/science/math/almonds/default.nix +++ b/nixpkgs/pkgs/applications/science/math/almonds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub, ncurses }: +{ lib, python3, fetchFromGitHub, ncurses }: with python3.pkgs; buildPythonApplication rec { pname = "almonds"; diff --git a/nixpkgs/pkgs/applications/science/math/calc/default.nix b/nixpkgs/pkgs/applications/science/math/calc/default.nix index e770cff2da9c..81b7487bd27b 100644 --- a/nixpkgs/pkgs/applications/science/math/calc/default.nix +++ b/nixpkgs/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.12.7.2"; + version = "2.12.7.6"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "147wmbajcxv6wp92j6pizq4plrr1sb7jirifr1477bx33hc49bsp"; + sha256 = "sha256-Pg8nvW+RDy1Vb+Xg+5tnDxZEVkD80VcQGyZVayq8zsk="; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/science/math/cemu/default.nix b/nixpkgs/pkgs/applications/science/math/cemu/default.nix index cc8c3514a0b7..9d56ac70d921 100644 --- a/nixpkgs/pkgs/applications/science/math/cemu/default.nix +++ b/nixpkgs/pkgs/applications/science/math/cemu/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, lib, stdenv +, lib , mkDerivation , SDL2 , libGL diff --git a/nixpkgs/pkgs/applications/science/math/geogebra/default.nix b/nixpkgs/pkgs/applications/science/math/geogebra/default.nix index a20b43c875e2..fa2724469b66 100644 --- a/nixpkgs/pkgs/applications/science/math/geogebra/default.nix +++ b/nixpkgs/pkgs/applications/science/math/geogebra/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: let pname = "geogebra"; - version = "5-0-609-0"; + version = "5-0-620-0"; srcIcon = fetchurl { url = "http://static.geogebra.org/images/geogebra-logo.svg"; @@ -27,7 +27,7 @@ let calculus in one easy-to-use package. ''; homepage = "https://www.geogebra.org/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sikmir ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; @@ -41,9 +41,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - "http://web.archive.org/web/20201022200454/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "http://web.archive.org/web/20210101213140/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "0xbhg8hm3dqm3qkraj48pqwslrnjyxpq9mcgylr2m8i1gmqw7xwf"; + sha256 = "0v4r76b91cj0pns78gh3d432g2jlq2pz37lslg3fnnpvlfh25s9j"; }; nativeBuildInputs = [ makeWrapper ]; @@ -70,8 +70,11 @@ let preferLocalBuild = true; src = fetchurl { - url = "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"; - sha256 = "16fgqwxz31cfmia0pyzpk05aqzrqr11sjbw37q9zb3xfh3p1r4gz"; + urls = [ + "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" + "https://web.archive.org/web/20210101213641/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" + ]; + sha256 = "02sbxrns9zvhcfrr68ygv766and6f6b2a3dfarljxszwsviv6ljf"; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix b/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix index 4ed66d969303..dc952dc23295 100644 --- a/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,14 +1,14 @@ { lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: let pname = "geogebra"; - version = "6-0-609-0"; + version = "6-0-620-0"; srcIcon = geogebra.srcIcon; desktopItem = geogebra.desktopItem; meta = with lib; geogebra.meta // { license = licenses.geogebra; - maintainers = with maintainers; [ voidless ]; + maintainers = with maintainers; [ voidless sikmir ]; platforms = with platforms; linux ++ darwin; }; @@ -17,10 +17,10 @@ let src = fetchurl { urls = [ - "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20201022200156/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - ]; - sha256 = "0rzcbq587x8827g9v03awa9hz27vyfjc0cz45ymbchqp31lsx49b"; + "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20210101214511/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + ]; + sha256 = "0xxzmphbfvmhnxnc1pkjgdhccjndyzmlvvaa8xfdrvswwwk7zh43"; }; dontConfigure = true; @@ -51,8 +51,11 @@ let inherit pname version meta; src = fetchurl { - url = "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"; - sha256 = "0275869zgwbl1qjj593q6629hnxbwk9c15rkm29a3lh10pinb099"; + urls = [ + "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + "https://web.archive.org/web/20210101214236/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + ]; + sha256 = "13g05d45j6dn9zwxpxnln83j7w1cvcd7l8jnir30pxlmdi7h8r78"; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/applications/science/math/ginac/default.nix b/nixpkgs/pkgs/applications/science/math/ginac/default.nix index 4bb9b0ae681d..6a38670adccf 100644 --- a/nixpkgs/pkgs/applications/science/math/ginac/default.nix +++ b/nixpkgs/pkgs/applications/science/math/ginac/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GiNaC is Not a CAS"; - homepage = "http://www.ginac.de/"; + homepage = "https://www.ginac.de/"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/science/math/gretl/default.nix b/nixpkgs/pkgs/applications/science/math/gretl/default.nix index b68a02e9ebbd..cc9fe7c4d2ce 100644 --- a/nixpkgs/pkgs/applications/science/math/gretl/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2020e"; + version = "2021a"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "105y5hkzgyvad6wc3y7nn327bvrsch6jp03ckkn0w0hpnhiywzx7"; + sha256 = "sha256-BDaTv6PORiBnsEaU7uXJIKuxTqIgpY44vUmSViyME0A="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix b/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix index 9e0c84036466..22d1c92e1ec3 100644 --- a/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix +++ b/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "1.9"; + version = "2.0.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "ZGY4ZtAG/ZnEnC80modZBV4RdRQElbkjeoKCEFVrncE="; + sha256 = "NbWXMash0pK7Y9gOEBbL7zXjFytoeZBN9/wIbRTvQ8g="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/medicine/dcmtk/default.nix b/nixpkgs/pkgs/applications/science/medicine/dcmtk/default.nix index 0312043306a0..8a06260ebc71 100644 --- a/nixpkgs/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/nixpkgs/pkgs/applications/science/medicine/dcmtk/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { pname = "dcmtk"; - version = "3.6.5"; + version = "3.6.6"; src = fetchFromGitHub { owner = "DCMTK"; repo = pname; rev = "DCMTK-${version}"; - sha256 = "0i38k1s0wdpbxxpiwsx490mszhxi45wp0z67iksvh60wfkaw54na"; + sha256 = "sha256-bpvf2JJXikV/CqmXZb3w4Ua3VBEQcQk7PXw9ie0t8xo="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix b/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix index 832c63117591..1430881a3f08 100644 --- a/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix +++ b/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { buildInputs = [ fahviewer python ]; - doBuild = false; - unpackPhase = '' dpkg-deb -x ${src} ./ ''; diff --git a/nixpkgs/pkgs/applications/science/misc/rink/default.nix b/nixpkgs/pkgs/applications/science/misc/rink/default.nix index 5670969e7a2d..4f0d1eae4872 100644 --- a/nixpkgs/pkgs/applications/science/misc/rink/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/rink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: +{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: rustPlatform.buildRustPackage rec { version = "0.5.1"; diff --git a/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix index 6b3c405a9ac2..edf26f7ec230 100644 --- a/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "snakemake"; diff --git a/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix b/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix index e6d1c544ee4c..e048b881d33d 100644 --- a/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "apmplanner2"; - version = "2.0.28-rc1"; + version = "2.0.28"; src = fetchFromGitHub { owner = "ArduPilot"; repo = "apm_planner"; rev = version; - sha256 = "18yn8bdz5hmgb0m5hlk8bibz4cj4g25w75pm1rvc4ds0mr1qgyjd"; + sha256 = "0wvbfjnnf7sh6fpgw8gimh5hgzywj3nwrgr80r782f5gayd3v2l1"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index 22a32f89bded..703048118f62 100644 --- a/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.30"; + version = "1.8.32"; src = fetchPypi { inherit pname version; - sha256 = "fe046481b793b592334749249620fce8a463f4c46b394ff744645975465d677b"; + sha256 = "f89ba880fe7351a13c68ba3f4c56acd6e246790b103f3ec79d9a527b5767b8f0"; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 95c8aebd32d0..82959e7f5e35 100644 --- a/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.0.11"; + version = "4.1.1"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -27,6 +27,7 @@ mkDerivation rec { ''; qmakeFlags = [ + "CONFIG+=StableBuild" # Default install tries to copy Qt files into package "CONFIG+=QGC_DISABLE_BUILD_SETUP" "../qgroundcontrol.pro" @@ -42,7 +43,7 @@ mkDerivation rec { cp -v deploy/qgroundcontrol.desktop $out/share/applications mkdir -p $out/bin - cp -v build/release/QGroundControl "$out/bin/" + cp -v build/staging/QGroundControl "$out/bin/" mkdir -p $out/share/qgroundcontrol cp -rv resources/ $out/share/qgroundcontrol @@ -62,7 +63,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "14pk1vmcpg2cc5p100chbhnynclcwyqmyb2n2w11vvk0l2c9z1gz"; + sha256 = "1dji7jmwsrgcgzhra94wrgz67ydsdra7p10fw8gbw54gf6ncjfjm"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/search/xlsxgrep/default.nix b/nixpkgs/pkgs/applications/search/xlsxgrep/default.nix new file mode 100644 index 000000000000..8c62ae5736da --- /dev/null +++ b/nixpkgs/pkgs/applications/search/xlsxgrep/default.nix @@ -0,0 +1,20 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "xlsxgrep"; + version = "0.0.23"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm"; + }; + + pythonPath = with python3Packages; [ xlrd ]; + + meta = with lib; { + maintainers = with maintainers; [ felixscheinost ]; + description = "CLI tool to search text in XLSX and XLS files. It works similarly to Unix/GNU Linux grep"; + homepage = "https://github.com/zazuum/xlsxgrep"; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/applications/system/glances/default.nix b/nixpkgs/pkgs/applications/system/glances/default.nix index 10a6eb9c6bbf..26ca10e3f3fb 100644 --- a/nixpkgs/pkgs/applications/system/glances/default.nix +++ b/nixpkgs/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.1.6.1"; + version = "3.1.6.2"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "sha256-lYvFNeCuvLIV//fEQDZIj+nLGZmrKHfAQyNpe4vMmfU="; + sha256 = "sha256-6vxJKIwMKz8KQn10aOzqXhVBDfBLylw925hR1hWP7/A="; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): diff --git a/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index 6049b0e45e6a..71986e6ec6f9 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -23,7 +23,7 @@ , libxcb , libxkbcommon , wayland -, xdg_utils +, xdg-utils # Darwin Frameworks , AppKit @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace alacritty/src/config/mouse.rs \ - --replace xdg-open ${xdg_utils}/bin/xdg-open + --replace xdg-open ${xdg-utils}/bin/xdg-open ''; installPhase = '' diff --git a/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index 2b79c5362de1..63642af708f6 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -21,7 +21,7 @@ }: let - version = "1.6.2"; + version = "1.6.4"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "08i3jmjky5s2nnc0c95c009cym91rs4sj4876sr4xnlkb7ab4812"; + sha256 = "0awv53l3039s1rnkhdkzc0gwawlnd1m8cl4qhaijhxzzq68w0dfb"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix index 77a052a4f1d6..62cb6707c1b2 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3 , glibcLocales diff --git a/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix b/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix index 9634a3be6b6d..baa71a09b9eb 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix @@ -1,18 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libX11, ncurses, libXext, libXft, fontconfig }: -with lib; - -let - version = "0.7.2"; - name = "xst-${version}"; -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "xst"; + version = "0.8.4.1"; src = fetchFromGitHub { owner = "gnotclub"; - repo = "xst"; + repo = pname; rev = "v${version}"; - sha256 = "1fplgy30gyrwkjsw3z947327r98i13zd1whwkplpj9fzckhb9vs9"; + sha256 = "nOJcOghtzFkl7B/4XeXptn2TdrGQ4QTKBo+t+9npxOA="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,8 +18,8 @@ in stdenv.mkDerivation { TERMINFO=$out/share/terminfo make install PREFIX=$out ''; - meta = { - homepage = "https://github.com/neeasade/xst"; + meta = with lib; { + homepage = "https://github.com/gnotclub/xst"; description = "Simple terminal fork that can load config from Xresources"; license = licenses.mit; maintainers = [ maintainers.vyp ]; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix index 80698c56cde7..433e5c306180 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3 , keybinder3 diff --git a/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix index 528e3f50ea06..dc79e48b24fb 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix @@ -13,7 +13,7 @@ , wayland , libnotify -, xdg_utils +, xdg-utils , makeDesktopItem }: @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/settings.c \ - --replace xdg-open ${xdg_utils}/bin/xdg-open + --replace xdg-open ${xdg-utils}/bin/xdg-open substituteInPlace src/main.c \ --replace notify-send ${libnotify}/bin/notify-send ''; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index ba6c9bc8fdf8..8983b3d99043 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkg-config -, makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix -, gnused, coreutils, enableDecLocator ? true }: +{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig +, pkg-config, makeWrapper, nixosTests, writeScript, common-updater-scripts, git +, nixfmt, nix, gnused, coreutils, enableDecLocator ? true }: stdenv.mkDerivation rec { pname = "xterm"; - version = "363"; + version = "366"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "2Bo2OeJlUrZ2W9zyi+Hs24rKv5B5VXCOgwrWOX6hC0g="; + sha256 = "0vmzffy3hzgcgwx305h07ars5sxsq6nnl1ir4xqpxs9zjs2ji2w5"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix index cbd630094f0e..f4957a82d445 100644 --- a/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, flex, bison, +{lib, stdenv, fetchurl, makeWrapper, flex, bison, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt, python3, rcs, cvs, git, diff --git a/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/nixpkgs/pkgs/applications/version-management/fossil/default.nix index 987e7dcdaad0..af2ed175ac87 100644 --- a/nixpkgs/pkgs/applications/version-management/fossil/default.nix +++ b/nixpkgs/pkgs/applications/version-management/fossil/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.13"; + version = "2.14"; src = fetchurl { urls = @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${pname}-${version}.tar.gz"; - sha256 = "1xbk7bb7340x2vvn22ykii54v721fwk8vgr3xvjkvv8ff7hd6cyr"; + sha256 = "sha256-uNDJIBlt2K4pFS+nRI5ROh+nxYiHG3heP7/Ae0KgX7k="; }; nativeBuildInputs = [ installShellFiles tcl ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index 393edc57dcc8..47d31d6c18f6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: +{ buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: buildPythonApplication rec { pname = "bump2version"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix index 465de2d1d2be..4b7785374694 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "17cmwkha25hwsvnjcp388zd9kwacfq7adjp0sjw59y0vyr1maf22"; + sha256 = "sha256-cEVYU7vMgVxVIKztL6LHcvQjrNRRMrB5XMP/7gPCr5A="; }; - cargoSha256 = "1bji818cmkl0286a4qcnfiwibnqd5q5fvzmzgk5cabrdwaag2ia5"; + cargoSha256 = "sha256-iD3Cr1vo0FNyWvAN5m6ND+8sGyekgbkYmIxGTJkPEYE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 42ebe89cd4aa..a1daf3db4487 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"; + sha256 = "sha256-//n7kOANVHRSjxclxDcMnpMVzUcd/U6fFsP8acRjVWA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index 7c61c3329b20..38413f990a01 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -1,9 +1,4 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, installShellFiles -, git -}: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: buildGoModule rec { pname = "gh"; @@ -35,10 +30,8 @@ buildGoModule rec { done ''; - checkInputs = [ git ]; - checkPhase = '' - make test - ''; + # fails with `unable to find git executable in PATH` + doCheck = false; meta = with lib; { description = "GitHub CLI tool"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index b038e98e2dba..4bfe06fee747 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghorg"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix index c6fbf3b9569c..f56ce386e42b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghq"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index 1908b7539243..4d57820c84eb 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: +{ lib, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: buildPythonApplication rec { pname = "git-annex-metadata-gui"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 95e583585f19..6d3b65547330 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "git-annex-remote-b2"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index ba4cd42d29dd..33580712932c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-appraise-unstable"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index ec832866c717..35aada8b870f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -1,27 +1,20 @@ -{ fetchFromGitHub, python3Packages, lib, stdenv, git, graphviz }: +{ python3Packages, lib, git, graphviz }: python3Packages.buildPythonApplication rec { pname = "git-big-picture"; - version = "1.0.0"; + version = "1.1.1"; + format = "wheel"; - src = fetchFromGitHub { - owner = "git-big-picture"; - repo = pname; - rev = "v${version}"; - sha256 = "14yf71iwgk78nw8w0bpijsnnl4vg3bvxsw3vvypxmbrc1nh0bdha"; + src = python3Packages.fetchPypi { + inherit format version; + pname = "git_big_picture"; # underscores needed for working download URL + python = "py3"; # i.e. no Python 2.7 + sha256 = "a20a480057ced1585c4c38497d27a5012f12dd29697313f0bb8fa6ddbb5c17d8"; }; - buildInputs = [ git graphviz ]; - - # NOTE: Tests are disabled due to unpackaged test dependency "Scruf". - # When bumping to 1.1.0, please re-enable and use: - #checkInputs = [ cram git pytest ]; - #checkPhase = "pytest test.py"; - doCheck = false; - postFixup = '' wrapProgram $out/bin/git-big-picture \ - --prefix PATH ":" ${ lib.makeBinPath buildInputs } + --prefix PATH ":" ${ lib.makeBinPath [ git graphviz ] } ''; meta = { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 9ca5c707b5ce..7a24fe8e0359 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "git-bug"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix index 679e8dbdf507..e7eea5e43a12 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { pname = "git-cinnabar"; - version = "0.5.4"; + version = "0.5.6"; src = fetchFromGitHub { owner = "glandium"; repo = "git-cinnabar"; rev = version; - sha256 = "1cjn2cc6mj4m736wxab9s6qx83p5n5ha8cr3x84s9ra6rxs8d7pi"; + sha256 = "1wbp4xqpkaqhhkjw8rbbsagwiciqffacqqbm4j49q41mlk371ai3"; fetchSubmodules = true; }; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/libexec install git-cinnabar-helper $out/bin install git-cinnabar git-remote-hg $out/libexec @@ -38,12 +40,14 @@ stdenv.mkDerivation rec { --prefix GIT_CINNABAR_EXPERIMENTS , python3 \ --set PYTHONPATH ${mercurial}/${python3.sitePackages} done + + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/glandium/git-cinnabar"; description = "git remote helper to interact with mercurial repositories"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ qyliss ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index e7e0e009d112..5e105ad9dd3a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }: +{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: let inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix index d5abd0a59761..5193cd2531f4 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Command-line tool to delete merged Git branches"; homepage = "https://pypi.org/project/git-delete-merged-branches/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 3f6ea7972bac..f2291882b2b8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchzip, unixtools, which }: +{ lib, stdenv, fetchFromGitHub, unixtools, which }: stdenv.mkDerivation rec { pname = "git-extras"; version = "6.1.0"; - src = fetchzip { - url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; + src = fetchFromGitHub { + owner = "tj"; + repo = "git-extras"; + rev = version; sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz"; }; @@ -29,6 +31,6 @@ stdenv.mkDerivation rec { description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.spwhitt maintainers.cko ]; + maintainers = with maintainers; [ spwhitt cko ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix index 216a1035c72b..4dc9c4f8453d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { inherit ruby; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 1d669bfe49c6..f28d49702bce 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -1,27 +1,28 @@ -{ lib, stdenv, ncurses5, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q"; + sha256 = "117zwxyq2vc33nbnfpjbdr5vc2l5ymf6ln1dm5551ha3y3gdq3bf"; }; - cargoSha256 = "0jc6mhszxmwsdjk73wkfi0jjp9vkzzl9kk0dbnry6w7dyr5if8cc"; + cargoSha256 = "051llwk9swq03xdqwyj0hlyv2ywq2f1cnks95nygyy393q7v930x"; - buildInputs = [ ncurses5 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoParallelTestThreads = false; + # external_editor::tests::* tests fail + doCheck = false; meta = with lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ masaeedu zowoq ]; + maintainers = with maintainers; [ masaeedu SuperSandro2000 zowoq ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 3fb8b2f35e8d..7f2163e67d66 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.15.9"; + version = "2.16.1"; src = fetchPypi { inherit pname version; - sha256 = "0sg9ci9q1v3975855vi491ass72ladp3bjj2mvg77yxj13g3qqsx"; + sha256 = "00xh3q3gmi88qcl0a61pw532iyw4xcls5h336cjzld70ps2r89g4"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix index 3ba53e837fa8..5e5bba3df728 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: +{lib, stdenv, git, xdg-utils, gnugrep, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { pname = "git-open"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-open $out/bin wrapProgram $out/bin/git-open \ - --prefix PATH : "${lib.makeBinPath [ git xdg_utils gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ git xdg-utils gnugrep ]}" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index d6a35a28d66e..93dc314fa3d8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "git-remote-gcrypt"; - version = "1.3"; + version = "1.4"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh"; + sha256 = "sha256-uHgz8Aj5w8UOo/XbptCRKON1RAdDfFsLL9ZDEF1QrPQ="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index dd4e6e011a6e..69689a49a929 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages +{ lib, fetchFromGitHub, python3Packages , asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 }: diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix index 77e077436169..85a84103118d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "git-vanity-hash"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix index dc853be6772e..25f7e95d184f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gitbatch-unstable"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix index e2aaafea2024..3d429b7c561c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoPackage , fetchFromGitHub , pkg-config diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index 6f5ce3358a3a..1fa2ebc6f74a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildEnv, git, fetchFromGitHub +{ lib, buildEnv, git, fetchFromGitHub , gitwebTheme ? false }: let diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix index ac2cd5d3b417..eae572530c39 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NSc/h6cENuXIBwC4ixvZDlERV7b/X0GB4OGzxGEk4YY="; + sha256 = "sha256-JvHuOMpt62tw7ewDev7unAgZGV+ZSo6wDuiPhWap2v0="; }; - vendorSha256 = "sha256-N9swoVltKzdYez1WSoXMLZCvfYSFhVXgPjUfR0+5aAo="; + vendorSha256 = "sha256-0nnrH3GJhd4wlRETo9iSlFkXq358m30k7Fsb5haHlpQ="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix index 041034651894..e43c602d6d91 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline +{ lib, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline , cmake }: let version = "0.3.2"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index 4b189c55c8a8..e0d7e46d22a5 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: buildGoPackage rec { pname = "hub"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix index 284cbe758398..41c4e653a633 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils, installShellFiles, git }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils, installShellFiles, git }: buildGoModule rec { pname = "lab"; @@ -22,7 +22,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' - wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg_utils ]}"; + wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}"; for shell in bash fish zsh; do $out/bin/lab completion $shell > lab.$shell installShellCompletion lab.$shell diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index ce7493088430..18f2e5ad4871 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: # Currently `buildGo114Module` is passed as `buildGoModule` from # `../default.nix`. Please remove the fixed 1.14 once a new release has been diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/legit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/legit/default.nix index 7dbdd6071a57..df2866527115 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/legit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/legit/default.nix @@ -16,10 +16,8 @@ python3Packages.buildPythonApplication rec { six ]; - # Prevent tests from trying to create configuration in /homeless-shelter. - preCheck = '' - export HOME=$PWD/test-home - ''; + # no tests + doCheck = false; meta = with lib; { homepage = "https://github.com/frostming/legit"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index 5feb71c79317..1821dba0f006 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }: +{ lib, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }: buildPythonApplication rec { pname = "pass-git-helper"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 24743b21a4dd..8f84c0db558e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - license = licenses.gpl2; + license = licenses.gpl2Only; homepage = "https://github.com/tibirna/qgit"; description = "Graphical front-end to Git"; maintainers = with maintainers; [ peterhoeg markuskowa ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix index 69062d305b7a..1e65834f5193 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "scmpuff"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 3a37c798a085..4ee92c1d5e6a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, git, installShellFiles }: +{ lib, python3Packages, fetchFromGitHub, git, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "stgit"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 3abfd3a31392..3129bd2e2083 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -8,13 +8,13 @@ let in crystal.buildCrystalPackage rec { pname = "thicket"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "taylorthurlow"; repo = pname; rev = "v${version}"; - sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw"; + sha256 = "sha256-A89E0CbV7VFB7W4ycFcZloP0J/d42agEuD+hs9a6a6E="; }; format = "shards"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix index 6ac6cde44a87..1f2a77d20199 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b"; + sha256 = "sha256-kkH4px34VpnO/S1VjgQGU9Mm4/VpmiOtvlz2ubtStAk="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # those files are inherently impure, we'll handle the corresponding dependencies. postPatch = '' - rm -f contrib/config.make-* + rm contrib/config.make-* ''; enableParallelBuilding = true; @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; - maintainers = with maintainers; [ bjornfor domenkozar qknight globin ]; - license = licenses.gpl2; + maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 ]; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix b/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix index 3b906e4dc2e0..5dc75ce4d702 100644 --- a/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "git-crecord"; diff --git a/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix index 3c758908cd49..f72f51907500 100644 --- a/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix +++ b/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-lfs"; diff --git a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index ea9e195cd0dd..f6250563fc93 100644 --- a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.12"; + version = "2.12.2"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-k9G0lN7qKQhWiXibzhC9Ma9h+44LQJ966MIakWk5nJM="; + sha256 = "sha256-E0HGianaTNRVJsFh8tb1wdxEARRXzkFG2OHU6op5oQ4="; }; patches = [ ./import-ssl-module.patch ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-up/default.nix b/nixpkgs/pkgs/applications/version-management/git-up/default.nix index 57a40de9d4a4..06a2bb48989c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-up/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-up/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, git }: +{ lib, fetchurl, pythonPackages, git }: pythonPackages.buildPythonApplication rec { pname = "git-up"; diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 68b3a3e9099a..566459afa18d 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchurl, makeWrapper +{ lib, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true @@ -9,11 +9,11 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-tah7ciq+jkkROJq/V+yPRtWPuWaSnf5hKndjnifsQYc="; + sha256 = "sha256-uezg8GdNqgKVHgJj9rTqHFLWuLdyDp63fzr7DMslOII="; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix b/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix index 68dd3c190bec..384f5d0f01f7 100644 --- a/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, python2Packages}: +{ lib, fetchzip, python2Packages}: python2Packages.buildPythonApplication rec { pname = "gitinspector"; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json index c6d4401fde4a..9ea6d241060f 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.7.1", - "repo_hash": "13bbi9ps6z8q9di9gni2ckydgfk7pxkaqf0wgx8gfwm80sc7s0km", + "version": "13.7.4", + "repo_hash": "1ggx76k6941rhccsd585p4h5k4zb87yvg0pmpzhwhh2q4ma2sywm", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.7.1-ee", + "rev": "v13.7.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.7.1", - "GITLAB_PAGES_VERSION": "1.32.0", + "GITALY_SERVER_VERSION": "13.7.4", + "GITLAB_PAGES_VERSION": "1.34.0", "GITLAB_SHELL_VERSION": "13.14.0", - "GITLAB_WORKHORSE_VERSION": "8.58.0" + "GITLAB_WORKHORSE_VERSION": "8.58.2" } } diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index acfd91be331b..1b96307457c2 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby +{ lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby , bundlerEnv, pkg-config # libgit2 + dependencies , libgit2, openssl, zlib, pcre, http-parser }: @@ -33,14 +33,14 @@ let }; }; in buildGoModule rec { - version = "13.7.1"; + version = "13.7.4"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb"; + sha256 = "1inb7xlv8admzy9q1bgxccbrhks0mmc8lng356h39crj5sgaqkmg"; }; vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187"; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index d1b5958c751d..a1a9df57f044 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, buildGoModule, ruby }: +{ lib, fetchFromGitLab, buildGoModule, ruby }: buildGoModule rec { pname = "gitlab-shell"; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b38485716d7d..3e292632d4c4 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitLab, git, buildGoModule }: +{ lib, fetchFromGitLab, git, buildGoModule }: buildGoModule rec { pname = "gitlab-workhorse"; - version = "8.58.0"; + version = "8.58.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1642vxxqnpccjzfls3vz4l62kvksk6irwv1dhjcxv1cppbr9hz80"; + sha256 = "1ks8rla6hm618dxhr41x1ckzk3jxv0f7vl2547f7f1fl3zqna1zp"; }; vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; diff --git a/nixpkgs/pkgs/applications/version-management/gitless/default.nix b/nixpkgs/pkgs/applications/version-management/gitless/default.nix index e53da902e138..310158e3eeae 100644 --- a/nixpkgs/pkgs/applications/version-management/gitless/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitless/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, python, lib, stdenv }: +{ fetchFromGitHub, python, lib }: with python.pkgs; buildPythonApplication rec { diff --git a/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/nixpkgs/pkgs/applications/version-management/gogs/default.nix index fed2fd9ea338..c0b0021f8cbe 100644 --- a/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper +{ lib, buildGoModule, fetchFromGitHub, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true diff --git a/nixpkgs/pkgs/applications/version-management/meld/default.nix b/nixpkgs/pkgs/applications/version-management/meld/default.nix index 4f94e2926c4a..268098b2d2d0 100644 --- a/nixpkgs/pkgs/applications/version-management/meld/default.nix +++ b/nixpkgs/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , gettext , itstool diff --git a/nixpkgs/pkgs/applications/version-management/nitpick/default.nix b/nixpkgs/pkgs/applications/version-management/nitpick/default.nix index ba1f3bbb93b7..56d3531f7219 100644 --- a/nixpkgs/pkgs/applications/version-management/nitpick/default.nix +++ b/nixpkgs/pkgs/applications/version-management/nitpick/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , buildPythonPackage -, lib, stdenv +, lib , isPy27 }: diff --git a/nixpkgs/pkgs/applications/version-management/peru/default.nix b/nixpkgs/pkgs/applications/version-management/peru/default.nix index d7ad9060879e..b7b6d62e4b4c 100644 --- a/nixpkgs/pkgs/applications/version-management/peru/default.nix +++ b/nixpkgs/pkgs/applications/version-management/peru/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "peru"; diff --git a/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/nixpkgs/pkgs/applications/version-management/pijul/default.nix index 993db7c2ebdb..eaad772f7349 100644 --- a/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.37"; + version = "1.0.0-alpha.38"; src = fetchCrate { inherit version pname; - sha256 = "02hdnfpy0hlgwhahrd5ddjmq8r05pyny0r91q3avirli1i7rkvs6"; + sha256 = "0f14jkr1yswwyqz0l47b0287vpyz0g1qmksr3hkskhbmwlkf1q2b"; }; - cargoSha256 = "16v9nqrfdmrmll72yj6a6wl4rv28n838myjyw2n68kjmijakvnk4"; + cargoSha256 = "08p2dq48d1islk02xz1j39402fqxfh4isf8qi219aivl0yciwjn3"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; diff --git a/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix b/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix index 0384f9723d56..e274f0b0335e 100644 --- a/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg_utils, gtk3 }: +{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg-utils, gtk3 }: python3Packages.buildPythonApplication rec { pname = "rabbitvcs"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { }; buildInputs = [ gtk3 ]; - pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg_utils ]; + pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg-utils ]; prePatch = '' sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py diff --git a/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix b/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix index f52fd30d8391..3e526d5ac7ca 100644 --- a/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix +++ b/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python27Packages, git +{ lib, stdenv, fetchurl, makeWrapper, python27Packages, git , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy , breezy ? null, cvs ? null, darcs ? null, fossil ? null , mercurial ? null, monotone ? null, rcs ? null diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix index 200d1d5384fb..3e89fe0a4dc2 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , buildGoModule , srht, redis, celery, pyyaml, markdown }: diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix index bcc47920ebeb..69f8a7d4e458 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchNodeModules, buildPythonPackage +{ lib, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, humanize, html5lib, markdown, psycopg2, pygments , requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client , celery, alembic, importlib-metadata, mistletoe diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix index c7c11cafc8b4..ea3f58e38906 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, pyyaml, PyGithub }: diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix index 3ef49b796645..8966cbe08001 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , buildGoModule , srht, minio, pygit2, scmsrht }: diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix index d0e140908469..fae311831f2f 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchhg, buildPythonPackage +{ lib, fetchhg, buildPythonPackage , python , srht, hglib, scmsrht, unidiff }: diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix index 8ea4961e7d45..99b5663a9b89 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht }: diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix index a0b52a2d5640..25d22dede359 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, asyncpg, aiosmtpd, pygit2, emailthreads }: diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix index 26939d2bebec..24a31a3ef17f 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, pygit2 }: diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix index b6622d97487e..d07bd29357ac 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , buildGoModule , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix index eaec8b710dd6..12747f981032 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, pyyaml }: diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix index 6e8b03835bc4..615716d03afd 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , srht, redis, pyyaml, buildsrht , writeText }: diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix index 357dcd4d2e2a..85ae3b2cf146 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, redis, alembic, pystache , pytest, factory_boy, writeText }: diff --git a/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix b/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix index a7d1f86652c1..da6bb386535c 100644 --- a/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix +++ b/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix @@ -19,7 +19,7 @@ stdenv, symlinkJoin, webkit2-sharp, - xdg_utils, + xdg-utils, }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { mono openssh openssl - xdg_utils + xdg-utils ]; }}/bin \ --set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [ diff --git a/nixpkgs/pkgs/applications/video/cinelerra/default.nix b/nixpkgs/pkgs/applications/video/cinelerra/default.nix index bfc577e51a20..e0249f6d0b2f 100644 --- a/nixpkgs/pkgs/applications/video/cinelerra/default.nix +++ b/nixpkgs/pkgs/applications/video/cinelerra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool , pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr @@ -10,12 +10,20 @@ stdenv.mkDerivation { name = "cinelerra-cv-2018-05-16"; src = fetchFromGitHub { - owner = "ratopi"; - repo = "CinelerraCV"; + owner = "cinelerra-cv-team"; + repo = "cinelerra-cv"; rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc"; sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk"; }; + patches = [ + # avoid gcc10 error about narrowing + (fetchpatch { + url = "https://github.com/cinelerra-cv-team/cinelerra-cv/pull/2/commits/a1b2d9c3bd5730ec0284894f3d81892af3e77f1f.patch"; + sha256 = "1cjyv1m174dblpa1bs5dggk24h4477zqvc5sbfc0m5rpkndx5ycp"; + }) + ]; + preConfigure = '' find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i ./autogen.sh @@ -28,10 +36,9 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; + nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ]; buildInputs = - [ automake - autoconf libtool pkg-config file - faad2 faac + [ faad2 faac a52dec alsaLib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype mjpegtools x264 gettext openexr @@ -39,13 +46,13 @@ stdenv.mkDerivation { libtheora libpng libdv libuuid nasm perl - fontconfig intltool + fontconfig ]; - meta = { + meta = with lib; { description = "Video Editor"; - homepage = "http://www.cinelerra.org"; - maintainers = [ lib.maintainers.marcweber ]; - license = lib.licenses.gpl2; + homepage = "https://www.cinelerra.org/"; + maintainers = with maintainers; [ marcweber ]; + license = licenses.gpl2Only; }; } diff --git a/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/nixpkgs/pkgs/applications/video/clipgrab/default.nix index c1701dd51748..6db2450d1365 100644 --- a/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/nixpkgs/pkgs/applications/video/clipgrab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, ffmpeg_3 +{ lib, fetchurl, makeDesktopItem, ffmpeg_3 , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine }: diff --git a/nixpkgs/pkgs/applications/video/devede/default.nix b/nixpkgs/pkgs/applications/video/devede/default.nix index 4b1b7ae0b602..6a4d0dc1b8df 100644 --- a/nixpkgs/pkgs/applications/video/devede/default.nix +++ b/nixpkgs/pkgs/applications/video/devede/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor +{ lib, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: let diff --git a/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix b/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix index a4ebbf159b88..15f5b60a09a6 100644 --- a/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix +++ b/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, stdenv, fetchurl }: +{ appimageTools, lib, fetchurl }: let pname = "electronplayer"; version = "2.0.8"; diff --git a/nixpkgs/pkgs/applications/video/epgstation/default.nix b/nixpkgs/pkgs/applications/video/epgstation/default.nix index 53a3535fde4e..f1f89b109074 100644 --- a/nixpkgs/pkgs/applications/video/epgstation/default.nix +++ b/nixpkgs/pkgs/applications/video/epgstation/default.nix @@ -91,7 +91,7 @@ let # NOTE: this may take a while since it has to update all packages in # nixpkgs.nodePackages passthru.updateScript = import ./update.nix { - inherit (stdenv) lib; + inherit lib; inherit (src.meta) homepage; inherit pname diff --git a/nixpkgs/pkgs/applications/video/gnomecast/default.nix b/nixpkgs/pkgs/applications/video/gnomecast/default.nix index bc045deb9ecb..65865c31dfc8 100644 --- a/nixpkgs/pkgs/applications/video/gnomecast/default.nix +++ b/nixpkgs/pkgs/applications/video/gnomecast/default.nix @@ -16,6 +16,10 @@ buildPythonApplication rec { gtk3 gobject-introspection ]; + # NOTE: gdk-pixbuf setup hook does not run with strictDeps + # https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-hooks-gobject-introspection + strictDeps = false; + preFixup = '' gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]}) ''; diff --git a/nixpkgs/pkgs/applications/video/go-chromecast/default.nix b/nixpkgs/pkgs/applications/video/go-chromecast/default.nix index 782f00161068..2e3d0221709f 100644 --- a/nixpkgs/pkgs/applications/video/go-chromecast/default.nix +++ b/nixpkgs/pkgs/applications/video/go-chromecast/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.2.7"; + version = "0.2.9"; src = fetchFromGitHub { owner = "vishen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OCykgy49RZL2aAE0OeHxj8zkFnr32sIYjtoFMwESqLg="; + sha256 = "sha256-KhJMgr57pDnuFLhsbf0/4n9w0EfjuuKA46ENPLXox3A="; }; vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; diff --git a/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix index fe06e9431f9d..6dc42a47685b 100644 --- a/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, callPackage +{ lib, buildPythonApplication, fetchFromGitHub, callPackage , mpv, python-mpv-jsonipc, jellyfin-apiclient-python , pillow, tkinter, pystray, jinja2, pywebview }: diff --git a/nixpkgs/pkgs/applications/video/kazam/default.nix b/nixpkgs/pkgs/applications/video/kazam/default.nix index e6e971ad4387..35b7d173257f 100644 --- a/nixpkgs/pkgs/applications/video/kazam/default.nix +++ b/nixpkgs/pkgs/applications/video/kazam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection +{ lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection , gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio , fetchpatch }: diff --git a/nixpkgs/pkgs/applications/video/kodi/wrapper.nix b/nixpkgs/pkgs/applications/video/kodi/wrapper.nix index 6bec8f9c8912..80a36df3de74 100644 --- a/nixpkgs/pkgs/applications/video/kodi/wrapper.nix +++ b/nixpkgs/pkgs/applications/video/kodi/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, buildEnv, kodi, plugins }: +{ lib, makeWrapper, buildEnv, kodi, plugins }: let drvName = builtins.parseDrvName kodi.name; diff --git a/nixpkgs/pkgs/applications/video/makemkv/default.nix b/nixpkgs/pkgs/applications/video/makemkv/default.nix index 29676abb755e..cec6468c43be 100644 --- a/nixpkgs/pkgs/applications/video/makemkv/default.nix +++ b/nixpkgs/pkgs/applications/video/makemkv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchurl , autoPatchelfHook diff --git a/nixpkgs/pkgs/applications/video/manim/default.nix b/nixpkgs/pkgs/applications/video/manim/default.nix index 667b2bb2b885..f2d33506ffcd 100644 --- a/nixpkgs/pkgs/applications/video/manim/default.nix +++ b/nixpkgs/pkgs/applications/video/manim/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch -, cairo, ffmpeg_3, sox, xdg_utils, texlive +, cairo, ffmpeg_3, sox, xdg-utils, texlive , colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub , pbr, fetchPypi }: @@ -28,14 +28,14 @@ buildPythonApplication rec { pycairo pydub - cairo sox ffmpeg_3 xdg_utils + cairo sox ffmpeg_3 xdg-utils ]; # Test with texlive to see whether it works but don't propagate # because it's huge and optional # TODO: Use smaller TexLive distribution # Doesn't need everything but it's hard to figure out what it needs - checkInputs = [ cairo sox ffmpeg_3 xdg_utils texlive.combined.scheme-full ]; + checkInputs = [ cairo sox ffmpeg_3 xdg-utils texlive.combined.scheme-full ]; # Simple test and complex test with LaTeX checkPhase = '' diff --git a/nixpkgs/pkgs/applications/video/mediathekview/default.nix b/nixpkgs/pkgs/applications/video/mediathekview/default.nix index 6a8731dd72eb..2005a949a5c4 100644 --- a/nixpkgs/pkgs/applications/video/mediathekview/default.nix +++ b/nixpkgs/pkgs/applications/video/mediathekview/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "13.5.1"; + version = "13.7.1"; pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "0fixr6drim0wmh4q44zikcla4mrnm44nm95d5naqsgx6idalddrc"; + sha256 = "sha256-yFPyj1Mbgj2eJv4DpvfOtPyTbL9gMAXC5TzSx8AV27o="; }; nativeBuildInputs = [ makeWrapper ]; @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { install -m644 MediathekView.jar $out/lib makeWrapper ${jre}/bin/java $out/bin/mediathek \ - --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar" + --add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar" makeWrapper ${jre}/bin/java $out/bin/MediathekView \ - --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar" + --add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar" makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ - --add-flags "-Xmx1G -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" + --add-flags "-Xmx1G --enable-preview -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 5735771b5d3b..39d2f1e21cee 100644 --- a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, pkg-config, autoconf, automake, libiconv, drake -, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib +, ruby, docbook_xsl, file, xdg-utils, gettext, expat, boost, libebml, zlib , fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , withGUI ? true , qtbase ? null @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "51.0.0"; + version = "53.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "06k2slgac0fhgypmdriwdc5s09mry22vxk316ixfj5sv3irwn7wc"; + sha256 = "04wjs3sgb3gn85gl8y1svx177d1213hswx37zdsj80giw1k5df79"; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - expat file xdg_utils boost libebml zlib fmt + expat file xdg-utils boost libebml zlib fmt libmatroska libogg libvorbis flac cmark pcre2 ] ++ optional stdenv.isDarwin libiconv ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/video/mythtv/default.nix b/nixpkgs/pkgs/applications/video/mythtv/default.nix index a58c32dc563e..236aec2ee563 100644 --- a/nixpkgs/pkgs/applications/video/mythtv/default.nix +++ b/nixpkgs/pkgs/applications/video/mythtv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders diff --git a/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/default.nix index f0722b525329..9fdb78c70382 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -40,13 +40,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "26.0.2"; + version = "26.1.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; - rev = "refs/tags/${version}"; - sha256 = "1bf56z2yb7gq1knqwcqj369c3wl9jr3wll5vlngmfy2gwqrczjmw"; + rev = version; + sha256 = "1plr5a7k5scxlibhbknhhk19ipk8las14dzs7v64zx7rhpj00009"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/obs-gstreamer.nix b/nixpkgs/pkgs/applications/video/obs-studio/obs-gstreamer.nix new file mode 100644 index 000000000000..e32ec7575b2d --- /dev/null +++ b/nixpkgs/pkgs/applications/video/obs-studio/obs-gstreamer.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, gst_all_1 +, pkg-config +, meson +, ninja +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-gstreamer"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "fzwoch"; + repo = "obs-gstreamer"; + rev = "v${version}"; + sha256 = "1fdpwr8br8x9cnrhr3j4f0l81df26n3bj2ibi3cg96rl86054nid"; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ gst_all_1.gstreamermm obs-studio ]; + + # obs-studio expects the shared object to be located in bin/32bit or bin/64bit + # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 + postInstall = let + pluginPath = { + i686-linux = "bin/32bit"; + x86_64-linux = "bin/64bit"; + }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); + in '' + mkdir -p $out/share/obs/obs-plugins/obs-gstreamer/${pluginPath} + ln -s $out/lib/obs-plugins/obs-gstreamer.so $out/share/obs/obs-plugins/obs-gstreamer/${pluginPath} + ''; + + meta = with lib; { + description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; + homepage = "https://github.com/fswoch/obs-gstreamer"; + maintainers = with maintainers; [ ahuzik ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/video/pitivi/default.nix b/nixpkgs/pkgs/applications/video/pitivi/default.nix index 1b2af7614ab0..e388d5a67fe6 100644 --- a/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchurl , pkg-config diff --git a/nixpkgs/pkgs/applications/video/plex-media-player/default.nix b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix index e690c5070243..e7a735f167c8 100644 --- a/nixpkgs/pkgs/applications/video/plex-media-player/default.nix +++ b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config, cmake, python3, mkDerivation +{ lib, fetchFromGitHub, fetchurl, pkg-config, cmake, python3, mkDerivation , libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras , libvdpau, SDL2, mpv, libGL }: let diff --git a/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix b/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix index 7738dd99d215..d0904790a9e8 100644 --- a/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }: +{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }: buildPythonApplication rec { pname = "plex-mpv-shim"; diff --git a/nixpkgs/pkgs/applications/video/pyca/default.nix b/nixpkgs/pkgs/applications/video/pyca/default.nix index bf54c0a2d6cc..df42bbec156f 100644 --- a/nixpkgs/pkgs/applications/video/pyca/default.nix +++ b/nixpkgs/pkgs/applications/video/pyca/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: +{ lib, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: buildPythonApplication rec { pname = "pyca"; diff --git a/nixpkgs/pkgs/applications/video/qmediathekview/default.nix b/nixpkgs/pkgs/applications/video/qmediathekview/default.nix index b05fa113a30f..d0f414135703 100644 --- a/nixpkgs/pkgs/applications/video/qmediathekview/default.nix +++ b/nixpkgs/pkgs/applications/video/qmediathekview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }: mkDerivation rec { pname = "QMediathekView"; diff --git a/nixpkgs/pkgs/applications/video/shotcut/default.nix b/nixpkgs/pkgs/applications/video/shotcut/default.nix index ade4b61931b2..b8e07e9c3ef0 100644 --- a/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchpatch , mkDerivation @@ -21,17 +21,17 @@ , common-updater-scripts }: -assert lib.versionAtLeast mlt.version "6.22.1"; +assert lib.versionAtLeast mlt.version "6.24.0"; mkDerivation rec { pname = "shotcut"; - version = "20.11.28"; + version = "21.01.29"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1yr71ihml9wnm7y5pv0gz41l1k6ybd16dk78zxf96kn9b838mzhq"; + sha256 = "0Q+63IRY4UbiYS+IMnn7hlr6w3IYtWynjBfTBvtWBMo="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix index 3dfd9d4b09ba..cc3d518ff884 100644 --- a/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix +++ b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, intltool, file, desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, - libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook + libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook }: let @@ -41,7 +41,7 @@ stdenv.mkDerivation { hicolor-icon-theme libsigcxx libxmlxx - xdg_utils + xdg-utils isocodes ]; diff --git a/nixpkgs/pkgs/applications/video/tartube/default.nix b/nixpkgs/pkgs/applications/video/tartube/default.nix index 3bd48019d0dd..3619d4ee5e32 100644 --- a/nixpkgs/pkgs/applications/video/tartube/default.nix +++ b/nixpkgs/pkgs/applications/video/tartube/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , gdk-pixbuf , gobject-introspection @@ -11,17 +10,18 @@ , youtube-dl , glib , ffmpeg +, aria }: python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.3.042"; + version = "2.3.085"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "v${version}"; - sha256 = "117q4s2b2js3204506qv3kjcsy3amcf0mpwj6q0ixs1256ilkxwj"; + sha256 = "bkz64nj6748552ZMRcL/I1lUXGpZjaATUEqv3Kkphck="; }; nativeBuildInputs = [ @@ -39,6 +39,8 @@ python3Packages.buildPythonApplication rec { feedparser playsound ffmpeg + matplotlib + aria ]; buildInputs = [ @@ -50,7 +52,7 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' - sed -i "/^\s*install_requires/s/, 'pgi'\|'pgi', \|'pgi'//" setup.py + sed -i "/^\s*'pgi',$/d" setup.py ''; postInstall = '' diff --git a/nixpkgs/pkgs/applications/video/vcs/default.nix b/nixpkgs/pkgs/applications/video/vcs/default.nix index 83b49c075784..4998797fcf3a 100644 --- a/nixpkgs/pkgs/applications/video/vcs/default.nix +++ b/nixpkgs/pkgs/applications/video/vcs/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation { unpackCmd = "mkdir src; cp $curSrc src/vcs"; patches = [ ./fonts.patch ]; nativeBuildInputs = [ makeWrapper ]; - doBuild = false; inherit dejavu_fonts; installPhase = '' diff --git a/nixpkgs/pkgs/applications/video/vlc/default.nix b/nixpkgs/pkgs/applications/video/vlc/default.nix index c925eca302a8..f79899259602 100644 --- a/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, autoreconfHook , libarchive, perl, xorg, libdvdnav, libbluray -, zlib, a52dec, libmad, faad2, ffmpeg_3, alsaLib +, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # which are not included here for no other reason that nobody has mentioned # needing them buildInputs = [ - zlib a52dec libmad faad2 ffmpeg_3 alsaLib libdvdnav libdvdnav.libdvdread + zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive diff --git a/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix b/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix index 600bc715ffb4..1e042461ebd2 100644 --- a/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix @@ -1,12 +1,12 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , pkg-config , qmake , qttools , gstreamer , libX11 +, pulseaudio , qtbase , qtmultimedia , qtx11extras @@ -19,21 +19,19 @@ mkDerivation rec { pname = "vokoscreen-ng"; - version = "3.0.5"; + version = "3.0.8"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; rev = version; - sha256 = "1spyqw8h8bkc1prdb9aixiw5h3hk3gp2p0nj934bnwq04kmfp660"; + sha256 = "1302663hyp2xxhaavhfky24a2p9gz23i3rykmrc6c1n23h24snri"; }; patches = [ - # Better linux integration - (fetchpatch { - url = "https://github.com/vkohaupt/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637.patch"; - sha256 = "1iibimv8xfxxfk44kkbrkay37ibdndjvs9g53mxr8x8vrsp917bz"; - }) + # Adaptation of previously used https://github.com/City-busz/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637 patch + # used for 3.0.5 but incompatible at least since 3.0.8. The issue is addressed here https://github.com/vkohaupt/vokoscreenNG/issues/139 + ./linux-support-installation-target.patch ]; qmakeFlags = [ "src/vokoscreenNG.pro" ]; @@ -42,6 +40,7 @@ mkDerivation rec { buildInputs = [ gstreamer libX11 + pulseaudio qtbase qtmultimedia qtx11extras diff --git a/nixpkgs/pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch b/nixpkgs/pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch new file mode 100644 index 000000000000..4f1b63c342d8 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch @@ -0,0 +1,40 @@ +Seulement dans b: patch.patch +Seulement dans b: ..rej +diff --color -ur a/src/vokoscreenNG.pro b/src/vokoscreenNG.pro +--- a/src/vokoscreenNG.pro 2021-02-03 15:00:57.377401016 +0100 ++++ b/src/vokoscreenNG.pro 2021-02-03 15:09:18.141905863 +0100 +@@ -160,7 +160,32 @@ + # systrayAlternative + include(systrayAlternative/systrayAlternative.pri) + ++unix:!macx { ++ isEmpty(PREFIX) { ++ PREFIX = /usr/local ++ } ++ isEmpty(BINDIR) { ++ BINDIR = $$PREFIX/bin ++ } ++ isEmpty(DATADIR) { ++ DATADIR = $$PREFIX/share ++ } ++ ++ target.path = $$BINDIR ++ ++ icon.files = applications/vokoscreenNG.png ++ icon.path = $$DATADIR/icons/hicolor/256x256/apps/ ++ ++ desktop.files = applications/vokoscreenNG.desktop ++ desktop.path = $$DATADIR/applications/ ++ ++ appdata.files = applications/vokoscreenNG.appdata.xml ++ appdata.path = $$DATADIR/metainfo/ ++ ++ INSTALLS += target icon desktop appdata ++} + # ciscoOpenh264 + win32:include(ciscoOpenh264/ciscoOpenh264.pri) + +-unix:include(wayland/wayland.pri) +\ Pas de fin de ligne à la fin du fichier ++unix:include(wayland/wayland.pri) ++ diff --git a/nixpkgs/pkgs/applications/video/vokoscreen/default.nix b/nixpkgs/pkgs/applications/video/vokoscreen/default.nix index 06e91218cacc..598a162f3998 100644 --- a/nixpkgs/pkgs/applications/video/vokoscreen/default.nix +++ b/nixpkgs/pkgs/applications/video/vokoscreen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation +{ lib, fetchFromGitHub, mkDerivation , pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr , ffmpeg }: diff --git a/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix b/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix index d31523e946ac..2d865f418187 100644 --- a/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib, stdenv +{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib }: mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/virtualization/cntr/default.nix b/nixpkgs/pkgs/applications/virtualization/cntr/default.nix index f7b7c99b5540..2283b45aee47 100644 --- a/nixpkgs/pkgs/applications/virtualization/cntr/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cntr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cntr"; diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index cef69cb0c6ca..e5df1c655d88 100644 --- a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.25"; + version = "2.0.26"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u22irZ9AC1W2AVJ1OD1gLzTH4NOgRkZekZ78rNKXnps="; + sha256 = "sha256-q2lh02iZ7FDBPjtoKY5p3c6Vcn9Ey8DCMn/Oe7/74ug="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 388cf328ff51..995053715072 100644 --- a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , btrfs-progs , buildGoModule , fetchFromGitHub diff --git a/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 143d2fdcea3e..3d73ccbf48a2 100644 --- a/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -10,6 +10,7 @@ , systemd , yajl , nixosTests +, criu }: let @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; - buildInputs = [ libcap libseccomp systemd yajl ]; + buildInputs = [ criu libcap libseccomp systemd yajl ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index 3dabcf57daf3..93f5f56ac55a 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder +{ lib, buildPythonApplication, fetchPypi, pythonOlder , installShellFiles , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt @@ -8,12 +8,12 @@ }: buildPythonApplication rec { - version = "1.28.0"; + version = "1.28.2"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "947888fe9377b48c260d59b6511ba205655c6beb45a4b70fbce28f753aacf75a"; + sha256 = "2f148b590414915d029dad7551f4cdf0b03a774dc9baa674480217236d260cc1"; }; # lots of networking and other fails diff --git a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index 6c1ef95cd6f7..889752b27034 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoPackage , fetchFromGitHub , makeWrapper @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.33.0"; + version = "1.34.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "0fk1r9id3fjcqdg4nls2k5ik3822njz4xx9fpbvmx0fycvjmbr4v"; + sha256 = "1ynpd6yb1xc18y528sshd5k9nkz48h1zifj2w4sjh5n0864lna7b"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix b/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix index 9eb03508572d..84019395853b 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "docker-buildx"; diff --git a/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/nixpkgs/pkgs/applications/virtualization/docker/default.nix index e9496247f06d..207ebdf2211f 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -1,12 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage -, makeWrapper, installShellFiles, pkg-config -, go-md2man, go, containerd, runc, docker-proxy, tini, libtool -, sqlite, iproute, lvm2, systemd, docker-buildx -, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git -, procps, libseccomp -, nixosTests -, buildxSupport ? false -}: +{ lib, callPackage }: with lib; @@ -16,8 +8,16 @@ rec { , mobyRev, mobySha256 , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport - } : + , tiniRev, tiniSha256, buildxSupport ? false + # package dependencies + , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage + , makeWrapper, installShellFiles, pkg-config + , go-md2man, go, containerd, runc, docker-proxy, tini, libtool + , sqlite, iproute, lvm2, systemd, docker-buildx + , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git + , procps, libseccomp + , nixosTests + }: let docker-runc = runc.overrideAttrs (oldAttrs: { name = "docker-runc-${version}"; @@ -215,7 +215,7 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* - docker_20_10 = makeOverridable dockerGen rec { + docker_20_10 = callPackage dockerGen rec { version = "20.10.2"; rev = "v${version}"; sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; @@ -227,6 +227,5 @@ rec { containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; - inherit buildxSupport; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix b/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix index f41862c0dd15..96722fe393f6 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "distribution"; diff --git a/nixpkgs/pkgs/applications/virtualization/docker/proxy.nix b/nixpkgs/pkgs/applications/virtualization/docker/proxy.nix index 7fd7cda81e23..59fc80eefbf7 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/proxy.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/proxy.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "docker-proxy-${rev}"; diff --git a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix index 41a093153331..390f3049c026 100644 --- a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "amazon-ecs-agent"; diff --git a/nixpkgs/pkgs/applications/virtualization/firectl/default.nix b/nixpkgs/pkgs/applications/virtualization/firectl/default.nix index 0b5fc5dac52b..ac531b36dd21 100644 --- a/nixpkgs/pkgs/applications/virtualization/firectl/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/firectl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "firectl"; diff --git a/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix b/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix index 2d423911c99b..56760c293eb1 100644 --- a/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildBazelPackage , fetchFromGitHub , cacert @@ -76,7 +76,7 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "0myffqywbvqhax995z55jymwnwyxmp13r27kpbc7wb5fk9s4skvr"; + sha256 = "0fhmlq0d2317gwhma2mz1anb69j4chybk90j71j88wpgw1hxbk34"; }; buildAttrs = { diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 28b653513afa..e82ab35a3449 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.1.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "0cy842wlyasxlxnwxkwhwgj148s30kfxnhgxa6ar26fly432aa68"; + sha256 = "141ii271w2azvhl8ragrgzmir9iq9npl8wmh5dr31kvq4z4syxw1"; }; vendorSha256 = null; @@ -55,8 +55,9 @@ buildGoModule rec { mv bin/{podman-remote,podman} '' + '' install -Dm555 bin/podman $out/bin/podman - installShellCompletion --bash completions/bash/podman - installShellCompletion --zsh completions/zsh/_podman + installShellCompletion --bash completions/bash/* + installShellCompletion --fish completions/fish/* + installShellCompletion --zsh completions/zsh/* MANDIR=$man/share/man make install.man-nobuild ''; @@ -65,6 +66,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; + changelog = "https://github.com/containers/podman/blob/v${version}/changelog.txt"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix b/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix index 00dffc385a10..3a5f26bfcc8d 100644 --- a/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }: +{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }: mkDerivation rec { pname = "qtemu"; diff --git a/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/nixpkgs/pkgs/applications/virtualization/runc/default.nix index c3882ae9472e..f9fbec9f4bac 100644 --- a/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoPackage rec { pname = "runc"; - version = "1.0.0-rc92"; + version = "1.0.0-rc93"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; + sha256 = "008d5wkznic80n5q1vwx727qn5ifalc7cydq68hc1gk9wrhna4v4"; }; goPackagePath = "github.com/opencontainers/runc"; @@ -30,15 +30,13 @@ buildGoPackage rec { nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ]; - buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; + buildInputs = [ libselinux libseccomp libapparmor ]; - makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ]; + makeFlags = [ "BUILDTAGS+=seccomp" ]; buildPhase = '' cd go/src/${goPackagePath} patchShebangs . - substituteInPlace libcontainer/apparmor/apparmor.go \ - --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser make ${toString makeFlags} runc man ''; diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index 6961dcf7b893..3bc2df19d1de 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -1,5 +1,4 @@ -{stdenv -, lib +{ lib , fetchurl , util-linux , gpgme @@ -17,11 +16,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "0y6lm23g6a2ljm78w8iyak7yivxvpj3i55fjbd56m9b2ykssm5pv"; + sha256 = "sha256-gtLGUGNWAZXsNFUZMb48MluV6OIAnpJ1X9farTRuCDw="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 8fe9caf0e570..11ddaff8d3be 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, intltool, file +{ lib, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, glib, libosinfo, gnome3 diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index be9598293cc8..360e6e36c1af 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,7 +23,7 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.16"; + version = "6.1.18"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -40,7 +40,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1"; + sha256 = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"; }; outputs = [ "out" "modsrc" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix index 302f2b5945a4..4aa3ed1fd493 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "9802482b77b95a954cb5111793da10d009009a4e9a9c4eaa4bd1ae5dafe9db46"; + let value = "d609e35accff5c0819ca9be47de302abf094dc1b6d4c54da8fdda639671f267e"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 8e5adc835776..c35ebdb81d08 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "88db771a5efd7c048228e5c1e0b8fba56542e9d8c1b75f7af5b0c4cf334f0584"; + sha256 = "904432eb331d7ae517afaa4e4304e6492b7947b46ecb8267de7ef792c4921b4c"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix b/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix index 2f9882dee9b3..bc9003e128a4 100644 --- a/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix +++ b/nixpkgs/pkgs/applications/virtualization/xen/4.10.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, fetchpatch, fetchgit +{ lib, callPackage, fetchurl, fetchpatch, fetchgit , ocaml-ng , withInternalQemu ? true , withInternalTraditionalQemu ? true diff --git a/nixpkgs/pkgs/applications/virtualization/xen/packages.nix b/nixpkgs/pkgs/applications/virtualization/xen/packages.nix index 55e3b12c3b7e..5ff263dc8ff2 100644 --- a/nixpkgs/pkgs/applications/virtualization/xen/packages.nix +++ b/nixpkgs/pkgs/applications/virtualization/xen/packages.nix @@ -1,5 +1,5 @@ { callPackage -, stdenv + }: # TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim diff --git a/nixpkgs/pkgs/applications/window-managers/btops/default.nix b/nixpkgs/pkgs/applications/window-managers/btops/default.nix index f0bb26f43e25..5f107337ee44 100644 --- a/nixpkgs/pkgs/applications/window-managers/btops/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/btops/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "btops"; diff --git a/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/nixpkgs/pkgs/applications/window-managers/dwl/default.nix new file mode 100644 index 000000000000..9a56f865c348 --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/dwl/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, libxcb +, libxkbcommon +, wayland +, wayland-protocols +, wlroots +, enable-xwayland ? true, xwayland, libX11 +, patches ? [ ] +, conf ? null +, writeText +}: + +stdenv.mkDerivation rec { + pname = "dwl"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "djpohly"; + repo = pname; + rev = "v${version}"; + sha256 = "QoKaeF5DbSX0xciwc/0VKpubn/001cJjoZ+UzVDX4qE="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libxcb + libxkbcommon + wayland + wayland-protocols + wlroots + ] ++ lib.optionals enable-xwayland [ xwayland libX11 ]; + + # Allow users to set their own list of patches + inherit patches; + + prePatch = lib.optionalString enable-xwayland '' + sed -i -e '$ s|^#||' config.mk + ''; + + # Allow users to set an alternative config.def.h + postPatch = let + configFile = if lib.isDerivation conf || builtins.isPath conf + then conf + else writeText "config.def.h" conf; + in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + install -d $out/bin + install -m755 dwl $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/djpohly/dwl/"; + description = "Dynamic window manager for Wayland"; + longDescription = '' + dwl is a compact, hackable compositor for Wayland based on wlroots. It is + intended to fill the same space in the Wayland world that dwm does in X11, + primarily in terms of philosophy, and secondarily in terms of + functionality. Like dwm, dwl is: + + - Easy to understand, hack on, and extend with patches + - One C source file (or a very small number) configurable via config.h + - Limited to 2000 SLOC to promote hackability + - Tied to as few external dependencies as possible + ''; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} +# TODO: custom patches from upstream website +# TODO: investigate the modifications in the upstream unstable version diff --git a/nixpkgs/pkgs/applications/window-managers/dwm/default.nix b/nixpkgs/pkgs/applications/window-managers/dwm/default.nix index eb349e6f3b17..2c3ed2e47e88 100644 --- a/nixpkgs/pkgs/applications/window-managers/dwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/dwm/default.nix @@ -1,34 +1,46 @@ -{lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}: +{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [ ], conf ? null}: -with lib; - -let - name = "dwm-6.2"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "dwm"; + version = "6.2"; src = fetchurl { - url = "https://dl.suckless.org/dwm/${name}.tar.gz"; + url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz"; sha256 = "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p"; }; buildInputs = [ libX11 libXinerama libXft ]; - prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; + prePatch = '' + sed -i "s@/usr/local@$out@" config.mk + ''; # Allow users set their own list of patches inherit patches; # Allow users to set the config.def.h file containing the configuration - postPatch = let configFile = if isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf; - in optionalString (conf!=null) "cp ${configFile} config.def.h"; - - meta = { - homepage = "https://suckless.org/"; - description = "Dynamic window manager for X"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; all; + postPatch = + let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "config.def.h" conf; + in + lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + + meta = with lib; { + homepage = "https://dwm.suckless.org/"; + description = "An extremely fast, small, and dynamic window manager for X"; + longDescription = '' + dwm is a dynamic window manager for X. It manages windows in tiled, + monocle and floating layouts. All of the layouts can be applied + dynamically, optimising the environment for the application in use and the + task performed. + Windows are grouped by tags. Each window can be tagged with one or + multiple tags. Selecting certain tags displays all windows with these + tags. + ''; + license = licenses.mit; + maintainers = with maintainers; [ viric ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix b/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix index 1724a2c9824c..d419b0ebe3a8 100644 --- a/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg +{ lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg , enableAlsaUtils ? true, alsaUtils, coreutils , enableNetwork ? true, dnsutils, iproute, wirelesstools }: diff --git a/nixpkgs/pkgs/applications/window-managers/dwm/git.nix b/nixpkgs/pkgs/applications/window-managers/dwm/git.nix deleted file mode 100644 index 71e91b6093b3..000000000000 --- a/nixpkgs/pkgs/applications/window-managers/dwm/git.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, patches ? [], conf ? null }: - -let - name = "dwm-git-20180602"; -in - -stdenv.mkDerivation { - inherit name; - - src = fetchgit { - url = "git://git.suckless.org/dwm"; - rev = "b69c870a3076d78ab595ed1cd4b41cf6b03b2610"; - sha256 = "10i079h79l4gdch1qy2vrrb2xxxkgkjmgphr5r9a75jbbagwvz0k"; - }; - - buildInputs = [ libX11 libXinerama libXft ]; - - prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; - - # Allow users set their own list of patches - inherit patches; - - # Allow users to override the entire config file AFTER appying the patches - postPatch = lib.optionalString (conf!=null) '' - echo -n '${conf}' > config.def.h - ''; - - buildPhase = "make"; - - meta = with lib; { - homepage = "https://suckless.org/"; - description = "Dynamic window manager for X, development version"; - license = licenses.mit; - maintainers = with maintainers; [xeji]; - platforms = platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix b/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix index 52322d8e1948..d158aea83f3f 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix @@ -1,13 +1,13 @@ -{ fetchurl, lib, stdenv, i3, autoreconfHook }: +{ fetchurl, lib, i3, autoreconfHook }: i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.19"; + version = "4.19.1"; src = fetchurl { url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz"; - sha256 = "0j19kj05fpjfnj50vyykk6jsr07hq9l26y8na55bb7yfrra8yp4h"; + sha256 = "sha256-+yZ4Pc7zPZfwgBKbjQsrlXxIaxJBmIdE47lljx8FZG0="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/window-managers/i3/pystatus.nix b/nixpkgs/pkgs/applications/window-managers/i3/pystatus.nix index 404e7b41f556..bddaab615783 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/pystatus.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , libpulseaudio , libnotify diff --git a/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix index b9dbe6136b40..be7e88a25019 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , pkg-config diff --git a/nixpkgs/pkgs/applications/window-managers/i3/wk-switch.nix b/nixpkgs/pkgs/applications/window-managers/i3/wk-switch.nix index e7fd87aaf3b8..d0055ef63653 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/wk-switch.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "i3-wk-switch"; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix b/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix index db6ec29d9e98..9169cfc3817c 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , xorg, python3, pkg-config, cairo, libxkbcommon }: rustPlatform.buildRustPackage rec { diff --git a/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index 425f562dfd52..571c13e94619 100644 --- a/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.0.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "sha256-WdRAWAQEf9c66MVrLAs5VgBDK5r4JKM2GrjAV4cuGfA="; + sha256 = "sha256-n9mLD1WrHsO9W1rxopFQENxQEHp/sxuixV3PxLp2vOY="; }; nativeBuildInputs = [ cmake pkg-config perl asciidoc ]; diff --git a/nixpkgs/pkgs/applications/window-managers/labwc/default.nix b/nixpkgs/pkgs/applications/window-managers/labwc/default.nix new file mode 100644 index 000000000000..9d39bd537fde --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/labwc/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, cairo +, glib +, libinput +, libxml2 +, pandoc +, pango +, wayland +, wayland-protocols +, wlroots +, libxcb +, libxkbcommon +, xwayland +}: + +stdenv.mkDerivation rec { + pname = "labwc"; + version = "unstable-2021-02-06"; + + src = fetchFromGitHub { + owner = "johanmalm"; + repo = pname; + rev = "4a8fcf5c6d0b730b1e2e17e544ce7d7d3c72cd13"; + sha256 = "g1ba8dchUN393eis0VAu1bIjQfthDGLaSijSavz4lfU="; + }; + + nativeBuildInputs = [ pkg-config meson ninja pandoc ]; + buildInputs = [ + cairo + glib + libinput + libxml2 + pango + wayland + wayland-protocols + wlroots + libxcb + libxkbcommon + xwayland + ]; + + mesonFlags = [ "-Dxwayland=enabled" ]; + + meta = with lib; { + homepage = "https://github.com/johanmalm/labwc"; + description = "Openbox alternative for Wayland"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix b/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix index 712e9ab22c77..72170401d793 100644 --- a/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: +{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: let rpath = lib.makeLibraryPath [ libXinerama libX11 ]; @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "03kk3vg0r88317zv8j2bj44wq2fwxi25rv1aasvayrh1i5j6zr10"; + sha256 = "sha256-hirT0gScC2LFPvygywgPiSVDUE/Zd++62wc26HlufYU="; }; - cargoSha256 = "0m4sv4chxzk60njixlyja44rpn04apf3bm04fgd3v7abpr169f2s"; + cargoSha256 = "sha256-j57LHPU3U3ipUGQDrZ8KCuELOVJ3BxhLXsJePOO6rTM="; buildInputs = [ makeWrapper libX11 libXinerama ]; diff --git a/nixpkgs/pkgs/applications/window-managers/picom/default.nix b/nixpkgs/pkgs/applications/window-managers/picom/default.nix index 4287dd2db020..32eee9df0d83 100644 --- a/nixpkgs/pkgs/applications/window-managers/picom/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/picom/default.nix @@ -1,41 +1,82 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, uthash, asciidoc, docbook_xml_dtd_45 -, docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja -, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev -, dbus, libconfig, libdrm, libGL, pcre, libX11 -, libXinerama, libXext, xwininfo, libxdg_basedir }: +{ asciidoc +, dbus +, docbook_xml_dtd_45 +, docbook_xsl +, fetchFromGitHub +, lib +, libconfig +, libdrm +, libev +, libGL +, libX11 +, libxcb +, libxdg_basedir +, libXext +, libXinerama +, libxml2 +, libxslt +, makeWrapper +, meson +, ninja +, pcre +, pixman +, pkg-config +, stdenv +, uthash +, xcbutilimage +, xcbutilrenderutil +, xorgproto +, xwininfo +, withDebug ? false +}: stdenv.mkDerivation rec { pname = "picom"; version = "8.2"; src = fetchFromGitHub { - owner = "yshui"; - repo = "picom"; - rev = "v${version}"; + owner = "yshui"; + repo = "picom"; + rev = "v${version}"; sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl"; fetchSubmodules = true; }; nativeBuildInputs = [ - meson ninja - pkg-config - uthash asciidoc docbook_xml_dtd_45 docbook_xsl makeWrapper + meson + ninja + pkg-config + uthash ]; buildInputs = [ - dbus libX11 libXext - xorgproto - libXinerama libdrm pcre libxml2 libxslt libconfig libGL - libxcb xcbutilrenderutil xcbutilimage - pixman libev + dbus + libconfig + libdrm + libev + libGL + libX11 + libxcb libxdg_basedir + libXext + libXinerama + libxml2 + libxslt + pcre + pixman + xcbutilimage + xcbutilrenderutil + xorgproto ]; - mesonBuildType = "release"; + # Use "debugoptimized" instead of "debug" so perhaps picom works better in + # normal usage too, not just temporary debugging. + mesonBuildType = if withDebug then "debugoptimized" else "release"; + dontStrip = withDebug; mesonFlags = [ "-Dwith_docs=true" @@ -43,9 +84,13 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; + # In debug mode, also copy src directory to store. If you then run `gdb picom` + # in the bin directory of picom store path, gdb finds the source files. postInstall = '' wrapProgram $out/bin/picom-trans \ --prefix PATH : ${lib.makeBinPath [ xwininfo ]} + '' + lib.optionalString withDebug '' + cp -r ../src $out/ ''; meta = with lib; { @@ -56,6 +101,13 @@ stdenv.mkDerivation rec { extensions. It enables basic eye-candy effects. This fork adds additional features, such as additional effects, and a fork at a well-defined and proper place. + + The package can be installed in debug mode as: + + picom.override { withDebug = true; } + + For gdb to find the source files, you need to run gdb in the bin directory + of picom package in the nix store. ''; license = licenses.mit; homepage = "https://github.com/yshui/picom"; diff --git a/nixpkgs/pkgs/applications/window-managers/qtile/default.nix b/nixpkgs/pkgs/applications/window-managers/qtile/default.nix index 709a5b147362..21059c25afb1 100644 --- a/nixpkgs/pkgs/applications/window-managers/qtile/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/qtile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: +{ lib, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: let cairocffi-xcffib = python37Packages.cairocffi.override { withXcffib = true; diff --git a/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix b/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix index 0a80ce70e032..319023eb2e5a 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , sway-unwrapped , makeWrapper, symlinkJoin, writeShellScriptBin , withBaseWrapper ? true, extraSessionCommands ? "", dbus diff --git a/nixpkgs/pkgs/applications/window-managers/waybox/default.nix b/nixpkgs/pkgs/applications/window-managers/waybox/default.nix new file mode 100644 index 000000000000..666b2406d5f4 --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/waybox/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, libxkbcommon +, wayland +, wayland-protocols +, wlroots +, pixman +, udev +, libGL +}: + +stdenv.mkDerivation rec { + pname = "waybox"; + version = "unstable-2020-05-01"; + + src = fetchFromGitHub { + owner = "wizbright"; + repo = pname; + rev = "93811898f0eea3035145f593938d49d5af759b46"; + sha256 = "IOdKOqAQD87Rs3td8NVEgMnRF6kQSuQ64UVqeVqMBSM="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + libxkbcommon + wayland + wayland-protocols + wlroots + pixman + udev + libGL + ]; + + meta = with lib; { + homepage = "https://github.com/wizbright/waybox"; + description = "An openbox clone on Wayland"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix b/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix index 513784b8b52b..cb9f2fe85a7e 100644 --- a/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "wayfire"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://github.com/WayfireWM/wayfire/releases/download/${version}/wayfire-${version}.tar.xz"; - sha256 = "0wc5szslgf8d4r4dlbfgc5v49j2ziaa8fycmknq4p0vl67mh7acq"; + url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz"; + sha256 = "19k9nk5whql03ik66i06r4xgxk5v7mpdphjpv13hdw8ba48w73hd"; }; nativeBuildInputs = [ meson ninja pkg-config wayland ]; diff --git a/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix b/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix index 7c4b546c68ef..d6ac6aeb84e7 100644 --- a/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix @@ -1,16 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland, wrapGAppsHook +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook , gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell }: stdenv.mkDerivation rec { pname = "wcm"; - version = "0.6.0"; + version = "0.7.0"; - src = fetchFromGitHub { - owner = "WayfireWM"; - repo = "wcm"; - rev = "v${version}"; - sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg"; + src = fetchurl { + url = "https://github.com/WayfireWM/wcm/releases/download/v${version}/wcm-${version}.tar.xz"; + sha256 = "19za1fnlf5hz4n4mxxwqcr5yxp6mga9ah539ifnjnqrgvj19cjlj"; }; nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix b/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix index 00a4404c1d4e..b8e4c6aa7701 100644 --- a/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wf-config"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://github.com/WayfireWM/wf-config/releases/download/${version}/wf-config-${version}.tar.xz"; - sha256 = "1a5aqybhbp9dp4jygrm3gbkdap5qbd52y6ihfr4rm1cj37sckcn0"; + url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz"; + sha256 = "1bas5gsbnf8jxkkxd95992chz8yk5ckgg7r09gfnmm7xi8w0pyy7"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix b/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix index 6e5f189275b6..3948e9a32abc 100644 --- a/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wf-shell"; - version = "0.6.1"; + version = "0.7.0"; # > Note to packagers: do not use the autogenerated "Source code" # > archives from GitHub, but the wf-shell-0.4.0.tar.xz file. src = fetchurl { url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"; - sha256 = "0jl8gj185k2ff754lcj5b5nldhkvrhmlaj8lsik4kx78vlb5m3ns"; + sha256 = "1isybm9lcpxwyf6zh2vzkwrcnw3q7qxm21535g4f08f0l68cd5bl"; }; nativeBuildInputs = [ meson ninja pkg-config wayland ]; diff --git a/nixpkgs/pkgs/build-support/agda/default.nix b/nixpkgs/pkgs/build-support/agda/default.nix index 3c973e8cc0ac..d610a8f9a611 100644 --- a/nixpkgs/pkgs/build-support/agda/default.nix +++ b/nixpkgs/pkgs/build-support/agda/default.nix @@ -7,7 +7,7 @@ with lib.strings; let withPackages' = { pkgs, - ghc ? ghcWithPackages (p: with p; [ ieee ]) + ghc ? ghcWithPackages (p: with p; [ ieee754 ]) }: let pkgs' = if builtins.isList pkgs then pkgs else pkgs self; library-file = writeText "libraries" '' @@ -70,7 +70,7 @@ let installPhase = if installPhase != null then installPhase else '' runHook preInstall mkdir -p $out - find \( ${concatMapStringsSep " -or " (p: "-name '*.${p}'") (extensions ++ extraExtensions)} \) -exec cp -p --parents -t "$out" {} + + find -not \( -path ${everythingFile} -or -path ${lib.interfaceFile everythingFile} \) -and \( ${concatMapStringsSep " -or " (p: "-name '*.${p}'") (extensions ++ extraExtensions)} \) -exec cp -p --parents -t "$out" {} + runHook postInstall ''; }; diff --git a/nixpkgs/pkgs/build-support/agda/lib.nix b/nixpkgs/pkgs/build-support/agda/lib.nix new file mode 100644 index 000000000000..976151a8283c --- /dev/null +++ b/nixpkgs/pkgs/build-support/agda/lib.nix @@ -0,0 +1,10 @@ +{ lib }: +{ + /* Returns the Agda interface file to a given Agda file. + * + * Examples: + * interfaceFile "Everything.agda" == "Everything.agdai" + * interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai" + */ + interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai"; +} diff --git a/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh b/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh index 7986c589667b..4ff6802e6453 100755 --- a/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh +++ b/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh @@ -75,15 +75,15 @@ apprun() { wrap() { - cd "$APPDIR" || exit # quite same in appimageTools export APPIMAGE_SILENT_INSTALL=1 if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then + cd "$APPDIR" || true exec "$APPIMAGE_DEBUG_EXEC" fi - exec ./AppRun "$@" + exec "$APPDIR/AppRun" "$@" } usage() { diff --git a/nixpkgs/pkgs/build-support/appimage/default.nix b/nixpkgs/pkgs/build-support/appimage/default.nix index 170c25dffe2d..2a13d107bd0f 100644 --- a/nixpkgs/pkgs/build-support/appimage/default.nix +++ b/nixpkgs/pkgs/build-support/appimage/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , bash , binutils-unwrapped , coreutils @@ -66,7 +66,7 @@ rec { xorg.xrandr which perl - xdg_utils + xdg-utils iana-etc krb5 ]; @@ -121,7 +121,6 @@ rec { libusb1 udev dbus-glib - libav atk at-spi2-atk libudev0-shim diff --git a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index e960a2455282..8fef2ca6624c 100644 --- a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -57,12 +57,14 @@ let else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" + else if targetPlatform.system == "powerpc64le-linux" then "${libc_lib}/lib/ld64.so.2" # ARM with a wildcard, which can be "" or "-armhf". else if (with targetPlatform; isAarch32 && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" + else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; diff --git a/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index b40569a479bc..6592621570ce 100644 --- a/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, runCommandLocal, writeShellScriptBin, stdenv, coreutils, bubblewrap }: +{ lib, callPackage, runCommandLocal, writeShellScriptBin, coreutils, bubblewrap }: args @ { name @@ -24,8 +24,6 @@ let "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" ]); - chrootenv = callPackage ./chrootenv {}; - etcBindFlags = let files = [ # NixOS Compatibility @@ -37,6 +35,8 @@ let "hosts" "resolv.conf" "nsswitch.conf" + # User profiles + "profiles" # Sudo & Su "login.defs" "sudoers" @@ -80,6 +80,11 @@ let if [[ -d ${env}/etc ]]; then for i in ${env}/etc/*; do path="/''${i##*/}" + # NOTE: we're binding /etc/fonts from the host so we don't want to + # override it with a path from the FHS environment. + if [[ $path == '/fonts' ]]; then + continue + fi ro_mounts+=(--ro-bind "$i" "/etc$path") done fi diff --git a/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix b/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix index 083e7617b502..89b567a249f6 100644 --- a/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix +++ b/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix @@ -89,6 +89,9 @@ let ln -s /host/etc/resolv.conf resolv.conf ln -s /host/etc/nsswitch.conf nsswitch.conf + # symlink user profiles + ln -s /host/etc/profiles profiles + # symlink sudo and su stuff ln -s /host/etc/login.defs login.defs ln -s /host/etc/sudoers sudoers diff --git a/nixpkgs/pkgs/build-support/coq/default.nix b/nixpkgs/pkgs/build-support/coq/default.nix index 7e925e2473e1..8d86602bf38e 100644 --- a/nixpkgs/pkgs/build-support/coq/default.nix +++ b/nixpkgs/pkgs/build-support/coq/default.nix @@ -35,7 +35,7 @@ let "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; fetch = import ../coq/meta-fetch/default.nix - { inherit stdenv fetchzip; } ({ + { inherit lib stdenv fetchzip; } ({ inherit release releaseRev; location = { inherit domain owner repo; }; } // optionalAttrs (args?fetcher) {inherit fetcher;}); diff --git a/nixpkgs/pkgs/build-support/coq/meta-fetch/default.nix b/nixpkgs/pkgs/build-support/coq/meta-fetch/default.nix index 580d58395ef4..b01ae72a2089 100644 --- a/nixpkgs/pkgs/build-support/coq/meta-fetch/default.nix +++ b/nixpkgs/pkgs/build-support/coq/meta-fetch/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchzip }@args: -let lib = import ../extra-lib.nix {inherit (args.stdenv) lib;}; in +{ lib, stdenv, fetchzip }@args: +let lib' = lib; in +let lib = import ../extra-lib.nix {lib = lib';}; in with builtins; with lib; let default-fetcher = {domain ? "github.com", owner ? "", repo, rev, name ? "source", sha256 ? null, ...}@args: diff --git a/nixpkgs/pkgs/build-support/emacs/generic.nix b/nixpkgs/pkgs/build-support/emacs/generic.nix index 588699517baf..d84fa24923df 100644 --- a/nixpkgs/pkgs/build-support/emacs/generic.nix +++ b/nixpkgs/pkgs/build-support/emacs/generic.nix @@ -1,6 +1,6 @@ # generic builder for Emacs packages -{ lib, stdenv, emacs, texinfo }: +{ lib, stdenv, emacs, texinfo, ... }: with lib; diff --git a/nixpkgs/pkgs/build-support/emacs/trivial.nix b/nixpkgs/pkgs/build-support/emacs/trivial.nix index 396c971b2f01..f1aa078df272 100644 --- a/nixpkgs/pkgs/build-support/emacs/trivial.nix +++ b/nixpkgs/pkgs/build-support/emacs/trivial.nix @@ -1,12 +1,12 @@ # trivial builder for Emacs packages -{ lib, stdenv, texinfo, ... }@envargs: +{ callPackage, lib, ... }@envargs: with lib; args: -import ./generic.nix envargs ({ +callPackage ./generic.nix envargs ({ buildPhase = '' runHook preBuild diff --git a/nixpkgs/pkgs/build-support/fetchcvs/builder.sh b/nixpkgs/pkgs/build-support/fetchcvs/builder.sh index 0975c3478820..fe1019aafc2f 100644 --- a/nixpkgs/pkgs/build-support/fetchcvs/builder.sh +++ b/nixpkgs/pkgs/build-support/fetchcvs/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -(echo '#!/usr/bin/env sh'; \ +(echo "#!$SHELL"; \ echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh chmod +x ssh export CVS_RSH=$PWD/ssh diff --git a/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerConfig.nix b/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerConfig.nix index 9fd813bfa575..e8b2403d8f33 100644 --- a/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerConfig.nix +++ b/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerConfig.nix @@ -1,4 +1,4 @@ -pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +pkgargs@{ lib, haskellPackages, writeText, gawk }: let generic-fetcher = import ./generic-fetcher.nix pkgargs; diff --git a/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerLayer.nix b/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerLayer.nix index 869ba637429c..0fbbc078efc3 100644 --- a/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerLayer.nix +++ b/nixpkgs/pkgs/build-support/fetchdocker/fetchDockerLayer.nix @@ -1,4 +1,4 @@ -pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +pkgargs@{ lib, haskellPackages, writeText, gawk }: let generic-fetcher = import ./generic-fetcher.nix pkgargs; diff --git a/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix b/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix index 9efe9197d687..127f32dd61b6 100644 --- a/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix +++ b/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { inherit name; extid = if fixedExtid == null then "nixos@${name}" else fixedExtid; passthru = { - exitd=extid; + inherit extid; }; builder = writeScript "xpibuilder" '' diff --git a/nixpkgs/pkgs/build-support/fetchgit/default.nix b/nixpkgs/pkgs/build-support/fetchgit/default.nix index 5f5ded128de5..df97ef1492d9 100644 --- a/nixpkgs/pkgs/build-support/fetchgit/default.nix +++ b/nixpkgs/pkgs/build-support/fetchgit/default.nix @@ -1,6 +1,6 @@ -{stdenvNoCC, git, git-lfs, cacert}: let +{lib, stdenvNoCC, git, git-lfs, cacert}: let urlToName = url: rev: let - inherit (stdenvNoCC.lib) removeSuffix splitString last; + inherit (lib) removeSuffix splitString last; base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); matched = builtins.match "(.*).git" base; @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation { fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash. nativeBuildInputs = [ git ] - ++ stdenvNoCC.lib.optionals fetchLFS [ git-lfs ]; + ++ lib.optionals fetchLFS [ git-lfs ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; @@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation { GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [ + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ]; diff --git a/nixpkgs/pkgs/build-support/fetchhg/default.nix b/nixpkgs/pkgs/build-support/fetchhg/default.nix index 41eff1f9c0c5..15309d0a1950 100644 --- a/nixpkgs/pkgs/build-support/fetchhg/default.nix +++ b/nixpkgs/pkgs/build-support/fetchhg/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, mercurial }: +{ lib, stdenvNoCC, mercurial }: { name ? null , url , rev ? null @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { builder = ./builder.sh; nativeBuildInputs = [mercurial]; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; subrepoClause = if fetchSubrepos then "S" else ""; diff --git a/nixpkgs/pkgs/build-support/fetchmtn/default.nix b/nixpkgs/pkgs/build-support/fetchmtn/default.nix index b5da0f80a31f..4aa134242aa7 100644 --- a/nixpkgs/pkgs/build-support/fetchmtn/default.nix +++ b/nixpkgs/pkgs/build-support/fetchmtn/default.nix @@ -1,5 +1,5 @@ # You can specify some extra mirrors and a cache DB via options -{stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: +{lib, stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: # dbs is a list of strings # each is an url for sync @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { dbs = defaultDBMirrors ++ dbs; inherit branch cacheDB name selector; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } diff --git a/nixpkgs/pkgs/build-support/fetchrepoproject/default.nix b/nixpkgs/pkgs/build-support/fetchrepoproject/default.nix index 8144ed038bd0..69b1bd1aef74 100644 --- a/nixpkgs/pkgs/build-support/fetchrepoproject/default.nix +++ b/nixpkgs/pkgs/build-support/fetchrepoproject/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, gitRepo, cacert, copyPathsToStore }: +{ lib, stdenvNoCC, gitRepo, cacert, copyPathsToStore }: { name, manifest, rev ? "HEAD", sha256 # Optional parameters: @@ -9,7 +9,7 @@ assert repoRepoRev != "" -> repoRepoURL != ""; assert createMirror -> !useArchive; -with stdenvNoCC.lib; +with lib; let extraRepoInitFlags = [ diff --git a/nixpkgs/pkgs/build-support/fetchs3/default.nix b/nixpkgs/pkgs/build-support/fetchs3/default.nix index 3dbde203374d..8c551c20aa04 100644 --- a/nixpkgs/pkgs/build-support/fetchs3/default.nix +++ b/nixpkgs/pkgs/build-support/fetchs3/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, runCommand, awscli }: +{ lib, stdenvNoCC, runCommand, awscli }: { s3url , name ? builtins.baseNameOf s3url @@ -16,7 +16,7 @@ let AWS_SESSION_TOKEN = session_token; }; - credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials); + credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials); in runCommand name ({ nativeBuildInputs = [ awscli ]; diff --git a/nixpkgs/pkgs/build-support/fetchsvn/default.nix b/nixpkgs/pkgs/build-support/fetchsvn/default.nix index 06f0ea0a3d1f..82dececc124a 100644 --- a/nixpkgs/pkgs/build-support/fetchsvn/default.nix +++ b/nixpkgs/pkgs/build-support/fetchsvn/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, buildPackages +{ lib, stdenvNoCC, buildPackages , subversion, glibcLocales, sshSupport ? true, openssh ? null }: @@ -10,7 +10,7 @@ assert sshSupport -> openssh != null; let - repoName = with stdenvNoCC.lib; + repoName = with lib; let fst = head; snd = l: head (tail l); @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation { name = name_; builder = ./builder.sh; nativeBuildInputs = [ subversion glibcLocales ] - ++ stdenvNoCC.lib.optional sshSupport openssh; + ++ lib.optional sshSupport openssh; SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null; @@ -49,6 +49,6 @@ stdenvNoCC.mkDerivation { inherit url rev ignoreExternals ignoreKeywords; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; inherit preferLocalBuild; } diff --git a/nixpkgs/pkgs/build-support/fetchzip/default.nix b/nixpkgs/pkgs/build-support/fetchzip/default.nix index a1744b48deb9..b00983772e4b 100644 --- a/nixpkgs/pkgs/build-support/fetchzip/default.nix +++ b/nixpkgs/pkgs/build-support/fetchzip/default.nix @@ -45,18 +45,13 @@ '' else '' mv "$unpackDir" "$out" '') - + extraPostFetch - # Remove write permissions for files unpacked with write bits set + + '' + ${extraPostFetch} + '' + # Remove non-owner write permissions # Fixes https://github.com/NixOS/nixpkgs/issues/38649 - # - # However, we should (for the moment) retain write permission on the directory - # itself, to avoid tickling https://github.com/NixOS/nix/issues/4295 in - # single-user Nix installations. This is because in sandbox mode we'll try to - # move the path, and if we don't have write permissions on the directory, - # then we can't update the ".." entry. + '' - chmod -R a-w "$out" - chmod u+w "$out" + chmod 755 "$out" ''; } // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { # Hackety-hack: we actually need unzip hooks, too diff --git a/nixpkgs/pkgs/build-support/kernel/make-initrd.nix b/nixpkgs/pkgs/build-support/kernel/make-initrd.nix index 9af40d33242d..83d3bb65baec 100644 --- a/nixpkgs/pkgs/build-support/kernel/make-initrd.nix +++ b/nixpkgs/pkgs/build-support/kernel/make-initrd.nix @@ -83,7 +83,7 @@ in stdenvNoCC.mkDerivation rec { builder = ./make-initrd.sh; nativeBuildInputs = [ perl cpio ] - ++ stdenvNoCC.lib.optional makeUInitrd ubootTools; + ++ lib.optional makeUInitrd ubootTools; compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}"; diff --git a/nixpkgs/pkgs/build-support/plugins.nix b/nixpkgs/pkgs/build-support/plugins.nix index 1ed748515971..31b478c6c0de 100644 --- a/nixpkgs/pkgs/build-support/plugins.nix +++ b/nixpkgs/pkgs/build-support/plugins.nix @@ -1,4 +1,4 @@ -{ lib, stdenv }: +{ lib }: # helper functions for packaging programs with plugin systems { diff --git a/nixpkgs/pkgs/build-support/release/debian-build.nix b/nixpkgs/pkgs/build-support/release/debian-build.nix index 2544d5c740c2..4c2d82ce630b 100644 --- a/nixpkgs/pkgs/build-support/release/debian-build.nix +++ b/nixpkgs/pkgs/build-support/release/debian-build.nix @@ -2,7 +2,6 @@ # that contains a Debian-like (i.e. dpkg-based) OS. { name ? "debian-build" -, lib , diskImage , src, lib, stdenv, vmTools, checkinstall , fsTranslation ? false diff --git a/nixpkgs/pkgs/build-support/templaterpm/nix-template-rpm.py b/nixpkgs/pkgs/build-support/templaterpm/nix-template-rpm.py index f39595f89776..db8c0f2064c2 100755 --- a/nixpkgs/pkgs/build-support/templaterpm/nix-template-rpm.py +++ b/nixpkgs/pkgs/build-support/templaterpm/nix-template-rpm.py @@ -229,26 +229,26 @@ class SPECTemplate(object): @property def meta(self): - out = ' meta = {\n' + out = ' meta = with lib; {\n' out += ' homepage = ' + self.spec.sourceHeader['url'] + ';\n' out += ' description = "' + self.spec.sourceHeader['summary'] + '";\n' - out += ' license = stdenv.lib.licenses.' + self.spec.sourceHeader['license'] + ';\n' + out += ' license = lib.licenses.' + self.spec.sourceHeader['license'] + ';\n' out += ' platforms = [ "i686-linux" "x86_64-linux" ];\n' - out += ' maintainers = with stdenv.lib.maintainers; [ ' + self.maintainer + ' ];\n' + out += ' maintainers = with lib.maintainers; [ ' + self.maintainer + ' ];\n' out += ' };\n' out += '}\n' return out def __str__(self): - head = '{stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' + head = '{lib, stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' head += 'stdenv.mkDerivation {\n' body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ] return head + '\n'.join(body) def getTemplate(self): - head = '{stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' + head = '{lib, stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' head += 'let\n' head += ' buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n' head += 'in\n\n' diff --git a/nixpkgs/pkgs/common-updater/unstable-updater.nix b/nixpkgs/pkgs/common-updater/unstable-updater.nix index 94cd33b9a26b..d315c1027ab4 100644 --- a/nixpkgs/pkgs/common-updater/unstable-updater.nix +++ b/nixpkgs/pkgs/common-updater/unstable-updater.nix @@ -1,5 +1,4 @@ -{ stdenv -, writeShellScript +{ writeShellScript , coreutils , git , nix diff --git a/nixpkgs/pkgs/data/documentation/anarchism/default.nix b/nixpkgs/pkgs/data/documentation/anarchism/default.nix index 8f95a371ae22..d0cda3da544c 100644 --- a/nixpkgs/pkgs/data/documentation/anarchism/default.nix +++ b/nixpkgs/pkgs/data/documentation/anarchism/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, xdg_utils }: +{ lib, stdenv, fetchFromGitLab, xdg-utils }: stdenv.mkDerivation rec { pname = "anarchism"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace debian/anarchism.desktop \ - --replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open" + --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" substituteInPlace debian/anarchism.desktop \ --replace "file:///usr" "file://$out" ''; diff --git a/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix index 2915430d9f24..e9fa1b7e4f4f 100644 --- a/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix +++ b/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scheme-manpages-unstable"; - version = "2020-08-14"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "2e99a0aea9c0327e3c2dcfb9b7a2f8f528b4fe43"; - sha256 = "0ykj4i8mx50mgyz9q63glfnc0mw1lf89hwsflpnbizjda5b4s0fp"; + rev = "817798ccca81424e797fda0e218d53a95f50ded7"; + sha256 = "1amc0dmliz2a37pivlkx88jbc08ypfiwv3z477znx8khhc538glk"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/data/documentation/zeal/default.nix b/nixpkgs/pkgs/data/documentation/zeal/default.nix index a6c0b1f49185..8c806b87d4b2 100644 --- a/nixpkgs/pkgs/data/documentation/zeal/default.nix +++ b/nixpkgs/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config +{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config , qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: diff --git a/nixpkgs/pkgs/data/fonts/et-book/default.nix b/nixpkgs/pkgs/data/fonts/et-book/default.nix index e7d97b777076..c410826b2fb5 100644 --- a/nixpkgs/pkgs/data/fonts/et-book/default.nix +++ b/nixpkgs/pkgs/data/fonts/et-book/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, fetchFromGitHub }: fetchFromGitHub rec { rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; diff --git a/nixpkgs/pkgs/data/fonts/fira-code/default.nix b/nixpkgs/pkgs/data/fonts/fira-code/default.nix index 546c7d905a7b..d5c5d0e000a5 100644 --- a/nixpkgs/pkgs/data/fonts/fira-code/default.nix +++ b/nixpkgs/pkgs/data/fonts/fira-code/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "5.2"; diff --git a/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix b/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix index 2e4cfc8f05b6..e226c351a333 100644 --- a/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix +++ b/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "fira-code-symbols-20160811"; diff --git a/nixpkgs/pkgs/data/fonts/fira-mono/default.nix b/nixpkgs/pkgs/data/fonts/fira-mono/default.nix index 37f285b55527..2aef2fc4b05f 100644 --- a/nixpkgs/pkgs/data/fonts/fira-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/fira-mono/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "fira-mono-3.206"; diff --git a/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix b/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix index e55ae0bcf11b..8bdbc2d4c4f0 100644 --- a/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl } : +{ lib, fetchurl } : let major = "3"; diff --git a/nixpkgs/pkgs/data/fonts/go-font/default.nix b/nixpkgs/pkgs/data/fonts/go-font/default.nix index 056cd621394f..ed17dfc9054c 100644 --- a/nixpkgs/pkgs/data/fonts/go-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/go-font/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit }: +{ lib, fetchgit }: let version = "2017-03-30"; diff --git a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix index 0fac2a67bb8a..210902a0e71e 100644 --- a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub }: stdenv.mkDerivation { pname = "google-fonts"; - version = "2019-07-14"; + version = "unstable-2021-01-19"; outputs = [ "out" "adobeBlank" ]; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a"; - sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs"; + rev = "a3a831f0fe44cd58465c6937ea06873728f2ba0d"; + sha256 = "19abx2bj7mkysv2ihr43m3kpyf6kv6v2qjlm1skxc82rb72xqhix"; }; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; @@ -21,18 +23,9 @@ stdenv.mkDerivation { # directories. This causes non-determinism in the install since # the installation order of font files with the same name is not # fixed. - rm -rv ofl/alefhebrew \ - ofl/misssaintdelafield \ - ofl/mrbedford \ - ofl/siamreap \ - ofl/terminaldosislight - - # See comment above, the structure of these is a bit odd - # We keep the ofl/<font>/static/ variants - rm -rv ofl/comfortaa/*.ttf \ - ofl/mavenpro/*.ttf \ - ofl/muli/*.ttf \ - ofl/oswald/*.ttf + rm -rv ofl/cabincondensed \ + ofl/signikanegative \ + ofl/signikanegativesc if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then echo "error: duplicate font names" diff --git a/nixpkgs/pkgs/data/fonts/inconsolata/default.nix b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix index f064b4f61923..530bb0380d23 100644 --- a/nixpkgs/pkgs/data/fonts/inconsolata/default.nix +++ b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { inherit (google-fonts) src version; installPhase = '' - install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf + install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf ''; meta = with lib; { diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index f3bd8dab013c..e9fad77e8c0a 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 0d998a4863ab..cbdd309db5e5 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -1,31 +1,51 @@ { stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal , ttfautohint-nox + # Custom font set options. + # See https://typeof.net/Iosevka/customizer + # Can be a raw TOML string, or a Nix attrset. -# Custom font set options. -# See https://github.com/be5invis/Iosevka#build-your-own-style -# Ex: -# privateBuildPlan = { -# family = "Iosevka Expanded"; -# -# design = [ -# "sans" -# "expanded" -# ]; -# }; + # Ex: + # privateBuildPlan = '' + # [buildPlans.iosevka-custom] + # family = "Iosevka Custom" + # spacing = "normal" + # serifs = "sans" + # + # [buildPlans.iosevka-custom.variants.design] + # capital-j = "serifless" + # + # [buildPlans.iosevka-custom.variants.italic] + # i = "tailed" + # ''; + + # Or: + # privateBuildPlan = { + # family = "Iosevka Custom"; + # spacing = "normal"; + # serifs = "sans"; + # + # variants = { + # design.capital-j = "serifless"; + # italic.i = "tailed"; + # }; + # } , privateBuildPlan ? null # Extra parameters. Can be used for ligature mapping. - # It must be a raw toml string. - # + # It must be a raw TOML string. + # Ex: - # [[iosevka.compLig]] - # unicode = 57808 # 0xe1d0 - # featureTag = 'XHS0' - # sequence = "+>" + # extraParameters = '' + # [[iosevka.compLig]] + # unicode = 57808 # 0xe1d0 + # featureTag = 'XHS0' + # sequence = "+>" + # ''; , extraParameters ? null # Custom font set name. Required if any custom settings above. , set ? null }: assert (privateBuildPlan != null) -> set != null; +assert (extraParameters != null) -> set != null; let # We don't know the attribute name for the Iosevka package as it @@ -54,15 +74,21 @@ stdenv.mkDerivation rec { ttfautohint-nox ]; - privateBuildPlanJSON = - builtins.toJSON { buildPlans.${pname} = privateBuildPlan; }; + buildPlan = + if builtins.isAttrs privateBuildPlan + then builtins.toJSON { buildPlans.${pname} = privateBuildPlan; } + else privateBuildPlan; + inherit extraParameters; - passAsFile = [ "privateBuildPlanJSON" "extraParameters" ]; + passAsFile = [ "buildPlan" "extraParameters" ]; configurePhase = '' runHook preConfigure - ${lib.optionalString (privateBuildPlan != null) '' - remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml + ${lib.optionalString (builtins.isAttrs privateBuildPlan) '' + remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml + ''} + ${lib.optionalString (builtins.isString privateBuildPlan) '' + cp "$buildPlanPath" private-build-plans.toml ''} ${lib.optionalString (extraParameters != null) '' echo -e "\n" >> params/parameters.toml diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 6b6cd00f49ab..8ee3206d0705 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0qkxqdx3vs53djiibc4ib3qj61fygxvxfcvs7yi08vdhd9qbxhjg"; - iosevka-aile = "053f6b1z0w1089y608k4wmspgljn9lyzyggq168k0110z9vlfjhf"; - iosevka-curly = "04kc7f6gqqxbdkdh1k4z4b28f8pj09npb87fx4zr41wkzkxmavcf"; - iosevka-curly-slab = "1pdm2g3a1nfc8w53r3sdifwypj3diil16jy6sgvgpmk7klf804vf"; - iosevka-etoile = "10vw53cd317qxhvws11zf98756vfn836assw3rbns6zpfrj7a2xg"; - iosevka-slab = "01ynv6b7fqdd98imfr14xcgrhp20yffa3n738iz5qnr75vqpnfdc"; - iosevka-sparkle = "1nw63dd1ccj8cp1x06alfxdvdlw9ibin41llmc0jla0nz7n8vsp3"; - iosevka-ss01 = "0g54rghx6z0a9azckvgh7njq12rsr1zzskgrm3f29rin8fdwvvd9"; - iosevka-ss02 = "0jhl75bwd76vp9hpvqgj7awpvibv4pk5vjab97n53b4bdxdxh1rf"; - iosevka-ss03 = "1ki5q7gafgm2iayjn82wrnwkfb3nbcr2xsrgs2vsw5lm9plawbmd"; - iosevka-ss04 = "03933skk5zqxrkj5m0j90cxrv4fmjfbp7ai5fywmhjzq92xbcr97"; - iosevka-ss05 = "014dglqr17adyj2229vvzhz61jpkgj33ngkav5sh2dj5wcx6b137"; - iosevka-ss06 = "07z87rm0rb9n6d7h0kmp51dnnglmr0wbwmplc5mlv036fcrdibaj"; - iosevka-ss07 = "1672n5ynd5fv8dwnwg8aa50ny74ad9gbx2xlk2ixih7ajv15p19d"; - iosevka-ss08 = "1jqdqg6dzrnq6y0g7ls2ya3dh0j00xj2k41aajvdqw342n08h27k"; - iosevka-ss09 = "1p1v0byb2nh11k362zxjrbvzbbryh2wk76dsd1zwyjrlgqq6qa81"; - iosevka-ss10 = "12c940w8vy1hjhi7cxgqsb23ip60xw1ydzhx5cv4ycxmi5745wqq"; - iosevka-ss11 = "0s6fvh5pw119w872w4rvamiwssryx4a98c7fhr737nzgiqy4iyz5"; - iosevka-ss12 = "14gjqmn807cv3dbvkm2i6dz6if46fbrkr8ls5shwalnl8qj3d06c"; - iosevka-ss13 = "1qd04cani9jzp1hjs8g6b42bmxvjyyxdha122816s0rg9i46mpcc"; - iosevka-ss14 = "0q109ahk7ww66brxgldgmr61m2qzpyhi1q21591wg1br5cn2d52w"; + iosevka = "1ic5w8w4v27vfq7pvx9wv2zdcsj16xi71ln2a3fb4kh93zj84kl8"; + iosevka-aile = "1qv2b4zcz172knvr39argqshjpin1lidlafilfcm569cp8rasrdd"; + iosevka-curly = "0x9pdgyiab8hibyf1yrwn6cr90aqy9ygyk1zz9nqzcndk5mk54p4"; + iosevka-curly-slab = "0mxnbf9dwq3iq5dc0cgrdqf2dlyymylv46psb83n5kra4rz1wxnb"; + iosevka-etoile = "1rz9dkpiwwfjnhiajfxg3rrnf4lyxnynx89qswg0b8wql4q6bz71"; + iosevka-slab = "17p0cf4k8k3kabqp0b1anqqj8phfw7nnxiiscnngbrxhdvhpp62n"; + iosevka-sparkle = "0ip46lcq7gcv77ar6vqz51lhf448fd0nviijfpqfg7gdywdzalm0"; + iosevka-ss01 = "1v1z2rx7r6nb45i3qcb9pvilm6yxxkl5ks7ldmm902cx67pkv7rj"; + iosevka-ss02 = "1pd4sbr1p1cf9917nnn22v1kah8jfgm9jpfvq1j51wyr8lnxqz2k"; + iosevka-ss03 = "0pdbvrzilrxxcaz9gnhnqxvk4ipfxcgys41sasl3znxzij1ary8s"; + iosevka-ss04 = "08xwdp5s3dp30qy81j3qwhhqk1bibcpnh2i00a3kyw3g6jsnsvmp"; + iosevka-ss05 = "1njf1ysd42k2rc2lvg5ilq6q2wvg8dlm04d7wygdamw0yx6sia83"; + iosevka-ss06 = "04g4m770i1b75gl1lanbs0ibmjj8vg5yfwyn6n0bidfn30z4n01l"; + iosevka-ss07 = "07f1n44f5bvifbns6572ys6zihac6yljv7frm58w7xgyl0a3prvg"; + iosevka-ss08 = "157cq5jfxvr0n7ksqln5mjmr800dbyfy8vwl0ngbf0aiq3mw2x8f"; + iosevka-ss09 = "0yib3mhb48g2vjiaviwgcl6lad4dbwwblnmv4zi880bdvz7jrwr9"; + iosevka-ss10 = "06s0s9x1fiqqmnkm42khasws40db7l68d2ycsm38mx6b62nlsbkr"; + iosevka-ss11 = "0yzy322zqas0id70i1p92x7fbim8gai0a61nf6bf33aq3qgsj2w8"; + iosevka-ss12 = "0lhmhwd4z44y4469av6na7k5w4ra47g98dxfi0mb42a4n4sq0k5j"; + iosevka-ss13 = "1cq91iqfgq4fsazi2pjh6l4n9mgci4aayqp7fiy8lydv7f1ym0z9"; + iosevka-ss14 = "0xid48yr2qfsh6kvlajlaqnb43ck351kg8r3bwpvzrdbvl809983"; } diff --git a/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix index 42012e43d4bf..0ba7fd835c3c 100644 --- a/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "2.221"; + version = "2.225"; in fetchzip { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "1in3znnj0i0yfwj93ncxi3s1cp9lhgwnv2r14br47rr7vik4zjr6"; + sha256 = "1k8xmjaingz50626hd73hqbp196kg3zndiy0aqb88z5cw9nd0fva"; postFetch = '' mkdir -p $out/share/fonts diff --git a/nixpkgs/pkgs/data/fonts/jost/default.nix b/nixpkgs/pkgs/data/fonts/jost/default.nix index a8df441d9990..457cb0d03c99 100644 --- a/nixpkgs/pkgs/data/fonts/jost/default.nix +++ b/nixpkgs/pkgs/data/fonts/jost/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchzip}: +{lib, fetchzip}: let version = "3.5"; diff --git a/nixpkgs/pkgs/data/fonts/myrica/default.nix b/nixpkgs/pkgs/data/fonts/myrica/default.nix index aa5ee0ff1c38..c36292eb0014 100644 --- a/nixpkgs/pkgs/data/fonts/myrica/default.nix +++ b/nixpkgs/pkgs/data/fonts/myrica/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub { owner = "tomokuni"; repo = "Myrica"; + # commit does not exist on any branch on the target repository rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12"; diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix index eecab47c0879..6b1cd370241b 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "paratype-pt-mono"; diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix index 826b8887365e..d6b783ebe4c7 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "paratype-pt-sans"; diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix index bbff974e1071..2b5eeafd09b9 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "paratype-pt-serif"; diff --git a/nixpkgs/pkgs/data/fonts/scientifica/default.nix b/nixpkgs/pkgs/data/fonts/scientifica/default.nix new file mode 100644 index 000000000000..2a2b237d5275 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/scientifica/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchurl }: + +let + version = "2.1"; +in fetchurl rec { + name = "scientifica-${version}"; + + url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica-v${version}.tar"; + + downloadToTemp = true; + + recursiveHash = true; + + sha256 = "081faa48d6g86pacmgjqa96in72rjldavnwxq6bdq2br33h3qwrz"; + + postFetch = '' + tar xvf $downloadedFile + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/fonts/misc + cp scientifica/ttf/*.ttf $out/share/fonts/truetype + cp scientifica/otb/*.otb $out/share/fonts/misc + cp scientifica/bdf/*.bdf $out/share/fonts/misc + ''; + + meta = with lib; { + description = "Tall and condensed bitmap font for geeks"; + homepage = "https://github.com/NerdyPepper/scientifica"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/siji/default.nix b/nixpkgs/pkgs/data/fonts/siji/default.nix index ea2d2b687d53..adc6a79f10f4 100644 --- a/nixpkgs/pkgs/data/fonts/siji/default.nix +++ b/nixpkgs/pkgs/data/fonts/siji/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: +{ lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }: stdenv.mkDerivation rec { name = "siji-${version}"; version = "2016-05-13"; - src = fetchzip { - url = "https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip"; + src = fetchFromGitHub { + owner = "stark"; + repo = "siji"; + rev = "3cbb7fe938c33aaadbb657803ea5946e5157d6e2"; sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; }; diff --git a/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix index bcf6cefb8d67..95e4ce2a52ab 100644 --- a/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let pname = "ttf-bitstream-vera"; version = "1.10"; diff --git a/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix b/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix index 695792894426..bf52d07c52e9 100644 --- a/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "2020-11-14"; in diff --git a/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix b/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix index 5e690e7fd6f2..a2fde6813b78 100644 --- a/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,37 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "twemoji-color-font"; - version = "12.0.1"; - src = fetchFromGitHub { - owner = "eosrei"; - repo = "twemoji-color-font"; - rev = "v${version}"; - sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; - }; + version = "13.0.1"; - patches = [ - # Fix build with Inkscape 1.0 - # https://github.com/eosrei/twemoji-color-font/pull/82 - (fetchpatch { - url = "https://github.com/eosrei/twemoji-color-font/commit/208ad63c2ceb38c528b5237abeb2b85ceedc1d37.patch"; - sha256 = "TV8I++BEnVUQg7FNbnrEQ/MLV9n3drmspqjmDZgTGFI="; - postFetch = '' - substituteInPlace $out \ - --replace "inkscape --without-gui" "inkscape --export-png" - ''; - }) - ]; + # We fetch the prebuilt font because building it takes 1.5 hours on hydra. + # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 + src = fetchurl { + url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"; + sha256 = "1mn2cb6a3v0q8i81s9a8bk49nbwxq91n6ki7827i7rhjkncb0mbn"; + }; - nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; - # silence inkscape errors about non-writable home - preBuild = "export HOME=\"$NIX_BUILD_ROOT\""; - makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ]; - enableParallelBuilding = true; + dontBuild = true; installPhase = '' - install -Dm755 build/TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf - install -Dm644 linux/fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf + install -Dm755 TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf + install -Dm644 fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf ''; meta = with lib; { diff --git a/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix index b71ef7c99ec8..20b5b673ccff 100644 --- a/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, cabextract }: +{ lib, fetchzip, cabextract }: fetchzip { name = "vista-fonts-1"; diff --git a/nixpkgs/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix b/nixpkgs/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix new file mode 100644 index 000000000000..7b779191b6b2 --- /dev/null +++ b/nixpkgs/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "gruvbox-dark-icons-gtk"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "jmattheis"; + repo = pname; + rev = "v${version}"; + sha256 = "1fks2rrrb62ybzn8gqan5swcgksrb579vk37bx4xpwkc552dz2z2"; + }; + + nativeBuildInputs = [ gtk3 ]; + + propagatedBuildInputs = [ breeze-icons gnome-icon-theme hicolor-icon-theme ]; + + installPhase = '' + mkdir -p $out/share/icons/oomox-gruvbox-dark + rm README.md + cp -r * $out/share/icons/oomox-gruvbox-dark + gtk-update-icon-cache $out/share/icons/oomox-gruvbox-dark + ''; + + dontDropIconThemeCache = true; + + meta = with lib; { + description = "Gruvbox icons for GTK based desktop environments"; + homepage = "https://github.com/jmattheis/gruvbox-dark-gtk"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.nomisiv ]; + }; +} diff --git a/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix b/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix index 7d13476d73ec..3a5fe541985a 100644 --- a/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix +++ b/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-jade"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1bns1f3vv7d7ps08plnhl3432cy2l2mhv85h7n4fifjqqi8bll9x"; + sha256 = "0pwz3l5i93s84iwkn1jq8a150ma96788a0n41xq2cgy00j8h8xh0"; }; nativeBuildInputs = [ gtk3 ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Icon pack based upon Faenza and Mint-X"; homepage = "https://github.com/madmaxms/iconpack-jade"; - license = licenses.lgpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index ae3bf79d79aa..13b314e1ae05 100644 --- a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-obsidian"; - version = "4.14"; + version = "4.15"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1rhs8k88gh6673flr22cb3gbbw37wyzhd6jyysx6qgjjsnjvl2h8"; + sha256 = "1f32isq1xyn9b6p1nx5rssqgg9gw0jp9ld19860xk29fspmlfb8n"; }; nativeBuildInputs = [ gtk3 ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gnome icon pack based upon Faenza"; homepage = "https://github.com/madmaxms/iconpack-obsidian"; - license = licenses.lgpl3; + license = licenses.gpl3Only; # darwin cannot deal with file names differing only in case platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix index 9c64ed4b4972..36aee979f0b1 100644 --- a/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.3.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "01s7zhwwbdqgksjvfvn7kqijxzzc7734f707yk8y7anshq0518x3"; + sha256 = "sha256-YGhusal8g/UXMqrQvj147OScg51uNABTMIXxVXvnpKY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index ed5f8e7c4c2a..b18354910e44 100644 --- a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210101"; + version = "20210201"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-RHuT+zJQyhiApeLuh821PMI9dmD20OoRVxezF/uCWoE="; + sha256 = "sha256-TQEpNFmsloq1jIg6QsuY8kllINpmwJCY+Anwker6Z5M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index 38f72b5a2efe..2212b158c8ad 100644 --- a/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,15 @@ , fetchFromGitHub }: -stdenv.mkDerivation { - name = "ddccontrol-db-20180908"; +stdenv.mkDerivation rec { + pname = "ddccontrol-db"; + version = "20201221"; + src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; - rev = "5f211be363f77dc43e39f911b30f4fb19a2d7a84"; - sha256 = "0vi3bzxpjdkn791vri68k7dah4v2liscniz7hxrarhl4fxlicc0w"; + rev = version; + sha256 = "1sryyjjad835mwc7a2avbij6myln8b824kjdr78gc9hh3p16929b"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/data/misc/hackage/default.nix b/nixpkgs/pkgs/data/misc/hackage/default.nix index 551610c5ad5a..d1d8b91bdacb 100644 --- a/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/214ceb3bed92d49a0dffc6c2d8d21b1d0bcc7c25.tar.gz"; - sha256 = "1m8rm46w9xc8z8dvjg3i0bqpx9630i6ff681dp445q8wv7ji9y2v"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c0fe8e827d5ec71141700f5d5a90a6f6616ecbc5.tar.gz"; + sha256 = "16is1cipkfiabbh01i247vqfviwzjpfhgf6pkli61wwlhnk0q95s"; } diff --git a/nixpkgs/pkgs/data/misc/iana-etc/default.nix b/nixpkgs/pkgs/data/misc/iana-etc/default.nix index 1936bd6627a7..421054fa17f0 100644 --- a/nixpkgs/pkgs/data/misc/iana-etc/default.nix +++ b/nixpkgs/pkgs/data/misc/iana-etc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "20200729"; diff --git a/nixpkgs/pkgs/data/misc/mime-types/default.nix b/nixpkgs/pkgs/data/misc/mime-types/default.nix index dc942868250d..77b67e48f923 100644 --- a/nixpkgs/pkgs/data/misc/mime-types/default.nix +++ b/nixpkgs/pkgs/data/misc/mime-types/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "9"; diff --git a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index 36fc664a83bb..a75b2c1b65da 100644 --- a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20201119"; + version = "20210202"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1a0c42rh3anl3wy4hpg36s8k37y8zxpi5lc67wjwnj4j6mwi7w3l"; + sha256 = "sha256-C7Vq7d+Uos9IhTwOgsrK64c9mMGVkNgfvOrbBqORsRs="; }; nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; diff --git a/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix b/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix index 60ff492330dc..b91afb08f60e 100644 --- a/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix +++ b/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , fetchurl , symlinkJoin -, lib }: let diff --git a/nixpkgs/pkgs/data/themes/arc/default.nix b/nixpkgs/pkgs/data/themes/arc/default.nix index 919c04913f03..8a283a041852 100644 --- a/nixpkgs/pkgs/data/themes/arc/default.nix +++ b/nixpkgs/pkgs/data/themes/arc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20201013"; + version = "20210127"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s"; + sha256 = "sha256-P7YZTD5bAWNWepL7qsZZAMf8ujzNbHOj/SLx8Fw3bi4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/gruvbox-dark-gtk/default.nix b/nixpkgs/pkgs/data/themes/gruvbox-dark-gtk/default.nix new file mode 100644 index 000000000000..3b6f68ab4754 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/gruvbox-dark-gtk/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gruvbox-dark-gtk"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "jmattheis"; + repo = pname; + rev = "v${version}"; + sha256 = "1wf4ybnjdp2kbbvz7pmqdnzk94axaqx5ws18f34hrg4y267n0w4g"; + }; + + installPhase = '' + mkdir -p $out/share/themes/gruvbox-dark + rm -rf README.md LICENSE .github + cp -r * $out/share/themes/gruvbox-dark + ''; + + meta = with lib; { + description = "Gruvbox theme for GTK based desktop environments"; + homepage = "https://github.com/jmattheis/gruvbox-dark-gtk"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.nomisiv ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/qogir/default.nix b/nixpkgs/pkgs/data/themes/qogir/default.nix index d4ffdca3ae33..3f87473a4a15 100644 --- a/nixpkgs/pkgs/data/themes/qogir/default.nix +++ b/nixpkgs/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2020-11-16"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0qp65py1p93f5bxbf0jgc1d2lwrjhb7d0vzkivm73haji197l9p5"; + sha256 = "1pilq939bqzxysw4ixd279c49bp7l74bykpprrhgc5f2klpjg1zn"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/Qogir-theme"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 26d9be6d904f..832a534e5daa 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , runCommand , nixos-artwork , glib diff --git a/nixpkgs/pkgs/desktops/cinnamon/default.nix b/nixpkgs/pkgs/desktops/cinnamon/default.nix index 68ccd76211d2..2a52b83f0465 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/default.nix @@ -31,4 +31,5 @@ lib.makeScope pkgs.newScope (self: with self; { muffin = callPackage ./muffin { }; xapps = callPackage ./xapps { }; warpinator = callPackage ./warpinator { }; + xviewer = callPackage ./xviewer { }; }) diff --git a/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix b/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix index 2338c834d1f8..efcd20457b32 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, lib, stdenv +, lib , gobject-introspection , meson , ninja diff --git a/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix b/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix index f9429a071cc6..7be80048e3c2 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, fetchpatch , glib , gobject-introspection , gtk3 @@ -22,22 +21,15 @@ stdenv.mkDerivation rec { pname = "xapps"; - version = "1.8.9"; + version = "2.0.6"; outputs = [ "out" "dev" ]; - patches = [ - (fetchpatch { - url = "https://github.com/linuxmint/xapp/pull/110/commits/208563d4e2bbcfbeb4425d05f649867065c37615.patch"; - sha256 = "0brqndfgawhayrm36cjh6fkff274729jivjq3h5jx93lprvl2zih"; - }) - ]; - src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "01jx7612p0c0pi0r7fn5g08s6zjfmq1gfm5hi0fkzl0fxf2cx7a7"; + sha256 = "11qbz547qlfsvkz4bdxhryrsf10aw5jc2f1glbik7pvmmm87gf4f"; }; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 @@ -91,6 +83,10 @@ stdenv.mkDerivation rec { # Patch pastebin & inxi location sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info + + # Patch gtk3 module target dir + substituteInPlace libxapp/meson.build \ + --replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix b/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix new file mode 100644 index 000000000000..53e88ddb947d --- /dev/null +++ b/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, cinnamon-desktop +, file +, gdk-pixbuf +, glib +, gobject-introspection +, gtk-doc +, gtk3 +, intltool +, itstool +, lcms2 +, libexif +, libjpeg +, libpeas +, libtool +, libxml2 +, pkg-config +, shared-mime-info +, wrapGAppsHook +, xapps +, yelp-tools }: + +stdenv.mkDerivation rec { + pname = "xviewer"; + version = "2.8.3"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "0h3qgqaiz5swy09fr6z3ag2952hgzsk5d2fpwmwb78yjrzrhnzpy"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + autoreconfHook + cinnamon-desktop + gdk-pixbuf + gobject-introspection + gtk-doc + intltool + itstool + libtool + pkg-config + yelp-tools + ]; + + buildInputs = [ + glib + gtk3 + libexif + libjpeg + libpeas + libxml2 + shared-mime-info + xapps + lcms2 + ]; + + meta = with lib; { + description = "A generic image viewer from Linux Mint"; + homepage = "https://github.com/linuxmint/xviewer"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix b/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix index 8222c6ed843e..0c2ff79ddbd3 100644 --- a/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix +++ b/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "0.5.9"; + version = "0.5.11"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ao5b4Mhr+fhY19X1g0gupcU8LayR55/kgHSwhGUAfys="; + sha256 = "sha256-jCOYnG/+xz9qK6npOPT+tw1tp/K0QaFCmsBRO9J4bjE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/enlightenment/terminology/default.nix b/nixpkgs/pkgs/desktops/enlightenment/terminology/default.nix index e66415c3e129..36c449ee9de7 100644 --- a/nixpkgs/pkgs/desktops/enlightenment/terminology/default.nix +++ b/nixpkgs/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,18 +1,19 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, efl, pcre, mesa }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, pcre, mesa }: stdenv.mkDerivation rec { pname = "terminology"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1fxqjf7g30ix4qxi6366rrax27s3maxq43z2vakwnhz4mp49m9h4"; + sha256 = "0v74858yvrrfy0l2pq7yn6izvqhpkb9gw2jpd3a3khjwv8kw6frz"; }; nativeBuildInputs = [ meson ninja pkg-config + python3 ]; buildInputs = [ @@ -25,6 +26,10 @@ stdenv.mkDerivation rec { "-D edje-cc=${efl}/bin/edje_cc" ]; + postPatch = '' + patchShebangs data/colorschemes/*.py + ''; + meta = { description = "Powerful terminal emulator based on EFL"; homepage = "https://www.enlightenment.org/about-terminology"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 550f3f31d0bd..2f8163adc728 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , pkg-config , gnome3 diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index fc0ee5d38ffa..be456071e41d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , meson , ninja , gettext diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index f5ca1ba0ea61..6cc5c2ab7833 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "I5A/c2G+QQhw+6lHIJFnuW9JB2MGQdM8y6qOQvV0tpk="; + sha256 = "2Z6k+WPsEInpzVl6fUQ5ihHs7xMeQUInGhyQwVuqRSE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix index 77b8b8977d12..4a1a305d127e 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.38.0"; + version = "3.38.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j0ry0y9qi1mlm7dcjwrmrw45s1225ri8sv0s9vb8ibm85x8kpr6"; + sha256 = "APbWaJzCLePABb2H1MLr9yAGTLjcahiHgW+LfggrLmM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index def25f62f3c1..900040a76111 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.38.2"; + version = "3.38.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mflr8a3f2q55rirvqhizji0zinic75jk8mksflszqzgcdcph85z"; + sha256 = "19rwgvjicfmd5zgabr5ns42rg8cqa05p8qf7684prajjna8gcclp"; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index cea158205574..93453cc72e94 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt , gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook , docbook_xsl, docbook_xml_dtd_43, gnome3 }: @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"; }; + patches = [ + # version 3.36.0 is incompatible with libncap_ng >= 0.8.1. remove patch after update. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/ebc7bc9efacc17049e54da8d96a4a29943621113.diff"; + sha256 = "07bx7zmdswqsa3dj37m729g35n1prhylkw7ya8a7h64i10la12cs"; + }) + ]; + outputs = [ "out" "dev" ]; buildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 215e95d9ad2d..ff80efaa4de4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,13 +1,43 @@ -{ lib, stdenv, fetchurl, substituteAll, pkg-config, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree -, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd -, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts -, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils -, libsysprof-capture }: +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, meson +, ninja +, gettext +, gnome3 +, wrapGAppsHook +, packagekit +, ostree +, glib +, appstream-glib +, libsoup +, polkit +, isocodes +, gspell +, libxslt +, gobject-introspection +, flatpak +, fwupd +, gtk3 +, gsettings-desktop-schemas +, gnome-desktop +, libxmlb +, gnome-online-accounts +, json-glib +, libsecret +, valgrind-light +, docbook-xsl-nons +, docbook_xml_dtd_42 +, docbook_xml_dtd_43 +, gtk-doc +, desktop-file-utils +, libsysprof-capture +}: let - withFwupd = stdenv.isx86_64 || stdenv.isi686; - in stdenv.mkDerivation rec { @@ -27,15 +57,38 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkg-config gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 - valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection + meson + ninja + pkg-config + gettext + wrapGAppsHook + libxslt + docbook_xml_dtd_42 + docbook_xml_dtd_43 + valgrind-light + docbook-xsl-nons + gtk-doc + desktop-file-utils + gobject-introspection ]; buildInputs = [ - gtk3 glib packagekit appstream-glib libsoup - gsettings-desktop-schemas gnome-desktop - gspell json-glib libsecret ostree - polkit flatpak libxmlb gnome-online-accounts libsysprof-capture + gtk3 + glib + packagekit + appstream-glib + libsoup + gsettings-desktop-schemas + gnome-desktop + gspell + json-glib + libsecret + ostree + polkit + flatpak + libxmlb + gnome-online-accounts + libsysprof-capture ] ++ lib.optionals withFwupd [ fwupd ]; @@ -51,7 +104,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "gnome-software"; + packageName = pname; attrPath = "gnome3.gnome-software"; }; }; @@ -59,7 +112,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software store that lets you install and update applications and system extensions"; homepage = "https://wiki.gnome.org/Apps/Software"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index b4e8db775106..087aa7f5ce0c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1lgkvla0fadg76j898p2x2fipqf8kkqbbmmsfkfpz11q9y1d966r"; + sha256 = "J73cnQumFMhuXstPVMdevDQV4oh6zZFEIFdUj9MgZhg="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 26d7593038be..2b84442620db 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , gettext , meson diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index b02c7039e51d..d4b6561c0ded 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -38,7 +38,15 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "Yelp's universal stylesheets for Mallard and DocBook"; maintainers = teams.gnome.members; - license = [licenses.gpl2 licenses.lgpl2]; - platforms = platforms.linux; + license = with licenses; [ + # See https://gitlab.gnome.org/GNOME/yelp-xsl/blob/master/COPYING + # Stylesheets + lgpl2Plus + # Icons, unclear: https://gitlab.gnome.org/GNOME/yelp-xsl/issues/25 + gpl2 + # highlight.js + bsd3 + ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix new file mode 100755 index 000000000000..f8a8803435ba --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitLab, gnome3, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-fuzzy-app-search"; + version = "4"; + + src = fetchFromGitLab { + owner = "Czarlie"; + repo = "gnome-fuzzy-app-search"; + rev = "da9c15d39958d9c3b38df3b616fd40b85aed24e5"; + sha256 = "1r3qha530s97x818znn1wi76f4x9bhlgi7jlxfwjnrwys62cv5fn"; + }; + + uuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; + + nativeBuildInputs = [ glib ]; + + patches = [ ./fix-desktop-file-paths.patch ]; + + makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; + + meta = with lib; { + description = "Fuzzy application search results for Gnome Search"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search"; + broken = versionOlder gnome3.gnome-shell.version "3.18"; + }; +} diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch new file mode 100755 index 000000000000..1795f998c9bd --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch @@ -0,0 +1,50 @@ +diff --git a/applicationsUtils.js b/applicationsUtils.js +index 728223b..aa9f291 100644 +--- a/applicationsUtils.js ++++ b/applicationsUtils.js +@@ -44,27 +44,24 @@ var Search = new Lang.Class({ + * @return {Void} + */ + _init: function () { +- let dir = [ +- "/usr/share/applications", +- GLib.get_home_dir() + "/.local/share/applications", +- ]; +- +- // listen object - file/monitor list +- this._listen = dir.map((path) => { +- let file = Gio.File.new_for_path(path); +- let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null); +- +- // refresh on each directory change +- monitor.connect( +- "changed", +- Lang.bind(this, this._handleMonitorChanged) +- ); +- +- return { +- file: file, +- monitor: monitor, +- }; +- }); ++ this._listen = [...new Set(GLib.get_system_data_dirs())] ++ .filter((path) => path.endsWith("/share")) ++ .map((path) => Gio.File.new_for_path(path + "/applications")) ++ .filter((file) => file.query_exists(null)) ++ .map((file) => { ++ let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null); ++ ++ // refresh on each directory change ++ monitor.connect( ++ "changed", ++ Lang.bind(this, this._handleMonitorChanged) ++ ); ++ ++ return { ++ file: file, ++ monitor: monitor, ++ }; ++ }); + this._interval = null; + this._data = {}; + \ No newline at end of file diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 440c70c861fb..894197ae6d5f 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.38.3"; + version = "3.38.5"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "10ag0mrr4r40414nyarghpgjawvf331asxgq47dqjfxr5w7bz6wc"; + sha256 = "sha256-hUqFijqUQ1W8OThpbioqcxkOgYvScKUBmXN84MbMPGE="; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix b/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix index 05d80997b768..d0f09bbfae23 100644 --- a/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix +++ b/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }: mkDerivation rec { pname = "lumina-calculator"; diff --git a/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix b/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix index 8d975c749d66..679dfa65b5a7 100644 --- a/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix +++ b/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }: mkDerivation rec { pname = "lumina-pdf"; diff --git a/nixpkgs/pkgs/desktops/lumina/lumina/default.nix b/nixpkgs/pkgs/desktops/lumina/lumina/default.nix index 4daaf15534c1..d31f16e235ad 100644 --- a/nixpkgs/pkgs/desktops/lumina/lumina/default.nix +++ b/nixpkgs/pkgs/desktops/lumina/lumina/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , fluxbox diff --git a/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix index 8ff71e0a545f..21d824553337 100644 --- a/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -9,10 +9,11 @@ }: stdenv.mkDerivation rec { - name = "lxappearance-0.6.3"; + pname = "lxappearance"; + version = "0.6.3"; src = fetchurl { - url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz"; + url = "mirror://sourceforge/project/lxde/LXAppearance/${pname}-${version}.tar.xz"; sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj"; }; @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight program for configuring the theme and fonts of gtk applications"; homepage = "https://lxde.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ hinton romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix index 8cb8d2f580cd..15a3d918b95a 100644 --- a/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -1,21 +1,54 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, m4, intltool, libxmlxx, keybinder -, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib -, menu-cache, lxmenu-data, wirelesstools, curl +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, m4 +, intltool +, libxmlxx +, keybinder +, gtk2 +, libX11 +, libfm +, libwnck +, libXmu +, libXpm +, cairo +, gdk-pixbuf +, gdk-pixbuf-xlib +, menu-cache +, lxmenu-data +, wirelesstools +, curl , supportAlsa ? false, alsaLib }: stdenv.mkDerivation rec { - name = "lxpanel-0.10.0"; + pname = "lxpanel"; + version = "0.10.1"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; + sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug="; }; nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ]; buildInputs = [ - keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev - menu-cache lxmenu-data m4 wirelesstools curl + keybinder + gtk2 + libX11 + libfm + libwnck + libXmu + libXpm + cairo + gdk-pixbuf + gdk-pixbuf-xlib.dev + menu-cache + lxmenu-data + m4 + wirelesstools + curl ] ++ lib.optional supportAlsa alsaLib; postPatch = '' @@ -25,11 +58,11 @@ stdenv.mkDerivation rec { --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" ''; - meta = { + meta = with lib; { description = "Lightweight X11 desktop panel for LXDE"; homepage = "https://lxde.org/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.ryneeverett ]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.ryneeverett ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix index 7de2886eeb40..b6358cadeadd 100644 --- a/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -1,23 +1,37 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, gtk2 +, libX11 +, xrandr +, withGtk3 ? false, gtk3 +}: stdenv.mkDerivation rec { - name = "lxrandr-0.3.2"; + pname = "lxrandr"; + version = "0.3.2"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"; }; configureFlags = lib.optional withGtk3 "--enable-gtk3"; nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; + buildInputs = [ + libX11 + xrandr + (if withGtk3 then gtk3 else gtk2) + ]; meta = with lib; { description = "Standard screen manager of LXDE"; homepage = "https://lxde.org/"; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ rawkode ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/lxde/core/lxsession/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxsession/default.nix index 16264522f28f..b30c195f636a 100644 --- a/nixpkgs/pkgs/desktops/lxde/core/lxsession/default.nix +++ b/nixpkgs/pkgs/desktops/lxde/core/lxsession/default.nix @@ -58,9 +58,9 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with lib; { + homepage = "https://wiki.lxde.org/en/LXSession"; description = "Classic LXDE session manager"; license = licenses.gpl2Plus; - homepage = "https://wiki.lxde.org/en/LXSession"; maintainers = [ maintainers.shamilton ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix index 27066ba9952c..d2a560afd065 100644 --- a/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libintl }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, gtk3 +, libintl +}: stdenv.mkDerivation rec { pname = "lxtask"; @@ -15,7 +22,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gtk3" ]; - meta = { + meta = with lib; { + homepage = "https://wiki.lxde.org/en/LXTask"; description = "Lightweight and desktop independent task manager"; longDescription = '' LXTask is a lightweight task manager derived from xfce4 task manager @@ -24,9 +32,8 @@ stdenv.mkDerivation rec { Desktop Environment, it's totally desktop independent and only requires pure GTK. ''; - homepage = "https://wiki.lxde.org/en/LXTask"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix b/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix index 0ffdc5199aaa..111f7f175da4 100644 --- a/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "GUI configuration tool for compton X composite manager"; homepage = "https://github.com/lxqt/compton-conf"; - license = licenses.lgpl21; + description = "GUI configuration tool for compton X composite manager"; + license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix b/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix index 4bb3cd52d826..be1f8a80e78f 100644 --- a/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -46,9 +46,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Core library of PCManFM-Qt (Qt binding for libfm)"; homepage = "https://github.com/lxqt/libfm-qt"; - license = licenses.lgpl21; + description = "Core library of PCManFM-Qt (Qt binding for libfm)"; + license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix b/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix index f2d00a5869e4..adb8b8a11610 100644 --- a/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Qt implementation of freedesktop.org xdg specs"; homepage = "https://github.com/lxqt/libqtxdg"; - license = licenses.lgpl21; + description = "Qt implementation of freedesktop.org xdg specs"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix b/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix index 217a6fe79222..b7e30096b760 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -45,9 +45,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The image viewer and screenshot tool for lxqt"; homepage = "https://github.com/lxqt/lximage-qt"; - license = licenses.gpl2; + description = "The image viewer and screenshot tool for lxqt"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix index 0070d31af9a8..523092d17824 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Dialogue window providing information about LXQt and the system it's running on"; homepage = "https://github.com/lxqt/lxqt-about"; - license = licenses.lgpl21; + description = "Dialogue window providing information about LXQt and the system it's running on"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix index b3b74b92f6a9..8406b9094938 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -47,9 +47,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "LXQt system administration tool"; homepage = "https://github.com/lxqt/lxqt-admin"; - license = licenses.lgpl21; + description = "LXQt system administration tool"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 3d2ce3c0f57e..43896c2d6c4f 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Archive tool for the LXQt desktop environment"; homepage = "https://github.com/lxqt/lxqt-archiver/"; - license = licenses.gpl2; + description = "Archive tool for the LXQt desktop environment"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ jchw ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 249d16648848..f45f8c729556 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -44,9 +44,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Various packaging tools and scripts for LXQt applications"; homepage = "https://github.com/lxqt/lxqt-build-tools"; - license = licenses.lgpl21; + description = "Various packaging tools and scripts for LXQt applications"; + license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix index 407e45655ae0..c273a7bd859b 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -58,9 +58,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Tools to configure LXQt and the underlying operating system"; homepage = "https://github.com/lxqt/lxqt-config"; - license = licenses.lgpl21; + description = "Tools to configure LXQt and the underlying operating system"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 62bb75e78769..a54564e062b0 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "LXQt service for global keyboard shortcuts registration"; homepage = "https://github.com/lxqt/lxqt-globalkeys"; - license = licenses.lgpl21; + description = "LXQt service for global keyboard shortcuts registration"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 520c0322eaa4..c02b768d6b7e 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The LXQt notification daemon"; homepage = "https://github.com/lxqt/lxqt-notificationd"; - license = licenses.lgpl21; + description = "The LXQt notification daemon"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index cdfb51a472d5..3aac000fb679 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "GUI to query passwords on behalf of SSH agents"; homepage = "https://github.com/lxqt/lxqt-openssh-askpass"; - license = licenses.lgpl21; + description = "GUI to query passwords on behalf of SSH agents"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix index 5da0ab2499e1..bb6ed8548912 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -73,9 +73,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The LXQt desktop panel"; homepage = "https://github.com/lxqt/lxqt-panel"; - license = licenses.lgpl21; + description = "The LXQt desktop panel"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 762e7ac0462a..fc4378d861cc 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -48,9 +48,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The LXQt PolicyKit agent"; homepage = "https://github.com/lxqt/lxqt-policykit"; - license = licenses.lgpl21; + description = "The LXQt PolicyKit agent"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 22eb060dfd50..3c1350753cf3 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -48,9 +48,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Power management module for LXQt"; homepage = "https://github.com/lxqt/lxqt-powermanagement"; - license = licenses.lgpl21; + description = "Power management module for LXQt"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 5fbf9f8f5684..d19abcfe952e 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -47,9 +47,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "LXQt Qt platform integration plugin"; homepage = "https://github.com/lxqt/lxqt-qtplugin"; - license = licenses.lgpl21; + description = "LXQt Qt platform integration plugin"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix index 41a673fc3450..3f80800310f6 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -52,9 +52,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Tool used to launch programs quickly by typing their names"; homepage = "https://github.com/lxqt/lxqt-runner"; - license = licenses.lgpl21; + description = "Tool used to launch programs quickly by typing their names"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix index 4be5eab5d943..4c29a249dde8 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -49,9 +49,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "An alternative session manager ported from the original razor-session"; homepage = "https://github.com/lxqt/lxqt-session"; - license = licenses.lgpl21; + description = "An alternative session manager ported from the original razor-session"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix index a6fef7479abf..79168795c60e 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -44,9 +44,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "GUI frontend for sudo/su"; homepage = "https://github.com/lxqt/lxqt-sudo"; - license = licenses.lgpl21; + description = "GUI frontend for sudo/su"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix index 5ab100bd1011..08ba99c96064 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -25,9 +25,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Themes, graphics and icons for LXQt"; homepage = "https://github.com/lxqt/lxqt-themes"; - license = licenses.lgpl21; + description = "Themes, graphics and icons for LXQt"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix b/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix index 5772dfcf9e7f..442c4c940b02 100644 --- a/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -44,9 +44,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The Qt port of obconf, the Openbox configuration tool"; homepage = "https://github.com/lxqt/obconf-qt"; - license = licenses.gpl2; + description = "The Qt port of obconf, the Openbox configuration tool"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index cd6d177b2ef0..e996eefc9039 100644 --- a/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -39,9 +39,9 @@ mkDerivation rec { passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; homepage = "https://github.com/lxqt/pavucontrol-qt"; - license = licenses.gpl2; + description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index a2378fafd558..2fa7879d58e7 100644 --- a/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -47,9 +47,9 @@ mkDerivation rec { ''; meta = with lib; { - description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = "https://github.com/lxqt/pcmanfm-qt"; - license = licenses.gpl2; + description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/qps/default.nix b/nixpkgs/pkgs/desktops/lxqt/qps/default.nix index fea3db315cf0..be28b589ca1c 100644 --- a/nixpkgs/pkgs/desktops/lxqt/qps/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/qps/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Qt based process manager"; homepage = "https://github.com/lxqt/qps"; - license = licenses.gpl2; + description = "Qt based process manager"; + license = licenses.gpl2Plus; platforms = with platforms; linux; # does not build on darwin maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix b/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix index 47a621d21983..740cc09fca5f 100644 --- a/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix @@ -36,9 +36,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "A lightweight Qt-based terminal emulator"; homepage = "https://github.com/lxqt/qterminal"; - license = licenses.gpl2; + description = "A lightweight Qt-based terminal emulator"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo globin ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix b/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix index 2517b7a44477..5970827f458c 100644 --- a/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -32,9 +32,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "A terminal emulator widget for Qt 5"; homepage = "https://github.com/lxqt/qtermwidget"; - license = licenses.gpl2; + description = "A terminal emulator widget for Qt 5"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix b/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix index bc4f0f0de9f3..36174c870dfc 100644 --- a/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix @@ -45,9 +45,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Crossplatform tool for fast making screenshots"; homepage = "https://github.com/lxqt/screengrab"; - license = licenses.gpl2; + description = "Crossplatform tool for fast making screenshots"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix b/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix index 316a72a09c7f..ce97bc416e69 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3Packages , intltool diff --git a/nixpkgs/pkgs/desktops/mate/mozo/default.nix b/nixpkgs/pkgs/desktops/mate/mozo/default.nix index cee4261a77dc..4d893cd2e741 100644 --- a/nixpkgs/pkgs/desktops/mate/mozo/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: +{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: python3.pkgs.buildPythonApplication rec { pname = "mozo"; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 40ac23ca7f1f..bfe95e0be46d 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , runCommand , mutter , elementary-default-settings diff --git a/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix index 85f823221b74..e76ffa7204a1 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, file, which, intltool, gobject-introspection, - findutils, xdg_utils, dconf, gtk3, python3Packages, +{ lib, fetchurl, file, which, intltool, gobject-introspection, + findutils, xdg-utils, dconf, gtk3, python3Packages, wrapGAppsHook }: @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { python3Packages.dbus-python python3Packages.pygobject3 python3Packages.pexpect - xdg_utils + xdg-utils findutils ]; diff --git a/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix index a2339d585680..a2339d585680 100644 --- a/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes.nix b/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes/default.nix index 569a18a796e8..569a18a796e8 100644 --- a/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes.nix +++ b/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/default.nix b/nixpkgs/pkgs/desktops/xfce/default.nix index 09df8d79dca0..de8ae12b8952 100644 --- a/nixpkgs/pkgs/desktops/xfce/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/default.nix @@ -96,9 +96,9 @@ lib.makeScope pkgs.newScope (self: with self; { #### ART - xfce4-icon-theme = callPackage ./art/xfce4-icon-theme.nix { }; + xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { }; - xfwm4-themes = callPackage ./art/xfwm4-themes.nix { }; + xfwm4-themes = callPackage ./art/xfwm4-themes { }; #### PANEL PLUGINS @@ -110,47 +110,49 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { }; - xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { }; + xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { }; xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { }; - xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { }; + xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { }; - xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; + xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; - xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; + xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; - xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; + xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { }; - xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; + xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { }; - xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { }; + xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { }; - xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { }; + xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { }; + + xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { }; xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { }; - xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { }; + xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { }; - xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { }; + xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin { }; - xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { }; + xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { }; - xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; + xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { }; - xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; + xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { }; - xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { }; + xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { }; xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { }; xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { }; - xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; + xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { }; xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { }; - xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { }; + xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { }; xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { }; diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index aed655eb2bd2..e80d0bbc9ac7 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -1,16 +1,30 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, glib +, exo +, libXtst +, xorgproto +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk3 +, hicolor-icon-theme +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"; + sha256 = "YVrfmr2RQXpEMZ2OTa3GAS+iKjd48vN5cXUS3Lfvkko="; }; nativeBuildInputs = [ @@ -42,6 +56,6 @@ stdenv.mkDerivation rec { description = "CPU graph show for Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index aa14c878b12a..304b9d9076db 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -1,5 +1,5 @@ { mkXfceDerivation -, lib, stdenv +, lib , intltool , libxfce4ui , xfce4-panel diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index e64d6fbae511..e64d6fbae511 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix index a731c9fcbb53..cf383f840d5c 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix @@ -1,11 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, gtk2 +, xfce +}: let category = "panel-plugins"; -in - -with lib; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-embed-plugin"; version = "1.6.0"; @@ -32,11 +39,11 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = { + meta = with lib;{ homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; description = "Embed arbitrary app windows on Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix index 8df173d3367f..d19f0051d432 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix @@ -1,10 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-eyes-plugin"; version = "4.5.1"; @@ -37,6 +46,6 @@ stdenv.mkDerivation rec { description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix index 95f93148a912..36cca7b73954 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-fsguard-plugin"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"; + sha256 = "Z9jmohmnEXxZaTrbxZw5puujHj8YpUmRie9O8otVQQU="; }; nativeBuildInputs = [ @@ -37,6 +46,6 @@ stdenv.mkDerivation rec { description = "Filesystem usage monitor plugin for the Xfce panel"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix index 59796ad55b14..8289be333100 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-genmon-plugin"; - version = "4.0.2"; + version = "4.1.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15"; + sha256 = "shGf0P8Z+ik7l+yXsN6OJBeZ4IuGIYUVFnxWi9m1ATU="; }; nativeBuildInputs = [ @@ -36,6 +44,6 @@ stdenv.mkDerivation rec { description = "Generic monitor plugin for the Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix index 8afff65696d3..8afff65696d3 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix new file mode 100644 index 000000000000..136b91a8a2f8 --- /dev/null +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, gtk3 +, libxfce4ui, libxfce4util, xfconf, xfce4-dev-tools, xfce4-panel +, i3ipc-glib +}: + +stdenv.mkDerivation rec { + pname = "xfce4-i3-workspaces-plugin"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "denesb"; + repo = "xfce4-i3-workspaces-plugin"; + rev = version; + sha256 = "sha256-+tjxMr0UbE3BLdxBwNr2mZqKSQOOtw69FmN4rk4loyA="; + }; + + nativeBuildInputs = [ + pkg-config + intltool + ]; + + buildInputs = [ + gtk3 + xfconf + libxfce4ui + libxfce4util + xfce4-dev-tools + xfce4-panel + i3ipc-glib + ]; + + preConfigure = '' + ./autogen.sh + patchShebangs . + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/denesb/xfce4-i3-workspaces-plugin"; + description = "Workspace switcher plugin for xfce4-panel which can be used for the i3 window manager"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.berbiche ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index df31ea3b9b59..df31ea3b9b59 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix index 37f64021c72a..37f64021c72a 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index 407f349d9bfc..407f349d9bfc 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index 09ff309c05fc..7442e30ed69f 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -1,16 +1,27 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk2 +, libunique +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-notes-plugin"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907"; + sha256 = "E/kJyUi2Oflt5kz3k+t0yxd5WJIB05M+/yFO6PNasIg="; }; nativeBuildInputs = [ @@ -40,6 +51,6 @@ stdenv.mkDerivation rec { description = "Sticky notes plugin for Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index 845f1b22e33a..845f1b22e33a 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index a313510fded5..13bce97fe33f 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-systemload-plugin"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"; + sha256 = "BTG435I8ujvo0GTLi2OLlU33SRXlpEciiZlReEd4mDU="; }; nativeBuildInputs = [ @@ -36,6 +44,6 @@ stdenv.mkDerivation rec { description = "System load plugin for Xfce panel"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix index 7c2fb69dc5c4..7c2fb69dc5c4 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix index 5a98173ea00c..94b467fd6828 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -1,18 +1,26 @@ -{ lib, mkXfceDerivation, gtk3, libxfce4ui, pcre, libxfce4util, xfce4-panel, xfconf }: +{ lib +, mkXfceDerivation +, gtk3 +, libxfce4ui +, pcre +, libxfce4util +, xfce4-panel +, xfconf +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-verve-plugin"; - version = "2.0.0"; + version = "2.0.1"; rev-prefix = ""; - sha256 = "09vpa6m0ah7pgmra094c16vb79xrcwva808g6zpawwrhcwz85lcz"; + sha256 = "YwUOSTZMoHsWWmi/ajQv/fX8a0IJoc3re3laVEmnX/M="; buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ]; hardeningDisable = [ "format" ]; - meta = { + meta = with lib; { description = "A command-line plugin"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index 18639946ce8b..18639946ce8b 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index ec6ef0e7b62c..ec6ef0e7b62c 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix index a08621594890..35bc5ea8284e 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -1,16 +1,37 @@ -{ lib, mkXfceDerivation, gtk3, librsvg, libwnck3, libxklavier, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ lib +, mkXfceDerivation +, gtk3 +, librsvg +, libwnck3 +, libxklavier +, garcon +, libxfce4ui +, libxfce4util +, xfce4-panel +, xfconf +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-xkb-plugin"; - version = "0.8.1"; + version = "0.8.2"; rev-prefix = ""; - sha256 = "1gyky4raynp2ggdnq0g96c6646fjm679fzipcsmf1q0aymr8d5ky"; + sha256 = "xmCoNMxykeaThYEJo6BcbraFo9CruFZL6YPjovzb6hg="; - buildInputs = [ garcon gtk3 librsvg libxfce4ui libxfce4util libxklavier libwnck3 xfce4-panel xfconf ]; + buildInputs = [ + garcon + gtk3 + librsvg + libxfce4ui + libxfce4util + libxklavier + libwnck3 + xfce4-panel + xfconf + ]; meta = with lib; { description = "Allows you to setup and use multiple keyboard layouts"; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 985b067a02fb..c46b5a0fd1b7 100644 --- a/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkXfceDerivation , gtk3 , thunar diff --git a/nixpkgs/pkgs/development/arduino/ino/default.nix b/nixpkgs/pkgs/development/arduino/ino/default.nix index c536ed8c2c02..822cfb0e361a 100644 --- a/nixpkgs/pkgs/development/arduino/ino/default.nix +++ b/nixpkgs/pkgs/development/arduino/ino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, python2Packages, picocom +{ lib, fetchurl, python2Packages, picocom , avrdude, arduino-core }: python2Packages.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/development/beam-modules/build-hex.nix b/nixpkgs/pkgs/development/beam-modules/build-hex.nix index e0d9dfc42889..1ebe3760ec8d 100644 --- a/nixpkgs/pkgs/development/beam-modules/build-hex.nix +++ b/nixpkgs/pkgs/development/beam-modules/build-hex.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildRebar3, fetchHex }: +{ lib, buildRebar3, fetchHex }: { name, version, sha256 , builder ? buildRebar3 diff --git a/nixpkgs/pkgs/development/beam-modules/default.nix b/nixpkgs/pkgs/development/beam-modules/default.nix index 4f312129b387..02877a954117 100644 --- a/nixpkgs/pkgs/development/beam-modules/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, erlang }: +{ lib, pkgs, erlang }: let inherit (lib) makeExtensible; @@ -33,6 +33,7 @@ let buildRebar3 = callPackage ./build-rebar3.nix {}; buildHex = callPackage ./build-hex.nix {}; buildErlangMk = callPackage ./build-erlang-mk.nix {}; + fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. diff --git a/nixpkgs/pkgs/development/beam-modules/fetch-mix-deps.nix b/nixpkgs/pkgs/development/beam-modules/fetch-mix-deps.nix new file mode 100644 index 000000000000..020a82ad70b7 --- /dev/null +++ b/nixpkgs/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -0,0 +1,40 @@ +{ stdenvNoCC, lib, elixir, hex, rebar, rebar3, cacert, git }: + +{ name, version, sha256, src, mixEnv ? "prod", debug ? false, meta ? { } }: + +stdenvNoCC.mkDerivation ({ + name = "mix-deps-${name}-${version}"; + + nativeBuildInputs = [ elixir hex cacert git ]; + + inherit src; + + MIX_ENV = mixEnv; + MIX_DEBUG = if debug then 1 else 0; + DEBUG = if debug then 1 else 0; # for rebar3 + + configurePhase = '' + export HEX_HOME="$TEMPDIR/.hex"; + export MIX_HOME="$TEMPDIR/.mix"; + export MIX_DEPS_PATH="$out"; + + # Rebar + mix local.rebar rebar "${rebar}/bin/rebar" + mix local.rebar rebar3 "${rebar3}/bin/rebar3" + export REBAR_GLOBAL_CONFIG_DIR="$TMPDIR/rebar3" + export REBAR_CACHE_DIR="$TMPDIR/rebar3.cache" + ''; + + dontBuild = true; + + installPhase = '' + mix deps.get --only ${mixEnv} + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + inherit meta; +}) diff --git a/nixpkgs/pkgs/development/beam-modules/lib.nix b/nixpkgs/pkgs/development/beam-modules/lib.nix index 7ae2e0e26066..1b021cf93472 100644 --- a/nixpkgs/pkgs/development/beam-modules/lib.nix +++ b/nixpkgs/pkgs/development/beam-modules/lib.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv }: +{ pkgs, lib }: rec { diff --git a/nixpkgs/pkgs/development/compilers/carp/default.nix b/nixpkgs/pkgs/development/compilers/carp/default.nix index 0299c1797755..b0a14534b082 100644 --- a/nixpkgs/pkgs/development/compilers/carp/default.nix +++ b/nixpkgs/pkgs/development/compilers/carp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }: +{ lib, fetchFromGitHub, makeWrapper, clang, haskellPackages }: haskellPackages.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/compilers/cc65/default.nix b/nixpkgs/pkgs/development/compilers/cc65/default.nix index 347382990d16..6e201ac79339 100644 --- a/nixpkgs/pkgs/development/compilers/cc65/default.nix +++ b/nixpkgs/pkgs/development/compilers/cc65/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix b/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix index 2775666f14c3..d2f2805ed7ff 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -1,4 +1,4 @@ -{ stdenv, eggDerivation, fetchurl, chickenEggs }: +{ eggDerivation, fetchurl, chickenEggs }: # Note: This mostly reimplements the default.nix already contained in # the tarball. Is there a nicer way than duplicating code? diff --git a/nixpkgs/pkgs/development/compilers/chicken/4/eggs.nix b/nixpkgs/pkgs/development/compilers/chicken/4/eggs.nix index 6e6f104f8a0c..8c96caca2623 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/4/eggs.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/4/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs }: rec { inherit (pkgs) eggDerivation fetchegg; diff --git a/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/default.nix b/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/default.nix index d4d33a5593c3..23c5760b4bce 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/default.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/default.nix @@ -1,7 +1,7 @@ # Fetches a chicken egg from henrietta using `chicken-install -r' # See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html -{ stdenvNoCC, chicken }: +{ lib, stdenvNoCC, chicken }: { name, version, md5 ? "", sha256 ? "" }: if md5 != "" then @@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation { eggName = name; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix b/nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix index 69e8d9e62c35..62b634eb6370 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/egg2nix.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, eggDerivation, fetchFromGitHub, chickenEggs }: +{ lib, eggDerivation, fetchFromGitHub, chickenEggs }: # Note: This mostly reimplements the default.nix already contained in # the tarball. Is there a nicer way than duplicating code? diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix b/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix index 3c4ae74c1e66..1c1377350d21 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs }: rec { inherit (pkgs) eggDerivation fetchegg; diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/default.nix b/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/default.nix index 24bfbd7a30f4..08d23cbaa616 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/default.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/default.nix @@ -1,7 +1,7 @@ # Fetches a chicken egg from henrietta using `chicken-install -r' # See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html -{ stdenvNoCC, chicken }: +{ lib, stdenvNoCC, chicken }: { name, version, md5 ? "", sha256 ? "" }: if md5 != "" then @@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation { eggName = name; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } diff --git a/nixpkgs/pkgs/development/compilers/crystal/default.nix b/nixpkgs/pkgs/development/compilers/crystal/default.nix index 489e9d28cbcd..e887bc220895 100644 --- a/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -255,7 +255,13 @@ in rec { extraBuildInputs = [ git ]; }; - crystal = crystal_0_35; + crystal_0_36 = generic { + version = "0.36.0"; + sha256 = "0s7g13mrh2jrxxrrrg4hy3gi49rp7fmpn9zg9kj4nbc8w8yir20r"; + binary = crystal_0_35; + }; + + crystal = crystal_0_36; crystal2nix = callPackage ./crystal2nix.nix {}; } diff --git a/nixpkgs/pkgs/development/compilers/dmd/binary.nix b/nixpkgs/pkgs/development/compilers/dmd/binary.nix index 2ff2b35060b8..de0964155fcb 100644 --- a/nixpkgs/pkgs/development/compilers/dmd/binary.nix +++ b/nixpkgs/pkgs/development/compilers/dmd/binary.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc +{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc , version, hashes }: -with stdenv; + let + inherit (stdenv) hostPlatform; OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; MODEL = toString hostPlatform.parsed.cpu.bits; -in mkDerivation { +in stdenv.mkDerivation { pname = "dmd-bootstrap"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/ecl/default.nix b/nixpkgs/pkgs/development/compilers/ecl/default.nix index 0b4ea9b83890..79a290a6c1c0 100644 --- a/nixpkgs/pkgs/development/compilers/ecl/default.nix +++ b/nixpkgs/pkgs/development/compilers/ecl/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl +{lib, stdenv, fetchurl, fetchpatch , libtool, autoconf, automake , texinfo , gmp, mpfr, libffi, makeWrapper @@ -11,10 +11,10 @@ let s = # Generated upstream information rec { baseName="ecl"; - version="20.4.24"; + version="21.2.1"; name="${baseName}-${version}"; url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz"; - sha256="01qgdmr54wkj854f69qdm9sybrvd6gd21dpx4askdaaqybnkh237"; + sha256="000906nnq25177bgsfndiw3iqqgrjc9spk10hzk653sbz3f7anmi"; }; buildInputs = [ libtool autoconf automake texinfo makeWrapper @@ -36,37 +36,10 @@ stdenv.mkDerivation { }; patches = [ - # https://trac.sagemath.org/ticket/22191#comment:237 - (fetchurl { - name = "ECL_WITH_LISP_FPE.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/ECL_WITH_LISP_FPE.patch?h=9.2"; - sha256 = "0b194613avcmzr1k9gq725z41wdkg5rsa0q21kdw050iqpprcj1c"; - }) - # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1 - (fetchurl { - name = "write_error.patch"; + (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2"; - sha256 = "1lvdvh77blnxp0zbd27dsbq1ljkb5qblabf1illszn4j7qgq88fh"; - }) - - # Three patches to fix ecl's unicode handling (https://trac.sagemath.org/ticket/30122) - (fetchurl { - name = "0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch?h=9.2"; - sha256 = "0z8pnhawivrrbg4vz144nr2sz64jxp7764hn6df13bgkz84iqbmk"; - }) - - (fetchurl { - name = "0002-cosmetic-fix-some-compiler-warnings.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0002-cosmetic-fix-some-compiler-warnings.patch?h=9.2"; - sha256 = "0msx3say9igwr9z5ywnr3gs6vsndnzlx47fmzwzh4l0m274cnia8"; - }) - - (fetchurl { - name = "0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch?h=9.2"; - sha256 = "0ln5dsx6p265fkph3bl5wblgfi3f7frb4jl6v473wz3ibvcx1x9a"; + sha256 = "0hfxacpgn4919hg0mn4wf4m8r7y592r4gw7aqfnva7sckxi6w089"; }) ]; @@ -96,6 +69,6 @@ stdenv.mkDerivation { homepage = "https://common-lisp.net/project/ecl/"; license = lib.licenses.mit ; maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/compilers/elm/default.nix b/nixpkgs/pkgs/development/compilers/elm/default.nix index 7ee9e6e5d617..333c8c202705 100644 --- a/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,7 @@ let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; - hsPkgs = haskell.packages.ghc883.override { + hsPkgs = haskell.packages.ghc8103.override { overrides = self: super: with haskell.lib; with lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { @@ -41,7 +41,7 @@ let description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; homepage = "https://github.com/avh4/elm-format"; license = licenses.bsd3; - maintainers = with maintainers; [ turbomack ]; + maintainers = with maintainers; [ avh4 turbomack ]; })); elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: { @@ -79,6 +79,11 @@ let # Needed for elm-format indents = self.callPackage ./packages/indents.nix {}; + bimap = self.callPackage ./packages/bimap.nix {}; + avh4-lib = self.callPackage ./packages/avh4-lib.nix {}; + elm-format-lib = self.callPackage ./packages/elm-format-lib.nix {}; + elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; + elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; }; }; @@ -104,7 +109,6 @@ let homepage = "https://github.com/zwilias/elm-json"; license = licenses.mit; maintainers = [ maintainers.turbomack ]; - platforms = platforms.linux; }; }; }; @@ -117,7 +121,7 @@ let }; in with hsPkgs.elmPkgs; { - elm-test = patchBinwrap [elmi-to-json] + elm-test = nodePkgs.elm-test // { meta = with lib; { description = "Runs elm-test suites from Node.js"; @@ -162,8 +166,8 @@ let }; }); - create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json] - nodePkgs.create-elm-app) // { + create-elm-app = patchNpmElm + nodePkgs.create-elm-app // { meta = with lib; { description = "Create Elm apps with no build configuration"; homepage = "https://github.com/halfzebra/create-elm-app"; @@ -172,7 +176,7 @@ let }; }; - elm-review = patchBinwrap [elmRustPackages.elm-json] + elm-review = nodePkgs.elm-review // { meta = with lib; { description = "Analyzes Elm projects, to help find mistakes before your users find them"; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/avh4-lib.nix b/nixpkgs/pkgs/development/compilers/elm/packages/avh4-lib.nix new file mode 100644 index 000000000000..cd3df7d67a96 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/avh4-lib.nix @@ -0,0 +1,29 @@ +{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base, bimap +, binary, bytestring, containers, directory, fetchgit, filepath +, lib, mtl, process, relude, tasty, tasty-discover, tasty-hspec +, tasty-hunit, text +}: +mkDerivation { + pname = "avh4-lib"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base bimap binary bytestring + containers directory filepath mtl process relude text + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base bimap binary bytestring + containers directory filepath mtl process relude tasty tasty-hspec + tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Common code for haskell projects"; + license = lib.licenses.bsd3; +} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/bimap.nix b/nixpkgs/pkgs/development/compilers/elm/packages/bimap.nix new file mode 100644 index 000000000000..41412d1639c7 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/bimap.nix @@ -0,0 +1,15 @@ +{ mkDerivation, base, containers, exceptions, lib, QuickCheck +, template-haskell +}: +mkDerivation { + pname = "bimap"; + version = "0.3.3"; + sha256 = "73829355c7bcbd3eedba22a382a04a3ab641702b00828790ec082ec2db3a8ad1"; + libraryHaskellDepends = [ base containers exceptions ]; + testHaskellDepends = [ + base containers exceptions QuickCheck template-haskell + ]; + homepage = "https://github.com/joelwilliamson/bimap"; + description = "Bidirectional mapping between two key types"; + license = lib.licenses.bsd3; +} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-lib.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-lib.nix new file mode 100644 index 000000000000..7beb52e8006e --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-lib.nix @@ -0,0 +1,33 @@ +{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, avh4-lib +, base, bimap, binary, bytestring, containers, directory +, elm-format-markdown, elm-format-test-lib, fetchgit, filepath +, indents, json, lib, mtl, optparse-applicative, parsec, process +, relude, split, tasty, tasty-discover, tasty-hspec, tasty-hunit +, text +}: +mkDerivation { + pname = "elm-format-lib"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary + bytestring containers directory elm-format-markdown filepath + indents json mtl optparse-applicative parsec process relude text + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary + bytestring containers directory elm-format-markdown + elm-format-test-lib filepath indents json mtl optparse-applicative + parsec process relude split tasty tasty-hspec tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Common code used by elm-format and elm-refactor"; + license = lib.licenses.bsd3; +} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-markdown.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-markdown.nix new file mode 100644 index 000000000000..ae3b40347dbb --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-markdown.nix @@ -0,0 +1,16 @@ +{ mkDerivation, base, containers, fetchgit, lib, mtl, text }: +mkDerivation { + pname = "elm-format-markdown"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ base containers mtl text ]; + doHaddock = false; + description = "Markdown parsing for Elm documentation comments"; + license = lib.licenses.bsd3; +} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix new file mode 100644 index 000000000000..729c2d678fce --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix @@ -0,0 +1,27 @@ +{ mkDerivation, avh4-lib, base, containers, fetchgit, filepath +, hspec-core, hspec-golden, lib, mtl, split, tasty, tasty-discover +, tasty-hspec, tasty-hunit, text +}: +mkDerivation { + pname = "elm-format-test-lib"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + avh4-lib base containers filepath hspec-core hspec-golden mtl split + tasty tasty-hspec tasty-hunit text + ]; + testHaskellDepends = [ + avh4-lib base containers filepath hspec-core hspec-golden mtl split + tasty tasty-hspec tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Test helpers used by elm-format-tests and elm-refactor-tests"; + license = lib.licenses.bsd3; +} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix index 71386e00ef11..6b583a6edde2 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,40 +1,40 @@ -{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary -, bytestring, cmark, containers, directory, filepath, free, HUnit -, indents, json, mtl, optparse-applicative, parsec, process -, QuickCheck, quickcheck-io, split, lib, stdenv, tasty, tasty-golden -, tasty-hunit, tasty-quickcheck, text +{ mkDerivation, ansi-wl-pprint, avh4-lib, base, bimap, cmark +, containers, elm-format-lib, elm-format-test-lib, fetchgit, json +, lib, mtl, optparse-applicative, parsec, QuickCheck, quickcheck-io +, relude, tasty, tasty-hspec, tasty-hunit, tasty-quickcheck, text }: -mkDerivation { +mkDerivation rec { pname = "elm-format"; - version = "0.8.4"; + version = "0.8.5"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0cxlhhdjx4h9g03z83pxv91qrysbi0ab92rl52jb0yvkaix989ai"; - rev = "5bd4fbe591fe8b456160c180cb875ef60bc57890"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; }; - postPatch = '' - mkdir -p ./generated - cat <<EOHS > ./generated/Build_elm_format.hs - module Build_elm_format where - - gitDescribe :: String - gitDescribe = "0.8.4" - EOHS - ''; isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base binary bytestring - containers directory filepath free indents json mtl - optparse-applicative parsec process split text + executableHaskellDepends = [ + ansi-wl-pprint avh4-lib base containers elm-format-lib json + optparse-applicative relude text ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ - base cmark containers HUnit mtl parsec QuickCheck quickcheck-io - split tasty tasty-golden tasty-hunit tasty-quickcheck text + ansi-wl-pprint avh4-lib base bimap cmark containers elm-format-lib + elm-format-test-lib json mtl optparse-applicative parsec QuickCheck + quickcheck-io relude tasty tasty-hspec tasty-hunit tasty-quickcheck + text ]; doHaddock = false; homepage = "https://elm-lang.org"; description = "A source code formatter for Elm"; license = lib.licenses.bsd3; + postPatch = '' + mkdir -p ./generated + cat <<EOHS > ./generated/Build_elm_format.hs + module Build_elm_format where + + gitDescribe :: String + gitDescribe = "${version}" + EOHS + ''; } diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix index cd13eb4de4f1..cf0ba2303e10 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -2,7 +2,7 @@ , bytestring, Cabal, cmark, containers, directory, elm-format , fetchgit, filepath, free, HUnit, indents, json, mtl , optparse-applicative, parsec, process, QuickCheck, quickcheck-io -, split, lib, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck +, split, lib, tasty, tasty-golden, tasty-hunit, tasty-quickcheck , text }: mkDerivation { diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix index edb2ed6ed7a2..c012d59d8ae3 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix @@ -3,7 +3,7 @@ , file-embed, filelock, filepath, ghc-prim, haskeline, HTTP , http-client, http-client-tls, http-types, language-glsl, mtl , network, parsec, process, raw-strings-qq, scientific, SHA -, snap-core, snap-server, lib, stdenv, template-haskell, time +, snap-core, snap-server, lib, template-haskell, time , unordered-containers, utf8-string, vector, zip-archive }: mkDerivation { diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix index 6788fce6a990..3362ce5cc7a7 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, binary, bytestring, containers , directory, fetchgit, filepath, ghc-prim, hpack -, optparse-applicative, lib, stdenv, text, unliftio +, optparse-applicative, lib, text, unliftio , unordered-containers }: mkDerivation { diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh index d805fe3827dd..0ffa56eae90a 100755 --- a/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -10,6 +10,4 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ -i node-packages.json \ -o node-packages.nix \ -c node-composition.nix \ - # TODO: Switch to the commented out version once nodejs package set gets updated to new node2nix - -e node-env.nix - # --no-copy-node-env -e ../../../node-packages/node-env.nix + --no-copy-node-env -e ../../../node-packages/node-env.nix diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix b/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix index 80f3c08d9e33..85e765db3e50 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix @@ -1,4 +1,4 @@ -{ mkDerivation, base, concatenative, mtl, parsec, lib, stdenv }: +{ mkDerivation, base, concatenative, lib, mtl, parsec }: mkDerivation { pname = "indents"; version = "0.3.3"; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix index c43e7cc7f25c..4b662bd072b4 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix @@ -1,17 +1,17 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; + nodeEnv = import ../../../node-packages/node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix index 015958d1239e..7698d5307327 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix @@ -1,16 +1,16 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "@babel/cli-7.12.8" = { + "@babel/cli-7.12.10" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.12.8"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.8.tgz"; - sha512 = "/6nQj11oaGhLmZiuRUfxsujiPDc9BBReemiXgIbxc+M5W+MIiFKYwvNDJvBfnGKNsJTKbUfEheKc9cwoPHAVQA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.10.tgz"; + sha512 = "+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ=="; }; }; "@babel/code-frame-7.0.0" = { @@ -22,202 +22,193 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.10.4" = { + "@babel/code-frame-7.12.13" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz"; - sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; }; }; - "@babel/compat-data-7.12.7" = { + "@babel/compat-data-7.12.13" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz"; - sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.13.tgz"; + sha512 = "U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg=="; }; }; - "@babel/core-7.12.9" = { + "@babel/core-7.12.10" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.9"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz"; - sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz"; + sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.12.5" = { + "@babel/generator-7.12.15" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.5"; + version = "7.12.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz"; - sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz"; + sha512 = "6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ=="; }; }; - "@babel/helper-annotate-as-pure-7.10.4" = { + "@babel/helper-annotate-as-pure-7.12.13" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; - sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; + sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; - sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; + sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; }; }; - "@babel/helper-compilation-targets-7.12.5" = { + "@babel/helper-compilation-targets-7.12.13" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; - sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.13.tgz"; + sha512 = "dXof20y/6wB5HnLOGyLh/gobsMvDNoekcC+8MCV2iaTd5JemhFkPD73QB+tK3iFC9P0xJC73B6MvKkyUfS9cCw=="; }; }; - "@babel/helper-create-class-features-plugin-7.12.1" = { + "@babel/helper-create-class-features-plugin-7.12.13" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; - sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.13.tgz"; + sha512 = "Vs/e9wv7rakKYeywsmEBSRC9KtmE7Px+YBlESekLeJOF0zbGUicGfXSNi3o+tfXSNS48U/7K9mIOOCR79Cl3+Q=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.12.7" = { + "@babel/helper-create-regexp-features-plugin-7.12.13" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz"; - sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.13.tgz"; + sha512 = "XC+kiA0J3at6E85dL5UnCYfVOcIZ834QcAY0TIpgUVnz0zDzg+0TtvZTnJ4g9L1dPRGe30Qi03XCIS4tYCLtqw=="; }; }; - "@babel/helper-define-map-7.10.5" = { - name = "_at_babel_slash_helper-define-map"; - packageName = "@babel/helper-define-map"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; - sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; - }; - }; - "@babel/helper-explode-assignable-expression-7.12.1" = { + "@babel/helper-explode-assignable-expression-7.12.13" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; - sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz"; + sha512 = "5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw=="; }; }; - "@babel/helper-function-name-7.10.4" = { + "@babel/helper-function-name-7.12.13" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; }; }; - "@babel/helper-get-function-arity-7.10.4" = { + "@babel/helper-get-function-arity-7.12.13" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; }; }; - "@babel/helper-hoist-variables-7.10.4" = { + "@babel/helper-hoist-variables-7.12.13" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; - sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz"; + sha512 = "KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw=="; }; }; - "@babel/helper-member-expression-to-functions-7.12.7" = { + "@babel/helper-member-expression-to-functions-7.12.13" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; - sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz"; + sha512 = "B+7nN0gIL8FZ8SvMcF+EPyB21KnCcZHQZFczCxbiNGV/O0rsrSBlWGLzmtBJ3GMjSVMIm4lpFhR+VdVBuIsUcQ=="; }; }; - "@babel/helper-module-imports-7.12.5" = { + "@babel/helper-module-imports-7.12.13" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; - sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz"; + sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g=="; }; }; - "@babel/helper-module-transforms-7.12.1" = { + "@babel/helper-module-transforms-7.12.13" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; - sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz"; + sha512 = "acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA=="; }; }; - "@babel/helper-optimise-call-expression-7.12.7" = { + "@babel/helper-optimise-call-expression-7.12.13" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz"; - sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; + sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; }; }; - "@babel/helper-plugin-utils-7.10.4" = { + "@babel/helper-plugin-utils-7.12.13" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; - sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz"; + sha512 = "C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA=="; }; }; - "@babel/helper-remap-async-to-generator-7.12.1" = { + "@babel/helper-remap-async-to-generator-7.12.13" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; - sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz"; + sha512 = "Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA=="; }; }; - "@babel/helper-replace-supers-7.12.5" = { + "@babel/helper-replace-supers-7.12.13" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; - sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; + sha512 = "pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg=="; }; }; - "@babel/helper-simple-access-7.12.1" = { + "@babel/helper-simple-access-7.12.13" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; - sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz"; + sha512 = "0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { @@ -229,85 +220,85 @@ let sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; }; }; - "@babel/helper-split-export-declaration-7.11.0" = { + "@babel/helper-split-export-declaration-7.12.13" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.11.0"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; - sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; }; }; - "@babel/helper-validator-identifier-7.10.4" = { + "@babel/helper-validator-identifier-7.12.11" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.10.4"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; }; }; - "@babel/helper-validator-option-7.12.1" = { + "@babel/helper-validator-option-7.12.11" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.12.1"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; - sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz"; + sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw=="; }; }; - "@babel/helper-wrap-function-7.12.3" = { + "@babel/helper-wrap-function-7.12.13" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.12.3"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; - sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz"; + sha512 = "t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw=="; }; }; - "@babel/helpers-7.12.5" = { + "@babel/helpers-7.12.13" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; - sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.13.tgz"; + sha512 = "oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ=="; }; }; - "@babel/highlight-7.10.4" = { + "@babel/highlight-7.12.13" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; - sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz"; + sha512 = "kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww=="; }; }; - "@babel/parser-7.12.7" = { + "@babel/parser-7.12.15" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.7"; + version = "7.12.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz"; - sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.15.tgz"; + sha512 = "AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.12.1" = { + "@babel/plugin-proposal-async-generator-functions-7.12.13" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; - sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz"; + sha512 = "1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA=="; }; }; - "@babel/plugin-proposal-class-properties-7.12.1" = { + "@babel/plugin-proposal-class-properties-7.12.13" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; - sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz"; + sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.12.1" = { @@ -319,94 +310,94 @@ let sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.12.1" = { + "@babel/plugin-proposal-export-namespace-from-7.12.13" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; - sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; + sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw=="; }; }; - "@babel/plugin-proposal-json-strings-7.12.1" = { + "@babel/plugin-proposal-json-strings-7.12.13" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; - sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz"; + sha512 = "v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = { + "@babel/plugin-proposal-logical-assignment-operators-7.12.13" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; - sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz"; + sha512 = "fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; - sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz"; + sha512 = "Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.7" = { + "@babel/plugin-proposal-numeric-separator-7.12.13" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz"; - sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; + sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.12.1" = { + "@babel/plugin-proposal-object-rest-spread-7.12.13" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; - sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz"; + sha512 = "WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.12.1" = { + "@babel/plugin-proposal-optional-catch-binding-7.12.13" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; - sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz"; + sha512 = "9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.12.7" = { + "@babel/plugin-proposal-optional-chaining-7.12.13" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; - sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.13.tgz"; + sha512 = "0ZwjGfTcnZqyV3y9DSD1Yk3ebp+sIUpT2YDqP8hovzaNZnQq2Kd7PEqa6iOIUDBXBt7Jl3P7YAcEIL5Pz8u09Q=="; }; }; - "@babel/plugin-proposal-private-methods-7.12.1" = { + "@babel/plugin-proposal-private-methods-7.12.13" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; - sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz"; + sha512 = "sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.12.1" = { + "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; - sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; + sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -418,13 +409,13 @@ let sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; }; }; - "@babel/plugin-syntax-class-properties-7.12.1" = { + "@babel/plugin-syntax-class-properties-7.12.13" = { name = "_at_babel_slash_plugin-syntax-class-properties"; packageName = "@babel/plugin-syntax-class-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; - sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -508,319 +499,319 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.12.1" = { + "@babel/plugin-syntax-top-level-await-7.12.13" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; - sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; + sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; }; }; - "@babel/plugin-transform-arrow-functions-7.12.1" = { + "@babel/plugin-transform-arrow-functions-7.12.13" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; - sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz"; + sha512 = "tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg=="; }; }; - "@babel/plugin-transform-async-to-generator-7.12.1" = { + "@babel/plugin-transform-async-to-generator-7.12.13" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; - sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz"; + sha512 = "psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.12.1" = { + "@babel/plugin-transform-block-scoped-functions-7.12.13" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; - sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; + sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; }; }; - "@babel/plugin-transform-block-scoping-7.12.1" = { + "@babel/plugin-transform-block-scoping-7.12.13" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; - sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz"; + sha512 = "Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ=="; }; }; - "@babel/plugin-transform-classes-7.12.1" = { + "@babel/plugin-transform-classes-7.12.13" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; - sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz"; + sha512 = "cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA=="; }; }; - "@babel/plugin-transform-computed-properties-7.12.1" = { + "@babel/plugin-transform-computed-properties-7.12.13" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; - sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz"; + sha512 = "dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA=="; }; }; - "@babel/plugin-transform-destructuring-7.12.1" = { + "@babel/plugin-transform-destructuring-7.12.13" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; - sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz"; + sha512 = "Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ=="; }; }; - "@babel/plugin-transform-dotall-regex-7.12.1" = { + "@babel/plugin-transform-dotall-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; - sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; + sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.12.1" = { + "@babel/plugin-transform-duplicate-keys-7.12.13" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; - sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; + sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.12.1" = { + "@babel/plugin-transform-exponentiation-operator-7.12.13" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; - sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; + sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; }; }; - "@babel/plugin-transform-for-of-7.12.1" = { + "@babel/plugin-transform-for-of-7.12.13" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; - sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz"; + sha512 = "xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ=="; }; }; - "@babel/plugin-transform-function-name-7.12.1" = { + "@babel/plugin-transform-function-name-7.12.13" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; - sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; + sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; }; }; - "@babel/plugin-transform-literals-7.12.1" = { + "@babel/plugin-transform-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; - sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; + sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.12.1" = { + "@babel/plugin-transform-member-expression-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; - sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; + sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; }; }; - "@babel/plugin-transform-modules-amd-7.12.1" = { + "@babel/plugin-transform-modules-amd-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; - sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz"; + sha512 = "JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.12.1" = { + "@babel/plugin-transform-modules-commonjs-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; - sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz"; + sha512 = "OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.12.1" = { + "@babel/plugin-transform-modules-systemjs-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; - sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz"; + sha512 = "aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA=="; }; }; - "@babel/plugin-transform-modules-umd-7.12.1" = { + "@babel/plugin-transform-modules-umd-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; - sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz"; + sha512 = "BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; - sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; + sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; }; }; - "@babel/plugin-transform-new-target-7.12.1" = { + "@babel/plugin-transform-new-target-7.12.13" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; - sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; + sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; }; }; - "@babel/plugin-transform-object-super-7.12.1" = { + "@babel/plugin-transform-object-super-7.12.13" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; - sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; + sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; }; }; - "@babel/plugin-transform-parameters-7.12.1" = { + "@babel/plugin-transform-parameters-7.12.13" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; - sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz"; + sha512 = "e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA=="; }; }; - "@babel/plugin-transform-property-literals-7.12.1" = { + "@babel/plugin-transform-property-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; - sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; + sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; }; }; - "@babel/plugin-transform-regenerator-7.12.1" = { + "@babel/plugin-transform-regenerator-7.12.13" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; - sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz"; + sha512 = "lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA=="; }; }; - "@babel/plugin-transform-reserved-words-7.12.1" = { + "@babel/plugin-transform-reserved-words-7.12.13" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; - sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; + sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; }; }; - "@babel/plugin-transform-runtime-7.12.1" = { + "@babel/plugin-transform-runtime-7.12.10" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.12.1"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz"; - sha512 = "Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz"; + sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.12.1" = { + "@babel/plugin-transform-shorthand-properties-7.12.13" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; - sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; + sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; }; }; - "@babel/plugin-transform-spread-7.12.1" = { + "@babel/plugin-transform-spread-7.12.13" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; - sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz"; + sha512 = "dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.12.7" = { + "@babel/plugin-transform-sticky-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz"; - sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; + sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; }; }; - "@babel/plugin-transform-template-literals-7.12.1" = { + "@babel/plugin-transform-template-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; - sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz"; + sha512 = "arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.12.1" = { + "@babel/plugin-transform-typeof-symbol-7.12.13" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; - sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; + sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.12.1" = { + "@babel/plugin-transform-unicode-escapes-7.12.13" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; - sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; + sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.12.1" = { + "@babel/plugin-transform-unicode-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; - sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; + sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; }; }; - "@babel/preset-env-7.12.7" = { + "@babel/preset-env-7.12.10" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.12.7"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz"; - sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.10.tgz"; + sha512 = "Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -841,31 +832,31 @@ let sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; - "@babel/template-7.12.7" = { + "@babel/template-7.12.13" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz"; - sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; + sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; }; }; - "@babel/traverse-7.12.9" = { + "@babel/traverse-7.12.13" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.9"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz"; - sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz"; + sha512 = "3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA=="; }; }; - "@babel/types-7.12.7" = { + "@babel/types-7.12.13" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz"; - sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz"; + sha512 = "oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ=="; }; }; "@hapi/address-2.1.4" = { @@ -922,13 +913,13 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@nodelib/fs.scandir-2.1.3" = { + "@nodelib/fs.scandir-2.1.4" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -940,22 +931,22 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@nodelib/fs.stat-2.0.3" = { + "@nodelib/fs.stat-2.0.4" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; }; }; - "@nodelib/fs.walk-1.2.4" = { + "@nodelib/fs.walk-1.2.6" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -1039,22 +1030,22 @@ let sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; }; }; - "@types/http-proxy-1.17.4" = { + "@types/http-proxy-1.17.5" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz"; - sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz"; + sha512 = "GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q=="; }; }; - "@types/json-schema-7.0.6" = { + "@types/json-schema-7.0.7" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.6"; + version = "7.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; }; }; "@types/keyv-3.1.1" = { @@ -1075,13 +1066,13 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-14.14.10" = { + "@types/node-14.14.25" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.10"; + version = "14.14.25"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz"; - sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz"; + sha512 = "EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ=="; }; }; "@types/parse-json-4.0.0" = { @@ -1138,22 +1129,22 @@ let sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q=="; }; }; - "@types/webpack-4.41.25" = { + "@types/webpack-4.41.26" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.25"; + version = "4.41.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz"; - sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz"; + sha512 = "7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA=="; }; }; - "@types/webpack-sources-2.0.0" = { + "@types/webpack-sources-2.1.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz"; - sha512 = "a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz"; + sha512 = "LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg=="; }; }; "@webassemblyjs/ast-1.9.0" = { @@ -1795,13 +1786,13 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; - "autoprefixer-10.0.4" = { + "autoprefixer-10.1.0" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.0.4"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.4.tgz"; - sha512 = "hmjYejN/WTyPP9cdNmiwtwqM8/ACVJPD5ExtwoOceQohNbgnFNiwpL2+U4bXS8aXozBL00WvH6WhqbuHf0Fgfg=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.1.0.tgz"; + sha512 = "0/lBNwN+ZUnb5su18NZo5MBIjDaq6boQKZcxwy86Gip/CmXA2zZqUoFQLCNAGI5P25ZWSP2RWdhDJ8osfKEjoQ=="; }; }; "aws-sign2-0.7.0" = { @@ -1975,13 +1966,13 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; - "binary-extensions-2.1.0" = { + "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; }; "bindings-1.5.0" = { @@ -2002,6 +1993,15 @@ let sha512 = "Y+Wvypk3JhH5GPZAvlwJAWOVH/OsOhQMSj37vySuWHwQivoALplPxfBA8b973rFJI7OS+O+1YmmYXIiEXVMAcw=="; }; }; + "binwrap-0.2.3" = { + name = "binwrap"; + packageName = "binwrap"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/binwrap/-/binwrap-0.2.3.tgz"; + sha512 = "N4Pm7iyDEv0BrAMs+dny8WQa+e0nNTdzn2ODkf/MM6XBtKSCxCSUA1ZOQGoc1n7mUqdgOS5pwjsW91rmXVxy2Q=="; + }; + }; "bluebird-3.7.2" = { name = "bluebird"; packageName = "bluebird"; @@ -2164,13 +2164,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.14.7" = { + "browserslist-4.16.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.7"; + version = "4.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz"; - sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz"; + sha512 = "vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw=="; }; }; "buffer-4.9.2" = { @@ -2299,13 +2299,13 @@ let sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; }; }; - "call-bind-1.0.0" = { + "call-bind-1.0.2" = { name = "call-bind"; packageName = "call-bind"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz"; - sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; "call-me-maybe-1.0.1" = { @@ -2353,13 +2353,13 @@ let sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; }; - "camel-case-4.1.1" = { + "camel-case-4.1.2" = { name = "camel-case"; packageName = "camel-case"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz"; - sha512 = "7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q=="; + url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz"; + sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; }; }; "camelcase-3.0.0" = { @@ -2398,13 +2398,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001161" = { + "caniuse-lite-1.0.30001185" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001161"; + version = "1.0.30001185"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz"; - sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz"; + sha512 = "Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2533,13 +2533,13 @@ let sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w=="; }; }; - "chokidar-3.4.3" = { + "chokidar-3.5.1" = { name = "chokidar"; packageName = "chokidar"; - version = "3.4.3"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; - sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; + sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; }; }; "chownr-1.1.4" = { @@ -2551,6 +2551,15 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + }; "chrome-trace-event-1.0.2" = { name = "chrome-trace-event"; packageName = "chrome-trace-event"; @@ -2614,13 +2623,13 @@ let sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ=="; }; }; - "cli-table-0.3.1" = { + "cli-table-0.3.4" = { name = "cli-table"; packageName = "cli-table"; - version = "0.3.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; - sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.4.tgz"; + sha512 = "1vinpnX/ZERcmE443i3SZTmU5DF0rPO9DrL4I2iVAllhxzCM9SzPlHnz19fsZB78htkKZvYBvj6SZ6vXnaxmTA=="; }; }; "cli-width-2.2.1" = { @@ -2839,13 +2848,22 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-6.2.0" = { + "commander-6.2.1" = { name = "commander"; packageName = "commander"; - version = "6.2.0"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"; + sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; + }; + }; + "commander-7.0.0" = { + name = "commander"; + packageName = "commander"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz"; - sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; + url = "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz"; + sha512 = "ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA=="; }; }; "common-tags-1.8.0" = { @@ -3064,13 +3082,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.8.0" = { + "core-js-compat-3.8.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.8.0"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.0.tgz"; - sha512 = "o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz"; + sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog=="; }; }; "core-util-is-1.0.2" = { @@ -3181,15 +3199,6 @@ let sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; - "cross-spawn-promise-0.10.2" = { - name = "cross-spawn-promise"; - packageName = "cross-spawn-promise"; - version = "0.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn-promise/-/cross-spawn-promise-0.10.2.tgz"; - sha512 = "74PXJf6DYaab2klRS+D+9qxKJL1Weo3/ao9OPoH6NFzxtINSa/HE2mcyAPu1fpEmRTPD4Gdmpg3xEXQSgI8lpg=="; - }; - }; "crypt-0.0.2" = { name = "crypt"; packageName = "crypt"; @@ -3235,15 +3244,6 @@ let sha512 = "rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg=="; }; }; - "css-select-1.2.0" = { - name = "css-select"; - packageName = "css-select"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; - sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; - }; - }; "css-select-2.1.0" = { name = "css-select"; packageName = "css-select"; @@ -3280,15 +3280,6 @@ let sha512 = "wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ=="; }; }; - "css-what-2.1.3" = { - name = "css-what"; - packageName = "css-what"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz"; - sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; - }; - }; "css-what-3.4.2" = { name = "css-what"; packageName = "css-what"; @@ -3415,13 +3406,13 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.1" = { + "debug-4.3.2" = { name = "debug"; packageName = "debug"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; - sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; "decamelize-1.2.0" = { @@ -3721,13 +3712,13 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; - "domelementtype-2.0.2" = { + "domelementtype-2.1.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz"; - sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; + sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; }; }; "domhandler-2.4.2" = { @@ -3739,15 +3730,6 @@ let sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; }; }; - "domutils-1.5.1" = { - name = "domutils"; - packageName = "domutils"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; - }; - }; "domutils-1.7.0" = { name = "domutils"; packageName = "domutils"; @@ -3757,13 +3739,13 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; - "dot-case-3.0.3" = { + "dot-case-3.0.4" = { name = "dot-case"; packageName = "dot-case"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz"; - sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA=="; + url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz"; + sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; }; }; "dot-prop-5.3.0" = { @@ -3829,22 +3811,22 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.610" = { + "electron-to-chromium-1.3.657" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.610"; + version = "1.3.657"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz"; - sha512 = "eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.657.tgz"; + sha512 = "/9ROOyvEflEbaZFUeGofD+Tqs/WynbSTbNgNF+/TJJxH1ePD/e6VjZlDJpW3FFFd3nj5l3Hd8ki2vRwy+gyRFw=="; }; }; - "elliptic-6.5.3" = { + "elliptic-6.5.4" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz"; - sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"; + sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; }; }; "elm-0.19.1" = { @@ -3856,23 +3838,13 @@ let sha512 = "rehOtJKZvoYDddlrd7AX5NAf0H+LUllnBg3AHaeaIOKWzw4W316d7Bkhlbo7aSG+hVUVWP2ihKwyYkDi589TfA=="; }; }; - "elm-0.19.1-3" = { + "elm-0.19.1-5" = { name = "elm"; packageName = "elm"; - version = "0.19.1-3"; + version = "0.19.1-5"; src = fetchurl { - url = "https://registry.npmjs.org/elm/-/elm-0.19.1-3.tgz"; - sha512 = "6y36ewCcVmTOx8lj7cKJs3bhI5qMfoVEigePZ9PhEUNKpwjjML/pU2u2YSpHVAznuCcojoF6KIsrS1Ci7GtVaQ=="; - }; - }; - "elm-analyse-git://github.com/elm-tooling/elm-analyse#7f4000cce5ef024fe5e82c7ee1725feef95a9daf" = { - name = "elm-analyse"; - packageName = "elm-analyse"; - version = "0.16.6-alpha"; - src = fetchgit { - url = "git://github.com/elm-tooling/elm-analyse"; - rev = "7f4000cce5ef024fe5e82c7ee1725feef95a9daf"; - sha256 = "270cb1adfdeb368dde2b780938f653e9aa46cc97afbe4de828813fef7c30e556"; + url = "https://registry.npmjs.org/elm/-/elm-0.19.1-5.tgz"; + sha512 = "dyBoPvFiNLvxOStQJdyq28gZEjS/enZXdZ5yyCtNtDEMbFJJVQq4pYNRKvhrKKdlxNot6d96iQe1uczoqO5yvA=="; }; }; "elm-asset-webpack-loader-1.1.2" = { @@ -3893,13 +3865,13 @@ let sha512 = "qPDP/o/Fkifriaxaf3E7hHFB5L6Ijihyg8is4A6xna6/h/zebUiNssbQrxywI2oxNUkr6W/leEu/WlIC1tmVnw=="; }; }; - "elm-hot-1.1.5" = { + "elm-hot-1.1.6" = { name = "elm-hot"; packageName = "elm-hot"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.5.tgz"; - sha512 = "HSMlAr6INTV82wkpPNG0zsHoJXo/04GwG7bnhFX8s4zyIbbzuJAovsdo27FAT6/NKx5IVTXGI+IFcK9Z7oN1Tw=="; + url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.6.tgz"; + sha512 = "zYZJlfs7Gt4BdjA+D+857K+XAWzwwySJmXCgFpHW1dIEfaHSZCIPYPf7/jinZBLfKRkOAlKzI32AA84DY50g7Q=="; }; }; "elm-hot-webpack-loader-1.1.7" = { @@ -3911,15 +3883,6 @@ let sha512 = "FcRN8UlTl52EigvGjTaG9rnfdUJYh88eWRrruUmZLNVb/71maM92l3HNDAcyztOj4pEYGhoo9DEHEquZm6B08A=="; }; }; - "elm-json-0.2.8" = { - name = "elm-json"; - packageName = "elm-json"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/elm-json/-/elm-json-0.2.8.tgz"; - sha512 = "YfK39CNrHjB4LMnas6aAb2LP37YgqAnh69bWD7ojAs7lBNNkWIeBifeszAfmapylQt1MVuwj6zPPYwrqRQXEBA=="; - }; - }; "elm-test-0.19.1" = { name = "elm-test"; packageName = "elm-test"; @@ -3929,13 +3892,22 @@ let sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA=="; }; }; - "elm-test-0.19.1-revision4" = { + "elm-test-0.19.1-revision6" = { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision4"; + version = "0.19.1-revision6"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision4.tgz"; - sha512 = "DUzKPNzJb/2ZsPbtHttT5JIKGY1KtT7d9cexSNQI7DppvoEHxZ4nCd5EObv5kjskmC0JkQ5PHmCkIruQsbOdkQ=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision6.tgz"; + sha512 = "4VbIyCRlCUm/py0E0AjMT3/mwd6DR4Y5Z5gEox6z5JII6ZdKIJmcQzjgWRI5qo5ERJiw9M/Nxhk7SGXFUbZsxQ=="; + }; + }; + "elm-tooling-1.1.0" = { + name = "elm-tooling"; + packageName = "elm-tooling"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.1.0.tgz"; + sha512 = "wziiwTbqBkK/905a6stCpTWJhYEKNb4CCYt36VEd5XWmaLSelMOR+SxKcEPpxsiK/tFZ4o0PbW+h1QC5tWfYUQ=="; }; }; "elm-webpack-loader-6.0.1" = { @@ -3956,15 +3928,6 @@ let sha512 = "zNinzt6/YMr11HgeBlC9Z0UM3qHkYrGsWJTjrCmgBkKnaOLUzTP5K9N3z1RltyunItXtHAxb8DFPvMxlYRPv/Q=="; }; }; - "elmi-to-json-1.3.0" = { - name = "elmi-to-json"; - packageName = "elmi-to-json"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-1.3.0.tgz"; - sha512 = "6m1D5/Pb5pUrSOOBgRG3fE2mK19nhmLgZ16jj2KWTVIhT+0GIBuDI1iV0Fee27CZH790J7uMcdGWJ7fnVvpsKg=="; - }; - }; "emoji-regex-7.0.3" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -4019,13 +3982,13 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "enhanced-resolve-4.3.0" = { + "enhanced-resolve-4.5.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "4.3.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; - sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; + sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; "entities-1.1.2" = { @@ -4037,22 +4000,22 @@ let sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; }; }; - "entities-2.1.0" = { + "entities-2.2.0" = { name = "entities"; packageName = "entities"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; - sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; - "errno-0.1.7" = { + "errno-0.1.8" = { name = "errno"; packageName = "errno"; - version = "0.1.7"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; - sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; + url = "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz"; + sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="; }; }; "error-ex-1.3.2" = { @@ -4064,22 +4027,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.17.7" = { + "es-abstract-1.18.0-next.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.7"; + version = "1.18.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz"; - sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g=="; - }; - }; - "es-abstract-1.18.0-next.1" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.18.0-next.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; - sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz"; + sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw=="; }; }; "es-to-primitive-1.2.1" = { @@ -4271,13 +4225,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-4.1.0" = { + "execa-5.0.0" = { name = "execa"; packageName = "execa"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"; - sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; + url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz"; + sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; }; }; "expand-brackets-2.1.4" = { @@ -4424,13 +4378,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.4" = { + "fast-glob-3.2.5" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; - sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; + sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -4442,13 +4396,13 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fastq-1.9.0" = { + "fastq-1.10.1" = { name = "fastq"; packageName = "fastq"; - version = "1.9.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz"; - sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz"; + sha512 = "AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA=="; }; }; "faye-websocket-0.10.0" = { @@ -4703,13 +4657,13 @@ let sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; }; }; - "follow-redirects-1.13.0" = { + "follow-redirects-1.13.2" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.13.0"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz"; - sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz"; + sha512 = "6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="; }; }; "for-in-1.0.2" = { @@ -4748,6 +4702,15 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; + "fraction.js-4.0.13" = { + name = "fraction.js"; + packageName = "fraction.js"; + version = "4.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.13.tgz"; + sha512 = "E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA=="; + }; + }; "fragment-cache-0.2.1" = { name = "fragment-cache"; packageName = "fragment-cache"; @@ -4775,6 +4738,15 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "fromentries-1.3.2" = { + name = "fromentries"; + packageName = "fromentries"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz"; + sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg=="; + }; + }; "fs-extra-2.0.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -4829,13 +4801,13 @@ let sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; - "fs-extra-9.0.1" = { + "fs-extra-9.1.0" = { name = "fs-extra"; packageName = "fs-extra"; - version = "9.0.1"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz"; - sha512 = "h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ=="; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; }; "fs-minipass-1.2.7" = { @@ -4847,6 +4819,15 @@ let sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; + "fs-minipass-2.1.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + }; "fs-readdir-recursive-1.1.0" = { name = "fs-readdir-recursive"; packageName = "fs-readdir-recursive"; @@ -4892,13 +4873,13 @@ let sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; - "fsevents-2.2.1" = { + "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; - version = "2.2.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz"; - sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; }; "function-bind-1.1.1" = { @@ -4937,13 +4918,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.0.1" = { + "get-intrinsic-1.1.1" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; - sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -4982,6 +4963,15 @@ let sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; + "get-stream-6.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz"; + sha512 = "A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg=="; + }; + }; "get-value-2.0.6" = { name = "get-value"; packageName = "get-value"; @@ -5072,13 +5062,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globby-11.0.1" = { + "globby-11.0.2" = { name = "globby"; packageName = "globby"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz"; - sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; + sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; }; }; "globby-6.1.0" = { @@ -5126,13 +5116,13 @@ let sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.5" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.5.tgz"; + sha512 = "kBBSQbz2K0Nyn+31j/w36fUfxkBW9/gfwRWdUY1ULReH3iokVJgddZAFcD1D0xlgTmFxJCbUkUclAlc6/IDJkw=="; }; }; "gzip-size-5.0.0" = { @@ -5369,13 +5359,13 @@ let sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="; }; }; - "html-entities-1.3.1" = { + "html-entities-1.4.0" = { name = "html-entities"; packageName = "html-entities"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz"; - sha512 = "rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA=="; + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz"; + sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="; }; }; "html-minifier-terser-5.1.1" = { @@ -5459,13 +5449,13 @@ let sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; - "http-parser-js-0.5.2" = { + "http-parser-js-0.5.3" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz"; - sha512 = "opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ=="; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz"; + sha512 = "t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="; }; }; "http-proxy-1.17.0" = { @@ -5522,13 +5512,13 @@ let sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; - "human-signals-1.1.1" = { + "human-signals-2.1.0" = { name = "human-signals"; packageName = "human-signals"; - version = "1.1.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"; - sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; + url = "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"; + sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; "i-0.3.6" = { @@ -5621,13 +5611,13 @@ let sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; }; - "import-fresh-3.2.2" = { + "import-fresh-3.3.0" = { name = "import-fresh"; packageName = "import-fresh"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz"; - sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw=="; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; }; "import-local-2.0.0" = { @@ -5702,13 +5692,13 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ini-1.3.5" = { + "ini-1.3.8" = { name = "ini"; packageName = "ini"; - version = "1.3.5"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; "inquirer-6.2.0" = { @@ -5801,13 +5791,13 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; - "is-arguments-1.0.4" = { + "is-arguments-1.1.0" = { name = "is-arguments"; packageName = "is-arguments"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz"; - sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="; + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz"; + sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg=="; }; }; "is-arrayish-0.2.1" = { @@ -5855,13 +5845,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.2.2" = { + "is-callable-1.2.3" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz"; - sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; + sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; }; }; "is-color-stop-1.1.0" = { @@ -6026,13 +6016,13 @@ let sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; }; }; - "is-negative-zero-2.0.0" = { + "is-negative-zero-2.0.1" = { name = "is-negative-zero"; packageName = "is-negative-zero"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; - sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; }; }; "is-number-3.0.0" = { @@ -6071,13 +6061,13 @@ let sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; }; - "is-object-1.0.1" = { + "is-object-1.0.2" = { name = "is-object"; packageName = "is-object"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; - sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz"; + sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA=="; }; }; "is-path-cwd-2.2.0" = { @@ -6125,13 +6115,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-regex-1.1.1" = { + "is-regex-1.1.2" = { name = "is-regex"; packageName = "is-regex"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz"; - sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz"; + sha512 = "axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg=="; }; }; "is-regexp-1.0.0" = { @@ -6305,13 +6295,13 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.14.0" = { + "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.14.0"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; - sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; "jsbn-0.1.1" = { @@ -6440,13 +6430,13 @@ let sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; - "json5-2.1.3" = { + "json5-2.2.0" = { name = "json5"; packageName = "json5"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz"; - sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; }; "jsonfile-2.4.0" = { @@ -6773,13 +6763,13 @@ let sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="; }; }; - "lower-case-2.0.1" = { + "lower-case-2.0.2" = { name = "lower-case"; packageName = "lower-case"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz"; - sha512 = "LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ=="; + url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz"; + sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; }; }; "lowercase-keys-1.0.1" = { @@ -6818,6 +6808,15 @@ let sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; "make-dir-1.3.0" = { name = "make-dir"; packageName = "make-dir"; @@ -7016,31 +7015,31 @@ let sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; }; }; - "mime-2.4.6" = { + "mime-2.5.0" = { name = "mime"; packageName = "mime"; - version = "2.4.6"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz"; - sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; + url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz"; + sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag=="; }; }; - "mime-db-1.44.0" = { + "mime-db-1.45.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.44.0"; + version = "1.45.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; - sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; + sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; }; }; - "mime-types-2.1.27" = { + "mime-types-2.1.28" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.27"; + version = "2.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; - sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; + sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; }; }; "mimic-fn-1.2.0" = { @@ -7142,6 +7141,15 @@ let sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; + "minipass-3.1.3" = { + name = "minipass"; + packageName = "minipass"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz"; + sha512 = "Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg=="; + }; + }; "minizlib-1.3.3" = { name = "minizlib"; packageName = "minizlib"; @@ -7151,6 +7159,15 @@ let sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; + "minizlib-2.1.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + }; "mississippi-2.0.0" = { name = "mississippi"; packageName = "mississippi"; @@ -7196,6 +7213,15 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; "moment-2.29.1" = { name = "moment"; packageName = "moment"; @@ -7304,13 +7330,13 @@ let sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; }; }; - "nanoid-3.1.18" = { + "nanoid-3.1.20" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.18"; + version = "3.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz"; - sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz"; + sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; "nanomatch-1.2.13" = { @@ -7358,13 +7384,13 @@ let sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; - "no-case-3.0.3" = { + "no-case-3.0.4" = { name = "no-case"; packageName = "no-case"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz"; - sha512 = "ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw=="; + url = "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz"; + sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; "node-elm-compiler-5.0.4" = { @@ -7403,13 +7429,13 @@ let sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; }; - "node-releases-1.1.67" = { + "node-releases-1.1.70" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.67"; + version = "1.1.70"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz"; - sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz"; + sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw=="; }; }; "node-watch-0.5.5" = { @@ -7529,15 +7555,6 @@ let sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; - "num2fraction-1.2.2" = { - name = "num2fraction"; - packageName = "num2fraction"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"; - sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; - }; - }; "number-is-nan-1.0.1" = { name = "number-is-nan"; packageName = "number-is-nan"; @@ -7574,13 +7591,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.8.0" = { + "object-inspect-1.9.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; - sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"; + sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; }; }; "object-is-1.1.4" = { @@ -7718,13 +7735,13 @@ let sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; }; }; - "open-7.3.0" = { + "open-7.4.0" = { name = "open"; packageName = "open"; - version = "7.3.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.3.0.tgz"; - sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw=="; + url = "https://registry.npmjs.org/open/-/open-7.4.0.tgz"; + sha512 = "PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA=="; }; }; "opn-5.4.0" = { @@ -7745,15 +7762,6 @@ let sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; }; }; - "opn-6.0.0" = { - name = "opn"; - packageName = "opn"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz"; - sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ=="; - }; - }; "optimize-css-assets-webpack-plugin-5.0.3" = { name = "optimize-css-assets-webpack-plugin"; packageName = "optimize-css-assets-webpack-plugin"; @@ -7979,13 +7987,13 @@ let sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="; }; }; - "param-case-3.0.3" = { + "param-case-3.0.4" = { name = "param-case"; packageName = "param-case"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz"; - sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA=="; + url = "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz"; + sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; }; }; "parent-module-1.0.1" = { @@ -8024,13 +8032,13 @@ let sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; }; - "parse-json-5.1.0" = { + "parse-json-5.2.0" = { name = "parse-json"; packageName = "parse-json"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz"; - sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; }; "parse-passwd-1.0.0" = { @@ -8051,13 +8059,13 @@ let sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; - "pascal-case-3.1.1" = { + "pascal-case-3.1.2" = { name = "pascal-case"; packageName = "pascal-case"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz"; - sha512 = "XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA=="; + url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz"; + sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; }; }; "pascalcase-0.1.1" = { @@ -8366,13 +8374,13 @@ let sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; - "postcss-8.1.10" = { + "postcss-8.2.4" = { name = "postcss"; packageName = "postcss"; - version = "8.1.10"; + version = "8.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz"; - sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz"; + sha512 = "kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg=="; }; }; "postcss-calc-7.0.5" = { @@ -8735,13 +8743,13 @@ let sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; }; }; - "pretty-bytes-5.4.1" = { + "pretty-bytes-5.5.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; - sha512 = "s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA=="; + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz"; + sha512 = "p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA=="; }; }; "pretty-error-2.1.2" = { @@ -9239,13 +9247,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.3.0" = { + "regexp.prototype.flags-1.3.1" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; + sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA=="; }; }; "regexpu-core-4.7.1" = { @@ -9284,13 +9292,13 @@ let sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; }; - "regjsparser-0.6.4" = { + "regjsparser-0.6.7" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.6.4"; + version = "0.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz"; - sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz"; + sha512 = "ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ=="; }; }; "relateurl-0.2.7" = { @@ -9311,13 +9319,13 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "renderkid-2.0.4" = { + "renderkid-2.0.5" = { name = "renderkid"; packageName = "renderkid"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz"; - sha512 = "K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g=="; + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz"; + sha512 = "ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ=="; }; }; "repeat-element-1.1.3" = { @@ -9572,6 +9580,15 @@ let sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; @@ -9761,13 +9778,13 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.3.2" = { + "semver-7.3.4" = { name = "semver"; packageName = "semver"; - version = "7.3.2"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; - sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; + sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; }; }; "semver-regex-1.0.0" = { @@ -10139,13 +10156,13 @@ let sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; - "source-map-url-0.4.0" = { + "source-map-url-0.4.1" = { name = "source-map-url"; packageName = "source-map-url"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"; + sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="; }; }; "spdx-correct-3.1.1" = { @@ -10643,6 +10660,15 @@ let sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; }; }; + "tar-6.1.0" = { + name = "tar"; + packageName = "tar"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"; + sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; + }; + }; "temp-0.9.0" = { name = "temp"; packageName = "temp"; @@ -10904,13 +10930,13 @@ let sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; }; }; - "ts-debounce-2.1.0" = { + "ts-debounce-2.3.0" = { name = "ts-debounce"; packageName = "ts-debounce"; - version = "2.1.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-debounce/-/ts-debounce-2.1.0.tgz"; - sha512 = "jlrN8iK/Iif5pQd+pIsH8uEexj3vvUT+BwqNrJt5xgZB+ucwVfQVAUMC8Dnx0vlk7AktHxoD9ZDYYVYUtxd5wA=="; + url = "https://registry.npmjs.org/ts-debounce/-/ts-debounce-2.3.0.tgz"; + sha512 = "j63IP7/unAzovrhVHE7U+fNkvDKwIaLH11dCO9TcRbYOZw1chPL054poqq3ZloyRJ5KwJMeB8csN/vGPPpQJjw=="; }; }; "ts-union-2.3.0" = { @@ -10931,6 +10957,15 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; + "tslib-2.1.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; + sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; + }; + }; "tsyringe-4.4.0" = { name = "tsyringe"; packageName = "tsyringe"; @@ -11138,15 +11173,6 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; - "universalify-1.0.0" = { - name = "universalify"; - packageName = "universalify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz"; - sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="; - }; - }; "universalify-2.0.0" = { name = "universalify"; packageName = "universalify"; @@ -11210,13 +11236,13 @@ let sha1 = "4a50875ec5c715d19379799f0590a0e796958f61"; }; }; - "uri-js-4.4.0" = { + "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; - sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; "urix-0.1.0" = { @@ -11390,15 +11416,6 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "vfile-location-3.2.0" = { - name = "vfile-location"; - packageName = "vfile-location"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz"; - sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="; - }; - }; "vm-browserify-1.1.2" = { name = "vm-browserify"; packageName = "vm-browserify"; @@ -11408,31 +11425,31 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vscode-jsonrpc-5.0.1" = { + "vscode-jsonrpc-6.0.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz"; - sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz"; + sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg=="; }; }; - "vscode-languageserver-6.1.1" = { + "vscode-languageserver-7.0.0" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "6.1.1"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz"; - sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz"; + sha512 = "60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw=="; }; }; - "vscode-languageserver-protocol-3.15.3" = { + "vscode-languageserver-protocol-3.16.0" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.15.3"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz"; - sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz"; + sha512 = "sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A=="; }; }; "vscode-languageserver-textdocument-1.0.1" = { @@ -11444,22 +11461,22 @@ let sha512 = "UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA=="; }; }; - "vscode-languageserver-types-3.15.1" = { + "vscode-languageserver-types-3.16.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.15.1"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz"; - sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz"; + sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="; }; }; - "vscode-uri-2.1.2" = { + "vscode-uri-3.0.2" = { name = "vscode-uri"; packageName = "vscode-uri"; - version = "2.1.2"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz"; - sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz"; + sha512 = "jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA=="; }; }; "watchpack-1.7.5" = { @@ -11516,13 +11533,13 @@ let sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; }; }; - "webpack-dev-middleware-3.7.2" = { + "webpack-dev-middleware-3.7.3" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; - version = "3.7.2"; + version = "3.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; - sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw=="; + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz"; + sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ=="; }; }; "webpack-dev-server-3.11.0" = { @@ -11885,13 +11902,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.4.0" = { + "ws-7.4.3" = { name = "ws"; packageName = "ws"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz"; - sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ=="; + url = "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz"; + sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; }; }; "xmlbuilder-13.0.2" = { @@ -11921,22 +11938,22 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-3.2.1" = { + "y18n-3.2.2" = { name = "y18n"; packageName = "y18n"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz"; + sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="; }; }; - "y18n-4.0.0" = { + "y18n-4.0.1" = { name = "y18n"; packageName = "y18n"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; + sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; }; }; "yallist-2.1.2" = { @@ -11957,6 +11974,15 @@ let sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; "yaml-1.10.0" = { name = "yaml"; packageName = "yaml"; @@ -12112,7 +12138,7 @@ in sources."fresh-0.5.2" sources."fs-extra-2.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-errors-1.7.2" @@ -12136,8 +12162,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -12196,7 +12222,7 @@ in sources."typedarray-0.0.6" sources."ultron-1.0.2" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -12241,8 +12267,8 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" - sources."binary-extensions-2.1.0" - sources."binwrap-0.2.2" + sources."binary-extensions-2.2.0" + sources."binwrap-0.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -12256,7 +12282,7 @@ in ]; }) sources."chokidar-3.2.1" - sources."chownr-1.1.4" + sources."chownr-2.0.0" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -12289,7 +12315,18 @@ in sources."which-2.0.1" ]; }) - sources."elmi-to-json-1.2.0" + (sources."elmi-to-json-1.2.0" // { + dependencies = [ + sources."binwrap-0.2.2" + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.5" + sources."tar-4.4.13" + sources."yallist-3.1.1" + ]; + }) sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" @@ -12310,14 +12347,14 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-extra-4.0.3" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -12346,13 +12383,13 @@ in sources."yallist-2.1.2" ]; }) - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" sources."moment-2.29.1" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" @@ -12407,7 +12444,7 @@ in ]; }) sources."table-5.4.6" - sources."tar-4.4.13" + sources."tar-6.1.0" sources."temp-0.9.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -12419,9 +12456,13 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-0.1.2" - sources."unzip-stream-0.3.1" + (sources."unzip-stream-0.3.1" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) sources."upgrade-1.1.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-1.3.1" @@ -12440,8 +12481,8 @@ in }) sources."wrappy-1.0.2" sources."xmlbuilder-13.0.2" - sources."y18n-4.0.0" - sources."yallist-3.1.1" + sources."y18n-4.0.1" + sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -12466,10 +12507,10 @@ in elm-doc-preview = nodeEnv.buildNodePackage { name = "elm-doc-preview"; packageName = "elm-doc-preview"; - version = "5.0.3"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-5.0.3.tgz"; - sha512 = "j9wli2wOHYiSMARDCRgAZGZ8JkcJqG4rh5+6rSgy5nVGqyXDEN6HCBX/8AhqtKMFKcuCp9ejx04heCaROlb/Eg=="; + url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-5.0.5.tgz"; + sha512 = "GlWnbw2Bl+pA7QzRlqSYNGEQ3r3oNxMr2Nu0uiCM6AWzQ6Sk3BwtqSiUZvXLLlzWBV9pAQnY9U8xpDpPuh5rOQ=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -12481,7 +12522,7 @@ in sources."async-limiter-1.0.1" sources."balanced-match-1.0.0" sources."batch-0.6.1" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -12493,7 +12534,7 @@ in ]; }) sources."chalk-3.0.0" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -12527,7 +12568,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."get-stream-4.1.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -12538,7 +12579,7 @@ in sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" sources."is-docker-2.1.1" @@ -12555,8 +12596,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -12566,7 +12607,7 @@ in sources."normalize-url-4.5.0" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.3.0" + sources."open-7.4.0" sources."p-cancelable-1.1.0" sources."package-json-6.5.0" sources."parseurl-1.3.3" @@ -12618,7 +12659,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.4.0" + sources."ws-7.4.3" ]; buildInputs = globalBuildInputs; meta = { @@ -12633,212 +12674,73 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.13.2"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.13.2.tgz"; - sha512 = "3bRD+Hut+XPLDY4r0t25tHhfWsXH2UPeruwDfsp/b991AjGpd3HlMNKVAnyu4DD2brUqo6xoHhpp3qTdHPJ2Pw=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.0.2.tgz"; + sha512 = "9G+n4pGWv/dpV6y7Wvf+J1FbJxQW6jtbtiF/20LYJVYP8LxjlrdMG5uzfZqBCFPNfn8aaIJL/ndkSvtSuFe/JA=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" - sources."accepts-1.3.7" - sources."ajv-6.12.6" - sources."array-flatten-1.1.1" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" + sources."anymatch-3.1.1" sources."array-union-2.1.0" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."async-limiter-1.0.1" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" - sources."babel-runtime-6.18.0" - sources."bcrypt-pbkdf-1.0.2" - sources."body-parser-1.19.0" + sources."binary-extensions-2.2.0" sources."braces-3.0.2" - sources."bytes-3.1.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.8" - sources."concat-stream-1.5.2" - sources."content-disposition-0.5.3" - sources."content-type-1.0.4" - sources."cookie-0.4.0" - sources."cookie-signature-1.0.6" - sources."core-js-2.6.12" - sources."core-util-is-1.0.2" + sources."chokidar-3.5.1" sources."cross-spawn-7.0.3" - sources."dashdash-1.14.1" - sources."debug-2.6.9" - sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."destroy-1.0.4" sources."dir-glob-3.0.1" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#7f4000cce5ef024fe5e82c7ee1725feef95a9daf" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - sources."etag-1.8.1" - (sources."execa-4.1.0" // { - dependencies = [ - sources."is-stream-2.0.0" - ]; - }) - sources."express-4.17.1" - (sources."express-ws-2.0.0" // { - dependencies = [ - sources."ws-1.1.5" - ]; - }) - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" + sources."execa-5.0.0" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.4" - sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.9.0" + sources."fast-glob-3.2.5" + sources."fastq-1.10.1" sources."fill-range-7.0.1" - sources."finalhandler-1.1.2" - sources."find-0.2.7" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."forwarded-0.1.2" - sources."fresh-0.5.2" - sources."fs-extra-2.0.0" - sources."get-stream-5.2.0" - sources."getpass-0.1.7" + sources."fromentries-1.3.2" + sources."fsevents-2.3.2" + sources."get-stream-6.0.0" sources."glob-parent-5.1.1" - sources."globby-11.0.1" - sources."graceful-fs-4.2.4" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."http-errors-1.7.2" - sources."http-signature-1.2.0" - sources."human-signals-1.1.1" - sources."iconv-lite-0.4.24" + sources."globby-11.0.2" + sources."human-signals-2.1.0" sources."ignore-5.1.8" - sources."inherits-2.0.3" - sources."ipaddr.js-1.9.1" + sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" + sources."is-stream-2.0.0" sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" - sources."lodash-4.17.20" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."methods-1.1.2" sources."micromatch-4.0.2" - sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" - sources."minimist-1.2.5" - sources."ms-2.0.0" - sources."negotiator-0.6.2" - sources."node-watch-0.5.5" + sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" - sources."oauth-sign-0.9.0" - sources."on-finished-2.3.0" - sources."once-1.4.0" sources."onetime-5.1.2" - sources."opn-6.0.0" - sources."options-0.0.6" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."parseurl-1.3.3" sources."path-key-3.1.1" - sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."performance-now-2.1.0" sources."picomatch-2.2.2" sources."pjson-1.0.9" - sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.6" - sources."psl-1.8.0" - sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.7.0" - sources."range-parser-1.2.1" - sources."raw-body-2.4.0" - sources."readable-stream-2.0.6" + sources."readdirp-3.5.0" sources."reflect-metadata-0.1.13" - sources."regenerator-runtime-0.9.6" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.2" - ]; - }) sources."reusify-1.0.4" sources."run-parallel-1.1.10" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - (sources."send-0.17.1" // { - dependencies = [ - sources."ms-2.1.1" - ]; - }) - sources."serve-static-1.14.1" - sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."slash-3.0.0" - sources."sshpk-1.16.1" - sources."statuses-1.5.0" - sources."string_decoder-0.10.31" sources."strip-final-newline-2.0.0" - sources."sums-0.2.4" - sources."through2-2.0.1" - sources."tmp-0.0.31" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" - sources."tough-cookie-2.5.0" - sources."traverse-chain-0.1.0" - sources."ts-debounce-2.1.0" + sources."ts-debounce-2.3.0" sources."tslib-1.14.1" sources."tsyringe-4.4.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."ultron-1.0.2" - sources."unpipe-1.0.0" - sources."uri-js-4.4.0" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-3.4.0" - sources."vary-1.1.2" - sources."verror-1.10.0" - sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageserver-7.0.0" + sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" - sources."vscode-uri-2.1.2" + sources."vscode-languageserver-types-3.16.0" + sources."vscode-uri-3.0.2" sources."web-tree-sitter-0.17.1" sources."which-2.0.2" - sources."wrappy-1.0.2" - (sources."ws-3.3.1" // { - dependencies = [ - sources."ultron-1.1.1" - ]; - }) - sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -12863,7 +12765,7 @@ in sources."ansi-styles-2.2.1" sources."anymatch-3.1.1" sources."async-limiter-1.0.1" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."braces-3.0.2" sources."chalk-1.1.3" sources."charenc-0.0.2" @@ -12892,9 +12794,9 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.13.0" + sources."follow-redirects-1.13.2" sources."fresh-0.5.2" - sources."fsevents-2.2.1" + sources."fsevents-2.3.2" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."has-ansi-2.0.0" @@ -12970,128 +12872,57 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision4"; + version = "0.19.1-revision6"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision4.tgz"; - sha512 = "DUzKPNzJb/2ZsPbtHttT5JIKGY1KtT7d9cexSNQI7DppvoEHxZ4nCd5EObv5kjskmC0JkQ5PHmCkIruQsbOdkQ=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision6.tgz"; + sha512 = "4VbIyCRlCUm/py0E0AjMT3/mwd6DR4Y5Z5gEox6z5JII6ZdKIJmcQzjgWRI5qo5ERJiw9M/Nxhk7SGXFUbZsxQ=="; }; dependencies = [ - sources."ajv-6.12.6" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" - sources."binary-extensions-2.1.0" - sources."binwrap-0.2.2" - sources."bluebird-3.7.2" + sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffers-0.1.1" - sources."caseless-0.12.0" - sources."chainsaw-0.1.0" - sources."chalk-3.0.0" - sources."chokidar-3.4.3" - sources."chownr-1.1.4" + sources."chalk-4.1.0" + sources."chokidar-3.5.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."combined-stream-1.0.8" + sources."commander-7.0.0" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" - sources."dashdash-1.14.1" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."elmi-to-json-1.3.0" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" + sources."elm-tooling-1.1.0" sources."fill-range-7.0.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" - sources."getpass-0.1.7" + sources."fsevents-2.3.2" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.4" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + sources."graceful-fs-4.2.5" sources."has-flag-4.0.0" - sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."is-typedarray-1.0.0" sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" - sources."jsprim-1.4.1" - sources."lodash-4.17.20" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" - sources."murmur-hash-js-1.0.0" - sources."mustache-3.2.1" sources."normalize-path-3.0.0" - sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."performance-now-2.1.0" sources."picomatch-2.2.2" - sources."psl-1.8.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" sources."readdirp-3.5.0" - sources."request-2.88.2" - sources."request-promise-4.2.6" - sources."request-promise-core-1.1.4" - sources."rimraf-2.6.3" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" + sources."rimraf-3.0.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."split-1.0.1" - sources."sshpk-1.16.1" - sources."stealthy-require-1.1.1" sources."supports-color-7.2.0" - sources."tar-4.4.13" - sources."temp-0.9.4" sources."through-2.3.8" sources."to-regex-range-5.0.1" - sources."tough-cookie-2.5.0" - sources."traverse-0.3.9" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."universalify-0.1.2" - sources."unzip-stream-0.3.1" - sources."uri-js-4.4.0" - sources."uuid-3.4.0" - sources."verror-1.10.0" sources."which-2.0.2" sources."wrappy-1.0.2" sources."xmlbuilder-15.1.1" - sources."yallist-3.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -13117,7 +12948,7 @@ in sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.10" + sources."@types/node-14.14.25" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" @@ -13136,18 +12967,19 @@ in sources."get-proxy-2.1.0" sources."get-stream-5.2.0" sources."got-10.7.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.5" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-cache-semantics-4.1.0" - sources."ini-1.3.5" - sources."is-object-1.0.1" + sources."ini-1.3.8" + sources."is-object-1.0.2" sources."isexe-2.0.0" sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" sources."keyv-4.0.3" sources."lowercase-keys-2.0.0" + sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" sources."normalize-url-4.5.0" sources."npm-conf-1.1.3" @@ -13162,7 +12994,7 @@ in sources."responselike-2.0.0" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.3.2" + sources."semver-7.3.4" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" @@ -13170,6 +13002,7 @@ in sources."url-to-options-1.0.1" sources."which-2.0.2" sources."wrappy-1.0.2" + sources."yallist-4.0.0" sources."yn-4.0.0" ]; buildInputs = globalBuildInputs; @@ -13203,7 +13036,7 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."binwrap-0.2.2" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" @@ -13263,7 +13096,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -13286,8 +13119,8 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."lodash-4.17.15" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" @@ -13354,7 +13187,7 @@ in sources."tweetnacl-0.14.5" sources."universalify-0.1.2" sources."unzip-stream-0.3.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-2.0.1" @@ -13362,7 +13195,7 @@ in sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" sources."xmlbuilder-13.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-3.1.1" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" @@ -13389,7 +13222,7 @@ in sources."compare-versions-3.6.0" sources."core-util-is-1.0.2" sources."fs-extra-6.0.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.5" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."jsonfile-4.0.0" @@ -13424,58 +13257,57 @@ in create-elm-app = nodeEnv.buildNodePackage { name = "create-elm-app"; packageName = "create-elm-app"; - version = "5.21.0"; + version = "5.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.21.0.tgz"; - sha512 = "yW7kMk/WyIUZc+OksH+GH8lhOWl129RiJGclJtpnLlmW3IDZYh23bP/e65MxX7BB+7lwi3KSObdbPYfCJf7CuA=="; + url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.22.0.tgz"; + sha512 = "XmYWohoM/xHxFJBPA61MJMqlMcEycBO4gUdtp4mVA6KbIgEV7PTv1UXVFYjTntUNOr5DIxvE1RcqB84rR767Uw=="; }; dependencies = [ - sources."@babel/cli-7.12.8" - sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.7" - sources."@babel/core-7.12.9" - sources."@babel/generator-7.12.5" - sources."@babel/helper-annotate-as-pure-7.10.4" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.5" - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.7" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.5" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/cli-7.12.10" + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + sources."@babel/core-7.12.10" + sources."@babel/generator-7.12.15" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + sources."@babel/helper-compilation-targets-7.12.13" + sources."@babel/helper-create-class-features-plugin-7.12.13" + sources."@babel/helper-create-regexp-features-plugin-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.7" - sources."@babel/plugin-proposal-async-generator-functions-7.12.1" - sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/helper-split-export-declaration-7.12.13" + sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/helper-validator-option-7.12.11" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.15" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.13" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" @@ -13485,46 +13317,46 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.1" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-runtime-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.1" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.7" + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-runtime-7.12.10" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.9" - sources."@babel/types-7.12.7" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -13535,10 +13367,10 @@ in sources."@types/anymatch-1.3.1" sources."@types/glob-7.1.3" sources."@types/html-minifier-terser-5.1.1" - sources."@types/http-proxy-1.17.4" - sources."@types/json-schema-7.0.6" + sources."@types/http-proxy-1.17.5" + sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.10" + sources."@types/node-14.14.25" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.4" sources."@types/source-list-map-0.1.2" @@ -13548,12 +13380,12 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.25" // { + (sources."@types/webpack-4.41.26" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-2.0.0" // { + (sources."@types/webpack-sources-2.1.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -13628,7 +13460,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."autoprefixer-10.0.4" + sources."autoprefixer-10.1.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."babel-extract-comments-1.0.0" @@ -13657,10 +13489,8 @@ in sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" - sources."binary-0.3.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" - sources."binwrap-0.2.2" sources."bluebird-3.7.2" sources."bn.js-5.1.3" (sources."body-parser-1.19.0" // { @@ -13691,41 +13521,43 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.14.7" + sources."browserslist-4.16.3" sources."buffer-4.9.2" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" - sources."buffers-0.1.1" sources."builtin-status-codes-3.0.0" sources."bytes-3.0.0" sources."cacache-12.0.4" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" - sources."camel-case-4.1.1" + sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001185" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" - sources."chainsaw-0.1.0" (sources."chalk-2.4.2" // { dependencies = [ sources."escape-string-regexp-1.0.5" ]; }) sources."chardet-0.7.0" - (sources."chokidar-3.4.3" // { + (sources."chokidar-3.5.1" // { dependencies = [ sources."glob-parent-5.1.1" ]; }) sources."chownr-1.1.4" - sources."chrome-trace-event-1.0.2" + (sources."chrome-trace-event-1.0.2" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -13750,10 +13582,12 @@ in ]; }) sources."cli-cursor-2.1.0" - sources."cli-table-0.3.1" + sources."cli-table-0.3.4" sources."cli-width-2.2.1" (sources."cliui-3.2.0" // { dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" sources."strip-ansi-3.0.1" ]; }) @@ -13765,7 +13599,7 @@ in sources."color-name-1.1.3" sources."color-string-1.5.4" sources."colorette-1.2.1" - sources."colors-1.0.3" + sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."common-tags-1.8.0" @@ -13802,7 +13636,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.8.0" // { + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -13824,17 +13658,19 @@ in dependencies = [ sources."camelcase-6.2.0" sources."loader-utils-2.0.0" - sources."semver-7.3.2" + sources."lru-cache-6.0.0" + sources."semver-7.3.4" + sources."yallist-4.0.0" ]; }) - sources."css-select-1.2.0" + sources."css-select-2.1.0" sources."css-select-base-adapter-0.1.1" (sources."css-tree-1.0.0-alpha.37" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."css-what-2.1.3" + sources."css-what-3.4.2" sources."cssesc-3.0.0" sources."cssnano-4.1.10" sources."cssnano-preset-default-4.0.7" @@ -13852,7 +13688,7 @@ in sources."cycle-1.0.3" sources."cyclist-1.0.1" sources."dashdash-1.14.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."deep-equal-0.2.2" @@ -13891,56 +13727,57 @@ in sources."dom-converter-0.2.0" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.2" + sources."domelementtype-2.1.0" ]; }) sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" sources."domhandler-2.4.2" - sources."domutils-1.5.1" - sources."dot-case-3.0.3" + sources."domutils-1.7.0" + sources."dot-case-3.0.4" sources."dot-prop-5.3.0" sources."dotenv-8.2.0" sources."duplexer-0.1.2" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.610" - (sources."elliptic-6.5.3" // { + sources."electron-to-chromium-1.3.657" + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; }) - sources."elm-0.19.1-3" + sources."elm-0.19.1-5" sources."elm-asset-webpack-loader-1.1.2" - sources."elm-hot-1.1.5" + sources."elm-hot-1.1.6" sources."elm-hot-webpack-loader-1.1.7" - (sources."elm-test-0.19.1-revision4" // { + (sources."elm-test-0.19.1-revision6" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."fs-extra-8.1.0" + sources."commander-7.0.0" sources."has-flag-4.0.0" + sources."rimraf-3.0.2" sources."supports-color-7.2.0" ]; }) + sources."elm-tooling-1.1.0" sources."elm-webpack-loader-6.0.1" - sources."elmi-to-json-1.3.0" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.3.0" // { + (sources."enhanced-resolve-4.5.0" // { dependencies = [ sources."memory-fs-0.5.0" ]; }) - sources."entities-2.1.0" - sources."errno-0.1.7" + sources."entities-2.2.0" + sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -14067,24 +13904,24 @@ in sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.13.0" + sources."follow-redirects-1.13.2" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" + sources."fraction.js-4.0.13" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" sources."fs-extra-6.0.1" - sources."fs-minipass-1.2.7" sources."fs-readdir-recursive-1.1.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.0.1" + sources."get-intrinsic-1.1.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -14109,7 +13946,7 @@ in sources."slash-1.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.5" (sources."gzip-size-5.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -14148,7 +13985,7 @@ in sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" sources."html-comment-regex-1.1.2" - sources."html-entities-1.3.1" + sources."html-entities-1.4.0" sources."html-minifier-terser-5.1.1" sources."html-webpack-plugin-4.5.0" (sources."htmlparser2-3.10.1" // { @@ -14163,7 +14000,7 @@ in sources."inherits-2.0.3" ]; }) - sources."http-parser-js-0.5.2" + sources."http-parser-js-0.5.3" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.21.0" sources."http-signature-1.2.0" @@ -14190,7 +14027,7 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" (sources."inquirer-6.2.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -14207,11 +14044,11 @@ in sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.0.4" + sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" @@ -14220,9 +14057,9 @@ in sources."is-directory-0.3.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-negative-zero-2.0.0" + sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" @@ -14230,7 +14067,7 @@ in sources."is-path-inside-2.1.0" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-regexp-1.0.0" sources."is-resolvable-1.1.0" sources."is-root-2.0.0" @@ -14246,7 +14083,7 @@ in sources."isobject-3.0.1" sources."isstream-0.1.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" @@ -14256,7 +14093,7 @@ in sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsprim-1.4.1" @@ -14286,7 +14123,7 @@ in sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" sources."loglevel-1.7.1" - sources."lower-case-2.0.1" + sources."lower-case-2.0.2" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."map-cache-0.2.2" @@ -14305,8 +14142,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" (sources."mini-css-extract-plugin-0.12.0" // { dependencies = [ @@ -14317,8 +14154,6 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" sources."mississippi-3.0.0" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -14330,17 +14165,15 @@ in sources."ms-2.1.2" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."murmur-hash-js-1.0.0" - sources."mustache-3.2.1" sources."mute-stream-0.0.8" sources."nan-2.14.2" - sources."nanoid-3.1.18" + sources."nanoid-3.1.20" sources."nanomatch-1.2.13" sources."ncp-1.0.1" sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."no-case-3.0.3" + sources."no-case-3.0.4" (sources."node-elm-compiler-5.0.5" // { dependencies = [ sources."cross-spawn-6.0.5" @@ -14356,7 +14189,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.67" + sources."node-releases-1.1.70" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -14367,7 +14200,6 @@ in ]; }) sources."nth-check-1.0.2" - sources."num2fraction-1.2.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -14384,7 +14216,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -14412,7 +14244,7 @@ in sources."p-try-2.2.0" sources."pako-1.0.11" sources."parallel-transform-1.2.0" - sources."param-case-3.0.3" + sources."param-case-3.0.4" (sources."parent-module-1.0.1" // { dependencies = [ sources."callsites-3.1.0" @@ -14422,7 +14254,7 @@ in sources."parse-json-4.0.0" sources."parse-passwd-1.0.0" sources."parseurl-1.3.3" - sources."pascal-case-3.1.1" + sources."pascal-case-3.1.2" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" @@ -14488,13 +14320,15 @@ in (sources."postcss-loader-4.1.0" // { dependencies = [ sources."cosmiconfig-7.0.0" - sources."import-fresh-3.2.2" + sources."import-fresh-3.3.0" sources."loader-utils-2.0.0" - sources."parse-json-5.1.0" + sources."lru-cache-6.0.0" + sources."parse-json-5.2.0" sources."path-type-4.0.0" sources."resolve-from-4.0.0" sources."schema-utils-3.0.0" - sources."semver-7.3.2" + sources."semver-7.3.4" + sources."yallist-4.0.0" ]; }) (sources."postcss-merge-longhand-4.0.11" // { @@ -14586,7 +14420,7 @@ in }) (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-8.1.10" + sources."postcss-8.2.4" sources."source-map-0.6.1" ]; }) @@ -14599,17 +14433,13 @@ in sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" - sources."pretty-bytes-5.4.1" + sources."pretty-bytes-5.5.0" sources."pretty-error-2.1.2" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."promise-8.1.0" sources."promise-inflight-1.0.1" - (sources."prompt-1.0.0" // { - dependencies = [ - sources."colors-1.4.0" - ]; - }) + sources."prompt-1.0.0" sources."proxy-addr-2.0.6" sources."prr-1.0.1" sources."pseudomap-1.0.2" @@ -14692,21 +14522,17 @@ in sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.1" sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.7" // { dependencies = [ sources."jsesc-0.5.0" ]; }) sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" - (sources."renderkid-2.0.4" // { + (sources."renderkid-2.0.5" // { dependencies = [ sources."strip-ansi-3.0.1" ]; @@ -14714,8 +14540,6 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.2" - sources."request-promise-4.2.6" - sources."request-promise-core-1.1.4" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" @@ -14734,7 +14558,11 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.6.3" + (sources."rxjs-6.6.3" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -14834,7 +14662,7 @@ in sources."source-map-0.6.1" ]; }) - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -14870,18 +14698,13 @@ in ]; }) sources."statuses-1.5.0" - sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" sources."stream-shift-1.0.1" sources."strict-uri-encode-1.1.0" sources."string-replace-loader-2.3.0" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) + sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" @@ -14909,15 +14732,8 @@ in ]; }) sources."supports-color-5.5.0" - (sources."svgo-1.3.2" // { - dependencies = [ - sources."css-select-2.1.0" - sources."css-what-3.4.2" - sources."domutils-1.7.0" - ]; - }) + sources."svgo-1.3.2" sources."tapable-1.1.3" - sources."tar-4.4.13" (sources."temp-0.9.4" // { dependencies = [ sources."rimraf-2.6.3" @@ -14959,8 +14775,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" - sources."traverse-0.3.9" - sources."tslib-1.14.1" + sources."tslib-2.1.0" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -15017,9 +14832,8 @@ in sources."has-values-0.1.4" ]; }) - sources."unzip-stream-0.3.1" sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -15049,7 +14863,6 @@ in sources."vary-1.1.2" sources."vendors-1.0.4" sources."verror-1.10.0" - sources."vfile-location-3.2.0" sources."vm-browserify-1.1.2" sources."watchpack-1.7.5" (sources."watchpack-chokidar2-2.0.1" // { @@ -15083,9 +14896,9 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."webpack-dev-middleware-3.7.2" // { + (sources."webpack-dev-middleware-3.7.3" // { dependencies = [ - sources."mime-2.4.6" + sources."mime-2.5.0" ]; }) (sources."webpack-dev-server-3.11.0" // { @@ -15100,6 +14913,7 @@ in sources."strip-ansi-5.2.0" ]; }) + sources."emoji-regex-7.0.3" sources."extend-shallow-2.0.1" sources."fill-range-4.0.0" sources."find-up-3.0.0" @@ -15158,6 +14972,7 @@ in (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" + sources."colors-1.0.3" sources."pkginfo-0.3.1" ]; }) @@ -15184,6 +14999,8 @@ in sources."worker-farm-1.7.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" sources."strip-ansi-3.0.1" ]; }) @@ -15191,13 +15008,16 @@ in sources."ws-6.2.1" sources."xmlbuilder-15.1.1" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-3.1.1" sources."yaml-1.10.0" (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" - sources."y18n-3.2.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."y18n-3.2.2" ]; }) (sources."yargs-parser-4.2.1" // { @@ -15231,7 +15051,7 @@ in sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-6.2.0" + sources."commander-6.2.1" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" sources."find-elm-dependencies-2.0.4" @@ -15275,10 +15095,10 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.3.3"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.3.3.tgz"; - sha512 = "1TiTnEXzpzACrc/JdB3tvmgNf5Qd0RyX8wbBqPPuc1aWvHHvPf6wi/ncz1gcILFAObr1zquCePkJkoW0uoZiBA=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.4.1.tgz"; + sha512 = "2nirbEpOvOCgVylf5l6mtu+IqM//8kBeuj6zELPHmzWtn7heZTC0AS7fUtLVtnkgw9Cws8oh4tFLmHgVALE+dw=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -15286,9 +15106,8 @@ in sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.10" + sources."@types/node-14.14.25" sources."@types/responselike-1.0.0" - sources."ajv-6.12.6" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -15297,28 +15116,15 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" - sources."binary-extensions-2.1.0" - sources."binwrap-0.2.2" - sources."bluebird-3.7.2" + sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffers-0.1.1" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" - sources."caseless-0.12.0" - sources."chainsaw-0.1.0" sources."chalk-4.1.0" - sources."chokidar-3.4.3" - sources."chownr-1.1.4" + sources."chokidar-3.5.1" sources."cli-cursor-3.1.0" sources."cli-spinners-2.5.0" sources."clone-1.0.4" @@ -15329,54 +15135,30 @@ in }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."combined-stream-1.0.8" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" - (sources."cross-spawn-promise-0.10.2" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) - sources."dashdash-1.14.1" - sources."debug-4.3.1" + sources."debug-4.3.2" sources."decompress-response-5.0.0" sources."defaults-1.0.3" sources."defer-to-connect-2.0.0" - sources."delayed-stream-1.0.0" sources."duplexer3-0.1.4" - sources."ecc-jsbn-0.1.2" - sources."elm-json-0.2.8" + sources."elm-tooling-1.1.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."escape-string-regexp-1.0.5" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."folder-hash-3.3.3" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-9.0.1" - sources."fs-minipass-1.2.7" + sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."get-stream-5.2.0" - sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."got-10.7.0" - sources."graceful-fs-4.2.4" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + sources."graceful-fs-4.2.5" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.0" - sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" @@ -15385,24 +15167,12 @@ in sources."is-glob-4.0.1" sources."is-interactive-1.0.0" sources."is-number-7.0.0" - sources."is-typedarray-1.0.0" sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" sources."json-buffer-3.0.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."jsprim-1.4.1" + sources."jsonfile-6.1.0" sources."keyv-4.0.3" sources."kleur-3.0.3" sources."locate-path-5.0.0" - sources."lodash-4.17.20" (sources."log-symbols-3.0.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -15414,26 +15184,15 @@ in ]; }) sources."lowercase-keys-2.0.0" - sources."lru-cache-4.1.5" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) - sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."mustache-3.2.1" sources."mute-stream-0.0.8" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" - sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."onetime-5.1.2" (sources."ora-4.1.1" // { @@ -15451,57 +15210,31 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."performance-now-2.1.0" sources."picomatch-2.2.2" sources."prompts-2.4.0" - sources."pseudomap-1.0.2" - sources."psl-1.8.0" sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" sources."readdirp-3.5.0" - sources."request-2.88.2" - sources."request-promise-4.2.6" - sources."request-promise-core-1.1.4" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" - sources."sshpk-1.16.1" - sources."stealthy-require-1.1.1" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.1.0" - (sources."tar-4.4.13" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) sources."temp-0.9.4" sources."terminal-link-2.1.1" sources."to-readable-stream-2.1.0" sources."to-regex-range-5.0.1" - sources."tough-cookie-2.5.0" - sources."traverse-0.3.9" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" sources."type-fest-0.10.0" - sources."universalify-1.0.0" - sources."unzip-stream-0.3.1" - sources."uri-js-4.4.0" - sources."uuid-3.4.0" - sources."verror-1.10.0" + sources."universalify-2.0.0" sources."wcwidth-1.0.1" sources."which-2.0.2" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { diff --git a/nixpkgs/pkgs/development/compilers/fasm/bin.nix b/nixpkgs/pkgs/development/compilers/fasm/bin.nix index 8013b443162c..daadebf4c4dc 100644 --- a/nixpkgs/pkgs/development/compilers/fasm/bin.nix +++ b/nixpkgs/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.25"; + version = "1.73.27"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "0k3h61mfwslyb34kf4dnapfwl8jxlmrp4dv666wc057hkj047knn"; + sha256 = "sha256-aAFIN3+207ZmOFKID6oDUU1zJrWZV0LTOofiRPSM8LE="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/flutter/default.nix b/nixpkgs/pkgs/development/compilers/flutter/default.nix index 3eea7f596b6b..14f4d93caa03 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -1,40 +1,22 @@ -{ callPackage, dart }: +{ callPackage, fetchurl, dart }: let - dart_stable = dart.override { version = "2.10.0"; }; - dart_beta = dart.override { version = "2.10.0"; }; - dart_dev = dart.override { version = "2.11.0-161.0.dev"; }; mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; + version = "1.22.4"; + channel = "stable"; + filename = "flutter_linux_${version}-${channel}.tar.xz"; in { mkFlutter = mkFlutter; stable = mkFlutter rec { + inherit dart version; pname = "flutter"; - channel = "stable"; - version = "1.22.0"; - filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "0ryrx458ss8ryhmspcfrhjvad2pl46bxh1qk5vzwzhxiqdc79vm8"; - patches = getPatches ./patches/stable; - dart = dart_stable; - }; - beta = mkFlutter rec { - pname = "flutter"; - channel = "beta"; - version = "1.22.0-12.3.pre"; - filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "1axzz137z4lgpa09h7bjf52i6dij6a9wmjbha1182db23r09plzh"; - patches = getPatches ./patches/stable; - dart = dart_beta; - }; - dev = mkFlutter rec { - pname = "flutter"; - channel = "dev"; - version = "1.23.0-7.0.pre"; - filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "166qb4qbv051bc71yj7c0vrkamhvzz3fp3mz318qzm947mydwjj5"; - patches = getPatches ./patches/dev; - dart = dart_dev; + src = fetchurl { + url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; + sha256 = "0qalgav9drqddcj8lfvl9ddf3325n953pvkmgha47lslg9sa88zw"; + }; + patches = getPatches ./patches; }; } diff --git a/nixpkgs/pkgs/development/compilers/flutter/flutter.nix b/nixpkgs/pkgs/development/compilers/flutter/flutter.nix index a7ec87322507..4a7aa0d01463 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/flutter.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/flutter.nix @@ -1,10 +1,8 @@ -{ channel -, pname +{ pname , version -, sha256Hash , patches , dart -, filename ? "flutter_linux_${version}-${channel}.tar.xz" +, src }: { bash @@ -13,7 +11,8 @@ , coreutils , git , runCommand -, lib, stdenv +, stdenv +, lib , fetchurl , alsaLib , dbus @@ -26,25 +25,23 @@ , libXcursor , libXdamage , libXfixes +, libXrender +, libXtst +, libXi +, libXext , libGL , nspr , nss , systemd }: let - drvName = "flutter-${channel}-${version}"; + drvName = "flutter-${version}"; flutter = stdenv.mkDerivation { name = "${drvName}-unwrapped"; - src = fetchurl { - url = - "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; - sha256 = sha256Hash; - }; - buildInputs = [ git ]; - inherit patches; + inherit src patches; postPatch = '' patchShebangs --build ./bin/ @@ -52,25 +49,29 @@ let ''; buildPhase = '' - FLUTTER_ROOT=$(pwd) - FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" - SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" - STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" - SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" - DART_SDK_PATH="${dart}" + export FLUTTER_ROOT="$(pwd)" + export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" + export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" + + export SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" + export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" + + export DART_SDK_PATH="${dart}" HOME=../.. # required for pub upgrade --offline, ~/.pub-cache # path is relative otherwise it's replaced by /build/flutter - (cd "$FLUTTER_TOOLS_DIR" && ${dart}/bin/pub upgrade --offline) + pushd "$FLUTTER_TOOLS_DIR" + ${dart}/bin/pub get --offline + popd local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" echo "$revision" > "$STAMP_PATH" echo -n "${version}" > version - rm -rf bin/cache/{artifacts,dart-sdk,downloads} - rm -f bin/cache/*.stamp + rm -r bin/cache/{artifacts,dart-sdk,downloads} + rm bin/cache/*.stamp ''; installPhase = '' @@ -117,7 +118,11 @@ let libXcomposite libXcursor libXdamage + libXext libXfixes + libXi + libXrender + libXtst libGL nspr nss @@ -146,7 +151,7 @@ runCommand drvName homepage = "https://flutter.dev"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ babariviere ericdallo ]; + maintainers = with maintainers; [ babariviere ericdallo thiagokokada ]; }; } '' mkdir -p $out/bin diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch deleted file mode 100644 index f9ac00d1d323..000000000000 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 22efe87443..c6954575c5 100644 ---- a/bin/internal/shared.sh -+++ b/bin/internal/shared.sh -@@ -212,8 +212,6 @@ function shared::execute() { - # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" - # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" - -- upgrade_flutter 7< "$PROG_NAME" -- - BIN_NAME="$(basename "$PROG_NAME")" - case "$BIN_NAME" in - flutter*) -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index fb1616ba96..b973b3fd58 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -291,13 +291,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; - } - -- try { -- await globals.flutterVersion.ensureVersionFile(); -- } on FileSystemException catch (e) { -- globals.printError('Failed to write the version file to the artifact cache: "$e".'); -- globals.printError('Please ensure you have permissions in the artifact cache directory.'); -- throwToolExit('Failed to write the version file'); -- } - final bool machineFlag = topLevelResults['machine'] as bool; - if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) { - await globals.flutterVersion.checkFlutterVersionFreshness(); diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/dev/move-cache.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/dev/move-cache.patch deleted file mode 100644 index eb6ff5cf582e..000000000000 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/dev/move-cache.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index a059a8e992..b664a7070c 100644 ---- a/dev/devicelab/lib/framework/runner.dart -+++ b/dev/devicelab/lib/framework/runner.dart -@@ -137,7 +137,7 @@ Future<void> cleanupSystem() async { - print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); - final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; - final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); -- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); -+ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); - copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); - if (!Platform.isWindows) { - await exec( -diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index 36714c5fb4..c0cc049ee1 100644 ---- a/packages/flutter_tools/lib/src/asset.dart -+++ b/packages/flutter_tools/lib/src/asset.dart -@@ -6,6 +6,7 @@ import 'package:meta/meta.dart'; - import 'package:package_config/package_config.dart'; - import 'package:yaml/yaml.dart'; - -+import 'base/common.dart'; - import 'base/context.dart'; - import 'base/file_system.dart'; - import 'base/utils.dart'; -@@ -397,7 +398,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { - for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) { - final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); - result.add(_Asset( -- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), - relativeUri: Uri(path: entryUri.pathSegments.last), - entryUri: entryUri, - package: null, -diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index aaca036d78..43ff428f8d 100644 ---- a/packages/flutter_tools/lib/src/cache.dart -+++ b/packages/flutter_tools/lib/src/cache.dart -@@ -226,8 +226,15 @@ class Cache { - return; - } - assert(_lock == null); -+ -+ final Directory dir = globals.fs.directory(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); -+ if (!dir.existsSync()) { -+ dir.createSync(recursive: true); -+ globals.os.chmod(dir, '755'); -+ } -+ - final File lockFile = -- globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); -+ globals.fs.file(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile')); - try { - _lock = lockFile.openSync(mode: FileMode.write); - } on FileSystemException catch (e) { -@@ -330,7 +337,7 @@ class Cache { - if (_rootOverride != null) { - return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); - } else { -- return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache')); -+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); - } - } - diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch index 35ce5b367350..35ce5b367350 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch index dc77496edb31..dc77496edb31 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch diff --git a/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index cbc4e0e09e96..07b0921ec184 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/10/default.nix @@ -28,8 +28,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -245,7 +245,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index 69fdeefe87aa..6a2121a82981 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -271,7 +271,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index 4c0a144f14d1..709288559d1c 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -284,7 +284,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index 7d4cc2a3ea12..fa7881e398a8 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -36,8 +36,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -303,7 +303,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index 051307e4842c..2ea9033ba63a 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -26,8 +26,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -255,7 +255,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index 6a072267019d..6ecf462d54d9 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -26,8 +26,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -240,7 +240,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index ea5172184cc6..7f35f5c7bb99 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -29,8 +29,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -259,7 +259,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic langD libcCross threadsCross; + inherit lib stdenv crossStageStatic langD libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/nixpkgs/pkgs/development/compilers/gcc/builder.sh b/nixpkgs/pkgs/development/compilers/gcc/builder.sh index 7d104b96624e..e6d41d7b29ab 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/builder.sh +++ b/nixpkgs/pkgs/development/compilers/gcc/builder.sh @@ -147,9 +147,9 @@ if test "$noSysDirs" = "1"; then fi fi -if test -n "${targetConfig-}"; then - # The host strip will destroy some important details of the objects - dontStrip=1 +if [ -n "${targetConfig-}" ]; then + # if stripping gcc, include target directory too + stripDebugList="${stripDebugList-lib lib32 lib64 libexec bin sbin} $targetConfig" fi eval "$oldOpts" diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index 3f1866713e60..4bdec26fd993 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -39,8 +39,7 @@ assert langJava -> lib.versionOlder version "7"; let inherit (stdenv) - buildPlatform hostPlatform targetPlatform - lib; + buildPlatform hostPlatform targetPlatform; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix index 6ced56cedc05..ad4ab6bcb4bd 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -1,7 +1,7 @@ -{ stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: +{ lib, stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: let - inherit (stdenv) lib hostPlatform targetPlatform; + inherit (stdenv) hostPlatform targetPlatform; in { diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix index 66af8c4a4cc7..bd5a72f96036 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix @@ -11,6 +11,6 @@ in lib.concatLists [ (lib.optional (p ? float) "--with-float=${p.float}") (lib.optional (p ? mode) "--with-mode=${p.mode}") (lib.optional - (let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit && tp.isLittleEndian) + (let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit) "--with-long-double-128") ] diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix index 661dd5cb0026..83604630545e 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix @@ -116,6 +116,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix index 6e194b68faa2..a42dfce6468a 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix @@ -107,8 +107,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + + # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 ./issue-18549.patch ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix index 582817cca070..fe160259f2b3 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix @@ -107,7 +107,15 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - patches = lib.optionals stdenv.isDarwin [ + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix new file mode 100644 index 000000000000..075e9bf9d548 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix @@ -0,0 +1,264 @@ +{ lib, stdenv, pkgsBuildTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, bash + +, libiconv ? null, ncurses + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !stdenv.targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + +in +stdenv.mkDerivation (rec { + version = "8.10.4"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "03li4k10hxgyxcdyyz2092wx09spr1599hi0sxbh4m889qdqgbsj"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ] ++ lib.optionals stdenv.isDarwin [ + # Make Block.h compile with c++ compilers. Remove with the next release + (fetchpatch { + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; + sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; + }) + ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix index 219ace5a9164..8237f27241e7 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix @@ -110,6 +110,14 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + (fetchpatch { # https://phabricator.haskell.org/D5123 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/13ff0b7ced097286e0d7b054f050871effe07f86.diff"; name = "D5123.diff"; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix index 94553e56a811..144e46459759 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix @@ -111,6 +111,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix index ca4dc35ccdc4..9e99207d9aaa 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix @@ -116,6 +116,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index ab5f2c12e230..9bef190ad1c3 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -116,6 +116,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix index 39abe9c760e3..83f3534d3e4a 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix @@ -96,12 +96,12 @@ let in stdenv.mkDerivation (rec { - version = "9.0.0.20201227"; + version = "9.0.1"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/ghc/9.0.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "1kg227fzg9qq2p7r8xqr99vvnx7ind4clxkydikyzf3vqvaacjfy"; + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "1y9mi9bq76z04hmggavrn8jwi1gx92bm3zhx6z69ypq6wha068x5"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/compilers/ghc/respect-ar-path.patch b/nixpkgs/pkgs/development/compilers/ghc/respect-ar-path.patch new file mode 100644 index 000000000000..a08a802c18a0 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghc/respect-ar-path.patch @@ -0,0 +1,25 @@ +diff -urd a/aclocal.m4 b/aclocal.m4 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1199,7 +1199,8 @@ + # thinks that target == host so it never checks the unqualified + # tools for Windows. See #14274. + AC_DEFUN([FP_PROG_AR], +-[if test -z "$fp_prog_ar"; then ++[AC_SUBST(fp_prog_ar,$AR) ++if test -z "$fp_prog_ar"; then + if test "$HostOS" = "mingw32" + then + AC_PATH_PROG([fp_prog_ar], [ar]) +diff -urd a/configure b/configure +--- a/configure ++++ b/configure +@@ -10744,6 +10744,8 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + ++fp_prog_ar=$AR ++ + if test -z "$fp_prog_ar"; then + if test "$HostOS" = "mingw32" + then diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix index 88630f996a94..e8c4a027520d 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix @@ -10,7 +10,7 @@ , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl , network, optparse-applicative, parallel, parsec, process, random - , regex-posix, safe, shelly, split, stdenv, stringsearch, syb + , regex-posix, safe, shelly, split, lib, stringsearch, syb , system-fileio, system-filepath, tar, template-haskell , template-haskell-ghcjs, terminfo, test-framework , test-framework-hunit, text, time, transformers @@ -61,7 +61,7 @@ ghc-api-ghcjs = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap - , ghci-ghcjs, happy, hpc, process, stdenv, template-haskell-ghcjs + , ghci-ghcjs, happy, hpc, process, lib, template-haskell-ghcjs , terminfo, time, transformers, unix }: mkDerivation { @@ -81,7 +81,7 @@ ghci-ghcjs = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, stdenv + , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, lib , template-haskell-ghcjs, transformers, unix }: mkDerivation { @@ -98,7 +98,7 @@ ghcjs-th = callPackage ({ mkDerivation, base, binary, bytestring, containers, ghc-prim - , ghci-ghcjs, stdenv, template-haskell-ghcjs + , ghci-ghcjs, lib, template-haskell-ghcjs }: mkDerivation { pname = "ghcjs-th"; @@ -115,7 +115,7 @@ haddock-api-ghcjs = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths - , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv + , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, lib , transformers, xhtml }: mkDerivation { @@ -142,7 +142,7 @@ haddock-library-ghcjs = callPackage ({ mkDerivation, base, base-compat, bytestring, containers, deepseq , directory, filepath, haddock-library, hspec, hspec-discover - , optparse-applicative, parsec, QuickCheck, stdenv, text + , optparse-applicative, parsec, QuickCheck, lib, text , transformers, tree-diff }: mkDerivation { @@ -164,7 +164,7 @@ }) {}; template-haskell-ghcjs = callPackage - ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }: + ({ mkDerivation, base, ghc-boot-th, pretty, lib }: mkDerivation { pname = "template-haskell-ghcjs"; version = "2.14.0.0"; diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix index 82c37bd86177..4fff32759d38 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix @@ -1,9 +1,10 @@ { mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, deepseq, directory, dlist, fetchgit, ghc-prim , ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck -, quickcheck-unicode, random, scientific, stdenv, test-framework +, quickcheck-unicode, random, scientific, test-framework , test-framework-hunit, test-framework-quickcheck2, text, time , transformers, unordered-containers, vector +, lib }: mkDerivation { pname = "ghcjs-base"; diff --git a/nixpkgs/pkgs/development/compilers/ghdl/default.nix b/nixpkgs/pkgs/development/compilers/ghdl/default.nix index 6181486f50c7..e73324394394 100644 --- a/nixpkgs/pkgs/development/compilers/ghdl/default.nix +++ b/nixpkgs/pkgs/development/compilers/ghdl/default.nix @@ -5,24 +5,22 @@ assert backend == "mcode" || backend == "llvm"; stdenv.mkDerivation rec { pname = "ghdl-${backend}"; - # NOTE(aseipp): move to 0.38 when it comes out, since it should support a stable - # version of the yosys plugin - version = "unstable-2021.01.14"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ghdl"; repo = "ghdl"; - rev = "4868294436574660552ccef50a5b0849559393de"; - sha256 = "1wqjf0qc66dam1n2mskmlvj53bcsdwwk5rq9gimq6ah1vcwi222p"; + rev = "v${version}"; + sha256 = "1gyh0xckwbzgslbpw9yrpj4gqs9fm1a2qpbzl0sh143fk1kwjlly"; }; LIBRARY_PATH = "${stdenv.cc.libc}/lib"; - buildInputs = [ gnat zlib ]; + buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ]; preConfigure = '' # If llvm 7.0 works, 7.x releases should work too. - sed -i 's/check_version 7.0/check_version 7/g' configure + sed -i 's/check_version 7.0/check_version 7/g' configure ''; configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm") diff --git a/nixpkgs/pkgs/development/compilers/gleam/default.nix b/nixpkgs/pkgs/development/compilers/gleam/default.nix index b9c7e7e1e3d2..78a335f1b7be 100644 --- a/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec { description = "A statically typed language for the Erlang VM"; homepage = "https://gleam.run/"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = teams.beam.members; }; } diff --git a/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix b/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix index e208f262ebeb..44c966fa974b 100644 --- a/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix +++ b/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix @@ -1,16 +1,13 @@ { lib, stdenv, fetchurl, gcc, makeWrapper , db, gmp, ncurses }: -let - version = "2.2"; -in stdenv.mkDerivation rec { pname = "gnu-cobol"; - inherit version; + version = "3.1.2"; src = fetchurl { - url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version}/gnucobol-${version}.tar.gz"; - sha256 = "1jrjmdx0swssjh388pp08awhiisbrs2i7gx4lcm4p1k5rpg3hn4j"; + url = "mirror://sourceforge/gnucobol/${lib.versions.majorMinor version}/gnucobol-${version}.tar.xz"; + sha256 = "0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r"; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,9 +28,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open-source COBOL compiler"; - homepage = "https://sourceforge.net/projects/open-cobol/"; - license = licenses.gpl3; + homepage = "https://sourceforge.net/projects/gnucobol/"; + license = with licenses; [ gpl3Only lgpl3Only ]; maintainers = with maintainers; [ ericsagnes ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/compilers/go/1.14.nix b/nixpkgs/pkgs/development/compilers/go/1.14.nix index 0811e4bc7013..174c299b15b7 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.14.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.14.nix @@ -143,6 +143,7 @@ stdenv.mkDerivation rec { ./go-1.9-skip-flaky-20072.patch ./skip-external-network-tests.patch ./skip-nohup-tests.patch + ./go_no_vendor_checks-1_14.patch # fix rare TestDontCacheBrokenHTTP2Conn failure (fetchpatch { diff --git a/nixpkgs/pkgs/development/compilers/go/1.15.nix b/nixpkgs/pkgs/development/compilers/go/1.15.nix index 61ab1b020329..c3aef549e680 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.15.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.15.nix @@ -152,6 +152,7 @@ stdenv.mkDerivation rec { ./skip-external-network-tests-1.15.patch ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch + ./go_no_vendor_checks.patch ] ++ [ # breaks under load: https://github.com/golang/go/issues/25628 (if stdenv.isAarch32 diff --git a/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch b/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch new file mode 100644 index 000000000000..53e4ba78ff18 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go +index 71f68efbcc..3c566d04dd 100644 +--- a/src/cmd/go/internal/modload/init.go ++++ b/src/cmd/go/internal/modload/init.go +@@ -133,7 +133,7 @@ func checkVendorConsistency() { + readVendorList() + + pre114 := false +- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { ++ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks.patch b/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks.patch new file mode 100644 index 000000000000..45ff4360f0dd --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go +index 71f68efbcc..3c566d04dd 100644 +--- a/src/cmd/go/internal/modload/vendor.go ++++ b/src/cmd/go/internal/modload/vendor.go +@@ -133,7 +133,7 @@ func checkVendorConsistency() { + readVendorList() + + pre114 := false +- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { ++ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix b/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix index 76245a440817..f3a03b364743 100644 --- a/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix +++ b/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix @@ -1,48 +1,60 @@ -{ lib, stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }: +{ lib, stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath, Foundation, openssl }: let + platform = if stdenv.isDarwin then "darwin-amd64" else "linux-amd64"; common = javaVersion: let + javaVersionPlatform = "${javaVersion}-${platform}"; graalvmXXX-ce = stdenv.mkDerivation rec { pname = "graalvm${javaVersion}-ce"; - version = "20.2.0"; + version = "20.3.0"; srcs = [ (fetchurl { - sha256 = { "8" = "1s64zkkrns1ykh6dwpjrqy0hs9m1bb08cf7ss7msx33h9ivir5b0"; - "11" = "0aaf0sjsnlckhgsh3j4lph0shahw6slf4yndqcm2swc8i1dlpdsx"; - }.${javaVersion}; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersion}-linux-amd64-${version}.tar.gz"; + sha256 = { "8-linux-amd64" = "195b20ivvv8ipjn3qq2313j8qf96ji93pqm99nvn20bq23wasp25"; + "11-linux-amd64" = "1mdk1zhazvvh1fa01bzi5v5fxhvx592xmbakx0y1137vykbayyjm"; + "8-darwin-amd64" = "1rrs471204p71knyxpjxymdi8ws98ph2kf5j0knk529g0d24rs01"; + "11-darwin-amd64" = "008dl8dbf37mv4wahb9hbd6jp8svvmpy1rgsiqkn3i4hypxnkf12"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersionPlatform}-${version}.tar.gz"; }) (fetchurl { - sha256 = { "8" = "1cisyyzab4pdvzavnivhy9w6dwn36ybaxw40w767m142fbi06m3b"; - "11" = "0p4j6mxajmb0xl41c79154pk4vb8bffgg1nmwislahqjky9jkd4j"; - }.${javaVersion}; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8-linux-amd64" = "1rzbhllz28x5ps8n304v998hykr4m8z1gfg53ybi6laxhkbx3i13"; + "11-linux-amd64" = "09ipdl1489xnbckwl6sl9y7zy7kp5qf5fgf3kgz5d69jrk2z6rvf"; + "8-darwin-amd64" = "1iy2943jbrarh8bm9wy15xk7prnskqwik2ham07a6ybp4j4b81xi"; + "11-darwin-amd64" = "0vk2grlirghzc78kvwg66w0xriy5p8qkcp7qx83i62d7sj0kvwnf"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8" = "0rwwvk1mkfnl0b50xg7kh6015kjmsw2ra0ckrzmabl88z4bnzh2y"; - "11" = "0lc9as2a00j74lp7jby4p10vn5bbkiydzvzk28zfcbsp28p4wvwn"; - }.${javaVersion}; - url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8-linux-amd64" = "0v98v44vblhyi3jhrngmvrkb3a6d607x4fpmrb4mrrsg75vbvc6d"; + "11-linux-amd64" = "0kb9472ilwqg40gyw1c4lmzkd9s763raw560sw80ljm3p75k4sc7"; + "8-darwin-amd64" = "192n9ckr4p8qirpxr67ji3wzxpng33yfr7kxynlrcp7b3ghfic6p"; + "11-darwin-amd64" = "1wqdk8wphywa00kl3xikiskclb84rx3nw5a4vi5y2n060kclcp22"; + }.${javaVersionPlatform}; + url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8" = "0mj8p72qgvvrwpsbk0bsqldynlz1wq07icf951wq5xdbr0whj1gz"; - "11" = "1lkszqn4islsza011iabayv6riym0dwnkv83pkmk06b230qjfhzb"; - }.${javaVersion}; - url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8-linux-amd64" = "1iskmkhrrwlhcq92g1ljvsfi9q403xxkwgzn9m282z5llh2fxv74"; + "11-linux-amd64" = "13bg2gs22rzbngnbw8j68jqgcknbiw30kpxac5jjcn55rf2ymvkz"; + "8-darwin-amd64" = "08pib13q7s5wymnbykkyif66ll146vznxw4yz12qwhb419882jc7"; + "11-darwin-amd64" = "0cb9lhc21yr2dnrm4kwa68laaczvsdnzpcbl2qix50d0v84xl602"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8" = "1br7camk7y8ych43ws57096100f9kzjvqznh2flmws78ipcrrb66"; - "11" = "10swxspjvzh0j82lbpy38dckk69lw1pawqkhnj1hxd05ls36fwq5"; - }.${javaVersion}; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8-linux-amd64" = "12lvcl1vmc35wh3xw5dqca7yiijsd432x4lim3knzppipy7fmflq"; + "11-linux-amd64" = "1s8zfgjyyw6w53974h9a2ig8a1bvc97aplyrdziywfrijgp6zkqk"; + "8-darwin-amd64" = "06i1n42hkhcf1pfb2bly22ws4a09xgydsgh8b0kvjmb1fapd4paq"; + "11-darwin-amd64" = "1r2bqhfxnw09izxlsc562znlp3m9c1isqzhlki083h3vp548vv9s"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) ]; nativeBuildInputs = [ unzip perl ]; unpackPhase = '' unpack_jar() { jar=$1 - unzip -o $jar -d $out + unzip -q -o $jar -d $out perl -ne 'use File::Path qw(make_path); use File::Basename qw(dirname); if (/^(.+) = (.+)$/) { @@ -60,7 +72,27 @@ let mkdir -p $out arr=($srcs) - tar xf ''${arr[0]} -C $out --strip-components=1 + + # The tarball on Linux has the following directory structure: + # + # graalvm-ce-java11-20.3.0/* + # + # while on Darwin it looks like this: + # + # graalvm-ce-java11-20.3.0/Contents/Home/* + # + # We therefor use --strip-components=1 vs 3 depending on the platform. + tar xf ''${arr[0]} -C $out --strip-components=${if stdenv.isLinux then "1" else "3"} + + # Sanity check + if [ ! -d $out/bin ]; then + echo "The `bin` is directory missing after extracting the graalvm" + echo "tarball, please compare the directory structure of the" + echo "tarball with what happens in the unpackPhase (in particular" + echo "with regards to the `--strip-components` flag)." + exit 1 + fi + unpack_jar ''${arr[1]} unpack_jar ''${arr[2]} unpack_jar ''${arr[3]} @@ -68,7 +100,7 @@ let ''; installPhase = { - "8" = '' + "8-linux-amd64" = '' # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html substituteInPlace $out/jre/lib/security/java.security \ --replace file:/dev/random file:/dev/./urandom \ @@ -76,13 +108,13 @@ let # provide libraries needed for static compilation for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do - ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f) + ln -s $f $out/jre/lib/svm/clibraries/${platform}/$(basename $f) done # allow using external truffle-api.jar and languages not included in the distrubution rm $out/jre/lib/jvmci/parentClassLoader.classpath ''; - "11" = '' + "11-linux-amd64" = '' # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html substituteInPlace $out/conf/security/java.security \ --replace file:/dev/random file:/dev/./urandom \ @@ -90,10 +122,17 @@ let # provide libraries needed for static compilation for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do - ln -s $f $out/lib/svm/clibraries/linux-amd64/$(basename $f) + ln -s $f $out/lib/svm/clibraries/${platform}/$(basename $f) done - ''; - }.${javaVersion}; + ''; + "8-darwin-amd64" = '' + # allow using external truffle-api.jar and languages not included in the distrubution + rm $out/jre/lib/jvmci/parentClassLoader.classpath + ''; + "11-darwin-amd64" = '' + echo "" + ''; + }.${javaVersionPlatform}; dontStrip = true; @@ -116,15 +155,22 @@ let zlib # libz.so.1 ]}" + ${lib.optionalString stdenv.isLinux '' for f in $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true patchelf --set-rpath "$rpath" "$f" || true - if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi done + ''} ''; - propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables + # $out/bin/native-image needs zlib to build native executables. + propagatedBuildInputs = [ setJavaClassPath zlib ] ++ + # On Darwin native-image calls clang and it + # tries to include <Foundation/Foundation.h>, + # and Interactive Ruby (irb) requires OpenSSL + # headers. + lib.optionals stdenv.hostPlatform.isDarwin [ Foundation openssl ]; doInstallCheck = true; installCheckPhase = '' @@ -141,13 +187,33 @@ let $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' # Ahead-Of-Time compilation - $out/bin/native-image --no-server HelloWorld + $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld ./helloworld | fgrep 'Hello World' - # Ahead-Of-Time compilation with --static - $out/bin/native-image --no-server --static HelloWorld - ./helloworld | fgrep 'Hello World' - ''; + ${lib.optionalString stdenv.isLinux '' + # Ahead-Of-Time compilation with --static + # --static flag doesn't work for darwin + $out/bin/native-image --no-server --static HelloWorld + ./helloworld | fgrep 'Hello World' + ''} + + echo "Testing interpreted languages" + $out/bin/graalpython -c 'print(1 + 1)' + $out/bin/ruby -e 'puts(1 + 1)' + $out/bin/node -e 'console.log(1 + 1)' + + echo '1 + 1' | $out/bin/graalpython + + # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL + # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even + # though `openssl` is in `propagatedBuildInputs`. For more details see: + # https://github.com/NixOS/nixpkgs/pull/105815 + # echo '1 + 1' | $out/bin/irb + + echo '1 + 1' | $out/bin/node -i + ${lib.optionalString (javaVersion == "11") '' + echo '1 + 1' | $out/bin/jshell + ''}''; passthru.home = graalvmXXX-ce; @@ -156,7 +222,7 @@ let description = "High-Performance Polyglot VM"; license = with licenses; [ upl gpl2Classpath bsd3 ]; maintainers = with maintainers; [ bandresen volth hlolli glittershark ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }; in diff --git a/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix b/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix index c9c5206f6da3..eb3045d52ad6 100644 --- a/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: +{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, setJavaClassPath }: let common = javaVersion: diff --git a/nixpkgs/pkgs/development/compilers/halide/default.nix b/nixpkgs/pkgs/development/compilers/halide/default.nix index 1ff821edf800..69b7cd4d8682 100644 --- a/nixpkgs/pkgs/development/compilers/halide/default.nix +++ b/nixpkgs/pkgs/development/compilers/halide/default.nix @@ -49,7 +49,7 @@ llvmPackages.stdenv.mkDerivation rec { description = "C++ based language for image processing and computational photography"; homepage = "https://halide-lang.org"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + platforms = platforms.all; maintainers = [ maintainers.ck3d ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix b/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix index cabdbd9dcc01..688ca15177a8 100644 --- a/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, git, clang, +{ lib, git, clang, fetchFromGitHub, requireFile, openssl, xz, gnutar, automake, autoconf, libtool, clangStdenv } : diff --git a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index 2edf93b7fc02..3b5465ac9c3e 100644 --- a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, openjdk11, fetchFromGitHub, jetbrains }: +{ lib, openjdk11, fetchFromGitHub, jetbrains }: openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; diff --git a/nixpkgs/pkgs/development/compilers/ldc/binary.nix b/nixpkgs/pkgs/development/compilers/ldc/binary.nix index cbdb56efb17f..3a07009296a8 100644 --- a/nixpkgs/pkgs/development/compilers/ldc/binary.nix +++ b/nixpkgs/pkgs/development/compilers/ldc/binary.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 +{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 , version, hashes }: -with stdenv; + let - OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + inherit (stdenv) hostPlatform; + OS = if stdenv.hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; ARCH = toString hostPlatform.parsed.cpu.name; -in mkDerivation { +in stdenv.mkDerivation { pname = "ldc-bootstrap"; inherit version; diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix index 789d4c055eb0..6ab0f894ca9c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix @@ -56,6 +56,11 @@ stdenv.mkDerivation rec { echo "$VCSVersion" > lib/Basic/VCSVersion.inc ''; + passthru = { + isClang = true; + inherit llvm; + }; + meta = with lib; { description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend"; homepage = "https://llvm.org/"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix index 94b6ee71032a..54a7733f4bae 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-nIvqEk18NLtY8Hec2Iq6ufWMblzYJ8SOIXgqomtqa0s="; + hash = "sha256-5mQ8tN7A045JCF7tHKgAZAbyVmXOd6Wf0CVUiPA80YM="; }; in rec { clang = wrapCCWith rec { diff --git a/nixpkgs/pkgs/development/compilers/lobster/default.nix b/nixpkgs/pkgs/development/compilers/lobster/default.nix index b65d640b4751..59e853f4c7e9 100644 --- a/nixpkgs/pkgs/development/compilers/lobster/default.nix +++ b/nixpkgs/pkgs/development/compilers/lobster/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lobster"; - version = "unstable-2020-10-04"; + version = "unstable-2020-12-25"; src = fetchFromGitHub { owner = "aardappel"; repo = pname; - rev = "4c5e78f021ce9d06592fb3a66388e5e31fac1adb"; - sha256 = "1wnbc8kr1dyfs53nlcxah22ghphmazzrlcj9z47cgkdsj1qfy84x"; + rev = "70e44d475995b03363dedf9c2bcb817b0db8fdcf"; + sha256 = "0azhminzrkbpvkapass1kccd6123bg7qmcbnzr5774n6bz5365g3"; }; nativeBuildInputs = [ cmake ]; @@ -48,7 +48,9 @@ stdenv.mkDerivation rec { passthru = { tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + url = "https://github.com/aardappel/lobster"; + }; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix index 34d8f98970e0..454156c2d280 100644 --- a/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix +++ b/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix @@ -1,4 +1,6 @@ -{lib, stdenv, fetchurl}: stdenv.mkDerivation { +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation { name = "meta-build-env-0.1"; src = fetchurl { url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz"; diff --git a/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/nixpkgs/pkgs/development/compilers/mlkit/default.nix index 5fc134f5ab26..1769b31b5a5c 100644 --- a/nixpkgs/pkgs/development/compilers/mlkit/default.nix +++ b/nixpkgs/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.5.6"; + version = "4.5.7"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-aa6dRcGTXGakJsHCvHXRKs5BHtIZi6V2r8348epzpVc="; + sha256 = "sha256-Wq+Os7nzRA5Pxz6Ba7DudcDQs3KA0eYVLy1nO/A16EE="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index ebb6db31d5d1..efb299854525 100644 --- a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , boost, python3, eigen , icestorm, trellis , llvmPackages @@ -12,7 +12,7 @@ let boostPython = boost.override { python = python3; enablePython = true; }; in -with stdenv; mkDerivation rec { +stdenv.mkDerivation rec { pname = "nextpnr"; version = "2021.01.02"; diff --git a/nixpkgs/pkgs/development/compilers/open-watcom-bin/default.nix b/nixpkgs/pkgs/development/compilers/open-watcom-bin/default.nix index a9c6b221065c..9a1066dd3c25 100644 --- a/nixpkgs/pkgs/development/compilers/open-watcom-bin/default.nix +++ b/nixpkgs/pkgs/development/compilers/open-watcom-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: +{ lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: let @@ -112,7 +112,7 @@ stdenvNoCC.mkDerivation rec { done ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A C/C++ Compiler (binary distribution)"; homepage = "http://www.openwatcom.org/"; license = licenses.watcom; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/12.nix b/nixpkgs/pkgs/development/compilers/openjdk/12.nix index 0b3a4db6c48f..f1c6d8493eb7 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/12.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/12.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk11 +, libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , setJavaClassPath , headless ? false , enableJavaFX ? openjfx.meta.available, openjfx @@ -44,6 +44,11 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) + # Fix gnumake 4.3 incompatibility + (fetchpatch { + url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch"; + sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h"; + }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/13.nix b/nixpkgs/pkgs/development/compilers/openjdk/13.nix index 7c6fe633c49d..05e367e63146 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/13.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/13.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap +, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath , headless ? false , enableJavaFX ? openjfx.meta.available, openjfx @@ -44,6 +44,11 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) + # Fix gnumake 4.3 incompatibility + (fetchpatch { + url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch"; + sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h"; + }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk13.patch ]; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix index 21801b8ba3a7..f9059ae2fc43 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -65,9 +65,7 @@ let # Downloaded AWT jars differ by platform. outputHash = { x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw"; - # The build-time dependencies don't currently build for i686, so no - # reason to fetch this one correctly either... - i686-linux = "0000000000000000000000000000000000000000000000000000"; + i686-linux = "0hx69p2z96p7jbyq4r20jykkb8gx6r8q2cj7m30pldlsw3650bqx"; }.${stdenv.system} or (throw "Unsupported platform"); }; diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index c44d7fc116fe..7a6cdf4d7052 100644 --- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -18,7 +18,6 @@ , config , glib , libxml2 -, libav_0_8 , ffmpeg_3 , libxslt , libGL @@ -171,8 +170,8 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ - (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); + [stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ + lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc]; rpath = lib.strings.makeLibraryPath libraries; diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk11-linux.nix index 7e0e5cae7ca5..eafe23c8e76d 100644 --- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk11-linux.nix +++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk11-linux.nix @@ -9,12 +9,12 @@ let result = stdenv.mkDerivation rec { pname = "oraclejdk"; - version = "11.0.8"; + version = "11.0.10"; src = requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html"; - sha256 = "6390878c91e29bad7b2483eb0b470620bd145269600f3b6a9d65724e6f83b6fd"; + sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 01d1ee8e980c..206df75b9ebf 100644 --- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,10 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "271"; - sha256.i686-linux = "nC1bRTDj0BPWqClLCfNIqdUn9HywUF8Z/pIV9Kq3LG0="; - sha256.x86_64-linux = "66eSamg7tlxvThxQLOYkNGxCsA+1Ux3ropbyVgtFLHg="; - sha256.armv7l-linux = "YZKX0iUf7yqUBUhlpHtVdYw6DBEu7E/pbfcVfK7HMxM="; - sha256.aarch64-linux = "bFRGnfmYIdXz5b/I8wlA/YiGXhCm/cVoOAU+Hlu4F0I="; + patchVersion = "281"; + sha256.i686-linux = "/yEY5O6MYNyjS5YSGZtgydb8th6jHQLNvI9tNPIh3+0="; + sha256.x86_64-linux = "hejH2nJIx0UPsQVWeniEHQlzWXhQd2wkpSf+sC7z5YY="; + sha256.armv7l-linux = "oXbW8hZxesDqwV79ANB4SdnS71O51ZApKbQhqq4i/EM="; + sha256.aarch64-linux = "oFH3TeIzVsFk6IZcDEHVDVJC7dSbGcwhdUH/WUXSNDM="; jceName = "jce_policy-8.zip"; sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; } diff --git a/nixpkgs/pkgs/development/compilers/osl/default.nix b/nixpkgs/pkgs/development/compilers/osl/default.nix index d3de5cad2f69..100676448131 100644 --- a/nixpkgs/pkgs/development/compilers/osl/default.nix +++ b/nixpkgs/pkgs/development/compilers/osl/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, lib, stdenv, fetchFromGitHub, cmake, zlib, openexr, +{ clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr, openimageio, llvm, boost165, flex, bison, partio, pugixml, util-linux, python }: diff --git a/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix b/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix index 1d8ba03e72fc..d8d141a5e567 100644 --- a/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix +++ b/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix @@ -1,22 +1,19 @@ -{ lib, stdenv, fetchFromGitLab, coreutils, which }: +{ lib, stdenv, fetchFromGitLab, which }: stdenv.mkDerivation rec { pname = "owl-lisp"; - version = "0.1.23"; + version = "0.2"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "1indcbicqcdlk9sinkdyhk50fi1b4cb7yrr14vr874gjzmwr2l3i"; + sha256 = "sha256-G12yZxlq6Hss5j4Seq1hcPQWXMIeL2Z8VkBdmIGESX8="; }; nativeBuildInputs = [ which ]; - prePatch = '' - substituteInPlace Makefile \ - --replace /usr $out - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; # tests are run as part of the compilation process doCheck = false; @@ -26,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/owl-lisp/owl"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix b/nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix index 660a4f2de40b..c461d2caa93c 100644 --- a/nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix +++ b/nixpkgs/pkgs/development/compilers/pakcs/curry-base.nix @@ -1,5 +1,5 @@ { mkDerivation, base, Cabal, containers, directory, extra, filepath -, mtl, parsec, pretty, lib, stdenv, time, transformers +, mtl, parsec, pretty, lib, time, transformers }: mkDerivation { pname = "curry-base"; diff --git a/nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix b/nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix index 8fd1645ee704..88e88487594b 100644 --- a/nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix +++ b/nixpkgs/pkgs/development/compilers/pakcs/curry-frontend.nix @@ -1,6 +1,6 @@ { mkDerivation, base, bytestring, Cabal, containers, curry-base , directory, extra, file-embed, filepath, mtl, network-uri, pretty -, process, set-extra, lib, stdenv, template-haskell, transformers +, process, set-extra, lib, template-haskell, transformers }: mkDerivation { pname = "curry-frontend"; diff --git a/nixpkgs/pkgs/development/compilers/qbe/default.nix b/nixpkgs/pkgs/development/compilers/qbe/default.nix index 9ebcb2242ddb..b4bc2a35a55d 100644 --- a/nixpkgs/pkgs/development/compilers/qbe/default.nix +++ b/nixpkgs/pkgs/development/compilers/qbe/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "unstable-2019-07-11"; + version = "unstable-2020-10-05"; src = fetchgit { url = "git://c9x.me/qbe.git"; - rev = "7bf08ff50729037c8820b26d085905175b5593c8"; - sha256 = "0w1yack5ky6x6lbw8vn6swsy8s90n6ny0jpkw0866ja677z7qz34"; + rev = "496c069405cd79aed968f59dd5a5f92d1f96809f"; + sha256 = "1vpszl77j9mnw8r0p9l23k8nxbnz31lgii7v3mai130nbpjsjsdf"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/development/compilers/scala/2.x.nix b/nixpkgs/pkgs/development/compilers/scala/2.x.nix index a747206dff8d..d3fa31ddd94b 100644 --- a/nixpkgs/pkgs/development/compilers/scala/2.x.nix +++ b/nixpkgs/pkgs/development/compilers/scala/2.x.nix @@ -10,28 +10,24 @@ let "2.10" = { version = "2.10.7"; sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE="; - tests = [ nixosTests.scala.scala_2_10 ]; pname = "scala_2_10"; }; "2.11" = { version = "2.11.12"; sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg="; - tests = [ nixosTests.scala.scala_2_11 ]; pname = "scala_2_11"; }; "2.12" = { version = "2.12.13"; sha256 = "17548sx7liskkadqiqaajmwp2w7bh9m2d8hp2mwyg8yslmjx4pcc"; - tests = [ nixosTests.scala.scala_2_12 ]; pname = "scala_2_12"; }; "2.13" = { version = "2.13.4"; sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw"; - tests = [ nixosTests.scala.scala_2_13 ]; pname = "scala_2_13"; }; }; @@ -69,8 +65,14 @@ stdenv.mkDerivation rec { done ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/scalac -version 2>&1 | grep '^Scala compiler version ${version}' + + echo 'println("foo"*3)' | $out/bin/scala 2>/dev/null | grep "foofoofoo" + ''; + passthru = { - inherit tests; updateScript = writeScript "update.sh" '' #!${stdenv.shell} set -o errexit diff --git a/nixpkgs/pkgs/development/compilers/swift/default.nix b/nixpkgs/pkgs/development/compilers/swift/default.nix index 26e9f2b87e1a..530115602673 100644 --- a/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -331,6 +331,9 @@ stdenv.mkDerivation { # Swift doesn't support 32bit Linux, unknown on other platforms. platforms = platforms.linux; badPlatforms = platforms.i686; - broken = stdenv.isAarch64; # 2018-09-04, never built on Hydra + broken = true; # 2021-01-29 + knownVulnerabilities = [ + "CVE-2020-9861" + ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/vyper/default.nix b/nixpkgs/pkgs/development/compilers/vyper/default.nix index 79702c01bee3..81ee04edf088 100644 --- a/nixpkgs/pkgs/development/compilers/vyper/default.nix +++ b/nixpkgs/pkgs/development/compilers/vyper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, writeText, asttokens +{ lib, buildPythonPackage, fetchPypi, writeText, asttokens , pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx , sphinx_rtd_theme, pytestrunner }: diff --git a/nixpkgs/pkgs/development/compilers/yosys/default.nix b/nixpkgs/pkgs/development/compilers/yosys/default.nix index 7d2191f8f456..9ac7603ea200 100644 --- a/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -103,5 +103,12 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ shell thoughtpolice emily ]; + #In file included from kernel/driver.cc:20: + #./kernel/yosys.h:42:10: fatal error: 'map' file not found + ##include <map> + + #https://github.com/YosysHQ/yosys/issues/681 + #https://github.com/YosysHQ/yosys/issues/2011 + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix b/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix index ccf8efc7c805..35f3ef2bcc88 100644 --- a/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix +++ b/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "yosys-ghdl"; - version = "2021.01.01"; + version = "2021.01.25"; src = fetchFromGitHub { owner = "ghdl"; repo = "ghdl-yosys-plugin"; - rev = "8b3e740fef9a653a20a838f1ade475960e1d379b"; - sha256 = "13kpcp37r11xgqd8aksddi40a5vpzqi7p8qgyjbs99lyscyli75x"; + rev = "cba859cacf8c6631146dbdaa0f297c060b5a68cd"; + sha256 = "01d9wb7sqkmkf2y9bnn3pmhy08khzs5m1d06whxsiwgwnjzfk9mx"; }; buildInputs = [ yosys readline zlib ghdl ]; diff --git a/nixpkgs/pkgs/development/compilers/zulu/8.nix b/nixpkgs/pkgs/development/compilers/zulu/8.nix index e81cc4124287..2bc90539be1e 100644 --- a/nixpkgs/pkgs/development/compilers/zulu/8.nix +++ b/nixpkgs/pkgs/development/compilers/zulu/8.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib +, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib , fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL + stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/nixpkgs/pkgs/development/compilers/zulu/default.nix b/nixpkgs/pkgs/development/compilers/zulu/default.nix index 63b95465c273..cbfa9997b8db 100644 --- a/nixpkgs/pkgs/development/compilers/zulu/default.nix +++ b/nixpkgs/pkgs/development/compilers/zulu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib +, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib , fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL + stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/nixpkgs/pkgs/development/compilers/zz/default.nix b/nixpkgs/pkgs/development/compilers/zz/default.nix index 273873c88017..dade163c5273 100644 --- a/nixpkgs/pkgs/development/compilers/zz/default.nix +++ b/nixpkgs/pkgs/development/compilers/zz/default.nix @@ -2,26 +2,37 @@ rustPlatform.buildRustPackage rec { pname = "zz"; - version = "0.1"; + version = "unstable-2021-01-26"; + # commit chosen by using the latest build from http://bin.zetz.it/ src = fetchFromGitHub { - owner = "aep"; + owner = "zetzit"; repo = "zz"; - rev = version; - sha256 = "0kqrfm2r9wn0p2c3lcprsy03p9qhrwjs990va8qi59jp704l84ad"; + rev = "0b5c52674e9adf795fbfb051d4dceef3126e669f"; + sha256 = "0bb77ll1g5i6a04ybpgx6lqsb74xs4v4nyqm9j4j6x24407h8l89"; }; nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "0yllcqxyyhwr9h0z8q84l0ms8x6jrqhpg79ik4xng6h5yf4ab0pq"; + cargoSha256 = "1lf4k3n89w2797c1yrj1dp97y8a8d5hnixr1nwa2qcq1sxmm5rcg"; + + postPatch = '' + # remove search path entry which would reference /build + sed -i '/env!("CARGO_MANIFEST_DIR")/d' src/lib.rs + ''; postInstall = '' - wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin" + mkdir -p "$out/share/zz" + cp -r modules "$out/share/zz/" + + wrapProgram $out/bin/zz \ + --prefix PATH ":" "${lib.getBin z3}/bin" \ + --suffix ZZ_MODULE_PATHS ":" "$out/share/zz/modules" ''; meta = with lib; { description = "🍺🐙 ZetZ a zymbolic verifier and tranzpiler to bare metal C"; - homepage = "https://github.com/aep/zz"; + homepage = "https://github.com/zetzit/zz"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/nixpkgs/pkgs/development/coq-modules/corn/default.nix b/nixpkgs/pkgs/development/coq-modules/corn/default.nix index 9f2316f3177d..6910f487c64e 100644 --- a/nixpkgs/pkgs/development/coq-modules/corn/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/corn/default.nix @@ -3,8 +3,14 @@ with lib; mkCoqDerivation rec { pname = "corn"; inherit version; - defaultVersion = if versions.range "8.6" "8.9" coq.coq-version then "8.8.1" else null; - release."8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp"; + defaultVersion = switch coq.coq-version [ + { case = "8.6"; out = "8.8.1"; } + { case = (versions.range "8.7" "8.12"); out = "8.12.0"; } + ] null; + release = { + "8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp"; + "8.12.0".sha256 = "0b92vhyzn1j6cs84z2182fn82hxxj0bqq7hk6cs4awwb3vc7dkhi"; + }; preConfigure = "patchShebangs ./configure.sh"; configureScript = "./configure.sh"; diff --git a/nixpkgs/pkgs/development/dhall-modules/Prelude.nix b/nixpkgs/pkgs/development/dhall-modules/Prelude.nix index 512c8f8bf551..320022abc0ed 100644 --- a/nixpkgs/pkgs/development/dhall-modules/Prelude.nix +++ b/nixpkgs/pkgs/development/dhall-modules/Prelude.nix @@ -1,11 +1,11 @@ { buildDhallGitHubPackage }: buildDhallGitHubPackage { - name = "Prelude-20.0.0"; + name = "Prelude"; owner = "dhall-lang"; repo = "dhall-lang"; directory = "Prelude"; file = "package.dhall"; - rev = "v20.0.0"; - sha256 = "1smk57xki1cj24xpp0s3gv85radl6ry76ybsjkqak8h13s79lwla"; + rev = "v20.1.0"; + sha256 = "04r1w7wqydmwm9mh3lz4y96a87k5kkvzsmrhbdrf0izcy5bqqv5y"; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 4c161c453c5b..f03f4a6dcc0d 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0w71kbz127fcli24sxsvd48l5xamwamjwhr18x9alam5cldqkkz1"; + sha256 = "1m9jfr5b0qwajwwmvcq02263bmnqgcqvpdr06sdwlfz3sxsjfp8r"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -815,8 +815,9 @@ self: super: { # https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913 cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512); - # Depends on tasty < 1.x, which we don't have. - cryptohash-sha256 = doJailbreak super.cryptohash-sha256; + # https://github.com/haskell-hvr/cryptohash-sha256/issues/11 + # Jailbreak is necessary to break out of tasty < 1.x dependency. + cryptohash-sha256 = markUnbroken (doJailbreak super.cryptohash-sha256); # Needs tasty-quickcheck ==0.8.*, which we don't have. cryptohash-sha1 = doJailbreak super.cryptohash-sha1; @@ -1377,11 +1378,6 @@ self: super: { # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc pandoc-citeproc = doJailbreak super.pandoc-citeproc; - # 2021-01-17: Tests are broken because of a version mismatch. - # See here: https://github.com/jgm/pandoc/issues/7035 - # This problem is fixed on master. Remove override when this assert fails. - pandoc = assert super.pandoc.version == "2.11.3.2"; dontCheck super.pandoc; - # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. domain-auth = dontCheck super.domain-auth; @@ -1409,30 +1405,26 @@ self: super: { # quickcheck-instances is only used in the tests of binary-instances. binary-instances = dontCheck super.binary-instances; - # tons of overrides for bleeding edge versions for ghcide and hls - # overriding aeson on all of them to prevent double compilations - # this shouldn‘t break anything because nearly all their reverse deps are - # in this list or marked as broken anyways # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests: # https://github.com/haskell/haskell-language-server/issues/610 # https://github.com/haskell/haskell-language-server/issues/611 - haskell-language-server = dontCheck (super.haskell-language-server.override { - lsp-test = dontCheck self.lsp-test_0_11_0_7; - fourmolu = self.fourmolu_0_3_0_0; - }); - # 2021-01-20 - # apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0 - # https://github.com/haskell/haskell-language-server/issues/1240 - apply-refact = super.apply-refact_0_8_2_1; + haskell-language-server = dontCheck super.haskell-language-server; + + # 2021-02-08: Jailbreaking because of + # https://github.com/haskell/haskell-language-server/issues/1329 + hls-tactics-plugin = doJailbreak super.hls-tactics-plugin; + # 2021-02-11: Jailbreaking because of syntax error on bound revision + hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin; + + # 2021-02-08: Overrides because nightly is to old for hls 0.9.0 + lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7); + haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0; + haskell-lsp-types = doDistribute self.haskell-lsp-types_0_23_0_0; - fourmolu = dontCheck super.fourmolu; # 1. test requires internet # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute - ghcide = doDistribute (unmarkBroken (dontCheck - (super.ghcide_0_7_0_0.override { - lsp-test = dontCheck self.lsp-test_0_11_0_7; - }))); - refinery = doDistribute super.refinery_0_3_0_0; + ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide)); + data-tree-print = doJailbreak super.data-tree-print; # 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing @@ -1533,7 +1525,7 @@ self: super: { # 2020-12-05: http-client is fixed on too old version essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { - http-client = self.http-client_0_7_4; + http-client = self.http-client_0_7_5; }; # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) @@ -1581,4 +1573,12 @@ self: super: { # Allow building with older versions of http-client. http-client-restricted = doJailbreak super.http-client-restricted; + # 2020-02-11: https://github.com/ekmett/lens/issues/969 + # A change in vector 0.2.12 broke the lens doctests. + # This is fixed on lens master. Remove this override on assert fail. + lens = assert super.lens.version == "4.19.2"; doJailbreak (dontCheck super.lens); + + # Test suite fails, upstream not reachable for simple fix (not responsive on github) + vivid-osc = dontCheck super.vivid-osc; + vivid-supercollider = dontCheck super.vivid-supercollider; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 27bf04b914e7..6831c7c327d7 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -88,5 +88,6 @@ self: super: { # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 2a0a7810f72a..b695c448be46 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -94,4 +94,12 @@ self: super: { # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. exceptions = super.exceptions_0_10_4; + + # Older compilers need the latest ghc-lib to build this package. + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; + + # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + vector = dontCheck super.vector; + + mmorph = super.mmorph_1_1_3; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index d1099c56b2c8..e6e0f690fe79 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -123,4 +123,10 @@ self: super: { # ghc versions which don‘t match the ghc-lib-parser-ex version need the # additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + + # Older compilers need the latest ghc-lib to build this package. + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; + + # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + vector = dontCheck super.vector; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index d9efb1ab9c32..e3f196440cab 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -84,7 +84,7 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/alex-3.2.5.patch"; sha256 = "0q8x49k3jjwyspcmidwr6b84s4y43jbf4wqfxfm6wz8x2dxx6nwh"; }); - doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_17)) (pkgs.fetchpatch { + doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18)) (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/doctest-0.17.patch"; sha256 = "16s2jcbk9hsww38i2wzxghbf0zpp5dc35hp6rd2n7d4z5xfavp62"; }); @@ -100,10 +100,6 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch"; sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d"; }); - syb = appendPatch (dontCheck super.syb) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/syb-0.7.1.patch"; - sha256 = "1407r8xv6bfnmpbw7glfh4smi76a2fc9pkq300c3d9f575708zqr"; - }); # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. unordered-containers = dontCheck super.unordered-containers; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1587e1dba618..e03c9425ed25 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.10.3 +compiler: ghc-8.10.4 core-packages: - array-0.5.4.0 @@ -13,17 +13,17 @@ core-packages: - directory-1.3.6.0 - exceptions-0.10.4 - filepath-1.4.2.1 - - ghc-8.10.3 - - ghc-boot-8.10.3 - - ghc-boot-th-8.10.3 + - ghc-8.10.4 + - ghc-boot-8.10.4 + - ghc-boot-th-8.10.4 - ghc-compact-0.1.0.0 - - ghc-heap-8.10.3 + - ghc-heap-8.10.4 - ghc-prim-0.6.1 - - ghci-8.10.3 + - ghci-8.10.4 - haskeline-0.8.0.1 - hpc-0.6.1.0 - integer-gmp-1.0.3.0 - - libiserv-8.10.3 + - libiserv-8.10.4 - mtl-2.2.2 - parsec-3.1.14.0 - pretty-1.1.3.6 @@ -73,10 +73,10 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # haskell-language-server 0.5.0.0 doesn't accept newer versions - - fourmolu ==0.2.* - - refinery ==0.2.* - # Stackage Nightly 2021-01-20 + - ghcide < 0.7.4 # for hls 0.9.0 + - hls-explicit-imports-plugin < 0.1.0.1 # for hls 0.9.0 + + # Stackage Nightly 2021-02-10 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -105,6 +105,7 @@ default-package-overrides: - aeson-with ==0.1.2.0 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.0 + - Agda ==2.6.1.3 - agda2lagda ==0.2020.11.1 - al ==0.1.4.2 - alarmclock ==0.7.0.5 @@ -233,14 +234,14 @@ default-package-overrides: - arithmoi ==0.11.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - - ascii ==1.0.0.2 + - ascii ==1.0.1.2 - ascii-case ==1.0.0.2 - - ascii-char ==1.0.0.2 + - ascii-char ==1.0.0.6 - asciidiagram ==1.3.3.3 - ascii-group ==1.0.0.2 - ascii-predicates ==1.0.0.2 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.0.2 + - ascii-superset ==1.0.1.2 - ascii-th ==1.0.0.2 - asif ==6.0.4 - asn1-encoding ==0.9.6 @@ -269,7 +270,7 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.19 + - autoexporter ==1.1.20 - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.5.2.0 @@ -286,7 +287,7 @@ default-package-overrides: - base32string ==0.9.1 - base58-bytestring ==0.1.0 - base58string ==0.10.0 - - base64 ==0.4.2.2 + - base64 ==0.4.2.3 - base64-bytestring ==1.1.0.0 - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 @@ -307,7 +308,7 @@ default-package-overrides: - benchpress ==0.2.2.15 - between ==0.11.0.0 - bibtex ==0.1.0.6 - - bifunctors ==5.5.9 + - bifunctors ==5.5.10 - bimap ==0.4.0 - bimaps ==0.1.0.2 - bimap-server ==0.1.0.1 @@ -356,13 +357,13 @@ default-package-overrides: - bordacount ==0.1.0.0 - boring ==0.1.3 - both ==0.1.1.1 - - bound ==2.0.2 + - bound ==2.0.3 - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.58.1 + - brick ==0.60.2 - broadcast-chan ==0.2.1.1 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 @@ -371,8 +372,8 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.4.1 - bugsnag-hs ==0.2.0.3 - - bugzilla-redhat ==0.3.0 - - burrito ==1.2.0.0 + - bugzilla-redhat ==0.3.1 + - burrito ==1.2.0.1 - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 @@ -395,6 +396,8 @@ default-package-overrides: - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - c2hs ==0.28.7 + - cabal-appimage ==0.3.0.2 + - cabal-debian ==5.1 - cabal-doctest ==1.0.8 - cabal-file ==0.1.1 - cabal-flatpak ==0.1.0.2 @@ -435,7 +438,7 @@ default-package-overrides: - charsetdetect-ae ==1.1.0.4 - Chart ==1.9.3 - chaselev-deque ==0.5.0.5 - - ChasingBottoms ==1.3.1.9 + - ChasingBottoms ==1.3.1.10 - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 @@ -474,7 +477,7 @@ default-package-overrides: - cmdargs ==0.10.20 - codec-beam ==0.2.0 - codec-rpm ==0.2.2 - - code-page ==0.2 + - code-page ==0.2.1 - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 @@ -490,6 +493,7 @@ default-package-overrides: - comonad ==5.0.8 - comonad-extras ==4.0.1 - compactmap ==0.1.4.2.1 + - compdata ==0.12.1 - compensated ==0.8.1 - compiler-warnings ==0.1.0 - composable-associations ==0.1.0.0 @@ -538,6 +542,7 @@ default-package-overrides: - contravariant ==1.5.3 - contravariant-extras ==0.3.5.2 - control-bool ==0.2.1 + - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 - control-monad-omega ==0.3.2 - convertible ==1.1.1.0 @@ -566,7 +571,7 @@ default-package-overrides: - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 - cryptohash-sha1 ==0.11.100.1 - - cryptohash-sha256 ==0.11.101.0 + - cryptohash-sha256 ==0.11.102.0 - cryptonite ==0.27 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 @@ -599,7 +604,7 @@ default-package-overrides: - data-accessor-mtl ==0.2.0.4 - data-accessor-template ==0.2.1.16 - data-accessor-transformers ==0.2.1.7 - - data-ascii ==1.0.0.2 + - data-ascii ==1.0.0.4 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 @@ -614,7 +619,7 @@ default-package-overrides: - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - - data-fix ==0.3.0 + - data-fix ==0.3.1 - data-forest ==0.1.0.8 - data-has ==0.4.0.0 - data-hash ==0.2.0.1 @@ -652,12 +657,12 @@ default-package-overrides: - derive-topdown ==0.0.2.2 - deriving-aeson ==0.2.6 - deriving-compat ==0.5.10 - - derulo ==1.0.9 - - dhall ==1.37.1 - - dhall-bash ==1.0.35 - - dhall-json ==1.7.4 - - dhall-lsp-server ==1.0.12 - - dhall-yaml ==1.2.4 + - derulo ==1.0.10 + - dhall ==1.38.0 + - dhall-bash ==1.0.36 + - dhall-json ==1.7.5 + - dhall-lsp-server ==1.0.13 + - dhall-yaml ==1.2.5 - diagrams-solve ==0.1.2 - dialogflow-fulfillment ==0.1.1.3 - di-core ==1.0.4 @@ -675,7 +680,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - - dl-fedora ==0.7.5 + - dl-fedora ==0.7.6 - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -753,7 +758,7 @@ default-package-overrides: - epub-metadata ==4.5 - eq ==4.2.1 - equal-files ==0.0.5.3 - - equational-reasoning ==0.6.0.4 + - equational-reasoning ==0.7.0.0 - equivalence ==0.3.5 - erf ==2.0.0.0 - error-or ==0.1.2.0 @@ -839,7 +844,7 @@ default-package-overrides: - flexible-defaults ==0.0.3 - FloatingHex ==0.5 - floatshow ==0.2.4 - - flow ==1.0.21 + - flow ==1.0.22 - flush-queue ==1.0.0 - fmlist ==0.9.4 - fmt ==0.6.1.2 @@ -876,7 +881,7 @@ default-package-overrides: - funcmp ==1.9 - function-builder ==0.3.0.1 - functor-classes-compat ==1 - - fusion-plugin ==0.2.1 + - fusion-plugin ==0.2.2 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 @@ -893,6 +898,7 @@ default-package-overrides: - generic-data ==0.9.2.0 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.13.1 + - generic-functor ==0.2.0.0 - generic-lens ==2.0.0.0 - generic-lens-core ==2.0.0.0 - generic-monoid ==0.1.0.1 @@ -931,13 +937,13 @@ default-package-overrides: - ghc-check ==0.5.0.3 - ghc-core ==0.5.6 - ghc-events ==0.15.1 - - ghc-exactprint ==0.6.3.3 + - ghc-exactprint ==0.6.3.4 - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.3.20201220 - - ghc-lib-parser ==8.10.3.20201220 - - ghc-lib-parser-ex ==8.10.0.17 + - ghc-lib ==8.10.4.20210206 + - ghc-lib-parser ==8.10.4.20210206 + - ghc-lib-parser-ex ==8.10.0.19 - ghc-parser ==0.2.2.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.7 @@ -948,7 +954,7 @@ default-package-overrides: - ghc-typelits-extra ==0.4.2 - ghc-typelits-knownnat ==0.7.4 - ghc-typelits-natnormalise ==0.7.3 - - ghc-typelits-presburger ==0.5.0.0 + - ghc-typelits-presburger ==0.5.2.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.22 - gi-cairo ==1.0.24 @@ -971,7 +977,7 @@ default-package-overrides: - gi-pango ==1.0.23 - githash ==0.1.5.0 - github ==0.26 - - github-release ==1.3.5 + - github-release ==1.3.6 - github-rest ==1.0.3 - github-types ==0.2.1 - github-webhooks ==0.15.0 @@ -1011,7 +1017,7 @@ default-package-overrides: - hackage-db ==2.1.0 - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 - - hadolint ==1.19.0 + - hadolint ==1.22.1 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.3 - half ==0.3.1 @@ -1022,6 +1028,7 @@ default-package-overrides: - happstack-server ==7.7.0 - happy ==1.20.0 - HasBigDecimal ==0.1.1 + - hasbolt ==0.1.4.4 - hashable ==1.3.0.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 @@ -1037,6 +1044,7 @@ default-package-overrides: - haskell-lsp ==0.22.0.0 - haskell-lsp-types ==0.22.0.0 - haskell-names ==0.9.9 + - haskell-src ==1.0.3.1 - haskell-src-exts ==1.23.1 - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.5 @@ -1061,10 +1069,10 @@ default-package-overrides: - hebrew-time ==0.1.2 - hedgehog ==1.0.4 - hedgehog-corpus ==0.2.0 - - hedgehog-fakedata ==0.0.1.3 + - hedgehog-fakedata ==0.0.1.4 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.14.0 + - hedis ==0.14.2 - hedn ==0.3.0.2 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1113,7 +1121,7 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.9 - - hpack ==0.34.3 + - hpack ==0.34.4 - hpack-dhall ==0.5.2 - hpc-codecov ==0.2.0.1 - hpc-lcov ==1.0.1 @@ -1154,7 +1162,7 @@ default-package-overrides: - hspec-hedgehog ==0.0.1.2 - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.2.0 - - hspec-meta ==2.6.0 + - hspec-meta ==2.7.8 - hspec-need-env ==0.1.0.5 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 @@ -1169,6 +1177,7 @@ default-package-overrides: - HsYAML-aeson ==0.2.0.0 - hsyslog ==5.0.2 - htaglib ==1.2.0 + - HTF ==0.14.0.5 - html ==1.0.1.2 - html-conduit ==1.3.2.1 - html-entities ==1.1.4.3 @@ -1218,7 +1227,7 @@ default-package-overrides: - hw-json-simd ==0.1.1.0 - hw-json-simple-cursor ==0.1.1.0 - hw-json-standard-cursor ==0.2.3.1 - - hw-kafka-client ==4.0.1 + - hw-kafka-client ==4.0.3 - hw-mquery ==0.2.1.0 - hw-packed-vector ==0.2.1.0 - hw-parser ==0.1.1.0 @@ -1230,13 +1239,13 @@ default-package-overrides: - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hw-xml ==0.5.1.0 - - hxt ==9.3.1.18 - - hxt-charproperties ==9.4.0.0 + - hxt ==9.3.1.21 + - hxt-charproperties ==9.5.0.0 - hxt-css ==0.1.0.3 - hxt-curl ==9.1.1.1 - hxt-expat ==9.1.1 - hxt-http ==9.1.5.2 - - hxt-regex-xmlschema ==9.2.0.3 + - hxt-regex-xmlschema ==9.2.0.7 - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 @@ -1324,12 +1333,12 @@ default-package-overrides: - jalaali ==1.0.0.0 - jira-wiki-markup ==1.3.2 - jose ==0.8.4 - - jose-jwt ==0.8.0 + - jose-jwt ==0.9.0 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - - json-feed ==1.0.11 + - json-feed ==1.0.12 - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 @@ -1396,7 +1405,7 @@ default-package-overrides: - lens-family-core ==2.0.0 - lens-family-th ==0.5.1.0 - lens-misc ==0.0.2.0 - - lens-process ==0.3.0.2 + - lens-process ==0.4.0.0 - lens-properties ==4.11.1 - lens-regex ==0.1.1 - lens-regex-pcre ==1.1.0.0 @@ -1406,7 +1415,7 @@ default-package-overrides: - libgit ==0.3.1 - libgraph ==1.14 - libjwt-typed ==0.2 - - libmpd ==0.9.3.0 + - libmpd ==0.10.0.0 - liboath-hs ==0.0.1.2 - libyaml ==0.1.2 - LibZip ==1.0.1 @@ -1415,7 +1424,7 @@ default-package-overrides: - lifted-base ==0.2.3.12 - lift-generics ==0.2 - line ==4.0.1 - - linear ==1.21.3 + - linear ==1.21.4 - linear-circuit ==0.1.0.2 - linenoise ==0.3.2 - linux-file-extents ==0.2.0.0 @@ -1425,7 +1434,7 @@ default-package-overrides: - ListLike ==4.7.4 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-singleton ==1.0.0.4 + - list-singleton ==1.0.0.5 - list-t ==1.0.4 - ListTree ==0.2.3 - little-logger ==0.3.1 @@ -1467,11 +1476,11 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - - massiv ==0.5.9.0 - - massiv-io ==0.4.0.0 + - massiv ==0.6.0.0 + - massiv-io ==0.4.1.0 - massiv-persist ==0.1.0.0 - massiv-serialise ==0.1.0.0 - - massiv-test ==0.1.6 + - massiv-test ==0.1.6.1 - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 @@ -1526,19 +1535,19 @@ default-package-overrides: - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 - - mixed-types-num ==0.4.0.2 + - mixed-types-num ==0.4.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.2 - - mmorph ==1.1.3 + - mmorph ==1.1.4 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - mock-time ==0.1.0 - mod ==0.1.2.1 - model ==0.5 - - modern-uri ==0.3.3.0 + - modern-uri ==0.3.3.1 - modular ==0.1.0.8 - monad-chronicle ==1.0.0.1 - monad-control ==1.0.2.3 @@ -1603,7 +1612,7 @@ default-package-overrides: - mwc-random ==0.14.0.0 - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - - mysql ==0.1.7.2 + - mysql ==0.1.7.3 - mysql-simple ==0.4.5 - n2o ==0.11.1 - nagios-check ==0.3.2 @@ -1637,9 +1646,9 @@ default-package-overrides: - network-simple-tls ==0.4 - network-transport ==0.5.4 - network-transport-composed ==0.2.1 - - network-uri ==2.6.3.0 + - network-uri ==2.6.4.1 - newtype ==0.2.2.0 - - newtype-generics ==0.5.4 + - newtype-generics ==0.6 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 @@ -1734,8 +1743,8 @@ default-package-overrides: - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-semigroup ==0.5.1.8 - - password ==2.1.0.0 - - password-instances ==2.0.0.1 + - password ==2.1.1.0 + - password-instances ==2.0.0.2 - path ==0.7.0 - path-binary-instance ==0.1.0.1 - path-extensions ==0.1.1.0 @@ -1757,6 +1766,7 @@ default-package-overrides: - peano ==0.1.0.1 - pem ==0.2.4 - percent-format ==0.0.1 + - peregrin ==0.3.1 - perfect-hash-generator ==0.2.0.6 - perfect-vector-shuffle ==0.1.1.1 - persist ==0.1.1.5 @@ -1769,7 +1779,7 @@ default-package-overrides: - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.11.0.1 - persistent-qq ==2.9.2.1 - - persistent-sqlite ==2.11.0.0 + - persistent-sqlite ==2.11.1.0 - persistent-template ==2.9.1.0 - persistent-test ==2.0.3.5 - persistent-typed-db ==0.1.0.2 @@ -1854,7 +1864,7 @@ default-package-overrides: - probability ==0.2.7 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - - product-profunctors ==0.11.0.1 + - product-profunctors ==0.11.0.2 - profiterole ==0.1 - profunctors ==5.5.2 - projectroot ==0.2.0.1 @@ -1886,9 +1896,9 @@ default-package-overrides: - pureMD5 ==2.1.3 - purescript-bridge ==0.14.0.0 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==2.0.0.2 + - pusher-http-haskell ==2.0.0.3 - pvar ==1.0.0.0 - - PyF ==0.9.0.2 + - PyF ==0.9.0.3 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qrcode-core ==0.9.4 @@ -1909,12 +1919,12 @@ default-package-overrides: - quickcheck-transformer ==0.3.1.1 - quickcheck-unicode ==1.0.1.0 - quiet ==0.2 - - quote-quot ==0.1.0.0 + - quote-quot ==0.2.0.0 - radius ==0.7.1.0 - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.1 - - rampart ==1.1.0.1 + - rampart ==1.1.0.2 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.1 @@ -1930,9 +1940,9 @@ default-package-overrides: - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.12 + - ratel ==1.0.13 - rate-limit ==1.4.2 - - ratel-wai ==1.1.3 + - ratel-wai ==1.1.4 - rattle ==0.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 @@ -1955,7 +1965,7 @@ default-package-overrides: - reducers ==3.12.3 - refact ==0.3.0.2 - ref-fd ==0.4.0.2 - - refined ==0.6.1 + - refined ==0.6.2 - reflection ==2.1.6 - reform ==0.2.7.4 - reform-blaze ==0.2.4.3 @@ -1987,7 +1997,7 @@ default-package-overrides: - replace-attoparsec ==1.4.4.0 - replace-megaparsec ==1.4.4.0 - repline ==0.4.0.0 - - req ==3.8.0 + - req ==3.9.0 - req-conduit ==1.0.0 - rerebase ==1.6.1 - resistor-cube ==0.0.1.2 @@ -2004,7 +2014,7 @@ default-package-overrides: - rhine ==0.7.0 - rhine-gloss ==0.7.0 - rigel-viz ==0.2.0.0 - - rio ==0.1.19.0 + - rio ==0.1.20.0 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.1.0 - roc-id ==0.1.0.0 @@ -2012,10 +2022,10 @@ default-package-overrides: - rocksdb-haskell-jprupp ==2.1.3 - rocksdb-query ==0.4.2 - roles ==0.2.0.0 - - rope-utf16-splay ==0.3.1.0 + - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.3.1 + - rpmbuild-order ==0.4.3.2 - RSA ==2.4.1 - runmemo ==1.0.0.1 - rvar ==0.2.0.6 @@ -2032,7 +2042,7 @@ default-package-overrides: - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.1 - - salve ==1.0.10 + - salve ==1.0.11 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 @@ -2073,7 +2083,7 @@ default-package-overrides: - seqalign ==0.2.0.4 - seqid ==0.6.2 - seqid-streams ==0.7.2 - - sequence-formats ==1.5.1.4 + - sequence-formats ==1.5.2 - sequenceTools ==1.4.0.5 - serf ==0.1.1.0 - serialise ==0.2.3.0 @@ -2118,6 +2128,7 @@ default-package-overrides: - shell-utility ==0.1 - shelly ==1.9.0 - shikensu ==0.3.11 + - shortcut-links ==0.5.1.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.2.0.0 - siggy-chardust ==1.0.0 @@ -2180,7 +2191,7 @@ default-package-overrides: - speedy-slice ==0.3.1 - Spintax ==0.3.5 - splice ==0.6.1.1 - - splint ==1.0.1.2 + - splint ==1.0.1.3 - split ==0.2.3.4 - splitmix ==0.1.0.3 - spoon ==0.3.1 @@ -2246,7 +2257,7 @@ default-package-overrides: - stripe-haskell ==2.6.2 - stripe-http-client ==2.6.2 - stripe-tests ==2.6.2 - - strive ==5.0.12 + - strive ==5.0.13 - structs ==0.1.4 - structured ==0.1 - structured-cli ==2.6.0.0 @@ -2259,7 +2270,7 @@ default-package-overrides: - swagger2 ==2.6 - sweet-egison ==0.1.1.3 - swish ==0.10.0.4 - - syb ==0.7.1 + - syb ==0.7.2.1 - symbol ==0.2.4 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 @@ -2285,12 +2296,13 @@ default-package-overrides: - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.7 + - tasty-bench ==0.2.1 - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.2 - tasty-focus ==1.0.1 - tasty-golden ==2.3.3.2 - - tasty-hedgehog ==1.0.0.2 + - tasty-hedgehog ==1.0.1.0 - tasty-hspec ==1.1.6 - tasty-hunit ==0.10.0.3 - tasty-hunit-compat ==0.2.0.1 @@ -2300,6 +2312,7 @@ default-package-overrides: - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1.2 - tasty-rerun ==1.1.18 + - tasty-silver ==3.1.15 - tasty-smallcheck ==0.8.2 - tasty-test-reporter ==0.1.1.4 - tasty-th ==0.1.7 @@ -2313,7 +2326,7 @@ default-package-overrides: - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - - tensors ==0.1.4 + - tensors ==0.1.5 - termbox ==0.3.0 - terminal-progress-bar ==0.4.1 - terminal-size ==0.3.2.1 @@ -2324,7 +2337,7 @@ default-package-overrides: - test-framework-smallcheck ==0.2 - test-fun ==0.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.1 + - texmath ==0.12.1.1 - text-ansi ==0.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.6.1 @@ -2348,7 +2361,7 @@ default-package-overrides: - tf-random ==0.5 - th-abstraction ==0.4.2.0 - th-bang-compat ==0.0.1.0 - - th-compat ==0.1 + - th-compat ==0.1.1 - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.0.0 - th-desugar ==1.11 @@ -2396,7 +2409,7 @@ default-package-overrides: - tinylog ==0.15.0 - titlecase ==1.0.1 - tldr ==0.9.0 - - tls ==1.5.4 + - tls ==1.5.5 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - tlynx ==0.5.0.1 @@ -2418,6 +2431,7 @@ default-package-overrides: - traverse-with-class ==1.0.1.0 - tree-diff ==0.1 - tree-fun ==0.8.1.0 + - tree-view ==0.5 - trifecta ==2.1 - triplesec ==0.2.2.1 - tsv2csv ==0.1.0.2 @@ -2429,6 +2443,7 @@ default-package-overrides: - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - turtle ==1.5.20 + - typecheck-plugin-nat-simple ==0.1.0.2 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - typed-uuid ==0.0.0.2 @@ -2442,7 +2457,7 @@ default-package-overrides: - type-level-numbers ==0.1.1.1 - type-map ==0.1.6.0 - type-natural ==1.0.0.0 - - type-of-html ==1.6.1.2 + - type-of-html ==1.6.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - typerep-map ==0.3.3.0 @@ -2479,13 +2494,14 @@ default-package-overrides: - universe-instances-trans ==1.1 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.5.0 + - universum ==1.7.2 - unix-bytestring ==0.3.7.3 - - unix-compat ==0.5.2 + - unix-compat ==0.5.3 - unix-time ==0.4.7 - - unliftio ==0.2.13.1 + - unliftio ==0.2.14 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 + - unliftio-streams ==0.1.1.1 - unlit ==0.4.0.0 - unordered-containers ==0.2.13.0 - unsafe ==0.0 @@ -2519,12 +2535,13 @@ default-package-overrides: - valor ==0.1.0.0 - vault ==0.3.1.4 - vec ==0.3 - - vector ==0.12.1.2 + - vector ==0.12.2.0 - vector-algorithms ==0.8.0.4 - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 - vector-builder ==0.3.8 - vector-bytes-instances ==0.1.1 + - vector-circular ==0.1.3 - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 @@ -2533,7 +2550,7 @@ default-package-overrides: - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 - verbosity ==0.4.0.0 - - versions ==4.0.1 + - versions ==4.0.2 - vformat ==0.14.1.0 - vformat-aeson ==0.1.0.1 - vformat-time ==0.1.0.0 @@ -2562,7 +2579,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.13 + - warp ==3.3.14 - warp-tls ==3.3.0 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2584,7 +2601,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.0.0.4 + - witch ==0.0.0.5 - witherable-class ==0 - within ==0.2.0.1 - with-location ==0.1.0 @@ -2599,12 +2616,12 @@ default-package-overrides: - word-wrap ==0.4.1 - world-peace ==1.0.2.0 - wrap ==0.0.0 - - wreq ==0.5.3.2 + - wreq ==0.5.3.3 - writer-cps-exceptions ==0.1.0.1 - writer-cps-mtl ==0.1.1.6 - writer-cps-transformers ==0.5.6.1 - wss-client ==0.3.0.0 - - wuss ==1.1.17 + - wuss ==1.1.18 - X11 ==1.9.2 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2635,7 +2652,7 @@ default-package-overrides: - xml-types ==0.3.8 - xmonad ==0.15 - xmonad-contrib ==0.16 - - xmonad-extras ==0.15.2 + - xmonad-extras ==0.15.3 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 @@ -2650,7 +2667,7 @@ default-package-overrides: - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.2 + - yesod-page-cursor ==2.0.0.3 - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.5 - yesod-sitemap ==1.6.0 @@ -2686,7 +2703,9 @@ default-package-overrides: extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - - dhall == 1.29.0 # required for spago 0.14.0. + - Cabal == 3.2.* # required for cabal-install etc. + - dhall == 1.29.0 # required for ats-pkg + - dhall == 1.37.1 # required for spago 0.19.0. - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - haddock == 2.23.* # required on GHC < 8.10.x @@ -2699,8 +2718,10 @@ extra-packages: - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - - ghcide == 0.7.0.0 # Needed for hls 0.8.0 - - apply-refact == 0.8.2.1 # Needed for hls 0.8.0 + - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls + - haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 + - haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 + - lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08 package-maintainers: peti: @@ -3289,6 +3310,7 @@ broken-packages: - atomic-primops-foreign - atomic-primops-vector - atomo + - atp - atp-haskell - ats-pkg - ats-setup @@ -4950,6 +4972,7 @@ broken-packages: - envstatus - epanet-haskell - epass + - ephemeral - epi-sim - epic - epoll @@ -5113,6 +5136,7 @@ broken-packages: - fay-websockets - fb-persistent - fbmessenger-api + - fbrnch - fca - fcache - fcd @@ -6026,7 +6050,6 @@ broken-packages: - haskell-igraph - haskell-in-space - haskell-kubernetes - - haskell-language-server - haskell-lsp-client - haskell-ml - haskell-mpfr @@ -6456,9 +6479,6 @@ broken-packages: - hlrdb - hlrdb-core - hls - - hls-explicit-imports-plugin - - hls-hlint-plugin - - hls-retrie-plugin - hlwm - hly - hmark @@ -6844,7 +6864,6 @@ broken-packages: - hugs2yc - hulk - HulkImport - - hum - human-parse - human-text - humble-prelude @@ -7553,6 +7572,7 @@ broken-packages: - libxml-enumerator - libxslt - lie + - lifetimes - lifted-base-tf - lifted-protolude - lifter @@ -8276,9 +8296,6 @@ broken-packages: - nested-sequence - NestedFunctor - nestedmap - - net-mqtt - - net-mqtt-lens - - net-mqtt-rpc - net-spider - net-spider-cli - net-spider-pangraph @@ -8953,7 +8970,6 @@ broken-packages: - postgresql-tx-squeal - postgresql-tx-squeal-compat-simple - postgresql-typed-lifted - - postgrest - postgrest-ws - postie - postmark @@ -11022,6 +11038,7 @@ broken-packages: - unix-fcntl - unix-handle - unix-process-conduit + - unix-simple - unlifted-list - unliftio-streams - unm-hip @@ -11192,9 +11209,6 @@ broken-packages: - visual-prof - visualize-cbn - vitrea - - vivid - - vivid-osc - - vivid-supercollider - vk-aws-route53 - VKHS - voicebase diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 06578f565350..4e23ab80c1b6 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -659,7 +659,9 @@ self: super: builtins.intersectAttrs super { let # spago requires an older version of megaparsec, but it appears to work # fine with newer versions. - spagoWithOverrides = doJailbreak super.spago; + spagoWithOverrides = doJailbreak (super.spago.override { + dhall = self.dhall_1_37_1; + }); # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. @@ -785,7 +787,7 @@ self: super: builtins.intersectAttrs super { testTarget = "unit-tests"; }; - haskell-language-server = overrideCabal super.haskell-language-server (drv: { + haskell-language-server = enableCabalFlag (enableCabalFlag (overrideCabal super.haskell-language-server (drv: { postInstall = let inherit (pkgs.lib) concatStringsSep take splitString; ghc_version = self.ghc.version; @@ -800,7 +802,7 @@ self: super: builtins.intersectAttrs super { export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper export HOME=$TMPDIR ''; - }); + })) "all-plugins") "all-formatters"; # tests depend on a specific version of solc hevm = dontCheck (doJailbreak super.hevm); diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 1c760b056e04..6928bba47fa0 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -800,12 +800,12 @@ self: { , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process , regex-tdfa, split, stm, strict, template-haskell, text, time - , unordered-containers, uri-encode, zlib + , transformers, unordered-containers, uri-encode, zlib }: mkDerivation { pname = "Agda"; - version = "2.6.1.2"; - sha256 = "0b872fi12j316zcbwnablkg45p252a4sqca9lsgfig55qirk0w08"; + version = "2.6.1.3"; + sha256 = "1rx1r21kpgz27g2qn6fqgdpkl5b07c2fl86j3clylpp9rr0ch6xv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -815,7 +815,7 @@ self: { containers data-hash deepseq directory edit-distance equivalence exceptions filepath geniplate-mirror ghc-compact gitrev hashable hashtables haskeline ieee754 mtl murmur-hash pretty process - regex-tdfa split stm strict template-haskell text time + regex-tdfa split stm strict template-haskell text time transformers unordered-containers uri-encode zlib ]; libraryToolDepends = [ alex happy ]; @@ -2777,6 +2777,36 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal_3_4_0_0" = callPackage + ({ mkDerivation, array, async, base, base-compat, base-orphans + , binary, bytestring, clock, containers, deepseq, Diff, directory + , filepath, integer-logarithms, mtl, optparse-applicative, parsec + , pretty, process, QuickCheck, rere, stm, tagged, tar, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, text + , time, transformers, tree-diff, unix + }: + mkDerivation { + pname = "Cabal"; + version = "3.4.0.0"; + sha256 = "1za1cl14fkw8y89hhw6sqirzmkixjaa4wpqsibyk0fvnjs59jydq"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty process text time transformers unix + ]; + testHaskellDepends = [ + array async base base-compat base-orphans binary bytestring clock + containers deepseq Diff directory filepath integer-logarithms + optparse-applicative pretty process QuickCheck rere stm tagged tar + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text + transformers tree-diff + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Cabal-ide-backend" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , deepseq, directory, extensible-exceptions, filepath, HUnit @@ -3120,24 +3150,6 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.9"; - sha256 = "1acsmvdwsgry0i0qhmz0img71gq97wikmn9zgbqppl4n8a1d7bvh"; - libraryHaskellDepends = [ - base containers mtl QuickCheck random syb - ]; - testHaskellDepends = [ - array base containers mtl QuickCheck random syb - ]; - description = "For testing partial and infinite values"; - license = lib.licenses.mit; - }) {}; - - "ChasingBottoms_1_3_1_10" = callPackage - ({ mkDerivation, array, base, containers, mtl, QuickCheck, random - , syb - }: - mkDerivation { - pname = "ChasingBottoms"; version = "1.3.1.10"; sha256 = "1flr56hd8ny0ddlv1agi0ikdjv5wgx0aba6xqdsn3nv6dyw9nbf3"; libraryHaskellDepends = [ @@ -3148,7 +3160,6 @@ self: { ]; description = "For testing partial and infinite values"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "CheatSheet" = callPackage @@ -8031,8 +8042,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.4.0.0"; - sha256 = "1zmilqvlp170nb7zakbhdpihykkq95s7nb7la2sdas1fv69mhnx3"; + version = "2.5.0.0"; + sha256 = "1awwrq7hivk1hp709iz624hm2wjbk18hspld91pixv5x34fcn7s9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -9382,8 +9393,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.14.0.3"; - sha256 = "138gh5a2nx25czhp9qpaav2lq7ff142q4n6sbkrglfsyn48rifqp"; + version = "0.14.0.5"; + sha256 = "1hgkymgb8v3f5s7i8nn01iml8mqvah4iyqiqcflj3ffbjb93v1zd"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -11956,6 +11967,17 @@ self: { broken = true; }) {}; + "Kawaii-Parser" = callPackage + ({ mkDerivation, base, containers, mtl }: + mkDerivation { + pname = "Kawaii-Parser"; + version = "0.0.0"; + sha256 = "163rh1vciljl35wc5wrcr1ky2vb536pv6hhnl3r97mfjc9c9k2wm"; + libraryHaskellDepends = [ base containers mtl ]; + description = "A simple parsing library"; + license = lib.licenses.bsd3; + }) {}; + "KdTree" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -12891,7 +12913,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) openmpi;}; + }) {openmpi = null;}; "LogicGrowsOnTrees-network" = callPackage ({ mkDerivation, base, cereal, cmdtheline, composition, containers @@ -16324,8 +16346,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.9.0.2"; - sha256 = "186kxid40nsxhc4yas6a1jk6ndsycsfrc5k9pfvyhgw720rx2p2c"; + version = "0.9.0.3"; + sha256 = "1x1zryq3di5z3mc1wind6ma1b7cpsvf90y7k5dyvwkn1kisz3jf8"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec mtl template-haskell text @@ -18383,8 +18405,8 @@ self: { }: mkDerivation { pname = "Shpadoinkle-backend-snabbdom"; - version = "0.3.0.0"; - sha256 = "0ff87nxa7ff3j400k5a65in8jj00m6bk46pmana0a8k1d7ln7fsk"; + version = "0.3.0.1"; + sha256 = "0452znn1q558n1dy52j493y7f9lml57cnqbmdmqv28zq12sxpypm"; libraryHaskellDepends = [ base exceptions file-embed ghcjs-dom jsaddle monad-control mtl Shpadoinkle text transformers-base unliftio @@ -21932,20 +21954,20 @@ self: { }) {inherit (pkgs) readline;}; "Z-Data" = callPackage - ({ mkDerivation, base, Cabal, case-insensitive, containers, deepseq - , ghc-prim, hashable, hspec, hspec-discover, HUnit, integer-gmp - , primitive, QuickCheck, quickcheck-instances, scientific, tagged - , template-haskell, time, unordered-containers + ({ mkDerivation, base, bytestring, Cabal, case-insensitive + , containers, deepseq, ghc-prim, hashable, hspec, hspec-discover + , HUnit, integer-gmp, primitive, QuickCheck, quickcheck-instances + , scientific, tagged, template-haskell, time, unordered-containers }: mkDerivation { pname = "Z-Data"; - version = "0.4.0.0"; - sha256 = "0vgphl16hq35cs12rvx663bxn88h4hx25digwy6h0yrc0j2yj9ls"; + version = "0.6.0.0"; + sha256 = "16wb7hrk6rlxl0sks5nkhl60wxwlxdyjwj9j72g40l5x6qnlvk7d"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base case-insensitive containers deepseq ghc-prim hashable - integer-gmp primitive QuickCheck scientific tagged template-haskell - time unordered-containers + base bytestring case-insensitive containers deepseq ghc-prim + hashable integer-gmp primitive QuickCheck scientific tagged + template-haskell time unordered-containers ]; testHaskellDepends = [ base containers hashable hspec HUnit integer-gmp primitive @@ -21967,8 +21989,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.4.0.0"; - sha256 = "0jyx2mghm40llcvilg6m9120wfngvpmsggy7xy6zdf29lz3v9bd5"; + version = "0.6.1.0"; + sha256 = "0m0qvamvixxm9yd45393j44mnnlnw2672gcdv7kaqw4hjczlddmq"; libraryHaskellDepends = [ base containers exceptions primitive stm time unix-time unordered-containers Z-Data @@ -22014,17 +22036,18 @@ self: { }) {}; "Z-YAML" = callPackage - ({ mkDerivation, base, primitive, scientific, transformers + ({ mkDerivation, base, hspec, primitive, scientific, transformers , unordered-containers, Z-Data, Z-IO }: mkDerivation { pname = "Z-YAML"; - version = "0.3.0.0"; - sha256 = "1z5k6qd9hsbwlvxcmy442g8fk7707fccwa9l8b518psp29nd7kzm"; + version = "0.3.2.0"; + sha256 = "01v0vza54lpxijg4znp2pcnjw2z6ybvx453xqy7ljwf9289csfq8"; libraryHaskellDepends = [ base primitive scientific transformers unordered-containers Z-Data Z-IO ]; + testHaskellDepends = [ base hspec Z-Data ]; description = "YAML tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -23938,6 +23961,8 @@ self: { pname = "acts"; version = "0.3.1.0"; sha256 = "06bpayfa8vwj8dqlqp71nw2s9iwbffdknkk4hpazd4r1wvhnrg37"; + revision = "2"; + editedCabalFile = "1xc061cj6wxqyr79hdakmc3nnzdh46sj2sd7j9gfrvgmbipl895q"; libraryHaskellDepends = [ base deepseq finitary finite-typelits groups ]; @@ -23957,6 +23982,8 @@ self: { pname = "ad"; version = "4.4.1"; sha256 = "1afpqk0my4n50xvq9f0rhcs8kzy3w1xxjql462xc0mvvhsgp6s6g"; + revision = "1"; + editedCabalFile = "1sprgwc6niixmc3p073al3bm3ff873h6zjgizdz2wpqm0b6rfmka"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection @@ -25306,6 +25333,8 @@ self: { pname = "aeson-yaml"; version = "1.1.0.0"; sha256 = "1kyrh2w3qpzwm7kpb4rkrzi22kqqz1vcjw1f59wdkl8a5hffkv6y"; + revision = "1"; + editedCabalFile = "167gfgmy1pq50rh3rszj01ch4qy3jl4lpl3g8yq300kffrfs882a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29586,6 +29615,27 @@ self: { license = lib.licenses.gpl3; }) {}; + "amqp-utils_0_4_5_0" = callPackage + ({ mkDerivation, amqp, base, bytestring, connection, containers + , data-default-class, directory, hinotify, magic, network, process + , text, time, tls, unix, utf8-string, x509-system + }: + mkDerivation { + pname = "amqp-utils"; + version = "0.4.5.0"; + sha256 = "0iwjgsai5bxfwqjlqcvykihd3zfj7wivx83sb07rqykjxqyhhsk9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + amqp base bytestring connection containers data-default-class + directory hinotify magic network process text time tls unix + utf8-string x509-system + ]; + description = "AMQP toolset for the command line"; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; + }) {}; + "amqp-worker" = callPackage ({ mkDerivation, aeson, amqp, base, bytestring, data-default , exceptions, monad-control, monad-loops, mtl, resource-pool @@ -30190,24 +30240,23 @@ self: { "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, exceptions, hspec, linebreak, mintty, mtl, QuickCheck - , random, split, terminal-size, timers-tick + , random, split, terminal-size, timers-tick, unidecode }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.0.0.0"; - sha256 = "0h33ih7sxzyp1a6r6ivk73lrfx6haxxzmgh56n75sa7p8vhr8f1i"; - revision = "1"; - editedCabalFile = "1x601p97ragf9k56qy1ndmn7g3brs8fvvmf1wcrxz1ynhndqqpjw"; + version = "1.1.0.0"; + sha256 = "08sy50yicjgcxmnpq2828xggmvxc5yjp3xp03nd0bq4ykyr4za80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal array base bytestring cereal clock exceptions linebreak mintty mtl QuickCheck random split terminal-size - timers-tick + timers-tick unidecode ]; testHaskellDepends = [ ansi-terminal array base bytestring cereal clock exceptions hspec linebreak mtl QuickCheck random split terminal-size timers-tick + unidecode ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = lib.licenses.gpl3; @@ -31748,37 +31797,6 @@ self: { broken = true; }) {}; - "apply-refact_0_8_2_1" = callPackage - ({ mkDerivation, base, containers, directory, extra, filemanip - , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative - , process, refact, silently, syb, tasty, tasty-expected-failure - , tasty-golden, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.8.2.1"; - sha256 = "12dnwsv37bhla7cnqa3h24mnvdk5199lwd5mf845n1r6xqrh2vvp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory extra filemanip ghc ghc-exactprint - process refact syb transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory extra filemanip filepath ghc ghc-boot-th - ghc-exactprint optparse-applicative process refact syb transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory extra filemanip filepath ghc ghc-boot-th - ghc-exactprint optparse-applicative process refact silently syb - tasty tasty-expected-failure tasty-golden transformers unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative @@ -33283,14 +33301,32 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.0.0.2"; - sha256 = "13v1zpll4x72ib5pwrs01kkhw5yc5xq8aazwm9zfni9452sw3r3w"; + version = "1.0.1.2"; + sha256 = "051q0gamgvgd4j1bzqxww7qy4syx21s0vqhfihwlb2ypxf2s2fqa"; + libraryHaskellDepends = [ + ascii-case ascii-char ascii-group ascii-predicates ascii-superset + ascii-th base bytestring data-ascii text + ]; + description = "The ASCII character set and encoding"; + license = lib.licenses.asl20; + }) {}; + + "ascii_1_0_1_4" = callPackage + ({ mkDerivation, ascii-case, ascii-char, ascii-group + , ascii-predicates, ascii-superset, ascii-th, base, bytestring + , data-ascii, text + }: + mkDerivation { + pname = "ascii"; + version = "1.0.1.4"; + sha256 = "0j0cx91q4kmljv2fnfa1cllmyyk2wr6vg373bdfq0cx79d6542hw"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-predicates ascii-superset ascii-th base bytestring data-ascii text ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "ascii-art-to-unicode" = callPackage @@ -33319,15 +33355,39 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-case_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-case"; + version = "1.0.0.4"; + sha256 = "1485y33as83f1iprdq7hl6ar7gha85678ajq80jld06wsmi9k0xa"; + libraryHaskellDepends = [ ascii-char base hashable ]; + description = "ASCII letter case"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-char" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { pname = "ascii-char"; - version = "1.0.0.2"; - sha256 = "0pglcppji9irbz0fjc6hb1fv7qjbjcii6k4qdv389l7kbb77w318"; + version = "1.0.0.6"; + sha256 = "049xccazgjb1zzqbzpgcw77hsl5j3j8l7f0268wxjy87il3wfnx3"; + libraryHaskellDepends = [ base hashable ]; + description = "A Char type representing an ASCII character"; + license = lib.licenses.asl20; + }) {}; + + "ascii-char_1_0_0_8" = callPackage + ({ mkDerivation, base, hashable }: + mkDerivation { + pname = "ascii-char"; + version = "1.0.0.8"; + sha256 = "1ajpkzq1d04ww5yif7dl4np5zhhm5ks8wxhmfdl8ygy8r7akg50d"; libraryHaskellDepends = [ base hashable ]; description = "A Char type representing an ASCII character"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "ascii-cows" = callPackage @@ -33368,6 +33428,18 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-group_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-group"; + version = "1.0.0.4"; + sha256 = "0h1y0dmly3yammmqwa197nf3g83x03r5jlnsv9z9zxm9bin38ac5"; + libraryHaskellDepends = [ ascii-char base hashable ]; + description = "ASCII character groups"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-holidays" = callPackage ({ mkDerivation, base, random, random-shuffle, terminfo, time }: mkDerivation { @@ -33394,6 +33466,18 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-predicates_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, base }: + mkDerivation { + pname = "ascii-predicates"; + version = "1.0.0.4"; + sha256 = "0c2331y1izxw7n33pfxfb7krz4lgdf87244xlnf03x8npckb7kgq"; + libraryHaskellDepends = [ ascii-char base ]; + description = "Various categorizations of ASCII characters"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-progress" = callPackage ({ mkDerivation, async, base, concurrent-output, data-default , hspec, QuickCheck, time @@ -33442,13 +33526,27 @@ self: { ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; - version = "1.0.0.2"; - sha256 = "1wanvb18h1jlf33f6zr7l1swvagdhw5w3554fsvjq1dm37nygd5m"; + version = "1.0.1.2"; + sha256 = "0hx5kh6h239hqrnqyda55769jfbxjxcr4mihya1djl7ls1fy493v"; + libraryHaskellDepends = [ + ascii-char base bytestring hashable text + ]; + description = "Representing ASCII with refined supersets"; + license = lib.licenses.asl20; + }) {}; + + "ascii-superset_1_0_1_4" = callPackage + ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: + mkDerivation { + pname = "ascii-superset"; + version = "1.0.1.4"; + sha256 = "1bjkinz2p8lq4grnj5d9q1z9jsn4b8cgkqsnxjhzb3plz94i5mxk"; libraryHaskellDepends = [ ascii-char base bytestring hashable text ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "ascii-table" = callPackage @@ -33483,6 +33581,21 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-th_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell + }: + mkDerivation { + pname = "ascii-th"; + version = "1.0.0.4"; + sha256 = "08vfy2gp0ppa3l95gjqrbqca3gn2aln7zvw7qpp6x7jnzjkl8dn1"; + libraryHaskellDepends = [ + ascii-char ascii-superset base template-haskell + ]; + description = "Template Haskell support for ASCII"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-vector-avc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , deepseq-generics, HUnit, split, zlib @@ -34654,6 +34767,26 @@ self: { broken = true; }) {}; + "atp" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, generic-random + , mtl, process, QuickCheck, text, tptp + }: + mkDerivation { + pname = "atp"; + version = "0.1.0.0"; + sha256 = "0n71mch62mkqn4ibq6n0k26fxk0rl63j7rzj4wpc038awjgxcfr8"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers mtl process text tptp + ]; + testHaskellDepends = [ + base containers generic-random mtl QuickCheck text + ]; + description = "Interface to automated theorem provers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "atp-haskell" = callPackage ({ mkDerivation, applicative-extras, base, containers, extra, HUnit , mtl, parsec, pretty, template-haskell, time @@ -34892,6 +35025,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec_0_13_2_5" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.5"; + sha256 = "0vv88m5m7ynjrg114psp4j4s69f1a5va3bvn293vymqrma7g7q11"; + libraryHaskellDepends = [ + array base bytestring containers deepseq ghc-prim scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + description = "Fast combinator parsing for bytestrings and text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -35508,8 +35670,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.19"; - sha256 = "0hgxfd5pykl6y1v3asnh46abfmi5fsdp0hs1kf6a2acqsnx9vad7"; + version = "1.1.20"; + sha256 = "1aciwnsxb76hl2yx1n8mbmd6rhl41f1axq3c2djdc6mkkiyh9qc1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -35726,8 +35888,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "38"; - editedCabalFile = "0jbvk8azs2x63cfxbppa67qg27zirgash448g7vmf07jqb8405cb"; + revision = "39"; + editedCabalFile = "1y77mk83yap8yx5wlybpr06wwy3qvmq0svqc4c6dfyvjd9wjvsdv"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -36473,6 +36635,21 @@ self: { broken = true; }) {}; + "aws-larpi" = callPackage + ({ mkDerivation, aeson, base, bytestring, modern-uri, req, text }: + mkDerivation { + pname = "aws-larpi"; + version = "0.1.0.0"; + sha256 = "04z5wcvkcvq961zc9pg79k6340vgm6rdws6lfjysl5jrwr5sfxg9"; + revision = "1"; + editedCabalFile = "00singwkjvv2g92i16bsaqdq2rwg2l4v39vmy1vdi6dbpalkka4n"; + libraryHaskellDepends = [ + aeson base bytestring modern-uri req text + ]; + description = "Package Haskell functions for easy use on AWS Lambda"; + license = lib.licenses.mit; + }) {}; + "aws-mfa-credentials" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-sts, base , exceptions, filelock, filepath, freer-effects, ini, lens @@ -38107,10 +38284,8 @@ self: { }: mkDerivation { pname = "base64"; - version = "0.4.2.2"; - sha256 = "05ins0i1561d4gfz6h7fxx8pj8i1qkskz8dgh8pfxa1llzmr856i"; - revision = "1"; - editedCabalFile = "1rlvmg18f2d2rdyzvvzk0is4073j5arx9qirgvshjx67kic2lzqm"; + version = "0.4.2.3"; + sha256 = "1hdqswxhgjrg8akl5v99hbm02gkpagsbx4i7fxbzdys1k0bj3gxw"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -38122,7 +38297,7 @@ self: { base base64-bytestring bytestring criterion deepseq random-bytestring text ]; - description = "Fast RFC 4648-compliant Base64 encoding"; + description = "A modern RFC 4648-compliant Base64 library"; license = lib.licenses.bsd3; }) {}; @@ -38753,8 +38928,8 @@ self: { }: mkDerivation { pname = "bcp47"; - version = "0.2.0.0"; - sha256 = "0dbbpxjhsm17xhqp2a4vvwb0rq3v33wmb84rqdcjr6j8d54wnq5f"; + version = "0.2.0.1"; + sha256 = "1hrqszdzr15p45wbbnpdkairmqwz8giyb0gn727wgxflh75a84xr"; libraryHaskellDepends = [ aeson base containers country generic-arbitrary iso639 megaparsec QuickCheck text @@ -38774,8 +38949,8 @@ self: { }: mkDerivation { pname = "bcp47-orphans"; - version = "0.1.0.1"; - sha256 = "0phw6hsrhya93w7zlrl7866zgpa62pscicjdb5lllpdqfcwl4jl2"; + version = "0.1.0.2"; + sha256 = "0rgr1p8dn54j432hfwg361dhsd4ngwvy3h8wx094m0kb6vjix9l6"; libraryHaskellDepends = [ base bcp47 cassava errors esqueleto hashable http-api-data path-pieces persistent text @@ -39912,28 +40087,6 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.5.9"; - sha256 = "0c0zm9n085a6zna91yq9c14xwpwi72wn9xlsgzpza9r9bmy5jv05"; - libraryHaskellDepends = [ - base base-orphans comonad containers tagged template-haskell - th-abstraction transformers - ]; - testHaskellDepends = [ - base hspec QuickCheck template-haskell transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - description = "Bifunctors"; - license = lib.licenses.bsd3; - }) {}; - - "bifunctors_5_5_10" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , hspec-discover, QuickCheck, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - }: - mkDerivation { - pname = "bifunctors"; version = "5.5.10"; sha256 = "03d96df4j1aq9z7hrk3n519g3h7fjgjf82fmgp6wxxbaigyrqwp7"; libraryHaskellDepends = [ @@ -39947,7 +40100,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bifunctors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -42621,8 +42773,8 @@ self: { pname = "bits"; version = "0.5.2"; sha256 = "1q5grjma421qiwjkwvnsakd4hxnf02bavfinky2skfhqvg63hkav"; - revision = "1"; - editedCabalFile = "0yjx0rixg51bhhddhb7m4g2ryp1qqj70j4bj6ggj0wpzmzazq5aa"; + revision = "2"; + editedCabalFile = "0zcxzi3afs2vxmm2mc9l65br5qym2ah9q3671f4ckzn0h0hcqw2n"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; @@ -42907,15 +43059,15 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; - "bitvec_1_1_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, gauge - , ghc-prim, integer-gmp, primitive, quickcheck-classes, random - , tasty, tasty-hunit, tasty-quickcheck, vector + "bitvec_1_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , integer-gmp, primitive, quickcheck-classes, random, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, vector }: mkDerivation { pname = "bitvec"; - version = "1.1.0.0"; - sha256 = "1blfi62immsx7hvg9krdbcp9n1p2a9qyhm9j30lc0g2jcl1n11mz"; + version = "1.1.1.0"; + sha256 = "0652dxx19g26jlx945qas09jhbcy17yw4visk9qhi9fbjl53v3yv"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp primitive vector ]; @@ -42924,7 +43076,7 @@ self: { tasty-quickcheck vector ]; benchmarkHaskellDepends = [ - base containers gauge integer-gmp random vector + base containers integer-gmp random tasty-bench vector ]; description = "Space-efficient bit vectors"; license = lib.licenses.bsd3; @@ -42955,6 +43107,8 @@ self: { pname = "bitwise-enum"; version = "1.0.0.3"; sha256 = "0ykrr8x1hc1lsj8cn19jcypvww4598g1v0vrn3z3b7n6hp6wfyis"; + revision = "3"; + editedCabalFile = "19d5xwigd482z47s8gpbd2jmm4pmx5bxg2fxkzjl8dias4yb431x"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -44968,24 +45122,22 @@ self: { }) {}; "bound" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytes, Cabal - , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest - , functor-classes-compat, hashable, mmorph, profunctors - , template-haskell, th-abstraction, transformers - , transformers-compat, vector, void + ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad + , deepseq, deriving-compat, functor-classes-compat, hashable + , mmorph, profunctors, template-haskell, th-abstraction + , transformers, transformers-compat, vector, void }: mkDerivation { pname = "bound"; - version = "2.0.2"; - sha256 = "14kl0aak48m1sbvi0g772hfmn6w984yc4j9p4ljxq6bfb2q4gqax"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "2.0.3"; + sha256 = "0rhpcz99sax81zh2k1ww7g2xgfcna56ppj9xc1l4gfnsrrlb27yg"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers transformers-compat ]; testHaskellDepends = [ - base deriving-compat doctest functor-classes-compat transformers + base deriving-compat functor-classes-compat transformers transformers-compat vector void ]; description = "Making de Bruijn Succ Less"; @@ -45110,7 +45262,7 @@ self: { }) {}; "box" = callPackage - ({ mkDerivation, attoparsec, base, comonad, concurrency + ({ mkDerivation, attoparsec, base, comonad, concurrency, containers , contravariant, dejafu, doctest, exceptions, generic-lens, lens , mmorph, mtl, numhask, numhask-space, optparse-generic , profunctors, random, text, time, transformers, transformers-base @@ -45118,18 +45270,18 @@ self: { }: mkDerivation { pname = "box"; - version = "0.6.2"; - sha256 = "1mwmz97s8mvan8fn8ps0gnzsidar1ygjfkgrcjglfklh5bmm8823"; + version = "0.6.3"; + sha256 = "1qdl8n9icp8v8hpk4jd3gsg8wrr469q4y6h6p1h6n6f899rwpv5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base comonad concurrency contravariant exceptions lens - mmorph numhask numhask-space profunctors text time transformers - transformers-base + attoparsec base comonad concurrency containers contravariant + exceptions lens mmorph numhask numhask-space profunctors text time + transformers transformers-base ]; executableHaskellDepends = [ - base concurrency dejafu exceptions generic-lens lens mtl numhask - optparse-generic random text transformers websockets + base concurrency containers dejafu exceptions generic-lens lens mtl + numhask optparse-generic random text transformers websockets ]; testHaskellDepends = [ base doctest numhask ]; description = "boxes"; @@ -45185,8 +45337,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "box-tuples"; - version = "0.2.0.3"; - sha256 = "12a3jj3z1gni8925n16ipqyah8vg244lx88v289f2rldiyvh3bvf"; + version = "0.2.0.4"; + sha256 = "02f3ll6qghs36sill1pznj2354cliq5kh5rbg19lsnykvqimca0i"; libraryHaskellDepends = [ base ghc-prim ]; description = "A hack to use GHC.Prim primitives in GHCi"; license = lib.licenses.mit; @@ -45404,8 +45556,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.58.1"; - sha256 = "0qsmj4469avxmbh7210msjwvz7fa98axxvf7198x0hb2y7vdpcz5"; + version = "0.60.2"; + sha256 = "1fcpbm58fikqv94cl97p6bzhyq07kkp3zppylqwpil2qzfhvzb3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46401,10 +46553,8 @@ self: { }: mkDerivation { pname = "bugzilla-redhat"; - version = "0.3.0"; - sha256 = "1d751f1219ivx9bfdl7xb89w2vns07ciqp4cqcykixnllx2jx18y"; - revision = "1"; - editedCabalFile = "145sdnk28sxwz4s1gh0qq6vzm9q6s5433q6w1199cv9585b53kcx"; + version = "0.3.1"; + sha256 = "088ya35lwxnvg0x996agy2ky8kp4r3j2i1ja15fy3afcqfpvbqiv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46679,8 +46829,8 @@ self: { }: mkDerivation { pname = "burrito"; - version = "1.2.0.0"; - sha256 = "1nrb08czlnfcgb7v59vzkffik2w5yp833la4mq6sp6sgnm0ylgya"; + version = "1.2.0.1"; + sha256 = "0swxc78vz1rj3q994cdnadgkanzcpm8rshvs2q49534rc2s6gq4g"; libraryHaskellDepends = [ base bytestring containers parsec template-haskell text transformers @@ -47150,8 +47300,8 @@ self: { pname = "bytes"; version = "0.17"; sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3"; - revision = "4"; - editedCabalFile = "0vxmahjxskyddq3gmr2b2ix5h33ywk6fmv17vqfbh8mhfbb26113"; + revision = "5"; + editedCabalFile = "0a089bz9sjnmv3f5w9jsm1b7g60qx8qxqj76lwjj0mslzi9iajk2"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable @@ -47183,8 +47333,8 @@ self: { }: mkDerivation { pname = "byteslice"; - version = "0.2.4.0"; - sha256 = "0f2dw5kf9gg41ns5hb0aarrv24yqv9cdzgl9hgdcf8jj5j3qj6di"; + version = "0.2.5.0"; + sha256 = "0sl5jbfni6sx6srlfdpj0cb0pjw38cf3fyxsnaldbap2wfd3ncyr"; libraryHaskellDepends = [ base bytestring primitive primitive-addr primitive-unlifted run-st tuples vector @@ -48054,8 +48204,8 @@ self: { }: mkDerivation { pname = "cab"; - version = "0.2.18"; - sha256 = "0ic1ivxiv217ls4g38q5dwrb8sbsrzvdm6c0idv9ancpjmm8k8jl"; + version = "0.2.19"; + sha256 = "0rn8b8fydrm8ad0va0pg016y5ph3dc0xashg0rqfjhzv8kwzlkzk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48092,8 +48242,8 @@ self: { ({ mkDerivation, base, Cabal, filepath }: mkDerivation { pname = "cabal-appimage"; - version = "0.3.0.0"; - sha256 = "0m3xq3k4s6rn90vd2sp115jyb722vi9wgih3lz05fnc2bypyg6zi"; + version = "0.3.0.2"; + sha256 = "0hyjb8y4zf7qccyzsms98sd0kgz83q1aqfhgx2f3dq1nprhbg9ld"; libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; license = lib.licenses.agpl3; @@ -48695,8 +48845,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.4"; - sha256 = "12z9gz1afra0fqd79j1r9fsdc7k8r6v1saw14l42kd2dqxdjqwcf"; + version = "0.4.1"; + sha256 = "1djw4l0z8nsaby2qcm08kvn2p1c35ynzdg25vc815dx2wpw38bh3"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal containers cryptohash-sha256 deepseq directory filepath lukko @@ -49612,8 +49762,8 @@ self: { }: mkDerivation { pname = "caerbannog"; - version = "0.6.0.3"; - sha256 = "0mv10cc50365kz2ad36wivvhcyl43bwxjp71f0n9vq2ndrmb4dna"; + version = "0.6.0.4"; + sha256 = "0zm6vdbsb947nd3wcniyk8mjs52r6hwyyp64w1abnazajraqask8"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hspec QuickCheck random @@ -49880,8 +50030,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.24.1"; - sha256 = "14q0s17an5vk2gq9vcy0ghd30zg1dj3q5vdln86mnd4v34wkpfr2"; + version = "0.1.25.1"; + sha256 = "17i8l2p314bifa5cfqvpy89m0yh9m1m4120cjc71ir2lb35wj9lf"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -53068,23 +53218,22 @@ self: { "chart-svg" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Color, concurrency - , cubicbezier, doctest, foldl, generic-lens, JuicyPixels, lens - , linear, lucid, numhask, numhask-space, reanimate, reanimate-svg - , scientific, tagsoup, text, time, transformers - , unordered-containers, vector + , containers, cubicbezier, doctest, foldl, generic-lens + , JuicyPixels, lens, linear, lucid, numhask, numhask-space + , reanimate, reanimate-svg, scientific, tagsoup, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "chart-svg"; - version = "0.2.0"; - sha256 = "1w7381r9zfj02c5r6fbza1x2qdxyqpgb3dj2wld73pzcladszp34"; - revision = "1"; - editedCabalFile = "18ilaajn42jni3pgzyc9f7z6ph3jyf0wrjfv9jnsp3ypyjj7yjn3"; + version = "0.2.2"; + sha256 = "184hpqkc9fvn64bg550clwxvjg2ii8igcl7nq3895pgi0cxxr0p1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base Color cubicbezier foldl generic-lens JuicyPixels - lens linear lucid numhask numhask-space reanimate reanimate-svg - scientific tagsoup text time transformers unordered-containers + attoparsec base Color containers cubicbezier foldl generic-lens + JuicyPixels lens linear lucid numhask numhask-space reanimate + reanimate-svg scientific tagsoup text time transformers + unordered-containers ]; executableHaskellDepends = [ attoparsec base bytestring concurrency foldl JuicyPixels lens @@ -53563,8 +53712,8 @@ self: { }: mkDerivation { pname = "cherry-core-alpha"; - version = "0.4.0.0"; - sha256 = "1rrmglzxvfq67ymgy7jifx8rgk33qq82vrcsbaqwcsjc95c3kfdx"; + version = "0.5.0.0"; + sha256 = "018ad2angm8n6dfw0sz3bamg38vzgv7j97vfpiidd575mf89imkn"; libraryHaskellDepends = [ aeson async base base64-bytestring binary bytestring case-insensitive containers directory ghc-prim http-client @@ -54076,6 +54225,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "chronos_1_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, doctest, hashable, HUnit, old-locale, primitive + , QuickCheck, semigroups, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, thyme, time, torsor, vector + }: + mkDerivation { + pname = "chronos"; + version = "1.1.2"; + sha256 = "0izzg5cnnw53m3pfxglpj96i88h1qx75w04n6a67855xly4dfyxa"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring deepseq hashable primitive + semigroups text torsor vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring deepseq doctest HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + torsor + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq old-locale QuickCheck + text thyme time vector + ]; + description = "A high-performance time library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "chronos-bench" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , containers, deepseq, optparse-applicative, process, terminal-size @@ -54104,8 +54281,8 @@ self: { pname = "chs-cabal"; version = "0.1.1.0"; sha256 = "0zan47md9zivzc1gd1j1g0200n8d0ffx4dcmkd9vriqjsdwhqvl5"; - revision = "1"; - editedCabalFile = "04fh1g2wfm69hz1hjg4ds2c3npdx6z2mgwddlkqr2sdbnngnmv10"; + revision = "2"; + editedCabalFile = "1axn8xmnrk42j1b8bxykbrqjy1ia0ajg27jirjb2gix1vvvpxb1d"; libraryHaskellDepends = [ base Cabal chs-deps ]; description = "Cabal with c2hs dependencies"; license = lib.licenses.bsd3; @@ -54705,8 +54882,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.3.0.4"; - sha256 = "13rx1919hnk26jpnqcdfqmd8hkvhg8504aq7abiyxy0diy28mvz7"; + version = "0.3.0.7"; + sha256 = "03cc3d7a1rf3k23150b19y4mx1c6vk53l9c59vv9npf39id33g7s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55975,8 +56152,8 @@ self: { }: mkDerivation { pname = "clickhouse-haskell"; - version = "0.1.2.3"; - sha256 = "1sa9jbiw8j04plk26p7n25plq0ymzsw7vqln0y6kbn3k30panyqg"; + version = "0.1.2.4"; + sha256 = "0c9847024crxiql09l55cx4881sv6lpzhhrwvhvb6f5548403iqg"; libraryHaskellDepends = [ aeson array async attoparsec base binary bytestring bytestring-to-vector call-stack containers data-default-class @@ -57348,8 +57525,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.13"; - sha256 = "0qi07canqwnwfvmbsp1j9lyklnn8h909r6js94xlpin1qa7dpjda"; + version = "0.1.3.14"; + sha256 = "1vkjnyzcl44h9b24k1h5mz61gdz42bs64ifxwijx8a2a72mwmaa6"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -57407,8 +57584,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "code-page"; - version = "0.2"; - sha256 = "0i0qbrbhvrwkbikqb7hh7yxaipaavwzvyrw211d0vkz99f62mqxz"; + version = "0.2.1"; + sha256 = "1aiavczjk6f2kc1cdwjc1mwkr4d9shiz3xwmfbzsdn0yqqchxydj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Windows code page library for Haskell"; @@ -58794,8 +58971,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.1.1.3"; - sha256 = "1hwbii1d56979l0svvjayzhmwa25s66l36bb08hjq6p36lkv2a1v"; + version = "0.1.1.4"; + sha256 = "0dpm110svgdf21lf5sfbzjcfryn0v6hhjcs8kkyf167kng2sclfn"; libraryHaskellDepends = [ base bytestring containers parsec text transformers ]; @@ -59192,8 +59369,8 @@ self: { }: mkDerivation { pname = "compdata"; - version = "0.12"; - sha256 = "0b08mmj04bbi735hvvdbg1nmg66qg1c11r0kvq7m569r91bmy54v"; + version = "0.12.1"; + sha256 = "0ksa3bgqjvshkrpd74420z9kkb3asq4flszzwrqswd4qw1yn9f05"; libraryHaskellDepends = [ base containers deepseq mtl QuickCheck template-haskell th-expand-syns transformers tree-view @@ -61583,6 +61760,8 @@ self: { pname = "config-schema"; version = "1.2.1.0"; sha256 = "1p5nhvhq7q5s67l4h4zb19ali5jbxrz9mb5cwzhykqmqji56n5vf"; + revision = "1"; + editedCabalFile = "056iks8k9lhbv34pqk8nisqc7vwzqq0shknixbpkd3vgbd3yksyf"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -61617,6 +61796,8 @@ self: { pname = "config-value"; version = "0.8.1"; sha256 = "086jv01a737547w6x9w1951vq0p7mx6vqw9ifw5kcs5nvhj5rx2q"; + revision = "1"; + editedCabalFile = "0wa3grq566fpkq5g9bcszwjv96drq6b3qg2w32rv8m00pd1j0n27"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -62851,6 +63032,8 @@ self: { pname = "contra-tracer"; version = "0.1.0.0"; sha256 = "146g43sqa23n1qg100jvz5m1jcjfxx4rxzmc8559b6apys9ys4br"; + revision = "1"; + editedCabalFile = "1r3rnxlbvfirj4n2vwysh7zkfdwlx3x4p9yjd32hpr3vdikgpvds"; libraryHaskellDepends = [ base ]; description = "Arrow and contravariant tracers"; license = lib.licenses.bsd3; @@ -63791,8 +63974,8 @@ self: { }: mkDerivation { pname = "cornea"; - version = "0.3.0.1"; - sha256 = "0kdj6ii6k8x9i87vgfl2cjlwkj4vls09w781xab6ix7h264asi71"; + version = "0.3.1.2"; + sha256 = "04iika5r5w3347w87b8whwrxym5nzvgl5pr76fpxw78fwvi1nvzk"; libraryHaskellDepends = [ base-noprelude either lens lifted-base monad-control mtl relude template-haskell th-abstraction transformers @@ -64860,8 +65043,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "10.6"; - sha256 = "0c86gf70iv59dwmm0yv8isyyd6zy497vqgf6ml9s6rz4hhg1rwl0"; + version = "10.7"; + sha256 = "0745aa7zs5niwi55kdkfnyii9vdg9jfqr2872w068r8p33njcbdk"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector @@ -65975,14 +66158,13 @@ self: { "cryptohash-sha256" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion - , SHA, tasty, tasty-hunit, tasty-quickcheck + , cryptohash-sha256-pure, SHA, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "cryptohash-sha256"; - version = "0.11.101.0"; - sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"; - revision = "4"; - editedCabalFile = "00p6sx2n1pzykm3my68hjfk8l66g66rh7inrfcnkd5mhilqdcqxr"; + version = "0.11.102.0"; + sha256 = "0685s4hfighzywvvn05cfff5bl2xz3wq0pfncv6zca4iba3ykmla"; + configureFlags = [ "-fuse-cbits" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -65990,10 +66172,14 @@ self: { base base16-bytestring bytestring SHA tasty tasty-hunit tasty-quickcheck ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptohash-sha256-pure SHA + ]; description = "Fast, pure and practical SHA-256 implementation"; license = lib.licenses.bsd3; - }) {}; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {cryptohash-sha256-pure = null;}; "cryptohash-sha512" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion @@ -66130,6 +66316,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "cryptonite_0_28" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.28"; + sha256 = "1nx568qv25dxhbii7lzf1hbv0dyz95z715mmxjnnrkgpwdm8ibbl"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty @@ -67127,28 +67336,28 @@ self: { }) {}; "curry-frontend" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, curry-base - , directory, extra, file-embed, filepath, mtl, network-uri, pretty - , process, set-extra, template-haskell, transformers + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , directory, extra, file-embed, filepath, mtl, network-uri, parsec + , pretty, process, set-extra, template-haskell, time, transformers }: mkDerivation { pname = "curry-frontend"; - version = "1.0.4"; - sha256 = "1dfljqyrp9w0sw3zmyy9rglpnjv14qj8ky1yjslmiaanjnl0m07b"; + version = "2.0.0"; + sha256 = "0bfqb922drarbjig3a35frf29cc4qa9mw789p5m0d88iwgkhvqnr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers curry-base directory extra file-embed - filepath mtl network-uri pretty process set-extra template-haskell - transformers + base binary bytestring containers directory extra file-embed + filepath mtl network-uri parsec pretty process set-extra + template-haskell time transformers ]; - executableHaskellDepends = [ - base bytestring containers curry-base directory extra file-embed + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring Cabal containers directory extra file-embed filepath mtl network-uri pretty process set-extra template-haskell transformers ]; - testHaskellDepends = [ base Cabal curry-base filepath ]; description = "Compile the functional logic language Curry to several intermediate formats"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -68307,14 +68516,31 @@ self: { }: mkDerivation { pname = "data-ascii"; - version = "1.0.0.2"; - sha256 = "03lxcybzamd1d5lrd1i9ygr5s094cr9ch2jdk5fx5hjg4bkigdds"; + version = "1.0.0.4"; + sha256 = "17pb1kmqln7cswsc4c7xipq619aj2y0kjhrcm23r8b39c0g02scy"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive hashable semigroups + text + ]; + description = "Type-safe, bytestring-based ASCII values"; + license = lib.licenses.bsd3; + }) {}; + + "data-ascii_1_0_0_6" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , hashable, semigroups, text + }: + mkDerivation { + pname = "data-ascii"; + version = "1.0.0.6"; + sha256 = "0j8mk1gdxcczhwcs75rx50zh6vxv2vkd1rf5n6q4ryn8wm5r3gcr"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive hashable semigroups text ]; description = "Type-safe, bytestring-based ASCII values"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "data-aviary" = callPackage @@ -69008,8 +69234,8 @@ self: { ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "data-fix"; - version = "0.3.0"; - sha256 = "184rz8ypgrb3sxy9wiaq321d82p689w7dcwkc0qkjlabd7nv6ncy"; + version = "0.3.1"; + sha256 = "0yfciggx8l82nfpv40w2673glnl9nnbh269kpfbw28i98x0c0icv"; libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; @@ -69958,8 +70184,8 @@ self: { }: mkDerivation { pname = "data-validation"; - version = "0.1.2.4"; - sha256 = "1ck7grirqv0hbi973fgbgwzflsmz8diwi1rmjmfxz1f3915vi1yz"; + version = "0.1.2.5"; + sha256 = "0xma425fsnqczw2csknms75zx9i5nfnjc3nqcxlqi9xbxv2fksi6"; libraryHaskellDepends = [ base containers template-haskell ]; testHaskellDepends = [ base containers hspec regex-tdfa template-haskell @@ -70654,6 +70880,34 @@ self: { license = lib.licenses.asl20; }) {}; + "dbus_1_2_18" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.18"; + sha256 = "15ggmggzgzf0xmj80rj14dyk83vra6yzm5pm92psnc4spn213p73"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -71634,16 +71888,14 @@ self: { broken = true; }) {}; - "deepseq_1_4_4_0" = callPackage + "deepseq_1_4_5_0" = callPackage ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.4.0"; - sha256 = "09kfpmgl679l74b6dadia11pvhya9ik4wrd8x76cgkxk7gwcbkrc"; - revision = "1"; - editedCabalFile = "0mbby1hig605jyiyy4m2y2nnjjf5i2adzc6x269hbz4pxscjp43n"; + version = "1.4.5.0"; + sha256 = "0d3yw95xkyx7wwx3anfj1fqb10080xykqic483xpl7rvi1mik6js"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ array base ghc-prim HUnit test-framework test-framework-hunit @@ -72207,22 +72459,44 @@ self: { }) {}; "dep-t" = callPackage - ({ mkDerivation, base, mtl, rank2classes, tasty, tasty-hunit - , template-haskell, transformers, unliftio-core + ({ mkDerivation, base, doctest, mtl, rank2classes, sop-core, tasty + , tasty-hunit, template-haskell, transformers, unliftio-core }: mkDerivation { pname = "dep-t"; - version = "0.1.0.2"; - sha256 = "0vzf37gmhvpv43xybzn7lms0jgl12ch7mz04a05a1arn3ljh89c9"; + version = "0.4.4.0"; + sha256 = "1qknqh9j7nvyy15zfi3prx6bifp2nd72kgfd085p478z887i71r4"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ - base mtl rank2classes tasty tasty-hunit template-haskell - transformers unliftio-core + base doctest mtl rank2classes sop-core tasty tasty-hunit + template-haskell transformers unliftio-core ]; description = "Reader-like monad transformer for dependency injection"; license = lib.licenses.bsd3; }) {}; + "dep-t-advice" = callPackage + ({ mkDerivation, barbies, base, criterion, dep-t, doctest, mtl + , rank2classes, sop-core, tasty, tasty-hunit, template-haskell + , transformers + }: + mkDerivation { + pname = "dep-t-advice"; + version = "0.4.6.0"; + sha256 = "1v1nn0qbr3l7hh3f5aw6ril8ifzg6r8im7gpyj5plfbp272v4gs9"; + libraryHaskellDepends = [ base dep-t sop-core transformers ]; + testHaskellDepends = [ + barbies base dep-t doctest mtl rank2classes sop-core tasty + tasty-hunit template-haskell transformers + ]; + benchmarkHaskellDepends = [ + base criterion dep-t mtl rank2classes sop-core template-haskell + transformers + ]; + description = "Giving good advice to functions in a DepT environment"; + license = lib.licenses.bsd3; + }) {}; + "dependency" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, containers , criterion, deepseq, hspec, microlens @@ -72797,8 +73071,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "derulo"; - version = "1.0.9"; - sha256 = "1rpxbg0g44813b0mlkifiav2w04wy56n1zlnqk5jcibdbmi6yagi"; + version = "1.0.10"; + sha256 = "0mdmrzypl0hjbnwn9ij1bjfk4j07r0c9gw7h3wdhl82a8zcxggpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -73265,7 +73539,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "dhall" = callPackage + "dhall_1_37_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -73319,6 +73593,63 @@ self: { doCheck = false; description = "A configuration language guaranteed to terminate"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "dhall" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mmorph, mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-silver, template-haskell, text + , text-manipulate, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.38.0"; + sha256 = "0ifxi9i7ply640s2cgljjczvmblgz0ryp2p9yxgng3qm5ai58229"; + revision = "1"; + editedCabalFile = "067hh41cnmjskf3y3kzlwsisw6v5bh9mbmhg5jfapm1y5xp6gw9r"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + th-lift-instances transformers transformers-compat + unordered-containers uri-encode vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random http-client http-client-tls + lens-family-core megaparsec mockery prettyprinter QuickCheck + quickcheck-instances scientific serialise special-values spoon + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-silver template-haskell text transformers turtle + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge text + ]; + doCheck = false; + description = "A configuration language guaranteed to terminate"; + license = lib.licenses.bsd3; }) {}; "dhall-bash" = callPackage @@ -73327,8 +73658,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.35"; - sha256 = "0v7br83m3zhz4pa98yrzbikkvldgrprjq0z5amimjsk8lcdmpq8k"; + version = "1.0.36"; + sha256 = "0hg45xjl1pcla9xbds40qrxcx2h6b4ysw8kbx8hpnaqaazr2jrw0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73370,10 +73701,10 @@ self: { }: mkDerivation { pname = "dhall-docs"; - version = "1.0.3"; - sha256 = "0cinkgcihn15zws18nff42lcpmzv4cg7k8wxmcwa93k7qvw01i2p"; - revision = "1"; - editedCabalFile = "1wzwfgv6bpgjq0day372gyxg9vrcmkf5sbzvm0lv4p39z0qcgpna"; + version = "1.0.4"; + sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl"; + revision = "2"; + editedCabalFile = "1y8aaph8zg3lp53apvkg0s6zviz3sa82qq1dnbqn6xjgb1dqjr7z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73437,10 +73768,10 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.7.4"; - sha256 = "1qzlv7wvap1ivgv7fi9ikqa9nm9z9kbbca5zvddh3njcdk6i73n9"; + version = "1.7.5"; + sha256 = "1fpkp8xkcw2abcigypyl0ji6910jyshlqwhf48yfwn6dsgbyw6iy"; revision = "1"; - editedCabalFile = "0njh1c7c4dcm5ya4w79mf11m5v9gnacyd7lrz7j4ipk4wdgwinvi"; + editedCabalFile = "0vl9vb84r1fz80jvqxaq4624pk67hxkm3vsx5j0l3bz8mk439yzn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73488,10 +73819,10 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.12"; - sha256 = "0gp9pa3pdm49ya6awdi1qjbycxdihz2z11mzmfnr5m2gf0vrjzpp"; + version = "1.0.13"; + sha256 = "0cj51xdmpp0w7ndzbz4yn882agvhbnsss3myqlhfi4y91lb8f1ak"; revision = "2"; - editedCabalFile = "0nn30rkmdxacankwvmagfxaha6532ikwpz7w18s27xw4qpkhp6v9"; + editedCabalFile = "1gmcfp6i36y00z4gyllcq62rgpjz2x7fgdy4n6d24ygczpqbwy9k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73515,10 +73846,10 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.19"; - sha256 = "0w3vxqn1h39f17mg246ydxni02civ3fm85s0wi4ks6iy1ng4dw0a"; + version = "1.1.20"; + sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd"; revision = "1"; - editedCabalFile = "0m0xpxc7nm962b0vkw7i88dnwihjza82cybqjzjk24dgp8v48cqs"; + editedCabalFile = "16hz1i0vkp1qsqf9dm0d9pc1kap02nzdalzjpiw2r8p3qbykaann"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73542,10 +73873,8 @@ self: { }: mkDerivation { pname = "dhall-nixpkgs"; - version = "1.0.3"; - sha256 = "03apykbil3x3j7ndapfgmf39p7l62d1lrn2ad1m6k5xqnd8nqlxf"; - revision = "1"; - editedCabalFile = "1wqh5l2rydb2ag1k514p3p8dq19m3mbv6i2cha4xr8ykwcwbwi0j"; + version = "1.0.4"; + sha256 = "0yr7z17dvmr1zipk29fmzm46myxxsz514587n6a7h00c56dyvnc3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73559,6 +73888,24 @@ self: { broken = true; }) {}; + "dhall-recursive-adt" = callPackage + ({ mkDerivation, base, data-fix, dhall, either, hedgehog + , neat-interpolation, recursion-schemes, tasty, tasty-hedgehog + , tasty-hunit + }: + mkDerivation { + pname = "dhall-recursive-adt"; + version = "0.1.0.0"; + sha256 = "01wk6xsakbhsx14s59f0rj32mlccgxgc29a3n5d3b923yd5w64zm"; + libraryHaskellDepends = [ base data-fix dhall recursion-schemes ]; + testHaskellDepends = [ + base dhall either hedgehog neat-interpolation recursion-schemes + tasty tasty-hedgehog tasty-hunit + ]; + description = "Convert recursive ADTs from and to Dhall"; + license = lib.licenses.cc0; + }) {}; + "dhall-text" = callPackage ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { @@ -73616,10 +73963,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.2.4"; - sha256 = "0xm1dsim5x83k6kp5g9yv08ixf6l4p2mm666m4vsylx98y5nwmag"; - revision = "1"; - editedCabalFile = "1mmsymbj57r49kj520f9hrw9bk80y29p3av68b1hmrcaiixqs87a"; + version = "1.2.5"; + sha256 = "0fax4p85344yrzk1l21j042mm02p0idp396vkq71x3dpiniq0mwf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74720,8 +75065,8 @@ self: { }: mkDerivation { pname = "differential"; - version = "0.2.0.0"; - sha256 = "1dzxqva176dw22bb4hlv8dfizkzqsj5z9qdv7piwdh171nd9bwqd"; + version = "0.2.0.1"; + sha256 = "0xmsrc92jxd78b3vri3sf37w1w7c8nl7wc36gsqamd00laia95xv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75751,8 +76096,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.1"; - sha256 = "07rhg7r4v05q1y6rin4b5v49231r2w35jfwnrbg7b7s1skdld9g3"; + version = "1.8.3"; + sha256 = "0adpb7wzij9n5f2xxqy9j8n3rx0bjg7z1lk0p212zkygabw297mi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76987,28 +77332,6 @@ self: { }) {}; "dl-fedora" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , http-directory, http-types, optparse-applicative, regex-posix - , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs - }: - mkDerivation { - pname = "dl-fedora"; - version = "0.7.5"; - sha256 = "1x4gdnb2k1ywvaniif7j2lsbavadaghvcpbdnms3x13s4cg18lyh"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring directory filepath http-directory http-types - optparse-applicative regex-posix simple-cmd simple-cmd-args text - time unix xdg-userdirs - ]; - description = "Fedora image download tool"; - license = lib.licenses.gpl3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "dl-fedora_0_7_6" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , http-directory, http-types, optparse-applicative, regex-posix , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs @@ -77791,7 +78114,7 @@ self: { license = lib.licenses.mit; }) {}; - "doctest_0_17" = callPackage + "doctest_0_18" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, hspec-core, HUnit, mockery , process, QuickCheck, setenv, silently, stringbuilder, syb @@ -77799,8 +78122,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.17"; - sha256 = "0f0knggq6yjcznyri35fll619q5jr8vcsbiyvdiz4prkawhaa4pz"; + version = "0.18"; + sha256 = "1yqrmjg3rn1vy0p6a6j78gnnl8lx4hzi0rwhpl5ljb4q6kzyc3x4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78109,8 +78432,8 @@ self: { }: mkDerivation { pname = "dom-lt"; - version = "0.2.2"; - sha256 = "0hf0wf4fl671awf87f0r7r4a57cgm88x666081c0wy16qchahffw"; + version = "0.2.2.1"; + sha256 = "1gaavi6fqzsl5di889880m110a1hrlylbjckm6bg24sv8nn96glp"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base containers HUnit ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; @@ -78274,6 +78597,59 @@ self: { broken = true; }) {}; + "dormouse-client" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, dormouse-uri, hedgehog, hspec + , hspec-discover, hspec-hedgehog, http-api-data, http-client + , http-client-tls, http-types, mtl, safe-exceptions, scientific + , streamly, streamly-bytestring, template-haskell, text, vector + }: + mkDerivation { + pname = "dormouse-client"; + version = "0.1.0.1"; + sha256 = "033299c0rc6hsg51pg7igb5fnf8w200ckazmyjk23d1h48mz7gcg"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + dormouse-uri http-api-data http-client http-client-tls http-types + mtl safe-exceptions streamly streamly-bytestring template-haskell + text + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + dormouse-uri hedgehog hspec hspec-discover hspec-hedgehog + http-api-data http-client http-client-tls http-types mtl + safe-exceptions scientific streamly streamly-bytestring + template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Simple, type-safe and testable HTTP client"; + license = lib.licenses.bsd3; + }) {}; + + "dormouse-uri" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, case-insensitive + , containers, hedgehog, hspec, hspec-discover, hspec-hedgehog + , http-types, safe-exceptions, scientific, template-haskell, text + , vector + }: + mkDerivation { + pname = "dormouse-uri"; + version = "0.1.0.1"; + sha256 = "04ps9k4dhg9xk7al12y757lxl45dfa0aczirdkyks28cavlpr07b"; + libraryHaskellDepends = [ + attoparsec base bytestring case-insensitive containers http-types + safe-exceptions template-haskell text + ]; + testHaskellDepends = [ + attoparsec base bytestring case-insensitive containers hedgehog + hspec hspec-discover hspec-hedgehog http-types safe-exceptions + scientific template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for type-safe representations of Uri/Urls"; + license = lib.licenses.bsd3; + }) {}; + "dot" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -78821,22 +79197,24 @@ self: { "dprox" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, dns - , hspec, iproute, network, optparse-applicative, streaming-commons - , unix, unordered-containers + , hashable, hspec, iproute, network, optparse-applicative, psqueues + , streaming-commons, time, unix, unordered-containers }: mkDerivation { pname = "dprox"; - version = "0.1.2.1"; - sha256 = "16z7qx76qy2gjz2j630maa2jgiqhphi8vpphbdywgk1abg7iwhrz"; + version = "0.2.0"; + sha256 = "0hylymdpvnh353rg9gh8d9m9ag8hfxjh2ndrdxvhapbpddbbz3qm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base bytestring containers dns iproute network - optparse-applicative streaming-commons unix unordered-containers + attoparsec base bytestring containers dns hashable iproute network + optparse-applicative psqueues streaming-commons time unix + unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring containers dns hspec iproute network - optparse-applicative streaming-commons unix unordered-containers + attoparsec base bytestring containers dns hashable hspec iproute + network optparse-applicative psqueues streaming-commons time unix + unordered-containers ]; description = "a lightweight DNS proxy server"; license = lib.licenses.bsd3; @@ -78940,8 +79318,8 @@ self: { }: mkDerivation { pname = "drifter"; - version = "0.2.4"; - sha256 = "012x67lncwlrf2kjmfki4lz3sclpj1gjf7wyszagwm523grp1qly"; + version = "0.3.0"; + sha256 = "079y7yzws7lghgazkc7qprz43q4bv0qjnxh7rmcrrwfs5acm1x34"; libraryHaskellDepends = [ base containers fgl text ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck text @@ -81587,8 +81965,8 @@ self: { ({ mkDerivation, base, containers, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.4.2"; - sha256 = "1cagf93vaz41hl5vm1xqvzdds82h2cck294apr5b082nscv6r9bc"; + version = "0.0.4.4"; + sha256 = "1kh10iykk6gqzl78smrwv1zl8dcy0ns2raisx5qchcvrdgshzdiy"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; @@ -81605,10 +81983,12 @@ self: { pname = "either-result"; version = "0.3.1.0"; sha256 = "1l4539j0ynn5jl0rh9bhjxlgvr0sn3bf8ws1zrlbfk15524znqhm"; + revision = "1"; + editedCabalFile = "1bmcvhjw53nhkzm99dzjq1mvj8s7b27ji2h8av5zy2wsniknrzbm"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base doctest hspec transformers ]; testToolDepends = [ doctest-discover hspec-discover ]; - description = "‘MonadFail’ instance for a wrapper of ‘ExceptT String m a’"; + description = "The simplest ‘MonadFail’ instance"; license = lib.licenses.asl20; }) {}; @@ -82407,8 +82787,8 @@ self: { }: mkDerivation { pname = "elm-street"; - version = "0.1.0.3"; - sha256 = "106qaw496kry8rcjyz4nwfn4i4pgygjw6zvfnqrld52mdqjbyxbv"; + version = "0.1.0.4"; + sha256 = "1dnpzc70qznbm3f678lxzkfbyihcqhlg185db09q64aj20hls5d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83848,6 +84228,30 @@ self: { broken = true; }) {}; + "ephemeral" = callPackage + ({ mkDerivation, attoparsec, base, box, box-csv, chart-svg + , concurrency, doctest, lens, lucid, mealy, microlens, moo + , mwc-probability, numhask, numhask-array, numhask-space, primitive + , profunctors, random, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "ephemeral"; + version = "0.0.1"; + sha256 = "1xxdifw1mcyfgz4749z136xqxmxbm26v0x0yk8238wm08i80y8fy"; + libraryHaskellDepends = [ + attoparsec base box box-csv chart-svg concurrency lens lucid mealy + microlens moo mwc-probability numhask numhask-array numhask-space + primitive profunctors random text time transformers + unordered-containers + ]; + testHaskellDepends = [ base doctest numhask ]; + description = "See readme.md"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "epi-sim" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, hspec , mwc-random, primitive, statistics, trifecta, vector @@ -84032,8 +84436,8 @@ self: { }: mkDerivation { pname = "equational-reasoning"; - version = "0.6.0.4"; - sha256 = "1dv9di6p7pqmxys9c2d3rv36qhafgji0rxf52v0240zvfqhg8wn4"; + version = "0.7.0.0"; + sha256 = "0l6gyq43byh6cy2pblb9a4qjy7w5k9maa97c076dxlsf53myj01h"; libraryHaskellDepends = [ base containers template-haskell th-desugar void ]; @@ -86312,26 +86716,24 @@ self: { "exh" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers - , exceptions, hspec, html-conduit, http-client, http-client-tls - , http-conduit, lens, megaparsec, monad-control, monad-time, mtl - , quickjs-hs, retry, text, time, transformers, transformers-base - , xml-conduit, xml-lens + , hspec, html-conduit, http-client, http-client-tls, in-other-words + , language-javascript, megaparsec, optics-core, optics-th, text + , time, transformers, xml-conduit, xml-optics }: mkDerivation { pname = "exh"; - version = "0.2.0"; - sha256 = "1pka39mzzbvxl0d60115hwyg2vgpznf1kk7z97p4k2m8kf2b668z"; + version = "1.0.0"; + sha256 = "0s5br96spx4v67mvl09w4kpcwvps65zp6qx5qpvrq63a0ncclp7l"; libraryHaskellDepends = [ - aeson base bytestring conduit containers exceptions html-conduit - http-client http-client-tls http-conduit lens megaparsec - monad-control monad-time mtl quickjs-hs retry text time - transformers transformers-base xml-conduit xml-lens + aeson base bytestring conduit containers html-conduit http-client + in-other-words language-javascript megaparsec optics-core optics-th + text time transformers xml-conduit xml-optics ]; testHaskellDepends = [ - aeson base bytestring conduit containers exceptions hspec - html-conduit http-client http-client-tls http-conduit lens - megaparsec monad-control monad-time mtl quickjs-hs retry text time - transformers transformers-base xml-conduit xml-lens + aeson base bytestring conduit containers hspec html-conduit + http-client http-client-tls in-other-words language-javascript + megaparsec optics-core optics-th text time transformers xml-conduit + xml-optics ]; description = "A library for crawling exhentai"; license = lib.licenses.bsd3; @@ -87971,8 +88373,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.1.4"; - sha256 = "151jlcrp80f8riyf8rxzvggyxq3k2mg2fi81r7wnc4in6gzsc0qj"; + version = "1.0.1.6"; + sha256 = "1yqld2b6lbxl9sw9yp3dy184189nhfs7q4shnyrzc0m000hxgwkj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88240,6 +88642,8 @@ self: { pname = "fast-tags"; version = "2.0.0"; sha256 = "0q2ijh1pdxzm57557vln195mmxs15wra9159vpsjvjda4gnd7bs6"; + revision = "1"; + editedCabalFile = "18q3hzl178a3hzxmvb79y1g9r29b6dxfq9nczwk2g3pqmi9qnbmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88741,6 +89145,38 @@ self: { broken = true; }) {}; + "fbrnch" = callPackage + ({ mkDerivation, aeson, async, base, bugzilla-redhat, bytestring + , config-ini, directory, email-validate, extra, filepath, haxr + , http-conduit, http-directory, http-query, lens, lens-aeson, mtl + , network-uri, optparse-applicative, pretty-terminal, process + , rpmbuild-order, simple-cmd, simple-cmd-args, text, time + , typed-process, unordered-containers, utf8-string, xdg-basedir + }: + mkDerivation { + pname = "fbrnch"; + version = "0.7.1"; + sha256 = "05gs3r9c67xvpkpg968aj0ym39qakazbycjlb8wnys5ijc0iwa7w"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring directory filepath haxr http-query lens + lens-aeson mtl text time unordered-containers + ]; + executableHaskellDepends = [ + aeson async base bugzilla-redhat bytestring config-ini directory + email-validate extra filepath http-conduit http-directory + http-query network-uri optparse-applicative pretty-terminal process + rpmbuild-order simple-cmd simple-cmd-args text time typed-process + utf8-string xdg-basedir + ]; + doHaddock = false; + description = "Build and create Fedora package repos and branches"; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fca" = callPackage ({ mkDerivation, base, bytestring, containers, cryptohash, hashable , text, unordered-containers @@ -88802,8 +89238,8 @@ self: { ({ mkDerivation, base, doctest, first-class-families, Glob }: mkDerivation { pname = "fcf-containers"; - version = "0.5.0"; - sha256 = "0j4ij4iw5axjp56zhxb3kn6ls1l8m2ckqx6620y1yjhz3ja608f2"; + version = "0.6.0"; + sha256 = "09sr1xqdjzfk5gysd7hi66xadwcfrjq4q3vakmdilc14lw833wgp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base first-class-families ]; @@ -90712,8 +91148,8 @@ self: { }: mkDerivation { pname = "finitary"; - version = "2.0.0.0"; - sha256 = "19b0sm9lb5k459bhq51srx5rcdgk9rjhfha34a3kcsmlqam9fak7"; + version = "2.1.1.0"; + sha256 = "1ip1l809d7wnhiyz522g34kzsvv2r9hz1l065jqlrwf1pnhgsv0c"; libraryHaskellDepends = [ base bitvec finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise primitive template-haskell @@ -90732,20 +91168,21 @@ self: { ({ mkDerivation, base, binary, bitvec, coercible-utils, deepseq , finitary, finite-typelits, ghc-typelits-extra , ghc-typelits-knownnat, hashable, hedgehog, hedgehog-classes - , transformers, vector, vector-binary-instances, vector-instances + , integer-gmp, primitive, vector, vector-binary-instances + , vector-instances }: mkDerivation { pname = "finitary-derive"; - version = "2.2.0.0"; - sha256 = "11nkryzbhkbz4v2i4kwaggw67nlhs5jljqczmvliyz1df75f5kh3"; + version = "3.0.0.1"; + sha256 = "1l8xh7azssfgwvr78jaklj6dagmjpbx5ad4j6kzx104khj0skpqy"; libraryHaskellDepends = [ base binary bitvec coercible-utils deepseq finitary finite-typelits - ghc-typelits-extra ghc-typelits-knownnat hashable transformers - vector vector-binary-instances vector-instances + ghc-typelits-extra ghc-typelits-knownnat hashable integer-gmp + primitive vector vector-binary-instances vector-instances ]; testHaskellDepends = [ base binary deepseq finitary finite-typelits hashable hedgehog - hedgehog-classes + hedgehog-classes vector ]; description = "Flexible and easy deriving of type classes for finitary types"; license = lib.licenses.gpl3Plus; @@ -90761,6 +91198,8 @@ self: { pname = "finitary-optics"; version = "1.0.0.0"; sha256 = "0is930yhcd1iqgbxn42ldzbh408inpsprw9psvnx61j6qm6p4cd7"; + revision = "2"; + editedCabalFile = "17qm24b8v61h9m0vjxcx6c89qm93c5lc5y3nb79b7xzfzx3y4zv4"; libraryHaskellDepends = [ base finitary finite-typelits optics-core ]; @@ -90771,6 +91210,22 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "finite" = callPackage + ({ mkDerivation, array, base, Cabal, containers, hashable + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "finite"; + version = "1.4.1.2"; + sha256 = "10hnqz4klgrpfbvla07h8yghpv22bsyijf0cibfzwl9j779vb4nc"; + libraryHaskellDepends = [ + array base containers hashable QuickCheck template-haskell + ]; + testHaskellDepends = [ base Cabal hashable QuickCheck ]; + description = "Finite ranges via types"; + license = lib.licenses.mit; + }) {}; + "finite-field" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, primes , QuickCheck, singletons, tasty, tasty-hunit, tasty-quickcheck @@ -92156,8 +92611,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "flow"; - version = "1.0.21"; - sha256 = "1zig5jwqflcs6akhxqkn9h7iwq7ypaz4cx7zwbqfy7sap6sdq2il"; + version = "1.0.22"; + sha256 = "1xsifahlma8x130d8hc1k5hzcf1kr8qg8xxh67lshbvarrg19air"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; @@ -93148,8 +93603,8 @@ self: { ({ mkDerivation, base, foma }: mkDerivation { pname = "foma"; - version = "0.1.1.0"; - sha256 = "1aiy4bizzx5g87lvlx8xy24rxvzh093mlaavxkcr542fq9ki8yb3"; + version = "0.1.2.0"; + sha256 = "1g9wy1zn0mi2lgfpprhh8q5sy0cvf5pbk2yrkr2911pn7g00jdc4"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ foma ]; description = "Simple Haskell bindings for Foma"; @@ -93694,8 +94149,8 @@ self: { }: mkDerivation { pname = "forsyde-shallow"; - version = "3.4.0.0"; - sha256 = "0czrgfx22j94xp56mf4cwrz2rdw2id77va89xpjxxrhdzwzfsvcn"; + version = "3.4.0.1"; + sha256 = "0im5xf8dcalsjk85fyvih042apv3wl54k3jlmdjg7fnm3mgxj1yj"; libraryHaskellDepends = [ base directory old-time process random ]; testHaskellDepends = [ base directory doctest hspec old-time process QuickCheck random @@ -93889,34 +94344,6 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.2.0.0"; - sha256 = "1jak0xgd6gcbw7icyrblvqnvzjyyakpw2zfnqj1z958qyg763v52"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory dlist exceptions - filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text - ]; - executableHaskellDepends = [ - base directory ghc-lib-parser gitrev optparse-applicative text - ]; - testHaskellDepends = [ - base containers filepath hspec path path-io text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - }) {}; - - "fourmolu_0_3_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec - , hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative - , path, path-io, syb, text - }: - mkDerivation { - pname = "fourmolu"; version = "0.3.0.0"; sha256 = "0v89dvcr8l0swj23kkakc39q6lyxjz90rqgwy7m6a5p6iv3h2wms"; isLibrary = true; @@ -93935,7 +94362,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fp-ieee" = callPackage @@ -95521,8 +95947,8 @@ self: { }: mkDerivation { pname = "fswatcher"; - version = "0.2.2"; - sha256 = "0rdvh9310qbnp6vh3janr60nla33kyfy23yfzbzsca8ridr7ab7w"; + version = "0.3.0"; + sha256 = "0bn3pnk7jra4p20hm4ydvnqibfh3h9kc5lswvs8s02wlzf5z5a9f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96514,14 +96940,14 @@ self: { }: mkDerivation { pname = "fusion-plugin"; - version = "0.2.1"; - sha256 = "08v43q428s6nw3diqaasdr0c9arrzvzvldcybj8wp2r66aw613ic"; + version = "0.2.2"; + sha256 = "1d7avmbrqgvp9c4jyrlw344hml29f3vy5m5fgyrsd1z3g4fymakb"; libraryHaskellDepends = [ base containers directory filepath fusion-plugin-types ghc syb time transformers ]; description = "GHC plugin to make stream fusion more predictable"; - license = lib.licenses.bsd3; + license = lib.licenses.asl20; }) {}; "fusion-plugin-types" = callPackage @@ -96537,31 +96963,31 @@ self: { "futhark" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary - , blaze-html, bytestring, cmark-gfm, containers, directory - , directory-tree, dlist, file-embed, filepath, free, gitrev, happy - , haskeline, language-c-quote, mainland-pretty, megaparsec, mtl - , neat-interpolation, parallel, parser-combinators, pcg-random - , process, process-extras, QuickCheck, regex-tdfa, sexp-grammar - , srcloc, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , temporary, terminal-size, text, time, transformers - , unordered-containers, utf8-string, vector - , vector-binary-instances, versions, zip-archive, zlib + , blaze-html, bytestring, bytestring-to-vector, cmark-gfm + , containers, directory, directory-tree, dlist, file-embed + , filepath, free, gitrev, happy, haskeline, language-c-quote + , mainland-pretty, megaparsec, mtl, neat-interpolation, parallel + , parser-combinators, pcg-random, process, process-extras + , QuickCheck, regex-tdfa, sexp-grammar, srcloc, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, time, transformers, unordered-containers, utf8-string + , vector, vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.18.5"; - sha256 = "1v81b2snf5famnm8fx3kbqcsrqb80kb29yk98lvljiflnq5bkmb4"; + version = "0.18.6"; + sha256 = "0bp837b6myis5kvyy0rg3py01fcyyj7qws7kqvci3mjyi9x57k7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary blaze-html bytestring - cmark-gfm containers directory directory-tree dlist file-embed - filepath free gitrev haskeline language-c-quote mainland-pretty - megaparsec mtl neat-interpolation parallel pcg-random process - process-extras regex-tdfa sexp-grammar srcloc template-haskell - temporary terminal-size text time transformers unordered-containers - utf8-string vector vector-binary-instances versions zip-archive - zlib + bytestring-to-vector cmark-gfm containers directory directory-tree + dlist file-embed filepath free gitrev haskeline language-c-quote + mainland-pretty megaparsec mtl neat-interpolation parallel + pcg-random process process-extras regex-tdfa sexp-grammar srcloc + template-haskell temporary terminal-size text time transformers + unordered-containers utf8-string vector vector-binary-instances + versions zip-archive zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; @@ -98262,6 +98688,21 @@ self: { license = lib.licenses.mit; }) {}; + "generic-labels" = callPackage + ({ mkDerivation, base, Cabal, generic-lens-core, inspection-testing + }: + mkDerivation { + pname = "generic-labels"; + version = "0.1.0.1"; + sha256 = "0wv4wsg53zrj01d6ddz6vpdjy427ag76snm1m14775vqq4n00v3z"; + revision = "1"; + editedCabalFile = "0kdxjh0sa16l1gcgdw9mnpd1zs0w1al47mvy912bzmm2m1dmbjdk"; + libraryHaskellDepends = [ base generic-lens-core ]; + testHaskellDepends = [ base Cabal inspection-testing ]; + description = "Generically extract and replace collections of record fields"; + license = lib.licenses.bsd3; + }) {}; + "generic-lens" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, lens, profunctors, text @@ -98280,6 +98721,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-lens_2_1_0_0" = callPackage + ({ mkDerivation, base, doctest, generic-lens-core, HUnit + , inspection-testing, lens, profunctors, text + }: + mkDerivation { + pname = "generic-lens"; + version = "2.1.0.0"; + sha256 = "1qxabrbzgd32i2fv40qw4f44akvfs1impjvcs5pqn409q9zz6kfd"; + libraryHaskellDepends = [ + base generic-lens-core profunctors text + ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-lens-core" = callPackage ({ mkDerivation, base, indexed-profunctors, text }: mkDerivation { @@ -98291,6 +98751,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-lens-core_2_1_0_0" = callPackage + ({ mkDerivation, base, indexed-profunctors, text }: + mkDerivation { + pname = "generic-lens-core"; + version = "2.1.0.0"; + sha256 = "0ja72rn7f7a24bmgqb6rds1ic78jffy2dzrb7sx8gy3ld5mlg135"; + libraryHaskellDepends = [ base indexed-profunctors text ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-lens-labels" = callPackage ({ mkDerivation, base, generic-lens }: mkDerivation { @@ -98394,6 +98866,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-optics_2_1_0_0" = callPackage + ({ mkDerivation, base, doctest, generic-lens-core, HUnit + , inspection-testing, optics-core, text + }: + mkDerivation { + pname = "generic-optics"; + version = "2.1.0.0"; + sha256 = "04szdpcaxiaw9n1cry020mcrcirypfq3qxwr7h8h34b2mffvnl25"; + libraryHaskellDepends = [ + base generic-lens-core optics-core text + ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing optics-core + ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-optics-lite" = callPackage ({ mkDerivation, base, generic-lens-lite, optics-core }: mkDerivation { @@ -99492,8 +99983,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.4.0.1"; - sha256 = "0q0clfmq7spfplxr6dxhq0d39f5l95yfr87ixnv2cn0ahcx7fpi7"; + version = "0.4.1.0"; + sha256 = "06sbiyqy63ymqafdw14yz6aww412v3g6vsqq0v99vph3yzhn8xxp"; libraryHaskellDepends = [ base bytestring cereal containers iproute lens mmap reinterpret-cast text @@ -99684,7 +100175,7 @@ self: { sed -i "s|\"-s\"|\"\"|" ./Setup.hs sed -i "s|numJobs (bf bi)++||" ./Setup.hs ''; - preBuild = "export LD_LIBRARY_PATH=`pwd`/dist/build\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"; + preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH''; description = "Grammatical Framework"; license = "unknown"; hydraPlatforms = lib.platforms.none; @@ -99950,8 +100441,8 @@ self: { }: mkDerivation { pname = "ghc-dump-core"; - version = "0.1.1.0"; - sha256 = "0mksk6qhsnjd19yx79nw3dygfsfkyq52mdywikg21s67j8d4dxv5"; + version = "0.1.2.0"; + sha256 = "0yv811iyjx4iklj44bhipmiwlxl8bx27866i32icnl5ds86ws7la"; libraryHaskellDepends = [ base bytestring directory filepath ghc serialise text ]; @@ -99989,13 +100480,13 @@ self: { "ghc-dump-util" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, ghc-dump-core - , hashable, optparse-applicative, regex-tdfa, regex-tdfa-text - , serialise, text, unordered-containers + , hashable, optparse-applicative, regex-tdfa, serialise, text + , unordered-containers }: mkDerivation { pname = "ghc-dump-util"; - version = "0.1.1.0"; - sha256 = "0x93y0ymf3fl977j3c3liz1c52q5b2fw5h1ivsw3dazpmrm62n7m"; + version = "0.1.2.0"; + sha256 = "1j85mscsc1g647r4d3v72lqclsi8bw174di6w9n24x0bq3rqskxi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100004,9 +100495,8 @@ self: { ]; executableHaskellDepends = [ ansi-wl-pprint base ghc-dump-core optparse-applicative regex-tdfa - regex-tdfa-text ]; - description = "Handy tools for working with @ghc-dump@ dumps"; + description = "Handy tools for working with ghc-dump dumps"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -100101,8 +100591,8 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.6.3.3"; - sha256 = "1psrr6iaa7k5f3zz7j82crg052n3x1h2dljyb16qzbv98bqny6nb"; + version = "0.6.3.4"; + sha256 = "0x3z9zlghcd22v6hidby72w6g11xl6cbwyskzcjlv0235csr5v98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100256,8 +100746,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.10.3.20201220"; - sha256 = "04df1j997m48vjxkfcp07d9vsxgpqi315zvfri1y1qxdg5g4vlmb"; + version = "8.10.4.20210206"; + sha256 = "1zzglnpbnj9ijna6g3rmykqir3iqcg2afmjg9q0ng3imbv40slhs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -100268,6 +100758,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib_9_0_1_20210207" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.0.1.20210207"; + sha256 = "1fi62pq18s63w4y6xrjq9zlcra8dk5xqjax8kyyvfrjaaxqci8qk"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty @@ -100275,8 +100786,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.3.20201220"; - sha256 = "0k68w2v5x68sxqcd7xm94khmr4gqxbj4jdsaac3m1wcy66bjriir"; + version = "8.10.4.20210206"; + sha256 = "07j3j67hxz43l1kkdfanghd935wiccvmw7sgk47fjymw6fdx92p2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -100287,6 +100798,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser_9_0_1_20210207" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, hpc + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.0.1.20210207"; + sha256 = "1gikdcgcgw1paxs5igxgxdfvpjp23963f6vn83m0a6vr88n2haah"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim hpc pretty process time transformers + unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser-ex" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit @@ -100294,8 +100826,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.17"; - sha256 = "16qbyvczncdb25g7mjdvxsn7m3j98649jy1pnv90vmyrn8l4m897"; + version = "8.10.0.19"; + sha256 = "0qdkqv7ss9b2mnf39gpbq7i50ypccnl3wdmxiq148zrxbglzfqw9"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot ghc-boot-th uniplate ]; @@ -100307,6 +100839,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser-ex_9_0_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.0.0.3"; + sha256 = "1kc6p5ciymq8rbgk4jj1hawmjhkj1yjzkxj9jjyqlgzs09i3dsw3"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc-lib-parser tasty tasty-hunit + uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -100904,6 +101456,27 @@ self: { license = lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_7_5" = callPackage + ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.7.5"; + sha256 = "1xraiil3nq02jdb4blkmsrdp36qhykv2xvwg3kaiyw5bgfl15gl3"; + libraryHaskellDepends = [ + base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck + ]; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra , integer-gmp, tasty, tasty-hunit, template-haskell, transformers @@ -100928,8 +101501,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.5.0.0"; - sha256 = "12v42xav9mvhkkzbfbrjcm2b3hk6vr3j6ra8qn9ji1jfzvin88wl"; + version = "0.5.2.0"; + sha256 = "0ny7paq8ykc4ycag1dlb9mlpv17dh9a6csh22abj6bls5rx4iljr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100962,15 +101535,16 @@ self: { }) {}; "ghc-vis" = callPackage - ({ mkDerivation, base, cairo, containers, deepseq, fgl - , ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text, transformers - , xdot + ({ mkDerivation, base, Cabal, cairo, containers, deepseq, fgl + , filepath, ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text + , transformers, xdot }: mkDerivation { pname = "ghc-vis"; - version = "0.9"; - sha256 = "134m5hzpbggifvigw2f4q6ci1lm5r2457va8lb0j7daiadq7xhcw"; + version = "0.9.2"; + sha256 = "1i7sx0ffbgfskhj27wnh9f8qldf4fqxmshlmqvajsrg9n5v5i772"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl svgcairo text transformers xdot @@ -101012,24 +101586,25 @@ self: { "ghci-dap" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , directory, filepath, ghc, ghc-boot, ghc-paths, ghc-prim, ghci - , haskeline, haskell-dap, process, text, time, transformers, unix + , directory, exceptions, filepath, ghc, ghc-boot, ghc-paths + , ghc-prim, ghci, haskeline, haskell-dap, process, text, time + , transformers, unix }: mkDerivation { pname = "ghci-dap"; - version = "0.0.14.0"; - sha256 = "0gnawjk1bzrcinazygwal4kfnqq780v7q4lm0xrvjb50cvixkjpf"; + version = "0.0.15.0"; + sha256 = "1m4ypd2d9bjdkdqrnqijc1na5g14mmjrcr5msgr7spsnskhzi4yg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath ghc - ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap process text - time transformers + array base bytestring containers deepseq directory exceptions + filepath ghc ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap + process text time transformers ]; executableHaskellDepends = [ - array base bytestring containers deepseq directory filepath ghc - ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap process text - time transformers unix + array base bytestring containers deepseq directory exceptions + filepath ghc ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap + process text time transformers unix ]; description = "ghci-dap is a GHCi having DAP interface"; license = lib.licenses.bsd3; @@ -101187,38 +101762,41 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghcide_0_7_0_0" = callPackage + "ghcide" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, case-insensitive, containers, cryptohash-sha1 - , data-default, deepseq, directory, extra, filepath, fingertree - , fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check, ghc-paths - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat - , hls-plugin-api, hslogger, implicit-hie-cradle, lens, lsp-test - , mtl, network-uri, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck + , data-default, deepseq, directory, dlist, extra, filepath + , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check + , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob + , haddock-library, hashable, haskell-lsp, haskell-lsp-types + , heapsize, hie-bios, hie-compat, hls-plugin-api, hp2pretty + , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri + , opentelemetry, optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield - , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake - , shake-bench, sorted-list, stm, syb, tasty, tasty-expected-failure - , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time - , transformers, unix, unordered-containers, utf8-string, yaml + , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions + , shake, shake-bench, sorted-list, stm, syb, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , tasty-rerun, text, time, transformers, unix, unordered-containers + , utf8-string, vector, yaml }: mkDerivation { pname = "ghcide"; - version = "0.7.0.0"; - sha256 = "165dbwbcpl2r7jqsjk859c42yas8h877mx37d0jnx8vm47fdy484"; + version = "0.7.3.0"; + sha256 = "0iak2bwkp0x66cl9axcxq00vmf4yn6y0h8ih4wq6mnavmplbyi3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async base base16-bytestring binary bytestring case-insensitive containers cryptohash-sha1 data-default deepseq - directory extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check ghc-paths Glob haddock-library hashable haskell-lsp - haskell-lsp-types heapsize hie-bios hie-compat hls-plugin-api - hslogger implicit-hie-cradle lens mtl network-uri opentelemetry - parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa - rope-utf16-splay safe safe-exceptions shake sorted-list stm syb - text time transformers unix unordered-containers utf8-string + directory dlist extra filepath fingertree fuzzy ghc ghc-boot + ghc-boot-th ghc-check ghc-exactprint ghc-paths Glob haddock-library + hashable haskell-lsp haskell-lsp-types heapsize hie-bios hie-compat + hls-plugin-api hslogger implicit-hie-cradle lens mtl network-uri + opentelemetry parallel prettyprinter prettyprinter-ansi-terminal + regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake + sorted-list stm syb text time transformers unix + unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra @@ -101239,6 +101817,7 @@ self: { benchmarkHaskellDepends = [ aeson base directory filepath shake shake-bench text yaml ]; + benchmarkToolDepends = [ hp2pretty ]; description = "The core of an IDE"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -101246,47 +101825,49 @@ self: { broken = true; }) {shake-bench = null;}; - "ghcide" = callPackage + "ghcide_0_7_4_0" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, case-insensitive, containers, cryptohash-sha1 - , data-default, deepseq, directory, dlist, extra, filepath - , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check - , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob - , haddock-library, hashable, haskell-lsp, haskell-lsp-types - , heapsize, hie-bios, hie-compat, hls-plugin-api, hslogger - , implicit-hie-cradle, lens, lsp-test, mtl, network-uri - , opentelemetry, optparse-applicative, parallel, prettyprinter + , binary, bytestring, bytestring-encoding, case-insensitive + , containers, cryptohash-sha1, data-default, deepseq, Diff + , directory, dlist, extra, filepath, fingertree, fuzzy, ghc + , ghc-boot, ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat + , hiedb, hls-plugin-api, hp2pretty, hslogger, implicit-hie-cradle + , lens, lsp-test, mtl, network-uri, opentelemetry + , optparse-applicative, parallel, prettyprinter , prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions - , shake, shake-bench, sorted-list, stm, syb, tasty + , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck , tasty-rerun, text, time, transformers, unix, unordered-containers , utf8-string, vector, yaml }: mkDerivation { pname = "ghcide"; - version = "0.7.2.0"; - sha256 = "1d35vfwg906djfr2klrql7crgcyabfad12akalx25jc6c7pacv1d"; + version = "0.7.4.0"; + sha256 = "00f2p18g6w7vf2a344fr4k0rg7spnbri76d1by7403g1daqwkar9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async base base16-bytestring binary bytestring - case-insensitive containers cryptohash-sha1 data-default deepseq - directory dlist extra filepath fingertree fuzzy ghc ghc-boot - ghc-boot-th ghc-check ghc-exactprint ghc-paths Glob haddock-library - hashable haskell-lsp haskell-lsp-types heapsize hie-bios hie-compat - hls-plugin-api hslogger implicit-hie-cradle lens mtl network-uri - opentelemetry parallel prettyprinter prettyprinter-ansi-terminal - regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake - sorted-list stm syb text time transformers unix + bytestring-encoding case-insensitive containers cryptohash-sha1 + data-default deepseq Diff directory dlist extra filepath fingertree + fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths + Glob haddock-library hashable haskell-lsp haskell-lsp-types + heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger + implicit-hie-cradle lens mtl network-uri opentelemetry parallel + prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie + rope-utf16-splay safe safe-exceptions shake sorted-list + sqlite-simple stm syb text time transformers unix unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra - filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize - hie-bios hls-plugin-api lens lsp-test optparse-applicative process - safe-exceptions shake text unordered-containers + filepath ghc gitrev hashable haskell-lsp haskell-lsp-types heapsize + hie-bios hiedb hls-plugin-api lens lsp-test optparse-applicative + process safe-exceptions shake text unordered-containers ]; testHaskellDepends = [ aeson base binary bytestring containers data-default directory @@ -101299,8 +101880,10 @@ self: { text ]; benchmarkHaskellDepends = [ - aeson base directory filepath shake shake-bench text yaml + aeson base directory extra filepath optparse-applicative shake + shake-bench text yaml ]; + benchmarkToolDepends = [ hp2pretty ]; description = "The core of an IDE"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -101842,7 +102425,7 @@ self: { description = "Gdk bindings"; license = lib.licenses.lgpl21; hydraPlatforms = lib.platforms.none; - }) {gtk4 = null;}; + }) {inherit (pkgs) gtk4;}; "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf @@ -102052,7 +102635,7 @@ self: { license = lib.licenses.lgpl21; hydraPlatforms = lib.platforms.none; broken = true; - }) {gtk4 = null;}; + }) {inherit (pkgs) gtk4;}; "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -102234,7 +102817,7 @@ self: { description = "Gtk bindings"; license = lib.licenses.lgpl21; hydraPlatforms = lib.platforms.none; - }) {gtk4 = null;}; + }) {inherit (pkgs) gtk4;}; "gi-gtk-declarative" = callPackage ({ mkDerivation, async, base, containers, data-default-class @@ -103026,8 +103609,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20201129"; - sha256 = "10fxl5215x0hqhmwd387xpzgvz4w190lylwr0rihxhy5mwdvf943"; + version = "8.20210127"; + sha256 = "1hsmaw70lfza1g5j6b9zbwqkkr374m18p7qb4nl952pj42a46vv3"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -103658,8 +104241,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.3.5"; - sha256 = "0z2sb9avhkq2mgj0pwlji5c2sjxd71628q1i3nhlbajfyms1bsqz"; + version = "1.3.6"; + sha256 = "07cxai2h6alyka0bsfch7vfjsvp3s9d48jw4n6z74kmxq3zdrgxh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104948,8 +105531,8 @@ self: { }: mkDerivation { pname = "glpk-hs"; - version = "0.7"; - sha256 = "0cbdlidq14hmhndlgxid4gdzyg0jlm5habp5389xl3zkbmm2hni9"; + version = "0.8"; + sha256 = "0zmf5f9klc7adcrmmf9nxrbqh97bx8l6wazsbyx6idymj6brz0qp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers deepseq gasp mtl ]; @@ -104970,8 +105553,8 @@ self: { }: mkDerivation { pname = "gltf-codec"; - version = "0.1.0.1"; - sha256 = "0qdwk4ygvhdp4x8bkw101b50wc8zfb6bb54zpxaxkmva40hcv2c2"; + version = "0.1.0.2"; + sha256 = "07zf9lzin22clixmvgvam6h995jfq2wzqz4498qv60jlcj88zzmh"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring scientific text unordered-containers vector @@ -105431,8 +106014,8 @@ self: { }: mkDerivation { pname = "goatee"; - version = "0.3.1.3"; - sha256 = "16nsgb1gf7mn35pchigrankl8q7p6cvgsxzbb3ab93jqm8kjxmyn"; + version = "0.4.0"; + sha256 = "1nbdqmln6v6r3kdj8vxv4dm903vaxh97mlg19fg8yihm00cbpipd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl parsec template-haskell @@ -105450,8 +106033,8 @@ self: { }: mkDerivation { pname = "goatee-gtk"; - version = "0.3.1.3"; - sha256 = "0sp819fzgflsfj1glgdmw2qhb97rzdy6nargdmwvaxfay925p8aw"; + version = "0.4.0"; + sha256 = "1iffzqmzxxa9aplvnncdj9lc3nvdi8rbnnyl0cb7irhyj7k21k5i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -107790,8 +108373,8 @@ self: { }: mkDerivation { pname = "goldplate"; - version = "0.1.2"; - sha256 = "1qbh23sqx0jvwrmhb88683z3rx31jy99xh8h24iqv1ykmjvmqwvf"; + version = "0.1.3"; + sha256 = "109qhyq0n4w1jdz7y2hd8cjf44pikavv6mfnmf65vyfjangjq610"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109329,8 +109912,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.11.0.0"; - sha256 = "1jg0cdyq0z1r752cx9mnbxj2rxd5s723zfvpk3mwcsvx5ygkhm0p"; + version = "0.11.1.0"; + sha256 = "093gk2w2qrvarcv7xn0d0saa1j35cy0isw5vz04h08gy37s2nspc"; libraryHaskellDepends = [ aeson base conduit containers exceptions hspec-expectations megaparsec parser-combinators scientific text transformers @@ -109498,8 +110081,8 @@ self: { }: mkDerivation { pname = "graphula"; - version = "2.0.0.2"; - sha256 = "1fqrjfr9pl9619fhrkl3khpb2lg3svzp644hvzn0bpcnxqj5p41z"; + version = "2.0.0.3"; + sha256 = "1hmay1g8j1b8pq98blq1sizc61h7lj782sajlwrllgvxc826rjm2"; libraryHaskellDepends = [ base containers directory generics-eot HUnit mtl persistent QuickCheck random semigroups temporary text transformers unliftio @@ -109842,6 +110425,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell_1_2_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , exceptions, greskell-core, hashable, hint, hspec, semigroups + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "greskell"; + version = "1.2.0.1"; + sha256 = "13hshwnhl0wdnnkqamgdgw2awsh1pynwfg35c34m5fcphbmxwmms"; + libraryHaskellDepends = [ + aeson base exceptions greskell-core hashable semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hint + hspec text unordered-containers + ]; + description = "Haskell binding for Gremlin graph query language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, QuickCheck, scientific @@ -109863,6 +110468,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell-core_0_1_3_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, hspec-discover, QuickCheck + , scientific, semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.3.6"; + sha256 = "1mfdi9sr0ic15bck6dv1k70cd0lnvimap9lqyhim2piz0f8jr53k"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + testToolDepends = [ doctest doctest-discover hspec-discover ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text @@ -110368,8 +110996,8 @@ self: { ({ mkDerivation, base, generic-data, groups }: mkDerivation { pname = "groups-generic"; - version = "0.1.0.0"; - sha256 = "1rnil9qashpvrjxmziymf447pnqpqpnga0lxlk7413y4dprn2rad"; + version = "0.2.0.0"; + sha256 = "0a13x4dc114qz5r97cpg2bbdch1kn6gfmndf9glqx2nbhx6qg654"; libraryHaskellDepends = [ base generic-data groups ]; description = "Generically derive Group instances"; license = lib.licenses.bsd3; @@ -112060,8 +112688,8 @@ self: { }: mkDerivation { pname = "hablog"; - version = "0.7.1"; - sha256 = "1nn88hpp1q1y96px18qvc9q6gq51dl6m1m9hiipr64a6rngryxiy"; + version = "0.8.0"; + sha256 = "0w3mcc06gzrjfyailr9lb4niydfx7gp1pcwizyh87qkhrgxcpnk7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113187,19 +113815,20 @@ self: { "hadolint" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , directory, filepath, gitrev, hspec, HsYAML, HUnit + , cryptonite, directory, filepath, gitrev, hspec, HsYAML, HUnit , language-docker, megaparsec, mtl, optparse-applicative, parallel , ShellCheck, split, text, void }: mkDerivation { pname = "hadolint"; - version = "1.19.0"; - sha256 = "0idvjk0nz9m28qcbkzcs2mjrbx543jj0gh8hj0s0lnj3nlpk0b46"; + version = "1.22.1"; + sha256 = "0138hn6c7lrq9xjsmngdj1h2m2ayxx6wqqgjw66pv7sgxsfy0zji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring containers directory filepath HsYAML - language-docker megaparsec mtl parallel ShellCheck split text void + aeson async base bytestring containers cryptonite directory + filepath HsYAML language-docker megaparsec mtl parallel ShellCheck + split text void ]; executableHaskellDepends = [ base containers gitrev language-docker megaparsec @@ -114649,8 +115278,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.11.0.1"; - sha256 = "1w4zxjs6253rxkfhhsvcvpfzzslaxyb3m2c6nbh22l6a1li9bcm9"; + version = "0.11.0.2"; + sha256 = "1ndg8zmcc5a9z9qcc5z5nwssywxighnqxa4pzc5iy7kw4x9bm3kn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -117295,15 +117924,12 @@ self: { }) {}; "haskell-dap" = callPackage - ({ mkDerivation, base, containers, unix }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "haskell-dap"; - version = "0.0.14.0"; - sha256 = "1n4w7kvsy7dri07840i6rm6b7fl425f8r3fglbcss42g674k35di"; - isLibrary = true; - isExecutable = true; + version = "0.0.15.0"; + sha256 = "1wk6813pwwnph7w1waci9q6r0glsjpayk27kr43zddwd2v0abcld"; libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ base unix ]; description = "Haskell implementation of the DAP interface data"; license = lib.licenses.bsd3; }) {}; @@ -117317,8 +117943,8 @@ self: { }: mkDerivation { pname = "haskell-debug-adapter"; - version = "0.0.33.0"; - sha256 = "1v4dzjv1w0jdp5dyq3qrbdw34433b5xg6wk5hg87agzc3mllbkqa"; + version = "0.0.34.0"; + sha256 = "00z9yhs2c34rdki404gcwf938a2lshr0a7mrvzpknk70n1a0gall"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117692,6 +118318,56 @@ self: { broken = true; }) {}; + "haskell-language-server" = callPackage + ({ mkDerivation, aeson, base, binary, blaze-markup, brittany + , bytestring, containers, data-default, deepseq, directory, extra + , filepath, floskell, fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths + , ghcide, gitrev, hashable, haskell-lsp, hie-bios, hls-class-plugin + , hls-eval-plugin, hls-explicit-imports-plugin + , hls-haddock-comments-plugin, hls-hlint-plugin, hls-plugin-api + , hls-retrie-plugin, hls-splice-plugin, hls-tactics-plugin + , hslogger, hspec, hspec-core, hspec-expectations, lens, lsp-test + , mtl, optparse-applicative, optparse-simple, ormolu, process + , regex-tdfa, safe-exceptions, shake, stm, stylish-haskell, tasty + , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-rerun, temporary, text, transformers, unordered-containers + , with-utf8, yaml + }: + mkDerivation { + pname = "haskell-language-server"; + version = "0.9.0.0"; + sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default directory extra filepath ghc ghcide + gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative + optparse-simple process shake text unordered-containers + ]; + executableHaskellDepends = [ + aeson base binary brittany bytestring containers deepseq directory + extra filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths + ghcide gitrev hashable haskell-lsp hie-bios hls-class-plugin + hls-eval-plugin hls-explicit-imports-plugin + hls-haddock-comments-plugin hls-hlint-plugin hls-plugin-api + hls-retrie-plugin hls-splice-plugin hls-tactics-plugin hslogger + lens mtl optparse-applicative optparse-simple ormolu process + regex-tdfa safe-exceptions shake stylish-haskell temporary text + transformers unordered-containers with-utf8 + ]; + testHaskellDepends = [ + aeson base blaze-markup bytestring containers data-default + directory extra filepath ghcide haskell-lsp hie-bios hls-plugin-api + hslogger hspec hspec-core hspec-expectations lens lsp-test process + stm tasty tasty-ant-xml tasty-expected-failure tasty-golden + tasty-hunit tasty-rerun temporary text transformers + unordered-containers yaml + ]; + testToolDepends = [ ghcide ]; + description = "LSP server for GHC"; + license = lib.licenses.asl20; + }) {}; + "haskell-lexer" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -117732,6 +118408,36 @@ self: { license = lib.licenses.mit; }) {}; + "haskell-lsp_0_23_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.23.0.0"; + sha256 = "07vyfqqvgaxg06yrawiwfffv511jlamhh4p7i0hwx60xdgpg11xh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "haskell-lsp_0_24_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable @@ -117801,6 +118507,24 @@ self: { license = lib.licenses.mit; }) {}; + "haskell-lsp-types_0_23_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, data-default + , deepseq, filepath, hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.23.0.0"; + sha256 = "0dz0980681khfn229aky3bsclj86xkril2y0ln3wr7g9v77ypbq7"; + libraryHaskellDepends = [ + aeson base binary bytestring data-default deepseq filepath hashable + lens network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "haskell-lsp-types_0_24_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, data-default , deepseq, filepath, hashable, lens, network-uri, scientific, text @@ -117893,7 +118617,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Distributed parallel programming in Haskell using MPI"; license = lib.licenses.bsd3; - }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; + }) {open-pal = null; open-rte = null; openmpi = null;}; "haskell-names" = callPackage ({ mkDerivation, aeson, base, bytestring, containers @@ -118275,8 +118999,8 @@ self: { pname = "haskell-src"; version = "1.0.3.1"; sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; - revision = "1"; - editedCabalFile = "1li6czcs54wnij6qnvpx6f66iiw023pggb3zl3jvp74qqflcf5sg"; + revision = "3"; + editedCabalFile = "0hjridmgm95lrb9qs972zicipsqcfwpr35gwkzxncpgwcm0vn0b6"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -119800,8 +120524,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.18.0"; - sha256 = "13j8hsyj7x30s6rl8pigvkcwn9ahrwd85y4i8z6728rsjj2ygih3"; + version = "0.19.0"; + sha256 = "0yyrka8hr6jsl7w59j3xmnvzq4gnwz4gybjar2zq1g096shdpk7c"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -119932,43 +120656,44 @@ self: { "haskoin-store" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64, bytestring - , cereal, conduit, containers, data-default, deepseq, filepath - , hashable, haskoin-core, haskoin-node, haskoin-store-data, hedis - , hspec, hspec-discover, http-types, monad-logger, mtl, network - , nqe, optparse-applicative, QuickCheck, random - , rocksdb-haskell-jprupp, rocksdb-query, scotty, string-conversions - , text, time, transformers, unliftio, unordered-containers, wai - , warp + , cereal, conduit, containers, data-default, deepseq, ekg-core + , ekg-statsd, filepath, foldl, hashable, haskoin-core, haskoin-node + , haskoin-store-data, hedis, hspec, hspec-discover, http-types + , lens, monad-control, monad-logger, mtl, network, nqe + , optparse-applicative, QuickCheck, random, rocksdb-haskell-jprupp + , rocksdb-query, scotty, stm, string-conversions, text, time + , transformers, unliftio, unordered-containers, wai, warp, wreq }: mkDerivation { pname = "haskoin-store"; - version = "0.39.0"; - sha256 = "1a1bhsjxb1nj49b5xjv78h89xsc5ffrf9qq1n12ak54ckvw0rgmv"; + version = "0.42.2"; + sha256 = "03xys3m0cdkjbabcrgc96sdb8ws3rrzq794ggnkwigwzgnav0gm0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cereal conduit containers - data-default deepseq hashable haskoin-core haskoin-node - haskoin-store-data hedis http-types monad-logger mtl network nqe - random rocksdb-haskell-jprupp rocksdb-query scotty - string-conversions text time transformers unliftio - unordered-containers wai warp + data-default deepseq ekg-core ekg-statsd foldl hashable + haskoin-core haskoin-node haskoin-store-data hedis http-types lens + monad-control monad-logger mtl network nqe random + rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions + text time transformers unliftio unordered-containers wai warp wreq ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring cereal conduit containers - data-default deepseq filepath hashable haskoin-core haskoin-node - haskoin-store-data hedis http-types monad-logger mtl network nqe - optparse-applicative random rocksdb-haskell-jprupp rocksdb-query - scotty string-conversions text time transformers unliftio - unordered-containers wai warp + data-default deepseq ekg-core ekg-statsd filepath foldl hashable + haskoin-core haskoin-node haskoin-store-data hedis http-types lens + monad-control monad-logger mtl network nqe optparse-applicative + random rocksdb-haskell-jprupp rocksdb-query scotty stm + string-conversions text time transformers unliftio + unordered-containers wai warp wreq ]; testHaskellDepends = [ aeson aeson-pretty base base64 bytestring cereal conduit containers - data-default deepseq hashable haskoin-core haskoin-node - haskoin-store-data hedis hspec http-types monad-logger mtl network - nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty - string-conversions text time transformers unliftio - unordered-containers wai warp + data-default deepseq ekg-core ekg-statsd foldl hashable + haskoin-core haskoin-node haskoin-store-data hedis hspec http-types + lens monad-control monad-logger mtl network nqe QuickCheck random + rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions + text time transformers unliftio unordered-containers wai warp wreq ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -119981,21 +120706,22 @@ self: { ({ mkDerivation, aeson, base, bytestring, cereal, containers , data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network - , QuickCheck, scotty, string-conversions, text, wreq + , QuickCheck, scotty, string-conversions, text + , unordered-containers, wreq }: mkDerivation { pname = "haskoin-store-data"; - version = "0.38.1"; - sha256 = "0x3p0fylfc8llv94nmjaz9537qp2jwm5zlbs8mw7b4lh9z69f3ba"; + version = "0.42.1"; + sha256 = "17yfbd4vp9xx551bybpkiiv6w1x8067xmyrfff7zak3glzb3piva"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network - scotty string-conversions text wreq + scotty string-conversions text unordered-containers wreq ]; testHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core hspec http-client http-types lens mtl network - QuickCheck scotty string-conversions text wreq + QuickCheck scotty string-conversions text unordered-containers wreq ]; testToolDepends = [ hspec-discover ]; description = "Data for Haskoin Store"; @@ -120668,10 +121394,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "haskus-utils-types"; - version = "1.5"; - sha256 = "1mbgnx4i82g9bq1qpvjjs9yb683gfja5bws8y26mzjl4igk6izsy"; - revision = "1"; - editedCabalFile = "1mjwmk5prbrb91dbhxg9pp47zf5cfnnm07h3f2m902af3l0yjiih"; + version = "1.5.1"; + sha256 = "1nm5nn45r2c9f20j7v0v3abkbglyi45wmyrigy1v65c5lk4g57r5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Haskus types utility modules"; @@ -123212,8 +123936,8 @@ self: { ({ mkDerivation, async, base, io-streams, time }: mkDerivation { pname = "heartbeat-streams"; - version = "0.1.0.2"; - sha256 = "059dx7paaniwmxgyzapv0542jf8yb4vzbg8501d2j779ixvzm80d"; + version = "0.1.0.3"; + sha256 = "004dkld0friilhb9j1fhibzndchkljxzqm6k99zli4h83q787wlf"; libraryHaskellDepends = [ async base io-streams time ]; description = "Heartbeats for io-streams"; license = lib.licenses.bsd3; @@ -123524,8 +124248,8 @@ self: { ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { pname = "hedgehog-fakedata"; - version = "0.0.1.3"; - sha256 = "0h0cf4y25453n52d4y1ximzdc9l04b17byd9kgjvc3c279866f1i"; + version = "0.0.1.4"; + sha256 = "1pa8kf6pxsvmfy8r29xk486cdi38881blqj1lcnjya98ilb6ldx3"; libraryHaskellDepends = [ base fakedata hedgehog random ]; testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; @@ -123667,33 +124391,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.14.0"; - sha256 = "114k87mi7manyqa90vjjjlfbdwpg3g3dxiwc16v2zyrw56n28mfv"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing containers deepseq errors - exceptions HTTP mtl network network-uri resource-pool scanner stm - text time tls unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring doctest HUnit mtl stm test-framework - test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = lib.licenses.bsd3; - }) {}; - - "hedis_0_14_1" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit - , mtl, network, network-uri, resource-pool, scanner, stm - , test-framework, test-framework-hunit, text, time, tls - , unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.14.1"; - sha256 = "0n7hwg8mp4v512g7s8cblmai0j00l1149bbdacm6s7d0plnk0qqd"; + version = "0.14.2"; + sha256 = "1zm8llpbbvr5f5s0i4qsn025734s1mamfvm1dgxw4p87m9zhprlm"; libraryHaskellDepends = [ async base bytestring bytestring-lexing containers deepseq errors exceptions HTTP mtl network network-uri resource-pool scanner stm @@ -123706,7 +124405,6 @@ self: { benchmarkHaskellDepends = [ base mtl time ]; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -124940,31 +125638,31 @@ self: { "hevm" = callPackage ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base , base16-bytestring, binary, brick, bytestring, cereal, containers - , cryptonite, data-dword, deepseq, directory, fgl, filepath, free - , haskeline, here, HUnit, lens, lens-aeson, libff, megaparsec - , memory, monad-par, mtl, multiset, operational, optparse-generic - , process, QuickCheck, quickcheck-text, regex-tdfa, restless-git - , rosezipper, s-cargot, sbv, scientific, secp256k1, semver-range - , tasty, tasty-hunit, tasty-quickcheck, temporary, text - , text-format, time, transformers, tree-view, unordered-containers - , vector, vty, witherable, wreq + , cryptonite, data-dword, Decimal, deepseq, directory, fgl + , filepath, free, haskeline, here, HUnit, lens, lens-aeson, libff + , megaparsec, memory, monad-par, mtl, multiset, operational + , optparse-generic, process, QuickCheck, quickcheck-text + , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific + , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck + , temporary, text, text-format, time, transformers, tree-view + , unordered-containers, vector, vty, witherable, wreq }: mkDerivation { pname = "hevm"; - version = "0.42.0"; - sha256 = "0p736bxsg91l7n82xad52j5gqvyx6ik7hbmlnnz5bsrnsm05maxz"; + version = "0.44.1"; + sha256 = "1ygrksnqav1cw9pq1x2xi0na5fxy0phyc0v48nkzpis868gy0b97"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ abstract-par aeson ansi-wl-pprint base base16-bytestring binary - brick bytestring cereal containers cryptonite data-dword deepseq - directory fgl filepath free haskeline lens lens-aeson megaparsec - memory monad-par mtl multiset operational optparse-generic process - QuickCheck quickcheck-text regex-tdfa restless-git rosezipper - s-cargot sbv scientific semver-range temporary text text-format - time transformers tree-view unordered-containers vector vty - witherable wreq + brick bytestring cereal containers cryptonite data-dword Decimal + deepseq directory fgl filepath free haskeline lens lens-aeson + megaparsec memory monad-par mtl multiset operational + optparse-generic process QuickCheck quickcheck-text regex-tdfa + restless-git rosezipper s-cargot sbv scientific semver-range + temporary text text-format time transformers tree-view + unordered-containers vector vty witherable wreq ]; librarySystemDepends = [ libff secp256k1 ]; executableHaskellDepends = [ @@ -125232,8 +125930,8 @@ self: { }: mkDerivation { pname = "hexpat-streamparser"; - version = "0.0.1"; - sha256 = "09klv9if55rlhjrh7cw68kk9z3mrwm1p2agb7a23j8a68iga5gvi"; + version = "0.0.2"; + sha256 = "11g78dkr9dp4kgz8zmckgq66587qahdhxyhcn03ajr0b07ab27z3"; libraryHaskellDepends = [ base bytestring hexpat List mtl parser-combinators text transformers @@ -126397,8 +127095,8 @@ self: { }: mkDerivation { pname = "hiedb"; - version = "0.3.0.0"; - sha256 = "1g2dzprxja8isw4irgbh8aabzr9iswb9szpn5nwnvbkzkabfqabd"; + version = "0.3.0.1"; + sha256 = "1ci68q5r42rarmj12vrmggnj7c7jb8sw3wnmzrq2gn7vqhrr05jc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126570,18 +127268,21 @@ self: { }) {}; "higgledy" = callPackage - ({ mkDerivation, barbies, base, doctest, generic-lens, hspec, lens - , markdown-unlit, named, QuickCheck + ({ mkDerivation, barbies, base, base-compat, Cabal, cabal-doctest + , doctest, generic-lens, generic-lens-core, hspec, lens + , markdown-unlit, named, QuickCheck, template-haskell }: mkDerivation { pname = "higgledy"; - version = "0.3.1.0"; - sha256 = "0az05c14l7k9nsfkh4qwpqf1dwlnapgkf5s1v6yfr1rjba0r4bmw"; + version = "0.4.1.0"; + sha256 = "1z67vip2appsl4f2qf70pqdnyjp6byaa4n3x8scp1aa94hg1xj3h"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - barbies base generic-lens named QuickCheck + barbies base generic-lens generic-lens-core named QuickCheck ]; testHaskellDepends = [ - barbies base doctest hspec lens named QuickCheck + barbies base base-compat doctest hspec lens named QuickCheck + template-haskell ]; testToolDepends = [ markdown-unlit ]; description = "Partial types as a type constructor"; @@ -126902,8 +127603,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "5.3.1"; - sha256 = "008s8zm9qs972b7v5kkmr8l3i9kc6zm7yj33mkw6dv69b7h3c01l"; + version = "5.3.2"; + sha256 = "129gkn8qg68wsd60mq8yk7hrqsc8sd8v56xn41m5ii3hriq1mmv7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127594,6 +128295,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "histogram-simple" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "histogram-simple"; + version = "1.0"; + sha256 = "11x8v0svvsc0impf59vixbsaxh5nwvyc9wmw9xkshd4k4a30bdb8"; + libraryHaskellDepends = [ base containers ]; + description = "Simple Data.Map-based histogram"; + license = lib.licenses.bsd3; + }) {}; + "historian" = callPackage ({ mkDerivation, base, containers, directory, filepath, process , regex-compat, regex-posix @@ -128097,8 +128809,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.20.3"; - sha256 = "1wy45ppcakml2wk021yr8kqv0q0x85vms8kx0npjawzbs498qqx9"; + version = "1.20.4"; + sha256 = "1fsdh4k0lrlx3n81hns8h2dh917i0cmh1iax55d9q7jlxvy5bq95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128190,17 +128902,19 @@ self: { }) {}; "hledger-flow" = callPackage - ({ mkDerivation, base, containers, exceptions, foldl, HUnit - , optparse-applicative, path, path-io, stm, text, time, turtle + ({ mkDerivation, base, containers, exceptions, filepath, foldl + , gitrev, HUnit, optparse-applicative, path, path-io, stm, text + , time, turtle }: mkDerivation { pname = "hledger-flow"; - version = "0.14.2.0"; - sha256 = "17a21rf2gj9hp7q0q7gg4znwa2j8xgrlxaq15akjn20sqp8l23ni"; + version = "0.14.3.0"; + sha256 = "113lr6b47fs3900wrn8fg1kxcbvfh91gla7585h13miz3wyjbdyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions foldl path path-io stm text time turtle + base containers exceptions filepath foldl gitrev path path-io stm + text time turtle ]; executableHaskellDepends = [ base optparse-applicative path text turtle @@ -128298,8 +129012,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.20.3"; - sha256 = "0pm6ckim1krkg4x7azspsnc1alwynqnjdhxrda764xyrz9s0r8cp"; + version = "1.20.4"; + sha256 = "17fs3jh3wx1hgzijqpw0s57hq6hq43fadplmqkcjw1ikgm8h0zyw"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -128350,8 +129064,8 @@ self: { }: mkDerivation { pname = "hledger-stockquotes"; - version = "0.1.0.0"; - sha256 = "19xn7rzrg4nw1dfdfm1hn7k0wdwrw8416rn28inkbkbn1f9mqgk5"; + version = "0.1.1.0"; + sha256 = "1srgl70zsixbfgmh22psg7q4wqfiay2jiybyvml42iv712n7z8xx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128375,8 +129089,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.20.3"; - sha256 = "02g6xdxif67fjj6rjskw69cxhx2irwv7sk0b1slr20nch122pzl1"; + version = "1.20.4"; + sha256 = "0y9jyv4mphzyla70z365l5dwg50chsng011bazzpfwr6w889803i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128422,8 +129136,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.20.3"; - sha256 = "1dz3lwp86dlmdrnj5hda12219x03xw8csxk0bjysn43rjzxag4q4"; + version = "1.20.4"; + sha256 = "06psp5r6blj3s1z8zg515jgw58pyxy43qinh5cl161fxcl8ldfn4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128710,21 +129424,22 @@ self: { "hls-eval-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory - , extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide, hashable - , haskell-lsp, haskell-lsp-types, hls-plugin-api - , parser-combinators, pretty-simple, QuickCheck, safe-exceptions - , shake, temporary, text, time, transformers, unordered-containers + , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide + , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens + , megaparsec, mtl, parser-combinators, pretty-simple, QuickCheck + , safe-exceptions, shake, temporary, text, time, transformers + , unordered-containers }: mkDerivation { pname = "hls-eval-plugin"; - version = "0.1.0.5"; - sha256 = "1vfsvhn7b5w537hsri6bz36c547pxv13jyjvj1a5934jzyzvv9qn"; + version = "0.2.0.0"; + sha256 = "0l85qia3gsdafxmkidr26sxgajvp46hcphkb1l8vm6q7h6jgj0d5"; libraryHaskellDepends = [ - aeson base containers deepseq Diff directory extra filepath ghc - ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types - hls-plugin-api parser-combinators pretty-simple QuickCheck - safe-exceptions shake temporary text time transformers - unordered-containers + aeson base containers deepseq Diff directory dlist extra filepath + ghc ghc-boot-th ghc-paths ghcide hashable haskell-lsp + haskell-lsp-types hls-plugin-api lens megaparsec mtl + parser-combinators pretty-simple QuickCheck safe-exceptions shake + temporary text time transformers unordered-containers ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -128756,6 +129471,25 @@ self: { pname = "hls-explicit-imports-plugin"; version = "0.1.0.0"; sha256 = "0il51ndiw16h5kgclwzx8p1pwv6ph808406bh52nq1bjyadlwkk2"; + revision = "1"; + editedCabalFile = "1mmsgs0n0x0q8zdzc617pi24wadgjr7hxrwqw6ihv004ahzdmjms"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide haskell-lsp-types + hls-plugin-api shake text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + + "hls-explicit-imports-plugin_0_1_0_1" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide + , haskell-lsp-types, hls-plugin-api, shake, text + , unordered-containers + }: + mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "0.1.0.1"; + sha256 = "0n36yk21wh9wklp8bnrg4b6qck2nf34m8p3fpilwpnzfchk6wr1y"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide haskell-lsp-types hls-plugin-api shake text unordered-containers @@ -128763,7 +129497,6 @@ self: { description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-haddock-comments-plugin" = callPackage @@ -128772,10 +129505,8 @@ self: { }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "0.1.0.0"; - sha256 = "12zs6yq39jpg3x6w9y5a5jri5rfh8qpxawdhmhiqm067zjnj9xi4"; - revision = "1"; - editedCabalFile = "0kddmrlmcsa1d22mqzw1wsh82x4nn0ff4xbwci7585i9z61mzhg2"; + version = "0.1.1.0"; + sha256 = "1kqkdbwx34k109dk3bl57hk2mcqw1cjj7l5382qfwy5bky4zjihn"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide haskell-lsp-types hls-plugin-api text unordered-containers @@ -128787,26 +129518,22 @@ self: { "hls-hlint-plugin" = callPackage ({ mkDerivation, aeson, apply-refact, base, binary, bytestring , containers, data-default, deepseq, Diff, directory, extra - , filepath, ghc, ghcide, hashable, haskell-lsp, hlint - , hls-plugin-api, hslogger, lens, regex-tdfa, shake, temporary - , text, transformers, unordered-containers + , filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp + , hlint, hls-plugin-api, hslogger, lens, regex-tdfa, shake + , temporary, text, transformers, unordered-containers }: mkDerivation { pname = "hls-hlint-plugin"; - version = "0.1.0.0"; - sha256 = "1sjbdzdrl4r0ar75z5znrv5iyim2hmf52c6r5hgmyn7wmhzbpvnq"; - revision = "1"; - editedCabalFile = "1al6a1kzhymxrpq5mvz1nlyhfcnjsz3ygqkafa8llb6hzsff6m7s"; + version = "0.2.0.0"; + sha256 = "0v822s8m6iy7s0sld06gwh3ly20na0624s5g4642kkb2facbhm7d"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc ghcide hashable - haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa shake - temporary text transformers unordered-containers + deepseq Diff directory extra filepath ghc ghc-exactprint ghcide + hashable haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa + shake temporary text transformers unordered-containers ]; description = "Hlint integration plugin with Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-plugin-api" = callPackage @@ -128816,10 +129543,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "0.6.0.0"; - sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi"; - revision = "2"; - editedCabalFile = "0726nm80c7xfg6bxac32bg8yjszw5b0fq27jsg0w7dg2rg4zy1ji"; + version = "0.7.0.0"; + sha256 = "1cpl65ay55k3lvwsvqzwbg0c6lkzmiki2qvk6lj2dn6rcry9gk55"; libraryHaskellDepends = [ aeson base containers data-default Diff hashable haskell-lsp hslogger lens process regex-tdfa shake text unix @@ -128837,8 +129562,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "0.1.0.0"; - sha256 = "1h928dvycyj4lxhn73zv58hgvc4yccr5dv7bbc6nsq62762f75j4"; + version = "0.1.1.0"; + sha256 = "0wlrqqx2230xxvc1bl5gyx3cavs74c74bl4v3ib4v48wffgswbbj"; libraryHaskellDepends = [ aeson base containers deepseq directory extra ghc ghcide hashable haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions @@ -128846,29 +129571,54 @@ self: { ]; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-splice-plugin" = callPackage ({ mkDerivation, aeson, base, containers, dlist, foldl, ghc - , ghc-exactprint, ghcide, haskell-lsp, hls-exactprint-utils - , hls-plugin-api, lens, retrie, shake, syb, text, transformers - , unordered-containers + , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, retrie + , shake, syb, text, transformers, unordered-containers }: mkDerivation { pname = "hls-splice-plugin"; - version = "0.1.0.0"; - sha256 = "10zqgczp1mx81ac8fh59dp1hipfh09w4hnxylqjhj6c6wzgwa4cj"; + version = "0.3.0.0"; + sha256 = "1mi9951hgq7mcwry5mdi4ywxk3jkzs47x7q4nvm2svkpvgnbfhdv"; libraryHaskellDepends = [ aeson base containers dlist foldl ghc ghc-exactprint ghcide - haskell-lsp hls-exactprint-utils hls-plugin-api lens retrie shake - syb text transformers unordered-containers + haskell-lsp hls-plugin-api lens retrie shake syb text transformers + unordered-containers ]; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; }) {}; + "hls-tactics-plugin" = callPackage + ({ mkDerivation, aeson, base, checkers, containers, deepseq + , directory, extra, filepath, fingertree, generic-lens, ghc + , ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide, haskell-lsp + , hie-bios, hls-plugin-api, hspec, hspec-discover, lens, mtl + , QuickCheck, refinery, retrie, shake, syb, text, transformers + }: + mkDerivation { + pname = "hls-tactics-plugin"; + version = "0.5.1.0"; + sha256 = "150hbhdj0rxiyslqfvwzqiyyc0pdvkbfjizv33ldbq8gmwn6lf52"; + revision = "1"; + editedCabalFile = "03g175y8hg962w7npphw9laaq9j0xf6nw6p04jd4y6d20pnjn1dl"; + libraryHaskellDepends = [ + aeson base containers deepseq directory extra filepath fingertree + generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide + haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text + transformers + ]; + testHaskellDepends = [ + base checkers containers ghc hie-bios hls-plugin-api hspec mtl + QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Tactics plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + "hlwm" = callPackage ({ mkDerivation, base, stm, transformers, unix, X11 }: mkDerivation { @@ -131053,8 +131803,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.7.0"; - sha256 = "1kj72jn0sfvf68lf9n2v7v2qqw1g3kjyr6s6zlyvs6p2k3fw4ync"; + version = "0.8.0"; + sha256 = "122caz296w8sfc0ma4zigssha8vbr8abgj9ajsr83jh9k68jy3d9"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -131070,8 +131820,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.7.1"; - sha256 = "1fhqlckfznmd5dhzsxgm40lynm790j8g4srf6y3g632dv7lccjwn"; + version = "0.8.0"; + sha256 = "0vkf5ajmdy7h88vfz2aq5zzq4mrnl4wi0dqn0rzzbr3rjpip42j6"; libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src mtl process temporary text @@ -131083,13 +131833,15 @@ self: { }) {}; "hoppy-runtime" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath }: + ({ mkDerivation, base, Cabal, containers, directory, filepath + , hoppy-generator + }: mkDerivation { pname = "hoppy-runtime"; - version = "0.7.0"; - sha256 = "0rkyili7kbxj22rvs4056vhcgwpjzgigmwcrj6iph5pfzxnnl40q"; + version = "0.8.0"; + sha256 = "123mn1sfwy01jyb803r4rhdqpdafmbkyip149ga1pvlaj272mlqy"; libraryHaskellDepends = [ - base Cabal containers directory filepath + base Cabal containers directory filepath hoppy-generator ]; description = "C++ FFI generator - Runtime support"; license = lib.licenses.asl20; @@ -131101,8 +131853,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.7.1"; - sha256 = "1y7xi347xq60p66avxgjyzxn9q7amjg1s43b9fln4v8f9ca0pwn7"; + version = "0.8.0"; + sha256 = "0ysbnhabnrr0jb8f9a06fqqxv2sy7ahj92jhw2bifnvjffk1pnqd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -131566,8 +132318,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.34.3"; - sha256 = "0gwqmv3p3g9551n405bxrwm7a5ysx3q72q04k5qmicb3mxwwxnff"; + version = "0.34.4"; + sha256 = "1xszy00al5zzga64gh7nvgqc93242f61kqy8lb09jkm98a8fs4bl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132176,25 +132928,25 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, exceptions, fields-json, hpqtypes, lifted-base - , log-base, monad-control, mtl, safe, semigroups, tasty - , tasty-hunit, text, text-show, transformers, uuid-types + , cryptohash, deepseq, exceptions, extra, fields-json, hpqtypes + , lifted-base, log-base, monad-control, mtl, QuickCheck, safe + , semigroups, tasty, tasty-bench, tasty-hunit, text, text-show + , time, transformers, uuid-types }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.10.3.0"; - sha256 = "1ifr6z89ki541b9x3kpyf10vbn3anhfcq8ppqwyp5zvmkx0q3wqs"; - revision = "1"; - editedCabalFile = "0pa13k78w0xm59pvlsd9rmg9ddi3jkc918j5i0hb4vlxcaivq34y"; + version = "1.10.4.0"; + sha256 = "0qlxhq4vkr0qq1ckazb0lng9mbnljh32xsmcpbp5qm01bngadz56"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions - fields-json hpqtypes lifted-base log-base monad-control mtl safe - semigroups text text-show + extra fields-json hpqtypes lifted-base log-base monad-control mtl + safe semigroups text text-show ]; testHaskellDepends = [ - base exceptions hpqtypes lifted-base log-base monad-control tasty - tasty-hunit text transformers uuid-types + base exceptions hpqtypes lifted-base log-base monad-control + QuickCheck tasty tasty-hunit text time transformers uuid-types ]; + benchmarkHaskellDepends = [ base deepseq tasty-bench ]; description = "Extra utilities for hpqtypes library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -132703,6 +133455,24 @@ self: { license = lib.licenses.bsd3; }) {GeoIP = null;}; + "hs-aws-lambda" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, deepseq, http-client, http-types, safe-exceptions + , text, unliftio + }: + mkDerivation { + pname = "hs-aws-lambda"; + version = "0.1.0.2"; + sha256 = "078qkvxbjdsqgjmfq4fcpndb8c8cyz4g8s1q0ankpy359dvgxkv8"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers deepseq + http-client http-types safe-exceptions text unliftio + ]; + testHaskellDepends = [ base ]; + description = "A modern and easy-to-use wrapper for Docker-based Lambda implementations"; + license = lib.licenses.publicDomain; + }) {}; + "hs-bibutils" = callPackage ({ mkDerivation, base, syb }: mkDerivation { @@ -134760,8 +135530,8 @@ self: { }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.2.2"; - sha256 = "1zw26rp206w5wq3qb2y35wjis2a3qvyip7k35f3ls4y530gw39bq"; + version = "0.1.2.4"; + sha256 = "17dhhjbynr7afjibv6fys45m2al422b6q3z7ncfycpwp6541qifm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135313,15 +136083,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "hslua_1_3_0" = callPackage + "hslua_1_3_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "1.3.0"; - sha256 = "1dfh1jax6yrk5sf9q8qnq1qgr541xkwwnz9y3q6r8wflvwlj7cal"; + version = "1.3.0.1"; + sha256 = "1mz8zk13dhgaf24hmmjqnn5hcln96iw73mcjwjilag8388wq72k7"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions mtl text @@ -135373,6 +136143,22 @@ self: { license = lib.licenses.mit; }) {}; + "hslua-module-path" = callPackage + ({ mkDerivation, base, filepath, hslua, tasty, tasty-hunit + , tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-path"; + version = "0.1.0.1"; + sha256 = "1zxfljcn74rky26ijqmba6grpj0h9plgr47wxdaf7gcz1y8dhn68"; + libraryHaskellDepends = [ base filepath hslua text ]; + testHaskellDepends = [ + base filepath hslua tasty tasty-hunit tasty-lua text + ]; + description = "Lua module to work with file paths"; + license = lib.licenses.mit; + }) {}; + "hslua-module-system" = callPackage ({ mkDerivation, base, containers, directory, exceptions, hslua , tasty, tasty-hunit, tasty-lua, temporary, text @@ -135840,6 +136626,8 @@ self: { pname = "hspec-core"; version = "2.7.8"; sha256 = "10c7avvjcrpy3nrf5xng4177nmxvz0gmc83h7qlnljcp3rkimbvd"; + revision = "1"; + editedCabalFile = "0hjp0lq7lg5a12ym43jprx7rc4c8mcd8gh7whpgpn5qmp9z4hyyg"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -136147,27 +136935,24 @@ self: { "hspec-meta" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock - , deepseq, directory, filepath, hspec-expectations, HUnit - , QuickCheck, quickcheck-io, random, setenv, stm, time - , transformers + , deepseq, directory, filepath, QuickCheck, quickcheck-io, random + , setenv, stm, time, transformers }: mkDerivation { pname = "hspec-meta"; - version = "2.6.0"; - sha256 = "1n1a4633wfivylglji8920f67mx7qz8j4q58n8p7dxk6yg4h3mz6"; - revision = "1"; - editedCabalFile = "1qh3j6mhlz2bvdk8qc5fa4nqh93q4vqnvxmqqisg4agacnvyp4b2"; + version = "2.7.8"; + sha256 = "0sfj0n2hy1r8ifysgbcmfdygcd7vyzr13ldkcp0l2ml337f8j0si"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm time transformers + filepath QuickCheck quickcheck-io random setenv stm time + transformers ]; executableHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm time transformers + filepath QuickCheck quickcheck-io random setenv stm time + transformers ]; description = "A version of Hspec which is used to test Hspec itself"; license = lib.licenses.mit; @@ -136220,6 +137005,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "hspec-need-env_0_1_0_6" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover + , hspec-expectations, setenv, transformers + }: + mkDerivation { + pname = "hspec-need-env"; + version = "0.1.0.6"; + sha256 = "0drbjdm6wld2bnfmv2jqhw4ija9v85pa4p5aq9qgh1gs6c5d50bq"; + libraryHaskellDepends = [ base hspec-core hspec-expectations ]; + testHaskellDepends = [ base hspec hspec-core setenv transformers ]; + testToolDepends = [ hspec-discover ]; + description = "Read environment variables for hspec tests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-parsec" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, parsec }: mkDerivation { @@ -138236,7 +139037,7 @@ self: { license = lib.licenses.mit; }) {}; - "http-client_0_7_4" = callPackage + "http-client_0_7_5" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -138245,8 +139046,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.4"; - sha256 = "1a4vhhn8y5qcqd4i2q7pl9jqfrsh65nkv32qcsc80cjy2bcqivjs"; + version = "0.7.5"; + sha256 = "11p4szyrdl0ck2iixdrq2dcjz9dlv4pd36ymkipmq7c28l1cvy7k"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -139721,37 +140522,36 @@ self: { }) {}; "hum" = callPackage - ({ mkDerivation, base, brick, bytestring, containers, directory - , filepath, lens, libmpd, mtl, relude, template-haskell, text - , text-zipper, time, transformers, vector, vty, witherable-class + ({ mkDerivation, array, base, brick, bytestring, containers + , directory, filepath, lens, libmpd, mtl, regex-tdfa, relude + , template-haskell, text, text-zipper, time, transformers, vector + , vty, witherable }: mkDerivation { pname = "hum"; - version = "0.1.0.0"; - sha256 = "06zyjg2i0kk4wnzrcax7rff710rpafqwz4rv75wq09vr65wvvj1y"; - revision = "1"; - editedCabalFile = "1y0lhdjjv780jlrr0kdnqbk1w8117g765cnvqd98k112z31p2l8i"; + version = "0.2.0.0"; + sha256 = "144b1161rvlmayklvgm7cajs0jz5bhlbcgrq288pvymlyl4f962b"; + revision = "2"; + editedCabalFile = "03hh7nyqchskkp4iqcq335mnpdsvgdw8d1pf3dp7p4wmsk20kwmk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base brick bytestring containers directory filepath lens libmpd mtl - relude template-haskell text text-zipper time transformers vector - vty witherable-class + array base brick bytestring containers directory filepath lens + libmpd mtl regex-tdfa relude template-haskell text text-zipper time + transformers vector vty witherable ]; executableHaskellDepends = [ - base brick bytestring containers directory filepath lens libmpd mtl - relude template-haskell text text-zipper time transformers vector - vty witherable-class + array base brick bytestring containers directory filepath lens + libmpd mtl regex-tdfa relude template-haskell text text-zipper time + transformers vector vty witherable ]; testHaskellDepends = [ - base brick bytestring containers directory filepath lens libmpd mtl - relude template-haskell text text-zipper time transformers vector - vty witherable-class + array base brick bytestring containers directory filepath lens + libmpd mtl regex-tdfa relude template-haskell text text-zipper time + transformers vector vty witherable ]; description = "A TUI MPD client, inspired by ncmpcpp"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "human-parse" = callPackage @@ -140128,8 +140928,8 @@ self: { }: mkDerivation { pname = "husk-scheme"; - version = "3.19.3"; - sha256 = "0bb4iph3pp26rm9sdsjsshbig3misd1yr4waqblj8vr9fmrpx084"; + version = "3.20"; + sha256 = "11pghca4msm5nw1zdw3qlxzhmcwl9xg5hyvjd9z7869a3qahid5q"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -140940,32 +141740,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "4.0.1"; - sha256 = "05ahw4cdp5kk5j4rbjf1bdvivg3nhiaaf68p902mp8jcbh7fz9sf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bifunctors bytestring containers text transformers unix - ]; - librarySystemDepends = [ rdkafka ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - base bifunctors bytestring containers either hspec monad-loops text - ]; - testToolDepends = [ hspec-discover ]; - description = "Kafka bindings for Haskell"; - license = lib.licenses.mit; - }) {inherit (pkgs) rdkafka;}; - - "hw-kafka-client_4_0_2" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, hspec-discover, monad-loops, rdkafka, text - , transformers, unix - }: - mkDerivation { - pname = "hw-kafka-client"; - version = "4.0.2"; - sha256 = "166gi8mj2ljv4xcjrhi2pgjmnj112998fzbzjfpf5ckj54d20ch9"; + version = "4.0.3"; + sha256 = "1s3wj5ih9mc7vp0w9rymw22w1yxp8z3qi7qmza9qw00aail8c5dg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140979,7 +141755,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Kafka bindings for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) rdkafka;}; "hw-kafka-conduit" = callPackage @@ -141678,8 +142453,8 @@ self: { }: mkDerivation { pname = "hxt"; - version = "9.3.1.18"; - sha256 = "0836k65px3w9c5h1h2bmzq5a7mp6ajxwvfg3pfr2kbxwkgc0j63j"; + version = "9.3.1.21"; + sha256 = "1y2kyb7hyhx0vpkfyd0f11v2v7khk57qyfgqzk442x8qcibm3d9a"; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri @@ -141726,8 +142501,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hxt-charproperties"; - version = "9.4.0.0"; - sha256 = "1bk88hj2pqlvcnyfncqyb9j7w9vvdxcq3cgr0w2l09c0abas23pm"; + version = "9.5.0.0"; + sha256 = "0jm98jddbsd60jc2bz8wa71rslagbaqf00ia7fvfsaiaa54nk0r8"; libraryHaskellDepends = [ base ]; description = "Character properties and classes for XML and Unicode"; license = lib.licenses.mit; @@ -141834,10 +142609,8 @@ self: { }: mkDerivation { pname = "hxt-regex-xmlschema"; - version = "9.2.0.3"; - sha256 = "1c4jr0439f5yc05h7iz53fa47g6l2wrvqp6gvwf01mlqajk3nx7l"; - revision = "1"; - editedCabalFile = "0vg9vnfjmq1ma6zwwv4yvfih6wbslksvsvy9b41i4f81l0hh7ia8"; + version = "9.2.0.7"; + sha256 = "0ynrf65m7abq2fjnarlwq6i1r99pl89npibxx05rlplcgpybrdmr"; libraryHaskellDepends = [ base bytestring hxt-charproperties parsec text ]; @@ -142542,8 +143315,8 @@ self: { pname = "hyphenation"; version = "0.8"; sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii"; - revision = "2"; - editedCabalFile = "0y10glmsgnc67f2y8d6irgwyz9fahg9dv2sidqx1r6rfbs02416i"; + revision = "3"; + editedCabalFile = "0krjvrk5hzcs101b5h95ai51wwq1fj04q1ryn63j1qmj22jpn4ki"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -144430,8 +145203,8 @@ self: { }: mkDerivation { pname = "imperative-edsl"; - version = "0.8"; - sha256 = "0mz6yy472wvcg4ywjhaaqi0cxyy9l437pw4rkwd2j392n6hlfbar"; + version = "0.8.1"; + sha256 = "1z1a7b7m69m9xagvfa6xx3l1j0s7lrlvp4n09lra1x3q7lpfgnra"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -144745,8 +145518,8 @@ self: { }: mkDerivation { pname = "in-other-words"; - version = "0.1.1.0"; - sha256 = "0f11si2bnxw2bm5mfnnqh9cfwhlzdcqkw5dfjql1y618db808am9"; + version = "0.2.0.0"; + sha256 = "0adl539jilc3rnwx9ir39y97f6h60xavzhhc8pa9vc6gqp1v4g20"; libraryHaskellDepends = [ async base exceptions monad-control mtl stm transformers transformers-base @@ -144760,6 +145533,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "in-other-words-plugin" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, hspec + , hspec-discover, in-other-words, syb, transformers + }: + mkDerivation { + pname = "in-other-words-plugin"; + version = "0.1.0.0"; + sha256 = "02c6qprny0x1qs5zpcma07vr3ikrksr18gqxpvf9hx55w3pnni0w"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra in-other-words syb + transformers + ]; + testHaskellDepends = [ + base containers ghc ghc-tcplugins-extra hspec in-other-words syb + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Disambiguate obvious uses of effects when using in-other-words"; + license = lib.licenses.bsd3; + }) {}; + "inbox" = callPackage ({ mkDerivation, async, base, error-or, text, time }: mkDerivation { @@ -145673,8 +146467,8 @@ self: { }: mkDerivation { pname = "inline-asm"; - version = "0.4.0.1"; - sha256 = "19djbqfidl8spii2y5a4qi5a6k2dhh9kg4lafxx58w60118rsv6z"; + version = "0.4.0.2"; + sha256 = "01npi02i8wf9b0pa18cgl78ma6r9xqz0i7dc3khkj1725w5wkhvp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145966,21 +146760,21 @@ self: { ({ mkDerivation, aeson, aeson-extra, base, binary, bytestring , containers, directory, ekg-core, exceptions, hslogger , http-client, http-client-tls, http-types, HUnit, network, process - , random, regex-base, regex-tdfa, retry, scientific, servant - , servant-server, stm, sysinfo, text, time, transformers, unix - , unordered-containers, wai, warp + , random, regex-base, regex-compat, regex-pcre, regex-tdfa, retry + , scientific, servant, servant-server, stm, sysinfo, text, time + , transformers, unix, unordered-containers, wai, warp }: mkDerivation { pname = "instana-haskell-trace-sdk"; - version = "0.3.0.0"; - sha256 = "0dy947230ing6mv4xvd8ahiwfhkz557n2mrvi86whns8jbb71nbv"; + version = "0.5.0.1"; + sha256 = "1414c9jahmkszpag40iyzrr0g346dp9l1ssz60693ivcm0q16pii"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-extra base bytestring containers directory ekg-core exceptions hslogger http-client http-client-tls http-types network - process random regex-base regex-tdfa retry scientific stm sysinfo - text time unix unordered-containers wai + process random regex-base regex-compat regex-pcre regex-tdfa retry + scientific stm sysinfo text time unix unordered-containers wai ]; executableHaskellDepends = [ aeson base binary bytestring hslogger http-client http-types @@ -145990,7 +146784,8 @@ self: { testHaskellDepends = [ aeson aeson-extra base bytestring directory ekg-core exceptions hslogger http-client http-types HUnit process random regex-base - regex-tdfa retry scientific text unix unordered-containers + regex-compat regex-pcre regex-tdfa retry scientific text unix + unordered-containers ]; description = "SDK for adding custom Instana tracing support to Haskell applications"; license = lib.licenses.mit; @@ -146827,8 +147622,8 @@ self: { pname = "intervals"; version = "0.9.1"; sha256 = "1s9pj2dah94smq769q4annxv2grdx376wvhzl4rsq85kjppf5a6z"; - revision = "1"; - editedCabalFile = "0fz1g5nlh87qznpm5cnj6rn65wi9nw8k7daw43jng1f2v0svvxng"; + revision = "2"; + editedCabalFile = "1nrpc95wwifnlk7p9nw6xgcc74zw1k6krhvll7rr18ddjgfgv07x"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base distributive ghc-prim ]; testHaskellDepends = [ @@ -147023,6 +147818,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "invert" = callPackage + ({ mkDerivation, base, containers, criterion, generic-deriving + , hashable, unordered-containers, vector + }: + mkDerivation { + pname = "invert"; + version = "1.0"; + sha256 = "18q070bawfnyi4wl6rxb6l5ihda0xzmlb8g1z0sg46vghvbs985v"; + revision = "2"; + editedCabalFile = "1829iy3jg0zwms16cqd4rdg5khl348ih44b3mz7l7cy9wlci3cli"; + libraryHaskellDepends = [ + base containers generic-deriving hashable unordered-containers + vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Automatically generate a function's inverse"; + license = lib.licenses.asl20; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -147238,6 +148053,8 @@ self: { pname = "io-streams"; version = "1.5.2.0"; sha256 = "1hbabrk5145d77qi23688piaf1wc93n8vaj846n0s3zk953z1lk3"; + revision = "1"; + editedCabalFile = "1dcadj5gv1m2yy97zsbq5x67vsblp8gy58a0kl5di9vkbgrcw46n"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -147413,8 +148230,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.7.2"; - sha256 = "10jcqc7x48kfslyahl9i4pb1qmjfg1fjznc5w7kl9kx2cxivbwig"; + version = "1.7.3"; + sha256 = "0xcn9la0c2illw53xn8m2w2jpfi9yivzl2w54l62cj2fn7l9l5cf"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -149194,12 +150011,13 @@ self: { "j" = callPackage ({ mkDerivation, base, bytestring, repa, tasty, tasty-hunit, unix + , vector }: mkDerivation { pname = "j"; - version = "0.2.1.1"; - sha256 = "14mmqdkh73idqsxsvgvz5nfv7n0ashj35amawzy63zs80hfmqcf2"; - libraryHaskellDepends = [ base bytestring repa unix ]; + version = "0.2.2.0"; + sha256 = "1lmk6zw5w51d6aglykiyp9qpa656qs9imf99nalzn7qldsz81aqd"; + libraryHaskellDepends = [ base bytestring repa unix vector ]; testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; license = lib.licenses.bsd3; @@ -150212,22 +151030,22 @@ self: { "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal - , containers, criterion, cryptonite, doctest, either, hspec, HUnit - , memory, mtl, QuickCheck, text, time, transformers - , transformers-compat, unordered-containers, vector + , containers, criterion, cryptonite, hspec, HUnit, memory, mtl + , QuickCheck, text, time, transformers, transformers-compat + , unordered-containers, vector }: mkDerivation { pname = "jose-jwt"; - version = "0.8.0"; - sha256 = "1hmnkmbhmw78k35g3h3b016p0b4rrax9s8izp5xfrsqqxkl9ic2g"; + version = "0.9.0"; + sha256 = "1dnkyzs7kk2lxz2kj3x6v8w1lypsr0rppyn78s7w5sr89y924752"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers cryptonite - either memory mtl text time transformers transformers-compat + memory mtl text time transformers transformers-compat unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring cryptonite doctest either hspec HUnit memory - mtl QuickCheck text unordered-containers vector + aeson base bytestring cryptonite hspec HUnit memory mtl QuickCheck + text unordered-containers vector ]; benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; description = "JSON Object Signing and Encryption Library"; @@ -150847,8 +151665,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.11"; - sha256 = "1h9v71pvzi761ml0dpkmhd7w2l36s1v3rsq9zbshw87762710fy1"; + version = "1.0.12"; + sha256 = "0baav0mvprja5jdmndan6psxqm37173yvrjrr04kfxs9568dvzyf"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -151162,8 +151980,8 @@ self: { }: mkDerivation { pname = "json-sop"; - version = "0.2.0.4"; - sha256 = "0q1p15whyyzpggfnqm4vy9p8l12xlxmnc4d82ykxl8rxzhbjkh0i"; + version = "0.2.0.5"; + sha256 = "1sdc2ywdra75nqlc5829f0clfi91fdqyrcmik1nrxrdnxr4yzhvh"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -151478,8 +152296,8 @@ self: { }: mkDerivation { pname = "jsonifier"; - version = "0.1.0.6"; - sha256 = "0yhczdq3m79xbg04hcahl2c75kipm5szahr7bmj8xjml4zxzd3bk"; + version = "0.1.1"; + sha256 = "09w92adnjskx7cxyki415nqxdzqfz78rcqisk1g862r92907ibwf"; libraryHaskellDepends = [ base bytestring ptr-poker scientific text ]; @@ -154394,6 +155212,22 @@ self: { broken = true; }) {}; + "kparams" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "kparams"; + version = "0.1.0.0"; + sha256 = "0q1ma3qm2anpr6w4xa78wh97b7pzy85ggjiiwbd0gb7b0vwbglx0"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + doHaddock = false; + description = "Extracts values from /proc/cmdline"; + license = lib.licenses.mit; + }) {}; + "kqueue" = callPackage ({ mkDerivation, base, c2hs, directory, filepath, mtl, time, unix }: @@ -154916,8 +155750,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.13"; - sha256 = "1a3gpr0gf1dhvy6lcqbgkf0iznjg62yav2xfnzps48wba5585dj0"; + version = "1.0.14"; + sha256 = "01yi2si0gakmjk66jmm93hz50nl7xa1zhmhcrhqn8ip0mkpncnqk"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -157640,8 +158474,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "2.0.2"; - sha256 = "01c42wyjvnd1wp665p2khjsm1apc9kw3gw6mnlwbdgsimhj8v4z0"; + version = "2.1.0"; + sha256 = "1nj6jcmara4x8y292q5qacli6hmfhahw856a0nyngca2c8m5mwr1"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -157937,8 +158771,8 @@ self: { pname = "lazy-io-streams"; version = "0.1.0.0"; sha256 = "022x0sikvdsvpp0gh7q82sdpd5kxd2zmprdpmf7z4c3hf4xk9vxy"; - revision = "1"; - editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm"; + revision = "2"; + editedCabalFile = "01r6i81rxm6rng50yhfj84z3dvhcbap10sfqigg01mfmy4zn9pnl"; libraryHaskellDepends = [ base bytestring io-streams ]; description = "Get lazy with your io-streams"; license = lib.licenses.bsd3; @@ -158717,8 +159551,8 @@ self: { pname = "lens"; version = "4.19.2"; sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j"; - revision = "3"; - editedCabalFile = "1anqghjbi0wyvqpg7qcbph5rfq78sjpdavrajh4z6f20kzy4mn45"; + revision = "5"; + editedCabalFile = "1r9rhblsw1g2y2lyf8vhps05hvx6jxs5r6y1rf868hxz0z242i7q"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -158782,8 +159616,8 @@ self: { pname = "lens-aeson"; version = "1.1"; sha256 = "03n9dkdyqkkf15h8k4c4bjwgjcbbs2an2cf6z8x54nvkjmprrg7p"; - revision = "3"; - editedCabalFile = "10zm8r29c3hb5saxv3ryr67nsg8rf4dk67yjwysasd3jpkxghj5p"; + revision = "4"; + editedCabalFile = "1wgk0nd0fxgdbqb6mkslj3gyrs9vdxpb83hvj2n2dcswg3ahwdsy"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -158982,19 +159816,15 @@ self: { }) {}; "lens-process" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath - , lens, process, tasty, tasty-hunit + ({ mkDerivation, base, filepath, lens, process, tasty, tasty-hunit }: mkDerivation { pname = "lens-process"; - version = "0.3.0.2"; - sha256 = "1bv6z7309bq9jv2lzr79bcbwg1pkhy728pnrjnl3c3nv807a3igk"; - revision = "2"; - editedCabalFile = "1l71hi0a5yn5x9w4br5bzypa25zdlqw6jcb69z3bhb6dx53197ma"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.4.0.0"; + sha256 = "1gms2bxa1sygpid09cg3nk1kyhkg4s38dqs0gd77ia2aln6zd7qg"; libraryHaskellDepends = [ base filepath lens process ]; testHaskellDepends = [ - base doctest filepath lens process tasty tasty-hunit + base filepath lens process tasty tasty-hunit ]; description = "Optics for system processes"; license = lib.licenses.bsd3; @@ -159642,14 +160472,14 @@ self: { }) {}; "libBF" = callPackage - ({ mkDerivation, base, deepseq }: + ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "libBF"; - version = "0.5.1"; - sha256 = "0iwbkfbp26z1zmnk28mnkvyh8k0i0bx56wl2jwygdnqvl5lmfv6i"; + version = "0.6"; + sha256 = "01dh44fj1fhg912hw6p0r1ng7spm59xpzwc1rps8p2lcsicj4gvw"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base deepseq ]; + libraryHaskellDepends = [ base deepseq hashable ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A binding to the libBF library"; @@ -160111,13 +160941,13 @@ self: { "libmpd" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default-class, filepath, hspec, mtl, network, QuickCheck - , safe-exceptions, text, time, unix, utf8-string + , data-default-class, filepath, hspec, hspec-discover, mtl, network + , QuickCheck, safe-exceptions, text, time, unix, utf8-string }: mkDerivation { pname = "libmpd"; - version = "0.9.3.0"; - sha256 = "08bi0m7kxh2ppkabq5vsx1cwz3i1y4y7w4j0g1hi9q9raml6y0y9"; + version = "0.10.0.0"; + sha256 = "088vlir0n3wps2p5ydgyx51p41nfjcm2v02sszpyjj3c8z7f4qkh"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network safe-exceptions text time utf8-string @@ -160127,6 +160957,7 @@ self: { hspec mtl network QuickCheck safe-exceptions text time unix utf8-string ]; + testToolDepends = [ hspec-discover ]; description = "An MPD client library"; license = lib.licenses.mit; }) {}; @@ -160682,21 +161513,17 @@ self: { }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage - ({ mkDerivation, base, Cabal, cmdargs, containers, directory - , process - }: + ({ mkDerivation, base, Cabal, containers, directory, process }: mkDerivation { pname = "licensor"; - version = "0.4.1"; - sha256 = "0p1wnyff2v23405v42ks5m3lyxhcahmcs3vh2qc5kz4q7ybnks7b"; + version = "0.4.3"; + sha256 = "19ydisxc5yzm0ccj76p7sg39cpjg5c57wd3gaybc5k7bqrlv14c6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal containers directory process ]; - executableHaskellDepends = [ - base Cabal cmdargs containers directory - ]; + executableHaskellDepends = [ base Cabal containers directory ]; description = "A license compatibility helper"; license = lib.licenses.mit; }) {}; @@ -160757,6 +161584,27 @@ self: { license = lib.licenses.mpl20; }) {}; + "lifetimes" = callPackage + ({ mkDerivation, base, containers, hspec, monad-stm + , safe-exceptions, stm, transformers, zenhack-prelude + }: + mkDerivation { + pname = "lifetimes"; + version = "0.1.0.0"; + sha256 = "192bzz4nqqi2kdk9x4nxlwmx0mf0sshqdcnx1dgyjh5z9k29rww5"; + libraryHaskellDepends = [ + base containers monad-stm stm transformers zenhack-prelude + ]; + testHaskellDepends = [ + base containers hspec monad-stm safe-exceptions stm transformers + zenhack-prelude + ]; + description = "Flexible manual resource management"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "lift-generics" = callPackage ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim , hspec, hspec-discover, mtl, template-haskell, th-compat @@ -161291,18 +162139,16 @@ self: { "linear" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq - , distributive, doctest, ghc-prim, hashable, HUnit, lens, random - , reflection, semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , transformers, transformers-compat, unordered-containers, vector - , void + , bytestring, cereal, containers, deepseq, distributive, ghc-prim + , hashable, HUnit, lens, random, reflection, semigroupoids + , semigroups, simple-reflect, tagged, template-haskell + , test-framework, test-framework-hunit, transformers + , transformers-compat, unordered-containers, vector, void }: mkDerivation { pname = "linear"; - version = "1.21.3"; - sha256 = "12gn571cfchrj9zir30c86vib3ppjia5908di21pnsfy6dmw6994"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "1.21.4"; + sha256 = "019dsw4xqcmz8g0hanc3xsl0k1pqzxkhp9jz1sf12mqsgs6jj0zr"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable lens random reflection @@ -161310,8 +162156,8 @@ self: { transformers-compat unordered-containers vector void ]; testHaskellDepends = [ - base binary bytestring deepseq doctest HUnit lens reflection - simple-reflect test-framework test-framework-hunit vector + base binary bytestring deepseq HUnit reflection simple-reflect + test-framework test-framework-hunit vector ]; description = "Linear Algebra"; license = lib.licenses.bsd3; @@ -161356,6 +162202,32 @@ self: { broken = true; }) {}; + "linear-base" = callPackage + ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim + , hashable, hashtables, hedgehog, mmorph, primitive, random + , random-shuffle, storable-tuple, tasty, tasty-hedgehog, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "linear-base"; + version = "0.1.0"; + sha256 = "00n7rmvkjg42n1pba1y1lziw9a8gyhix15rw13qsyymi8bdr8k82"; + libraryHaskellDepends = [ + base containers ghc-prim hashable primitive storable-tuple text + transformers vector + ]; + testHaskellDepends = [ + base containers hedgehog mmorph storable-tuple tasty tasty-hedgehog + text vector + ]; + benchmarkHaskellDepends = [ + base deepseq gauge hashable hashtables random random-shuffle + unordered-containers + ]; + description = "Standard library for linear types"; + license = lib.licenses.mit; + }) {}; + "linear-circuit" = callPackage ({ mkDerivation, base, comfort-array, comfort-graph, containers , lapack, netlib-ffi, non-empty, QuickCheck, transformers @@ -162552,8 +163424,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "list-singleton"; - version = "1.0.0.4"; - sha256 = "0mb2kwj3gvykwh0iywwzqdnma27nxs1hl1rvnp3qxi893p4ikyiw"; + version = "1.0.0.5"; + sha256 = "1vbhg04dral59b6f43xcykgi6war5mcflmczwcmqfhy7lgb86r3n"; libraryHaskellDepends = [ base ]; description = "Easily and clearly create lists with only one element in them"; license = lib.licenses.isc; @@ -163994,8 +164866,8 @@ self: { pname = "log-domain"; version = "0.13"; sha256 = "0isl8rs0k5088sxapfh351sff3lh7r1qkgwz8lmai3gvqasb3avv"; - revision = "2"; - editedCabalFile = "1dylv7gijrm3jn9d1gab9xfqk7xpfb9qrlkaaqpf7b3q8qdswqzs"; + revision = "3"; + editedCabalFile = "10ajmxkjbbkdrkasgfd5hhjcbggrylrg00m1lafac53v97hqpyp1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable @@ -164473,21 +165345,6 @@ self: { broken = true; }) {}; - "logict_0_7_0_3" = callPackage - ({ mkDerivation, base, mtl, tasty, tasty-hunit }: - mkDerivation { - pname = "logict"; - version = "0.7.0.3"; - sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r"; - revision = "1"; - editedCabalFile = "13hxmzaxd5iv9hjad5kw9infq0lxsgypqqb2z1i1939604a90qp4"; - libraryHaskellDepends = [ base mtl ]; - testHaskellDepends = [ base mtl tasty tasty-hunit ]; - description = "A backtracking logic-programming monad"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "logict" = callPackage ({ mkDerivation, async, base, mtl, tasty, tasty-hunit }: mkDerivation { @@ -165102,8 +165959,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.9.0"; - sha256 = "195z7kx7jv0118pbashbc441sf69xag5q43jwkdyf53cmvnxqcwq"; + version = "0.9.1"; + sha256 = "1f4rf4q6gfiz55qlfpkzk19nq6fw92ri3a1smyv4r55i50jr07rm"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -165351,6 +166208,24 @@ self: { broken = true; }) {}; + "lsfrom" = callPackage + ({ mkDerivation, base, directory, filepath, simple-cmd + , simple-cmd-args + }: + mkDerivation { + pname = "lsfrom"; + version = "0.1"; + sha256 = "04cv4x88r10b9zkfiy1kclq3dm79akg1p16djfad8h5x988c7bq1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base filepath simple-cmd simple-cmd-args + ]; + testHaskellDepends = [ base directory filepath simple-cmd ]; + description = "List dir files starting from a specific name"; + license = lib.licenses.bsd3; + }) {}; + "lsp" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, dependent-map, directory, filepath @@ -165436,6 +166311,34 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lsp-test_0_12_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, text, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.12.0.0"; + sha256 = "1zc43j7xyfxv2i9vinx82yhkrr6m4gz46jwn9p39k76ld6j8nzpd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-parse containers data-default Diff directory filepath Glob + haskell-lsp lens mtl parser-combinators process text transformers + unix unordered-containers + ]; + testHaskellDepends = [ + aeson base data-default directory filepath haskell-lsp hspec lens + text unordered-containers + ]; + description = "Functional test framework for LSP servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, dependent-sum-template, directory @@ -166527,6 +167430,8 @@ self: { pname = "machines"; version = "0.7.1"; sha256 = "0ayajyzaczdazfsmamlm5vap43x2mdm4w8v5970y1xlxh4rb3bs1"; + revision = "1"; + editedCabalFile = "1cp850vwzn213n0k9s5i62889a1wvmyi05jw6kmazaczcbcs7jsq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -168564,18 +169469,17 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , doctest, exceptions, mersenne-random-pure64, primitive - , QuickCheck, random, scheduler, splitmix, template-haskell - , unliftio-core, vector + ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions + , mersenne-random-pure64, primitive, QuickCheck, random, scheduler + , splitmix, template-haskell, unliftio-core, vector }: mkDerivation { pname = "massiv"; - version = "0.5.9.0"; - sha256 = "11i527mnyznpyqwr61cr3jhx4xs3y8m7948mqp6rwkis6lnvl2ms"; + version = "0.6.0.0"; + sha256 = "12p3gcrz3nwry99xhxfrz51aiswm5ira2hyxl4q1g3jfi8vwgcd0"; libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions primitive - scheduler unliftio-core vector + base bytestring deepseq exceptions primitive scheduler + unliftio-core vector ]; testHaskellDepends = [ base doctest mersenne-random-pure64 QuickCheck random splitmix @@ -168593,8 +169497,8 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.4.0.0"; - sha256 = "18q09pz563jp8lmnvmcynmhrk6pmqxr8whlcp6f9kilkzy7hzy9k"; + version = "0.4.1.0"; + sha256 = "1g20n4h1x03i7q36a6d65v2ylmrr6m8s2g91jnpx1lj7a91hc5c7"; libraryHaskellDepends = [ base bytestring Color data-default-class deepseq exceptions filepath JuicyPixels massiv netpbm unliftio vector @@ -168676,8 +169580,8 @@ self: { }: mkDerivation { pname = "massiv-test"; - version = "0.1.6"; - sha256 = "1cg41rkk19jyvkkx3nkd10lq738cg5kv29nrzwxqcm5v308av38i"; + version = "0.1.6.1"; + sha256 = "0f2f401flik0sj1wqlzghhr0dxbz2lyvlb4ij38n3m2vgpkgkd57"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions hspec massiv primitive QuickCheck scheduler unliftio vector @@ -169289,36 +170193,37 @@ self: { "matterhorn" = callPackage ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat - , brick, brick-skylighting, bytestring, cheapskate, checkers - , config-ini, connection, containers, data-clist, directory - , filepath, gitrev, hashable, Hclip, mattermost-api - , mattermost-api-qc, microlens-platform, mtl, network-uri, process - , random, semigroups, skylighting-core, split, stm, stm-delay - , strict, tasty, tasty-hunit, tasty-quickcheck, temporary, text - , text-zipper, time, timezone-olson, timezone-series, transformers - , Unique, unix, unordered-containers, utf8-string, uuid, vector - , vty, word-wrap, xdg-basedir + , brick, brick-skylighting, bytestring, checkers, commonmark + , commonmark-extensions, config-ini, connection, containers + , data-clist, directory, filepath, gitrev, hashable, Hclip + , mattermost-api, mattermost-api-qc, microlens-platform, mtl + , network-uri, parsec, process, random, semigroups + , skylighting-core, split, stm, stm-delay, strict, tasty + , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time + , timezone-olson, timezone-series, transformers, Unique, unix + , unordered-containers, utf8-string, uuid, vector, vty, word-wrap + , xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "50200.11.0"; - sha256 = "0wvw3wbv2sii1bjc8nmwyb1k0hzixfkfvpkmlkwa2my564vvmgz8"; + version = "50200.12.0"; + sha256 = "0rsxgc4igcjhddfil01la1sbnglvr08mf7gfi9fr6pf7sb9w6qbq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aspell-pipe async base base-compat brick brick-skylighting - bytestring cheapskate config-ini connection containers data-clist - directory filepath gitrev hashable Hclip mattermost-api - microlens-platform mtl network-uri process random semigroups - skylighting-core split stm stm-delay strict temporary text - text-zipper time timezone-olson timezone-series transformers unix - unordered-containers utf8-string uuid vector vty word-wrap - xdg-basedir + bytestring commonmark commonmark-extensions config-ini connection + containers data-clist directory filepath gitrev hashable Hclip + mattermost-api microlens-platform mtl network-uri parsec process + random semigroups skylighting-core split stm stm-delay strict + temporary text text-zipper time timezone-olson timezone-series + transformers unix unordered-containers utf8-string uuid vector vty + word-wrap xdg-basedir ]; executableHaskellDepends = [ base text ]; testHaskellDepends = [ - base bytestring cheapskate checkers containers mattermost-api + base bytestring checkers commonmark containers mattermost-api mattermost-api-qc tasty tasty-hunit tasty-quickcheck text time Unique uuid ]; @@ -169337,8 +170242,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.9.0"; - sha256 = "08whhlkr3ayimn66lwinvv0ci8zbhk5i7sz1fk5r1dp7mg2jzgig"; + version = "50200.10.0"; + sha256 = "0pbp4f0gwhap8d9chn6c2zf22ic3r32302zir4a5r6cmgg4vscgd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169362,8 +170267,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.9.0"; - sha256 = "0rcbsf5hrp2fd9jqmcr07gg2y0xg4ksasrqfxrc7n4mgw0a409i6"; + version = "50200.10.0"; + sha256 = "0cv7l5g63ar7ii704j8q3y5hsvbmljm8cmgdw6p2shqigv8slzci"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -169870,19 +170775,19 @@ self: { }) {}; "mealy" = callPackage - ({ mkDerivation, adjunctions, backprop, base, containers, doctest - , folds, generic-lens, hmatrix, lens, mwc-probability, mwc-random - , numhask, numhask-array, primitive, profunctors, tdigest, text - , vector, vector-algorithms + ({ mkDerivation, adjunctions, base, containers, doctest, folds + , generic-lens, lens, matrix, mwc-probability, numhask + , numhask-array, primitive, profunctors, tdigest, text, vector + , vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.0.1"; - sha256 = "0z7hf1blzhgrjmrf7s2dpgmg73157j476g17i7m52zgfgq4vmym9"; + version = "0.0.3"; + sha256 = "0gv4vi8ppbrhi8j2xwhnw96sybs2ci2ja6s37ggv4g0lxbxin17m"; libraryHaskellDepends = [ - adjunctions backprop base containers folds generic-lens hmatrix - lens mwc-probability mwc-random numhask numhask-array primitive - profunctors tdigest text vector vector-algorithms + adjunctions base containers folds generic-lens lens matrix + mwc-probability numhask numhask-array primitive profunctors tdigest + text vector vector-algorithms ]; testHaskellDepends = [ base doctest numhask ]; description = "See readme.md"; @@ -173333,23 +174238,6 @@ self: { }: mkDerivation { pname = "mixed-types-num"; - version = "0.4.0.2"; - sha256 = "0kirxpnmwwnbxamwpzrxyx69n482xhifqpr5id73pfni7lrd126p"; - libraryHaskellDepends = [ - base hspec hspec-smallcheck mtl QuickCheck smallcheck - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; - description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = lib.licenses.bsd3; - }) {}; - - "mixed-types-num_0_4_1" = callPackage - ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck - , smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; version = "0.4.1"; sha256 = "159zx9b5p3g1ywhnbihjbxkpxylgrkhhrswmazymqbh49f4s758y"; libraryHaskellDepends = [ @@ -173359,7 +174247,6 @@ self: { testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mixpanel-client" = callPackage @@ -173575,7 +174462,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "mmorph" = callPackage + "mmorph_1_1_3" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; @@ -173586,6 +174473,22 @@ self: { ]; description = "Monad morphisms"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mmorph" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.1.4"; + sha256 = "1hxyyh0x58kjdsyf1kj2kibjxzk2d9rcabv2y9vrpb59w85lqanz"; + revision = "1"; + editedCabalFile = "0xvwjcfpy6243wiwgyckmwc1nbw31y32n3hrrswdjw21znz894yl"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = lib.licenses.bsd3; }) {}; "mmsyn2" = callPackage @@ -174020,8 +174923,8 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.3.0"; - sha256 = "184vhcnpwjsvxwbdsipz7kc2xylfwfqflbbbyipag610w07a3qk2"; + version = "0.3.3.1"; + sha256 = "0h4ssb4wy4ac6vd5jcbvp0r2fr1jmyc60hg56s7ym50bbymj5wp3"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -175087,19 +175990,19 @@ self: { "monad-metrics-extensible" = callPackage ({ mkDerivation, base, dependent-map, dependent-sum, ekg, ekg-core - , exceptions, hspec, mtl, stm, text + , exceptions, hspec, mtl, stm, text, time }: mkDerivation { pname = "monad-metrics-extensible"; - version = "0.1.0.1"; - sha256 = "044hvhnf7wsgd18cac2j3bfw2vbxfnra736l6qndfx07mkv1nz5n"; + version = "0.1.1.0"; + sha256 = "14ahi50c6pd30zywjbsffn3p090ib57h6as2ad8jqxywjalxd8dm"; libraryHaskellDepends = [ base dependent-map dependent-sum ekg ekg-core exceptions mtl stm - text + text time ]; testHaskellDepends = [ base dependent-map dependent-sum ekg ekg-core exceptions hspec mtl - stm text + stm text time ]; description = "An extensible and type-safe wrapper around EKG metrics"; license = lib.licenses.bsd3; @@ -176628,8 +177531,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.11.1"; - sha256 = "04gvyfhn84p5dns28h1cfn68fpz7zwsavwvay27b3yfbzd8i1z31"; + version = "1.12.0"; + sha256 = "0cfmcrasf2cfirsa6xb1aznj75bwnzmiy9irirk1i9p2bx4aqy5m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178041,8 +178944,8 @@ self: { }: mkDerivation { pname = "mu-avro"; - version = "0.4.0.3"; - sha256 = "01sygrx80jfi6xygrgj2chqjr0fllld807p26rggfdzwp9p6pc9b"; + version = "0.4.0.4"; + sha256 = "06f3l7fwgx17cfa80a2inzx9255nqvk5q5fnlzvwhslymi8mb6xd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178070,8 +178973,8 @@ self: { }: mkDerivation { pname = "mu-graphql"; - version = "0.5.0.0"; - sha256 = "0idlxja65gv2whaln7snrqa87yfm7dc3pqwnq6qhmxwvm1npbjqk"; + version = "0.5.0.1"; + sha256 = "1mcm8db1q0sjzxyjhxd140l966vq6yh8hj1p2xx8yzqmagsfv7kx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178260,8 +179163,10 @@ self: { }: mkDerivation { pname = "mu-protobuf"; - version = "0.4.1.0"; - sha256 = "1sx9943y1z213fx5gasw78xz7zgxk33lfnx16918ls5jxma40igh"; + version = "0.4.2.0"; + sha256 = "07mgld1cmpynhdih7ppki8xw85zpknv0ipn7fvn79bj53s0nx6vg"; + revision = "1"; + editedCabalFile = "12zp8g0v8f924dsc3c0ynzqcv2j4c4xl6dh72mz11nmxi9la51s7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178304,8 +179209,8 @@ self: { }: mkDerivation { pname = "mu-schema"; - version = "0.3.1.1"; - sha256 = "0n30xn2z1dl4n28mbfnif8csvz0namll0hab1r7mhnamp0yc3gs8"; + version = "0.3.1.2"; + sha256 = "0q4a1anqrx6d5n0br26lb4x8gw10gasv8ggiw4fgcaly2sd09rs1"; libraryHaskellDepends = [ aeson base bytestring containers first-class-families sop-core template-haskell text th-abstraction unordered-containers uuid @@ -179551,8 +180456,8 @@ self: { }: mkDerivation { pname = "musicScroll"; - version = "0.3.1.0"; - sha256 = "0ssf841r00zgy8h1l2041hs936mpsqpp4nwr3v6w4b5bva2p9jhn"; + version = "0.3.2.1"; + sha256 = "0q6hglv26qpy1prx4is0jbhgb9xsxkpxbknyah9mcfn7c52cx0c0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -180285,8 +181190,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.7.2"; - sha256 = "0vkc39hx55hqwgkhqm80ckabbjaq4f9840msznf71glzihzg8k0n"; + version = "0.1.7.3"; + sha256 = "1yf9ni64q19ci6ripcjh0pvpklxyi0fzigb33ss05wswlal385rc"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ mysql ]; @@ -180798,9 +181703,10 @@ self: { ({ mkDerivation, base, named, servant }: mkDerivation { pname = "named-servant"; - version = "0.2.0"; - sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53"; + version = "0.3.1"; + sha256 = "01wy971gf178i866wly5fs86ll2rwkjp3n99ni0rdxw6p1hnq447"; libraryHaskellDepends = [ base named servant ]; + description = "support records and named (from the named package) parameters in servant"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -180812,8 +181718,8 @@ self: { }: mkDerivation { pname = "named-servant-client"; - version = "0.2.0"; - sha256 = "1yklvwdrf74m0ipsvn0b88slmhidri6f4n7jz7njz5i594qg7zdn"; + version = "0.3.1"; + sha256 = "1q6xzg5sgjy52jp378jm9dq2wl283mnnpslc8fq0pdly2v6d7z6i"; libraryHaskellDepends = [ base named named-servant servant servant-client-core ]; @@ -180829,8 +181735,8 @@ self: { }: mkDerivation { pname = "named-servant-server"; - version = "0.2.0"; - sha256 = "03mqkkf3l6abml6w5p04389c7haya7bp637vvaq43z0cxgpxs4mp"; + version = "0.3.1"; + sha256 = "168xvsdkln5pgf6iqs1qzy07b9ichzpqhx95j79hrba941jzd19y"; libraryHaskellDepends = [ base named named-servant servant servant-server text ]; @@ -181949,8 +182855,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.7.0.1"; - sha256 = "0gfym6fv92afbv1b126bnviw3qh4m9dim9q046kbh4h5sxah61ab"; + version = "0.7.1.0"; + sha256 = "1l19hmc3623gsx1yv0wcbgcy22p549zyrvfv44khzd45fl3fxfb7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182025,8 +182931,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.3.5"; - sha256 = "0y5jkkixrbm25z1vyhk5qmql1962jhhl6ifz8ba7fiwdv8qi1ndk"; + version = "0.4.3.6"; + sha256 = "1whi7v16zqa26c8a4a36g5p8gddk69acnxar3pgybyc58y9af0i1"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -182049,8 +182955,8 @@ self: { }: mkDerivation { pname = "net-spider-cli"; - version = "0.2.0.5"; - sha256 = "011s533mv5flvmq58vsr2fnydk954lkyfif6d9fs87555dwiskyd"; + version = "0.2.0.6"; + sha256 = "0byd87p7h6vrdmg7j7ypjq2mcks8a7axi9j9qnjv283y4n56nxw1"; libraryHaskellDepends = [ aeson base greskell-core hashable net-spider optparse-applicative text @@ -182070,8 +182976,8 @@ self: { }: mkDerivation { pname = "net-spider-pangraph"; - version = "0.2.0.3"; - sha256 = "0mjp5mvfp4hq8kna5f0pwmyc7s43ghhw91hc94n6xf6y4dnx0c2c"; + version = "0.2.0.4"; + sha256 = "13kw1yvppkh2z6zzlf5qfyfw2yyyvn48dr49ijvdrh0c11n4125l"; libraryHaskellDepends = [ base bytestring greskell net-spider pangraph text time ]; @@ -183632,18 +184538,20 @@ self: { "network-uri" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, parsec - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, th-compat }: mkDerivation { pname = "network-uri"; - version = "2.6.3.0"; - sha256 = "08x7myvjasm326byi3jz1hgv2fqk0vvkfiwi8zlc4b2xy64i6750"; - libraryHaskellDepends = [ base deepseq parsec template-haskell ]; + version = "2.6.4.1"; + sha256 = "111m485rx2kyqdymi1x6sl08hi6lp34q3f41yqcx99086swnv1ap"; + libraryHaskellDepends = [ + base deepseq parsec template-haskell th-compat + ]; testHaskellDepends = [ - base criterion deepseq HUnit test-framework test-framework-hunit - test-framework-quickcheck2 + base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion deepseq HUnit ]; description = "URI manipulation"; license = lib.licenses.bsd3; }) {}; @@ -184083,10 +184991,8 @@ self: { }: mkDerivation { pname = "newtype-generics"; - version = "0.5.4"; - sha256 = "0cprfg4n0z62cnix1qrbc79bfdd4s50b05fj9m9hk6vm1pc3szq0"; - revision = "1"; - editedCabalFile = "1id9a6prj2bzdsyfsfr0pnfy9p8v9wlw59x12fny6y2szfcxcrv7"; + version = "0.6"; + sha256 = "04bymwhkvlsgcsd0v630mndrzf0xnh3v81ba6nfzwcvbg3ksr2wa"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -184260,8 +185166,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.9.1"; - sha256 = "0ib0xzs815q29a2v1m550g7cm5cr7l6lkslmi0lpcxpfgpi08ccv"; + version = "0.4.9.2"; + sha256 = "064zbwamkkd5cx0wjisa019pprb4pg2mmm5n6a948f3dn0zpmlwx"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -184608,17 +185514,17 @@ self: { }) {}; "nix-diff" = callPackage - ({ mkDerivation, attoparsec, base, containers, Diff, mtl + ({ mkDerivation, attoparsec, base, containers, Diff, directory, mtl , nix-derivation, optparse-applicative, text, unix, vector }: mkDerivation { pname = "nix-diff"; - version = "1.0.10"; - sha256 = "0lcm4s28c4dgry3r1wj5zmb59izfi6vvyivxkpgyv9fhqmyiid4c"; + version = "1.0.11"; + sha256 = "0pi0nqhv48f90ls40whifw1lcld5sw3hcrz7kzy14s4sc6ln9543"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base containers Diff mtl nix-derivation + attoparsec base containers Diff directory mtl nix-derivation optparse-applicative text unix vector ]; description = "Explain why two Nix derivations differ"; @@ -188316,8 +189222,8 @@ self: { }: mkDerivation { pname = "opaleye-sqlite"; - version = "0.0.1.0"; - sha256 = "0r3ij02wkxq50hl70wn53fdr1qi5gigg4x3y0vabm53gabgxdbxq"; + version = "0.0.1.1"; + sha256 = "02wpy2q3j6z91kjrwl9qyka74rqhbs7dlgfrc6nvpnl1ssp9vps0"; libraryHaskellDepends = [ base base16-bytestring bytestring case-insensitive contravariant direct-sqlite pretty product-profunctors profunctors semigroups @@ -188339,8 +189245,8 @@ self: { }: mkDerivation { pname = "opaleye-trans"; - version = "0.5.1"; - sha256 = "11vfp8rb46fvrhryyw9k66cbfnd920n5r4mcasdcnxhn1n8hc7i4"; + version = "0.5.2"; + sha256 = "0vszkxbgk4cqiaz4q8vgsc56yzh37dg7np2315h6bpvp1hy8fcs0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190048,6 +190954,8 @@ self: { pname = "optparse-generic"; version = "1.4.4"; sha256 = "0xy0kc8qximsiqpnc1fmh5zlsh6n26s7scrixin5bwnylg056j74"; + revision = "1"; + editedCabalFile = "14vbfbl2va3s2pa4qjyyny1i15s2iw9993ld5b0qsqdv1z6nfjz1"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers void @@ -191598,8 +192506,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11.3.2"; - sha256 = "1p4l6h9wpsfqxvziwx4vvsq02jdwwwqq92gvrdxi4ad2q7nlgivr"; + version = "2.11.4"; + sha256 = "1x8s6gidcij81vcxhj3pday484dyxn3d5s9sz0rh3nfml80cgkyk"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -191697,8 +192605,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.9.0"; - sha256 = "18hxvzrl4b9y3343nissbcxrl4g8x82yrinyir9ifgmpz5ikg248"; + version = "0.3.9.1"; + sha256 = "0kyml1bmzjp6by86inlmyx8qkl4f92yibmhc477sglv9m8haw0wx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -191991,21 +192899,21 @@ self: { "pandoc-plantuml-diagrams" = callPackage ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover - , mtl, pandoc-types, process, SHA, utf8-string + , mtl, pandoc-types, process, SHA, text, utf8-string }: mkDerivation { pname = "pandoc-plantuml-diagrams"; - version = "0.1.0.4"; - sha256 = "1fshgv5wl56z3w0yimwv5dbi7dal600anb5wkxd5n3jlpmp8fwky"; + version = "0.1.1.0"; + sha256 = "19wd13vwf7v2v57wiv4s2y68zrvk6rcy1w2wxxad4cv5bb65wnfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory pandoc-types process SHA utf8-string + base bytestring directory pandoc-types process SHA text utf8-string ]; executableHaskellDepends = [ base pandoc-types ]; testHaskellDepends = [ base bytestring directory hspec hspec-discover mtl pandoc-types - process SHA utf8-string + process SHA text utf8-string ]; testToolDepends = [ hspec-discover ]; description = "Render and insert PlantUML diagrams with Pandoc"; @@ -192081,15 +192989,15 @@ self: { }) {}; "pandoc-sidenote" = callPackage - ({ mkDerivation, base, monad-gen, pandoc, pandoc-types }: + ({ mkDerivation, base, mtl, pandoc-types, text }: mkDerivation { pname = "pandoc-sidenote"; - version = "0.19.0.0"; - sha256 = "0vz8w1dgzm0hipwfz5a1m41xkjdindr3373x6ip6vqv9h2gzzbb3"; + version = "0.22.1.0"; + sha256 = "1ci30gav385ygcvqs2x3w7lp8y1m7myf9jci3idxrd4w7csdg7f3"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base monad-gen pandoc pandoc-types ]; - executableHaskellDepends = [ base pandoc-types ]; + libraryHaskellDepends = [ base mtl pandoc-types text ]; + executableHaskellDepends = [ base mtl pandoc-types text ]; description = "Convert Pandoc Markdown-style footnotes into sidenotes"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -192203,8 +193111,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.5"; - sha256 = "1cw6wm122zwbn61980vqr2prsc3qpnnaqgk0m3wvxs03dygarpja"; + version = "0.3.6"; + sha256 = "12slj2jy688k4ndngwmjjkdvl2ryljv3siwal874pdficx0dffxg"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -193055,8 +193963,8 @@ self: { }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.1"; - sha256 = "18z0ykpvr7m8ffqpqwnclnyifig61n9l41w3hn39f37455z1dy39"; + version = "2.1.2.0"; + sha256 = "0ksyhlg8vmrmdayzi2zpb33xggb7mv7vgbm6kgzr0knxbh3nm7jc"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables lens mtl template-haskell text th-abstraction vector @@ -193638,6 +194546,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "parser-combinators_1_3_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "parser-combinators"; + version = "1.3.0"; + sha256 = "0is45q3q6ngfqvzpwwga9phbwk45v7g1q2x1rlm95a7q946yy44k"; + libraryHaskellDepends = [ base ]; + description = "Lightweight package providing commonly useful parser combinators"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "parser-combinators-tests" = callPackage ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations , hspec-megaparsec, megaparsec, megaparsec-tests @@ -193662,6 +194582,28 @@ self: { broken = true; }) {}; + "parser-combinators-tests_1_3_0" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations + , hspec-megaparsec, megaparsec, megaparsec-tests + , parser-combinators, QuickCheck + }: + mkDerivation { + pname = "parser-combinators-tests"; + version = "1.3.0"; + sha256 = "0sw6ws7za93y3lbmxp6jp1k17zi3wdg7698ab133kcw82f6mzba2"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base hspec hspec-expectations hspec-megaparsec megaparsec + megaparsec-tests parser-combinators QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Test suite of parser-combinators"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "parser-helper" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }: mkDerivation { @@ -194091,8 +195033,8 @@ self: { }: mkDerivation { pname = "password"; - version = "2.1.0.0"; - sha256 = "1v8hbjy0r6l0c6r0l4832z9whadx195fzxpn9l19zjb5ylz1zmqc"; + version = "2.1.1.0"; + sha256 = "1x3nv3bn0rp0f6rayrzp7yvw7x1ly7vjygcl6wdq86y0k1ca2wby"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory template-haskell text @@ -194114,8 +195056,8 @@ self: { }: mkDerivation { pname = "password-instances"; - version = "2.0.0.1"; - sha256 = "1az6j3yh92nr1ksh4f966y7v8v81l9l14r8qfakf5h62iznwqv2q"; + version = "2.0.0.2"; + sha256 = "03dl3b530m02y7mv2lvssamhakswa3d9bj2r2ndvg78wi0vm5xp1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base http-api-data password persistent text @@ -195829,8 +196771,8 @@ self: { }: mkDerivation { pname = "peregrin"; - version = "0.3.0"; - sha256 = "0jhvd69avl5wy2fcsx93ng2yll97gagylwd264dv7qjaa4m6hqs2"; + version = "0.3.1"; + sha256 = "1hiv9rzpjmjywwc4j6bqkqvqwv2gr6d512hv0l6m5c6idsyk2v12"; libraryHaskellDepends = [ base bytestring postgresql-simple text ]; testHaskellDepends = [ base hspec pg-harness-client postgresql-simple resource-pool text @@ -196632,8 +197574,8 @@ self: { }: mkDerivation { pname = "persistent-odbc"; - version = "0.2.1.0"; - sha256 = "058nmmqnl1pz7cyvfnbgid3kqbfl95g9xqgxs00z5fbkz5kwg5rl"; + version = "0.2.1.1"; + sha256 = "1c44mq7y20s0xk88azp2aa5wv8kn7g1blw987rp0chb03mljkwja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196846,30 +197788,30 @@ self: { "persistent-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers - , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger - , persistent, persistent-template, persistent-test, QuickCheck - , resource-pool, resourcet, sqlite, system-fileio, system-filepath - , temporary, text, time, transformers, unliftio-core - , unordered-containers + , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th + , monad-logger, mtl, persistent, persistent-template + , persistent-test, QuickCheck, resource-pool, resourcet, sqlite + , system-fileio, system-filepath, temporary, text, time + , transformers, unliftio-core, unordered-containers }: mkDerivation { pname = "persistent-sqlite"; - version = "2.11.0.0"; - sha256 = "1kfijsn00brqm42ypaa66bmwq41r9n6h66r6jmgldhzpcbv46sfv"; + version = "2.11.1.0"; + sha256 = "04rdzcckdkvs8nisx0hh96sdfyly82yr8c0mx6nsxpyi7m52by9j"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring conduit containers microlens-th monad-logger - persistent resource-pool resourcet text time transformers + mtl persistent resource-pool resourcet text time transformers unliftio-core unordered-containers ]; librarySystemDepends = [ sqlite ]; testHaskellDepends = [ - base bytestring containers exceptions fast-logger hspec HUnit - monad-logger persistent persistent-template persistent-test - QuickCheck resourcet system-fileio system-filepath temporary text - time transformers unliftio-core + base bytestring conduit containers exceptions fast-logger hspec + HUnit microlens monad-logger mtl persistent persistent-template + persistent-test QuickCheck resourcet system-fileio system-filepath + temporary text time transformers unliftio-core ]; description = "Backend for the persistent library using sqlite3"; license = lib.licenses.mit; @@ -197649,8 +198591,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-examples"; - version = "0.6.2.1"; - sha256 = "0k9cwvfdxf13izbww7g08p0x702xgmm7dck3mjk4maajjfia34zm"; + version = "0.7.0.0"; + sha256 = "1dwqkl9223rmz503gclzs0l00mi9gkk542fwpvw71hd121hl4qvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197746,8 +198688,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-properties"; - version = "0.3.0.1"; - sha256 = "0b3wnzlka9dapk1478jr35pnd3ykj3mn5nkhvmwjdsxigzzaa1wf"; + version = "0.4.0.0"; + sha256 = "194sg4crm5z4lqqzr8apjgnbcl5h6ddkqk8crja41c5q3d5mpih5"; libraryHaskellDepends = [ base phonetic-languages-common phonetic-languages-rhythmicity phonetic-languages-vector ukrainian-phonetics-basic vector @@ -197760,10 +198702,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.1.2.0"; - sha256 = "1ljblyk0m1fs3n2gj72w6gs62dxjk5gsn8x6p7fwlwhvaa316wm3"; + version = "0.2.0.0"; + sha256 = "0cvn2l0ds5nyz4inx354l8r9m4bkqjic7plpjgvhih8f4b53j6ln"; libraryHaskellDepends = [ base ]; - description = "Allows to estimate the rhythmicity metrices for the text (usually, the Ukrainian poetic one)"; + description = "Allows to estimate the rhythmicity properties for the text (usually, the Ukrainian poetic one)"; license = lib.licenses.mit; }) {}; @@ -197805,13 +198747,13 @@ self: { , phonetic-languages-simplified-base , phonetic-languages-simplified-examples-common , phonetic-languages-simplified-properties-array - , phonetic-languages-ukrainian-array, print-info, subG + , phonetic-languages-ukrainian-array, subG , ukrainian-phonetics-basic-array, uniqueness-periods-vector-stats }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.2.2.0"; - sha256 = "1b8i9kgybidiczlpwyb2grgkxgyscdnldfpj75snwnpyyw40qlfs"; + version = "0.4.0.0"; + sha256 = "03vin7gng1sqifyy0s83igmd41bxxwrp7ck9j7bxhnqq0qmg5d7n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197833,7 +198775,7 @@ self: { phonetic-languages-rhythmicity phonetic-languages-simplified-base phonetic-languages-simplified-examples-common phonetic-languages-simplified-properties-array - phonetic-languages-ukrainian-array print-info subG + phonetic-languages-ukrainian-array subG ukrainian-phonetics-basic-array uniqueness-periods-vector-stats ]; description = "Helps to create Ukrainian texts with the given phonetic properties"; @@ -197871,8 +198813,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-lists-examples"; - version = "0.6.0.0"; - sha256 = "0y843gymz9wf7hmp8asxmd90rdlgxz2b1pgi27mpglr7xmhpfr34"; + version = "0.7.0.0"; + sha256 = "1y3ad4lxapd9nblijn09i36f3xl6g9hxqmn8adcza74f4cq8pgyb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197900,8 +198842,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.1.1.0"; - sha256 = "0ildphgb5dd2s5hc4nr7ii9q9dzm0qa7vc2j4yjcis72jjzjx6nd"; + version = "0.2.0.0"; + sha256 = "1y7cki8c07q9423b54cjvy9k6a9byarpww3px50bc91ivirda6zr"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -197917,8 +198859,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-lists"; - version = "0.3.0.0"; - sha256 = "094fyljkvfi2snj41j00xqflhabnsp5hn50xp6dvmpcr12k6nvs0"; + version = "0.4.0.0"; + sha256 = "01awd747w67m4rnm9zgsb8j28756fpvyml1j613kz33fp5s91ml2"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-common ukrainian-phonetics-basic @@ -197935,8 +198877,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-lists-double"; - version = "0.1.0.0"; - sha256 = "1mx282gq9b2m718zrjjqxk1a17qdw5mdipmb818jr5ccrb81yhsl"; + version = "0.2.0.0"; + sha256 = "1ci63bhlk8xzf111njg97xs1ibamiv04k19wsfnhvxs3zzyzgrj0"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-common ukrainian-phonetics-basic @@ -198773,6 +199715,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes_4_3_15" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.15"; + sha256 = "01hvzm7cp6y3wrdhca3wlb99y0az0rjy5lscmnds0v6i767kyxk1"; + libraryHaskellDepends = [ + base exceptions mmorph mtl transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -200014,6 +200980,31 @@ self: { broken = true; }) {}; + "pixiv" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptohash-md5, directory, exceptions, filepath, http-client + , http-client-tls, lens, monad-control, mtl, process, servant + , servant-client, servant-client-core, template-haskell, temporary + , text, time, transformers, transformers-base, zip-archive + }: + mkDerivation { + pname = "pixiv"; + version = "0.1.0"; + sha256 = "001pfzijh7ibcyinmw0l8yvw0kxsvmniw993qx9b6zlzf689cpp6"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptohash-md5 directory + exceptions filepath http-client http-client-tls lens monad-control + mtl process servant servant-client servant-client-core + template-haskell temporary text time transformers transformers-base + zip-archive + ]; + testHaskellDepends = [ + aeson base bytestring http-client http-client-tls + ]; + description = "Pixiv API binding based on servant-client"; + license = lib.licenses.bsd3; + }) {}; + "piyo" = callPackage ({ mkDerivation, base, extra, sdl2, sdl2-gfx, sdl2-image , sdl2-mixer, sdl2-ttf, text @@ -201786,6 +202777,21 @@ self: { broken = true; }) {}; + "polysemy-mocks" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, polysemy + , template-haskell + }: + mkDerivation { + pname = "polysemy-mocks"; + version = "0.1.0.0"; + sha256 = "04cgajjrlbiqij54k6agm1p6h4hv5lldb9f9yrzbwm0v69d02bs7"; + libraryHaskellDepends = [ base polysemy template-haskell ]; + testHaskellDepends = [ base hspec polysemy ]; + testToolDepends = [ hspec-discover ]; + description = "Mocking framework for polysemy effects"; + license = lib.licenses.bsd3; + }) {}; + "polysemy-optics" = callPackage ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: mkDerivation { @@ -202062,10 +203068,8 @@ self: { }: mkDerivation { pname = "pomaps"; - version = "0.2.0.0"; - sha256 = "1a3vf0r69263gpq1aass2x5wcmgrfk16pnsf4wsvrnka5lgnsijp"; - revision = "1"; - editedCabalFile = "1srihzg6wm2ydg6kr3q2n7pqk4wp4mhqscansi670pdzblv7ljkn"; + version = "0.2.0.1"; + sha256 = "199yq3nzdhdglggk1pfayv8p6rahs9xzzm1hjkjd74asfbkf9wqg"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -202224,8 +203228,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp-extras"; - version = "0.1.0.5"; - sha256 = "0y1plyfvjfbm4xwmc3khd4h089pk96p1krxchv5pnwqf0agxi5sv"; + version = "0.1.0.6"; + sha256 = "12av8vgnj9iy0bdcb13gc4x28n3c7ahb3221xla78sss5r4rhq0z"; libraryHaskellDepends = [ base data-default pontarius-xmpp text time xml-types ]; @@ -203809,8 +204813,6 @@ self: { ]; description = "REST API for any Postgres database"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgrest-ws" = callPackage @@ -204486,10 +205488,8 @@ self: { ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }: mkDerivation { pname = "predicate-transformers"; - version = "0.7.0.2"; - sha256 = "0wkd7xz3d4sifx9cxm9rnjskhxrbdyqpdspi0sa6jr1ckmq25zpf"; - revision = "1"; - editedCabalFile = "1b02l2fdfxvlsvhcmkpsp0vzc0igsd0nrb64yb7af5a7z08cc9c0"; + version = "0.7.0.3"; + sha256 = "0ipbl4wq95z61h7jd0x5jv5m01vw69v6qqif4nwx9wp7mjfdp7z0"; libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; @@ -205518,15 +206518,22 @@ self: { }) {}; "primal" = callPackage - ({ mkDerivation, base, deepseq, doctest, template-haskell - , transformers + ({ mkDerivation, array, atomic-primops, base, bytestring, criterion + , deepseq, doctest, hspec, QuickCheck, quickcheck-classes-base + , template-haskell, transformers, unliftio }: mkDerivation { pname = "primal"; - version = "0.2.0.0"; - sha256 = "1vr6rrg4hapivlny2bi47swhm2rwjdzrsxz4r97d4gdydr5vphln"; - libraryHaskellDepends = [ base deepseq transformers ]; - testHaskellDepends = [ base doctest template-haskell ]; + version = "0.3.0.0"; + sha256 = "17rq3azyw7lg6svspv5jbj4x474yb75rzgqxr5s6dfa597djkhqc"; + libraryHaskellDepends = [ array base deepseq transformers ]; + testHaskellDepends = [ + base bytestring deepseq doctest hspec QuickCheck + quickcheck-classes-base template-haskell + ]; + benchmarkHaskellDepends = [ + atomic-primops base criterion unliftio + ]; description = "Primeval world of Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -205539,8 +206546,8 @@ self: { }: mkDerivation { pname = "primal-memory"; - version = "0.2.0.0"; - sha256 = "00yw3m0bjgm3pns60clfy6g905ylwkipw82rwqx3aacgny1hbjy0"; + version = "0.3.0.0"; + sha256 = "0dkx0n8rfagb942h4xfycq9gpk3d670jzd6dn4hzj5v58zriw0ip"; libraryHaskellDepends = [ base bytestring deepseq primal text ]; testHaskellDepends = [ base bytestring doctest primal QuickCheck template-haskell @@ -205616,8 +206623,8 @@ self: { pname = "primitive"; version = "0.7.1.0"; sha256 = "1w53i4mk248g58xrffmksznr4nmn2bbbycajzpcqfxx5ybyyrsvb"; - revision = "1"; - editedCabalFile = "0nllkqvfrplhslfgbqgpn0r5k4mj5wlfixjxrpjz6vb73xwi5977"; + revision = "2"; + editedCabalFile = "1m08slj8m596z4pqsw3ag25ijhzlv9ki809ydh4nbin141bpsdgn"; libraryHaskellDepends = [ base deepseq transformers ]; testHaskellDepends = [ base base-orphans ghc-prim QuickCheck quickcheck-classes-base @@ -206209,14 +207216,16 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_10_0" = callPackage + "process_1_6_11_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.10.0"; - sha256 = "01c50qhrsvymbifa3lzyq6g4hmj6jl3awjp1jmbhdkmfdfaq3v16"; + version = "1.6.11.0"; + sha256 = "0nv8c2hnx1l6xls6b61l8sm7j250qfbj1fjj5n6m15ppk9f0d9jd"; + revision = "1"; + editedCabalFile = "136mp45m1jh27yayb0gx4giybp6imh7hbr774fsb2m9vj2l52b27"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -206549,16 +207558,15 @@ self: { "product-profunctors" = callPackage ({ mkDerivation, base, bifunctors, contravariant, criterion - , deepseq, profunctors, tagged, template-haskell + , deepseq, profunctors, tagged, template-haskell, th-abstraction }: mkDerivation { pname = "product-profunctors"; - version = "0.11.0.1"; - sha256 = "0lwwjnpxgkgk02179j8jj9c1zvaw4f406i9gm7ngqczl8y796q3l"; - revision = "1"; - editedCabalFile = "07k4g2jpxdh2n60b2wkngw6pklfh5fwf9360ih9m88dr7mi5c88n"; + version = "0.11.0.2"; + sha256 = "13q1zq5gli21khsxrgiwqilqfasb16hks5w0ikkm1i735z0pf97l"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell + th-abstraction ]; testHaskellDepends = [ base profunctors ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -209361,8 +210369,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.0.0.2"; - sha256 = "0ci2wg0y3762n1in8jyw1dpjljdynhl4bfp9506kfkc6ym9j2q1a"; + version = "2.0.0.3"; + sha256 = "0h53y0jxk1nyqwyr4f0nry0gl64s1w8ay15fips4drql37apbq1v"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -210066,9 +211074,11 @@ self: { }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.7.0"; - sha256 = "1i5h5j7cy94ab41x9aqkiv7vyx5h7cda8v1jccpna8lr7ccicczp"; - setupHaskellDepends = [ base Cabal directory filepath process ]; + version = "0.8.0"; + sha256 = "0k8zl9gzwfnnxkfclb20v0q3rl42bs1g9iw9vm5j0fhr934w38gs"; + setupHaskellDepends = [ + base Cabal directory filepath process qtah-generator + ]; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; description = "Qt bindings for Haskell - C++ library"; @@ -210083,8 +211093,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.7.0"; - sha256 = "09svfzi73gjy4bsz4snp1mciqin25xqr6n3kya8367q4j01mdrrv"; + version = "0.8.0"; + sha256 = "0wn0514xckbsj1phndb2b924lxh24sbngjgrvsn3sjg305vzizvr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -210097,23 +211107,21 @@ self: { }) {}; "qtah-generator" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, haskell-src, hoppy-generator, hoppy-std, mtl, process + ({ mkDerivation, base, bytestring, containers, directory, filepath + , haskell-src, hoppy-generator, hoppy-std, mtl, process , transformers }: mkDerivation { pname = "qtah-generator"; - version = "0.7.1"; - sha256 = "0iizb1af1j9g4lvdz81c2cl57r6ffv07kqgls6cl9pgp43ikrjjb"; + version = "0.8.0"; + sha256 = "1s782f1gagj1av8xv30qjqs5r05i3fr7a05dp213i6p818kj20r1"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ + libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src hoppy-generator hoppy-std mtl process transformers ]; - doHaddock = false; + executableHaskellDepends = [ base ]; description = "Generator for Qtah Qt bindings"; license = lib.licenses.lgpl3; hydraPlatforms = lib.platforms.none; @@ -210127,9 +211135,11 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.7.0"; - sha256 = "0wndmrrz4c3gfx9wjj9v13zjjpjandg2qkq7fkxp5z3rgw4hmm8f"; - setupHaskellDepends = [ base Cabal directory filepath ]; + version = "0.8.0"; + sha256 = "187x961030hfw79xs0m9xgplm8jlglynya4ndsax378vdpnbrrgw"; + setupHaskellDepends = [ + base Cabal directory filepath qtah-generator + ]; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -211667,16 +212677,18 @@ self: { }) {}; "quote-quot" = callPackage - ({ mkDerivation, base, tasty, tasty-quickcheck, template-haskell }: + ({ mkDerivation, base, tasty, tasty-bench, tasty-quickcheck + , template-haskell + }: mkDerivation { pname = "quote-quot"; - version = "0.1.0.0"; - sha256 = "124rgim8bb4x9rqsvc05dcbz739anj2xg8q9v9s0fpjkv6qwl79b"; + version = "0.2.0.0"; + sha256 = "0sj862037gdljwiv5s4yh0vjfppzf226z7sxb5f7y1k23rijsx0w"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base tasty tasty-quickcheck template-haskell ]; - benchmarkHaskellDepends = [ base template-haskell ]; + benchmarkHaskellDepends = [ base tasty-bench template-haskell ]; description = "Divide without division"; license = lib.licenses.bsd3; }) {}; @@ -212265,12 +213277,12 @@ self: { ({ mkDerivation, base, criterion, hspec }: mkDerivation { pname = "rampart"; - version = "1.1.0.1"; - sha256 = "0b0c8qkkj2xqmdd53q198kwm0n7qvdyh6qxmp24mqkpjcrskh6vl"; + version = "1.1.0.2"; + sha256 = "1lvzgdagjzvkxcdbc43n144vbva5vlvsjziz80rjzm7kg3mslg1r"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; - description = "🏰 Determine how intervals relate to each other"; + description = "Determine how intervals relate to each other"; license = lib.licenses.isc; }) {}; @@ -213194,8 +214206,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.12"; - sha256 = "00xhs04jrrbi1n2sx86v4pd3sggyk2682s3zxfmhb16zysh3hdx2"; + version = "1.0.13"; + sha256 = "0ydg5xlf10g1wp18bwpr3mg9x29fyc1c5g22rn4szy0cs6hvqx6m"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -213211,8 +214223,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.1.3"; - sha256 = "154zxrv9w904bgrgwb623zkqxzp200ivhwfpcwlb8r2903jmw7vq"; + version = "1.1.4"; + sha256 = "1b2d5agip0zw10nmkr45gwhzpaga9nsdqv62xil11gadhaqji2f7"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -213351,8 +214363,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.3.3"; - sha256 = "0c2q48vbqkvhd0m3sahn7ja8bxpj9xkgw2hkg9chrhj0amyp5xzk"; + version = "9.4.1"; + sha256 = "1m8bqjqp413sm86v0i2083hnsq7h11hlmmqch1pxbgpv5678jq0q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213413,8 +214425,8 @@ self: { }: mkDerivation { pname = "raw-feldspar"; - version = "0.3"; - sha256 = "0kxnl7vvqkmrq2cjwgrb4342bvr8a57v652f2pd5yvndamcz5m3w"; + version = "0.3.1"; + sha256 = "1kn86izm2wpqj59nnpxw34n37bh1w5y7h9rd59c1pcymhp29n6qd"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -213636,8 +214648,8 @@ self: { pname = "rcu"; version = "0.2.4"; sha256 = "1zl6gl6b9x2ppxzrvb356216f7gi1kpwxsqb0w220f86wyzf9gbr"; - revision = "1"; - editedCabalFile = "07blx598aqwkfgicsl7g7i9gf49550ln8zz0gp4g3kyxq8pvmphb"; + revision = "2"; + editedCabalFile = "1lblpsgprk26nplfzxkclvj6gsaim1b97njvrq564crryn6hn2wz"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -215027,6 +216039,17 @@ self: { broken = true; }) {}; + "redesigned-carnival" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "redesigned-carnival"; + version = "1.0.0.0"; + sha256 = "0qgb6w402fbpilb3gwa7r5v1lxx6dzk8g66cigsw062jfhdiy1hx"; + libraryHaskellDepends = [ base ]; + description = "Package for dependency confusion"; + license = lib.licenses.publicDomain; + }) {}; + "redis" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , exceptions, mtl, network, old-time, utf8-string @@ -215429,8 +216452,8 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.6.1"; - sha256 = "124sqpcii62jh2n2vfskg9jc8ic4hhlwmwim40f6a0dmhdnsh8lx"; + version = "0.6.2"; + sha256 = "1xfy6sl6kl9k7vvlvwg8fb3kdpqd0fl1c9wcfwgdqb874a4xn6dz"; libraryHaskellDepends = [ aeson base bytestring deepseq exceptions mtl QuickCheck template-haskell text these-skinny @@ -215459,22 +216482,6 @@ self: { }: mkDerivation { pname = "refinery"; - version = "0.2.0.0"; - sha256 = "0nsfmb5y8y0hanh3h03v0n8wa5frgj85gz8ycl8h5z045j2kk3wq"; - libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; - testHaskellDepends = [ - base checkers exceptions hspec logict mmorph mtl QuickCheck - ]; - description = "Toolkit for building proof automation systems"; - license = lib.licenses.bsd3; - }) {}; - - "refinery_0_3_0_0" = callPackage - ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph - , mtl, QuickCheck - }: - mkDerivation { - pname = "refinery"; version = "0.3.0.0"; sha256 = "1bsbnxf75prw153c3k02jk84h3sravdi1c1sl75c7sx4xq81qhlp"; libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; @@ -215483,7 +216490,6 @@ self: { ]; description = "Toolkit for building proof automation systems"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reflection" = callPackage @@ -218076,8 +219082,8 @@ self: { pname = "repa"; version = "3.4.1.4"; sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; - revision = "7"; - editedCabalFile = "0j0nqp6xvwis83h1hwm9910xjfxh13nddy61dlli0wdzzddpb8ah"; + revision = "8"; + editedCabalFile = "0bhkiav26m61lzjkxjldals136viixyg88xf1bbihsp9kzkbv6as"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -218652,10 +219658,8 @@ self: { }: mkDerivation { pname = "req"; - version = "3.8.0"; - sha256 = "1qd0bawdxig6sldlhqgj8cpkzfy7da9yy0wkvzs6mps6yk14kbap"; - revision = "1"; - editedCabalFile = "1gkd25bg87r0dr8rb04r3scjfm66v88905490fiy4x1826gj9cv0"; + version = "3.9.0"; + sha256 = "1hapa7f6n6xzw43w6zka3x8hp546h992axm6m8rcxl042j9p95b3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -219014,6 +220018,8 @@ self: { pname = "resolv"; version = "0.1.2.0"; sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1"; + revision = "1"; + editedCabalFile = "19pm4cg28viyl7r0viz4wfmm9w4nqxkjlb6kknfqcajjqmdacqad"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -220585,8 +221591,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.19.0"; - sha256 = "04kvpirwz86pj7izaa0la601xyqnqzsspg43z10vxnc1whjp5rsm"; + version = "0.1.20.0"; + sha256 = "0x5b5c0y97b5n1lvbcsqlkhbv4nbbznx1w1fp3a17a03pz7qf61s"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens microlens-mtl mtl primitive process text time @@ -220724,8 +221730,8 @@ self: { }: mkDerivation { pname = "risc386"; - version = "0.0.20130719"; - sha256 = "0i0fkg4vys3n31jwazrajirywxmk7idjv2kz3nlb8kwriqc6d723"; + version = "0.0.20210125"; + sha256 = "0fc551nvmqgl1sj3c45bwjzc9ksqbwg17dzkipyyzdrgi1shawn2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl pretty ]; @@ -221665,8 +222671,8 @@ self: { }: mkDerivation { pname = "rope-utf16-splay"; - version = "0.3.1.0"; - sha256 = "1ilcgwmdwqnp95vb7652fc03ji9dnzy6cm24pvbiwi2mhc4piy6b"; + version = "0.3.2.0"; + sha256 = "0yacy3iqx52nz2ja6fx5di7z3xjzakcmld2l1gixyawfvhavh17p"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -222250,14 +223256,14 @@ self: { }) {}; "rpmbuild-order" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , directory, extra, fgl, filepath, hspec, optparse-applicative - , process, simple-cmd, simple-cmd-args, unix + ({ mkDerivation, base, case-insensitive, containers, directory + , extra, fgl, filepath, hspec, optparse-applicative, process + , simple-cmd, simple-cmd-args, unix }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.3.1"; - sha256 = "01k1lw0gxxsnl4wqzsynl6xkrnim5fjmdj6jb6b0bgd5jd1y0fyj"; + version = "0.4.3.2"; + sha256 = "1510v4gbylzpdh7l23r4z6xhqmjalay3crxg2216lz8j0mb4sbq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222265,8 +223271,7 @@ self: { process ]; executableHaskellDepends = [ - base bytestring directory extra fgl optparse-applicative - simple-cmd-args + base directory extra fgl optparse-applicative simple-cmd-args ]; testHaskellDepends = [ base extra hspec simple-cmd unix ]; description = "Order RPM packages by dependencies"; @@ -222790,8 +223795,8 @@ self: { }: mkDerivation { pname = "runhs"; - version = "1.0.0.8"; - sha256 = "177xak0p91xn827cnpa374l94lmmym2yrrcsxzjd9752hdzyw7k3"; + version = "1.0.0.9"; + sha256 = "1i2g706997wkqj081pqxj8nq6nhj94x4kf5q0fnj39fp35fmak6q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -223770,8 +224775,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "salve"; - version = "1.0.10"; - sha256 = "01i74s62kp9gbwj4jwphvn8z7gsbryczx5gn9a6cd92r29393bkm"; + version = "1.0.11"; + sha256 = "00haa87rpwhy89zg31k0fwizg97i65kqx5gzikm4fjxr7j8ds1xb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; @@ -226473,8 +227478,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "seclib"; - version = "1.1.0.2"; - sha256 = "0jbgdd3mh126c3n0sblvd7rbcnnzrfyfajrj9xcsj7zi7jqvs8nw"; + version = "1.1.0.3"; + sha256 = "1ikkjxnl7p3gdzf7fsx9bakd9j6xg5wm5rgyz0n8f2n4nx0r04db"; libraryHaskellDepends = [ base ]; description = "A simple library for static information-flow security in Haskell"; license = lib.licenses.bsd3; @@ -227674,29 +228679,6 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.5.1.4"; - sha256 = "0qcs8lvv8dww6w9iyca4snxrr3hcjd14kafz59gxmbhx9q8zl8mz"; - libraryHaskellDepends = [ - attoparsec base bytestring containers errors exceptions foldl - lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe - transformers vector - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec pipes pipes-safe tasty - tasty-hunit transformers vector - ]; - description = "A package with basic parsing utilities for several Bioinformatic data formats"; - license = lib.licenses.gpl3; - }) {}; - - "sequence-formats_1_5_2" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, errors - , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec - , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers - , vector - }: - mkDerivation { - pname = "sequence-formats"; version = "1.5.2"; sha256 = "0n09mw9z8bjqr8dc32l7swp25vgci7m2hb1w6masgv2cw8irh7as"; libraryHaskellDepends = [ @@ -227710,7 +228692,6 @@ self: { ]; description = "A package with basic parsing utilities for several Bioinformatic data formats"; license = lib.licenses.gpl3; - hydraPlatforms = lib.platforms.none; }) {}; "sequenceTools" = callPackage @@ -228460,10 +229441,8 @@ self: { }: mkDerivation { pname = "servant-cassava"; - version = "0.10"; - sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; - revision = "7"; - editedCabalFile = "0n4nbm0axa9qd805jb3gja2p2fiwvhjpvdi5rhlwh4shm9crppcy"; + version = "0.10.1"; + sha256 = "0hf7v35yyfqxc20hgq755laba7lziz2vsy7y8cj8nhczcc67smq0"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -229212,8 +230191,8 @@ self: { pname = "servant-iCalendar"; version = "0.1.0.1"; sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; - revision = "7"; - editedCabalFile = "0yf5gccdilswzabzysc2mrxxq84xdx7k18a647bksimwd44x2i68"; + revision = "8"; + editedCabalFile = "10ka19ga7slcv4cb2f0ncfbkz52bbrm8jkxma8qksz6hm48wxjya"; libraryHaskellDepends = [ base data-default http-media iCalendar servant ]; @@ -232963,8 +233942,8 @@ self: { ({ mkDerivation, base, doctest, text }: mkDerivation { pname = "shortcut-links"; - version = "0.5.1.0"; - sha256 = "0gi3w7hh261nc2bmcwvagbgdazllk50sxn4vpzdhc2wb046mcida"; + version = "0.5.1.1"; + sha256 = "0567igvyl43fa06h7dq2lww0ing00n24xgmd25vhgx6kvnawnb90"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base doctest ]; description = "Link shortcuts for use in text markup"; @@ -235671,23 +236650,26 @@ self: { }) {}; "slack-web" = callPackage - ({ mkDerivation, aeson, base, containers, errors, hspec - , http-api-data, http-client, http-client-tls, megaparsec, mtl + ({ mkDerivation, aeson, base, containers, deepseq, errors, fakepull + , hashable, hspec, http-api-data, http-client, http-client-tls + , megaparsec, mtl, QuickCheck, quickcheck-instances, scientific , servant, servant-client, servant-client-core, text, time - , transformers + , transformers, unordered-containers }: mkDerivation { pname = "slack-web"; - version = "0.2.0.11"; - sha256 = "14ngln71sn5i26041m4v614vq4qhr44pzlgyxliyqw08dxn25la7"; + version = "0.2.1.0"; + sha256 = "01bwiq3b97bznn3sc51vi7q8xkjdslvqqh250fk7arcaq6hkkiw1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base containers errors http-api-data http-client - http-client-tls megaparsec mtl servant servant-client - servant-client-core text time transformers + aeson base containers deepseq errors hashable http-api-data + http-client http-client-tls megaparsec mtl scientific servant + servant-client servant-client-core text time transformers + unordered-containers ]; testHaskellDepends = [ - aeson base containers errors hspec http-api-data megaparsec text - time + aeson base fakepull hspec QuickCheck quickcheck-instances text time ]; description = "Bindings for the Slack web API"; license = lib.licenses.mit; @@ -239764,8 +240746,8 @@ self: { }: mkDerivation { pname = "spdx-license"; - version = "0.1.0"; - sha256 = "17ksd29w4qv4vpk6wcah4xr15sjx1fcz7mcwqb6r7kqqmw7jqp7y"; + version = "0.1.1"; + sha256 = "1zl21x5qmzpj7y7vcv8brwcf4b1rjb8yy4aih8v5igic6d1a8jyw"; libraryHaskellDepends = [ base containers megaparsec regex-tdfa string-interpolate text ]; @@ -240279,8 +241261,8 @@ self: { ({ mkDerivation, base, containers, ghc, hlint, stm }: mkDerivation { pname = "splint"; - version = "1.0.1.2"; - sha256 = "0b7czphkra6q6a5xm30pjh5b4cdvz87fzb2pv17dpxai0mb3c0r6"; + version = "1.0.1.3"; + sha256 = "1ji0jnq6d0c0yn4ka8pj838ff04ynj6d3vcv6xy3dl8v3si1mybd"; libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = lib.licenses.isc; @@ -241564,8 +242546,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.1.1"; - sha256 = "0b81f6v18dyd5zia6drqn3jqncj3sp8cscrhlrcwvbljs1j8fd0j"; + version = "0.1.2"; + sha256 = "1iqm96f9c6csv4dzr6l7cyiv99nmbc9739xhycg2gvpm9sncmxrb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -245969,8 +246951,8 @@ self: { }: mkDerivation { pname = "stripe-scotty"; - version = "1.0.0.4"; - sha256 = "0gkagcq2brl4kav6ha333fyl9npgllwws4ixz0z6nas6xf2953pk"; + version = "1.0.0.6"; + sha256 = "1x7dsk2m66ka8qd76mj5aww52rjs0b49vx1lws5bl2xl0asyb03v"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text unordered-containers @@ -246037,8 +247019,8 @@ self: { }: mkDerivation { pname = "stripe-wreq"; - version = "1.0.1.4"; - sha256 = "08c5jkxri3ix19m04w6md1mwc9wd8fgsqr7v3dxzab51ylfivdcr"; + version = "1.0.1.6"; + sha256 = "1lwwyzj4gi6rav8al3mkld4vq8rdvi4ir1y51nywflkcfiqjjjsx"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text unordered-containers wreq @@ -246082,19 +247064,17 @@ self: { "strive" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, markdown-unlit - , template-haskell, text, time, transformers + , http-client, http-client-tls, http-types, template-haskell, text + , time, transformers }: mkDerivation { pname = "strive"; - version = "5.0.12"; - sha256 = "1fdwmcpgfw7maw4lf4mw3qs8fiwxdsv518xjjmrp5w3hfjdlqgmz"; + version = "5.0.13"; + sha256 = "137kqb3lvqyzvarcgvc8ifphj2927z01pcl752sna9vcvj7q7wp6"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers ]; - testHaskellDepends = [ base bytestring markdown-unlit time ]; - testToolDepends = [ markdown-unlit ]; description = "A client for the Strava V3 API"; license = lib.licenses.mit; }) {}; @@ -246495,6 +247475,8 @@ self: { pname = "stylist"; version = "2.4.0.0"; sha256 = "0nkz6jnfx7si473lz0b907lq6zjpw2apbcph61s2aw44j5zgdg96"; + revision = "1"; + editedCabalFile = "18amb2sbp4qh2lszc21vpvnyqsbsy7s9396ivkcw7dmg7hljvk9a"; libraryHaskellDepends = [ async base css-syntax hashable network-uri regex-tdfa text unordered-containers @@ -247366,10 +248348,8 @@ self: { }: mkDerivation { pname = "supervisors"; - version = "0.2.0.0"; - sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i"; - revision = "2"; - editedCabalFile = "0pnxmbw3wb0dcbhpl583ffd991iv3zy4xf6xi5z3qhn5qh8nrmz1"; + version = "0.2.1.0"; + sha256 = "146nrqi8bjdvarz8i689ympid5d9jbrcm0bdv0q8jxi9zvwb3gvq"; libraryHaskellDepends = [ async base containers safe-exceptions stm ]; @@ -248026,20 +249006,6 @@ self: { }) {}; "syb" = callPackage - ({ mkDerivation, base, containers, HUnit, mtl }: - mkDerivation { - pname = "syb"; - version = "0.7.1"; - sha256 = "0077vxzyi9ppbphi2ialac3p376k49qly1kskdgf57wdwix9qjp0"; - revision = "1"; - editedCabalFile = "0rgxzwnbwawi8visnpq74s51n0qi9rzgnxsm2bdmi4vwfn3lb6w0"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base containers HUnit mtl ]; - description = "Scrap Your Boilerplate"; - license = lib.licenses.bsd3; - }) {}; - - "syb_0_7_2_1" = callPackage ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { pname = "syb"; @@ -248049,7 +249015,6 @@ self: { testHaskellDepends = [ base containers mtl tasty tasty-hunit ]; description = "Scrap Your Boilerplate"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "syb-extras" = callPackage @@ -248470,8 +249435,8 @@ self: { }: mkDerivation { pname = "symantic-parser"; - version = "0.0.0.20210102"; - sha256 = "00gmcbn1amdr9nx54wia898gc7437563g9gpvlkhsg9r7197acid"; + version = "0.1.0.20210201"; + sha256 = "0c7vqxd0dagn7l3k4khbqvwg51y6a40m0f5qf587vj4rpjalc473"; libraryHaskellDepends = [ array base bytestring containers ghc-prim hashable template-haskell text transformers unordered-containers @@ -248791,8 +249756,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.8.1"; - sha256 = "0560h3k360316q05wwylpbcvadp9dxzywbp206xm2wslpl1d9m8v"; + version = "3.8.2"; + sha256 = "04lv8v42bs4qjjcia39grfxmabiv41dipgg5b58xgiv4ay884nfm"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -250956,15 +251921,15 @@ self: { license = lib.licenses.mit; }) {}; - "tasty_1_4_0_3" = callPackage + "tasty_1_4_1" = callPackage ({ mkDerivation, ansi-terminal, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.4.0.3"; - sha256 = "044kxp33qnsaxh8s1ja73149acf9xys36x4fs6lz6nyd8id3w497"; + version = "1.4.1"; + sha256 = "0ixfsjjdps0an6iy8cqb41h6kjjli9sg0xw531jwci8xlr7g0a17"; libraryHaskellDepends = [ ansi-terminal base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth @@ -251058,6 +252023,17 @@ self: { broken = true; }) {}; + "tasty-bench" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.2.1"; + sha256 = "0gw0hlpkpwn7hpvwn9i8zqghrzjvhdrhr2q9y4r4ykhqv7y95zy3"; + libraryHaskellDepends = [ base containers deepseq tasty ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { @@ -251217,10 +252193,8 @@ self: { }: mkDerivation { pname = "tasty-hedgehog"; - version = "1.0.0.2"; - sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5"; - revision = "6"; - editedCabalFile = "12s7jgz14j32h62mgs4qbypqlpwjly1bk2hgrwqi9w3cjsskqk88"; + version = "1.0.1.0"; + sha256 = "0vkmhqfydyxbvjjbwvwn0q1f1a2dl9wmhz0s7020frpzwqcjwm5b"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -251564,6 +252538,33 @@ self: { "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, semigroups, stm, tagged, tasty + , tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.1.15"; + sha256 = "07iiaw5q5jb6bxm5ys1s6bliw0qxsqp100awzxwkwfia03i1iz8z"; + revision = "1"; + editedCabalFile = "1pxwixy274w0z99zsx0aywcxcajnpgan3qri81mr1wb6afxrq8d6"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + semigroups stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "tasty-silver_3_2_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit , temporary, text, transformers }: @@ -251627,8 +252628,8 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "1.0.1.1"; - sha256 = "1mkph7g4ybvy4h4rblr60bnalj5jf1acfgdqcw0ggwmbhfbzbg68"; + version = "1.1.0.0"; + sha256 = "1v1ikl4jy02c0jlvm4di8ndm7fbyr8235ydppp953d7qb8yilsyp"; libraryHaskellDepends = [ base directory filemanip filepath logict optparse-applicative prettyprinter tagged tasty @@ -252412,17 +253413,17 @@ self: { }) {}; "telegraph" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, deriving-aeson + ({ mkDerivation, aeson, base, bytestring, conduit , generic-data-surgery, http-client, http-client-tls, http-conduit - , in-other-words, mtl, text + , in-other-words, mtl, optics-th, text }: mkDerivation { pname = "telegraph"; - version = "1.0.0"; - sha256 = "1s3k3psva95lka5zqzylh20k3s7bqmsg22l43r1jzrkldlaqkh3n"; + version = "1.2.0"; + sha256 = "158wbdzgs4dnrfhhds1dbpmrns8p29qbg5sfph2qaigs1ygf3z58"; libraryHaskellDepends = [ - aeson base bytestring conduit deriving-aeson generic-data-surgery - http-client http-conduit in-other-words mtl text + aeson base bytestring conduit generic-data-surgery http-client + http-conduit in-other-words mtl optics-th text ]; testHaskellDepends = [ base http-client http-client-tls in-other-words @@ -253180,10 +254181,8 @@ self: { }: mkDerivation { pname = "tensors"; - version = "0.1.4"; - sha256 = "1wiq38px85ypnfpvbr3hcawrag457z0jvd4jr1bh7jf6qw6jqpfn"; - revision = "1"; - editedCabalFile = "0a96iw75ylygbjdlab5dj3dkkqamd2k1g2nfy6w7ly6j7rq6f84p"; + version = "0.1.5"; + sha256 = "181jiffwp3varv9xzb8if22lwwi1vhhgqf7hai373vn2yavk5wal"; libraryHaskellDepends = [ base deepseq vector ]; testHaskellDepends = [ base deepseq hspec QuickCheck reflection vector @@ -253508,23 +254507,26 @@ self: { }) {}; "tesla" = callPackage - ({ mkDerivation, aeson, base, bytestring, casing, containers - , exceptions, generic-deriving, HUnit, lens, lens-aeson - , monad-logger, mtl, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, unliftio-core, vector, wreq + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, casing + , containers, cryptonite, exceptions, generic-deriving, HUnit, lens + , lens-aeson, memory, monad-logger, mtl, random, retry, tagsoup + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , time, unliftio-core, vector, wreq }: mkDerivation { pname = "tesla"; - version = "0.3.0.1"; - sha256 = "0idn4pgzkg1n1xq5z3qihrb7nrpaxba3y98vcx52nl35c4flps4p"; + version = "0.3.1.0"; + sha256 = "1fwrhmxqpliyq92v1j6jcqxi5iyh7s8rj17mybvgkwh5aprwsdp8"; libraryHaskellDepends = [ - aeson base bytestring casing containers exceptions generic-deriving - lens lens-aeson monad-logger mtl template-haskell text time + aeson base base64-bytestring bytestring casing containers + cryptonite exceptions generic-deriving lens lens-aeson memory + monad-logger mtl random retry tagsoup template-haskell text time unliftio-core vector wreq ]; testHaskellDepends = [ - aeson base bytestring casing containers exceptions generic-deriving - HUnit lens lens-aeson monad-logger mtl tasty tasty-hunit + aeson base base64-bytestring bytestring casing containers + cryptonite exceptions generic-deriving HUnit lens lens-aeson memory + monad-logger mtl random retry tagsoup tasty tasty-hunit tasty-quickcheck template-haskell text time unliftio-core vector wreq ]; @@ -254279,8 +255281,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.1"; - sha256 = "1pp52g4jwyf0w0xpja7gamd39g3acfclc3q29ldpzpfbhnl23n27"; + version = "0.12.1.1"; + sha256 = "04clgbbzva9yxzkn9nf176mqj1lrv64h13awk86l4lrcfbb7kgh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254381,6 +255383,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-ascii" = callPackage + ({ mkDerivation, base, bytestring, deepseq, hashable, optics-core + , parsec, template-haskell, text + }: + mkDerivation { + pname = "text-ascii"; + version = "1.0.0"; + sha256 = "1mwm3ss54c927rdj8dlfw7v2l0maz12mkxb5ss3g1ngdkiwd0bsx"; + libraryHaskellDepends = [ + base bytestring deepseq hashable optics-core parsec + template-haskell text + ]; + description = "ASCII string and character processing"; + license = lib.licenses.asl20; + }) {}; + "text-binary" = callPackage ({ mkDerivation, base, binary, text }: mkDerivation { @@ -255028,6 +256046,8 @@ self: { pname = "text-show-instances"; version = "3.8.4"; sha256 = "1vsrf4vjq4z759srnzvyk3hn90ck4k91vy8cn625m8hy1zddqj2q"; + revision = "1"; + editedCabalFile = "1z7kgnxm9r9dgnqn4fyrfv3k8k2dac7g2hsf649jaxhh898z6dm6"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -255471,8 +256491,8 @@ self: { }: mkDerivation { pname = "th-compat"; - version = "0.1"; - sha256 = "11v1mdm0pf6wnbsvccm1gnziinabgdpp7qdrcmm53yv3pj8yaalw"; + version = "0.1.1"; + sha256 = "1y83yq5ac067a631bd4kg0d14yp8hc23a0dsqsgbqdn279c21ylm"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base base-compat hspec mtl template-haskell @@ -256922,6 +257942,29 @@ self: { license = lib.licenses.gpl3; }) {}; + "tidal_1_7_1" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, hosc, microspec, network, parsec + , primitive, random, text, transformers, vector, weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.7.1"; + sha256 = "0fksrydrmjph3ghggijr9hq3xa5wfnqgzm4qxiqravsj70s9m2n4"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq hosc + network parsec primitive random text transformers vector + ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -258476,8 +259519,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.5.4"; - sha256 = "0dx436m7rb52s1dgkckcpi8imfwf8234pnl1cmvn43x5h6jvyhnf"; + version = "1.5.5"; + sha256 = "0j1rxxq5lzs584nk19610mk7mmsqqkgfxw2qj74ibb1zsk7baj4a"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal cryptonite data-default-class hourglass memory mtl network transformers x509 @@ -259029,10 +260072,10 @@ self: { }: mkDerivation { pname = "tokyocabinet-haskell"; - version = "0.0.6"; - sha256 = "1cav27hnl49ghl6f7mhyaqmvfdqib6s76z251vai4vih9psis8rk"; + version = "0.0.7"; + sha256 = "1fmj46wvl6ayx30r5r538vnygz32s1877m2f9zf7nb2zyiz5vmcb"; revision = "1"; - editedCabalFile = "1mk2nwi51zm0b2081db26xipwa0yd53ikhxa5vd8fp8x2w52wliw"; + editedCabalFile = "07kx002x3yh1klhxn9fq0bi2pfy4mdqacg3caqklmdl22dkh74lq"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ tokyocabinet ]; testHaskellDepends = [ base bytestring directory HUnit mtl ]; @@ -259675,40 +260718,39 @@ self: { , containers, criterion, data-default, data-default-class , data-interval, deepseq, directory, extended-reals, filepath , finite-field, ghc-prim, hashable, hashtables, haskeline, heaps - , intern, lattices, log-domain, loop, megaparsec, mtl, multiset - , mwc-random, OptDir, optparse-applicative, parsec, pretty, primes - , primitive, process, pseudo-boolean, queue, QuickCheck, scientific - , semigroups, sign, stm, tasty, tasty-hunit, tasty-quickcheck - , tasty-th, template-haskell, temporary, text, time, transformers - , transformers-compat, unbounded-delays, unordered-containers - , vector, vector-space, xml-conduit, zlib + , intern, lattices, log-domain, loop, megaparsec, MIP, mtl + , multiset, mwc-random, OptDir, optparse-applicative, parsec + , pretty, primes, primitive, process, pseudo-boolean, queue + , QuickCheck, scientific, semigroups, sign, stm, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, template-haskell, temporary, text + , time, transformers, transformers-compat, unbounded-delays + , unordered-containers, vector, vector-space, xml-conduit, zlib }: mkDerivation { pname = "toysolver"; - version = "0.6.0"; - sha256 = "0hd3rwbv8k62qnw9spwx6gl0j4syivvrigjcdgc53llbqzdjr0v1"; - revision = "3"; - editedCabalFile = "02dmyy2agp6x59dcagqmbwk46bn8q1y4ragk5yggajsw4gbm5gvn"; + version = "0.7.0"; + sha256 = "1r8z8fg3iyz5cc7cmwv29i7gwdcb789s7p6yklfgmz8w314m83gj"; + revision = "1"; + editedCabalFile = "1gnpyqjrcpsc2qjnnajr77j5x0xnyxpsmcxqa2qfbahw0r9qvmfw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring bytestring-builder bytestring-encoding - case-insensitive clock containers data-default-class data-interval - deepseq extended-reals filepath finite-field ghc-prim hashable - hashtables heaps intern lattices log-domain loop megaparsec mtl - multiset mwc-random OptDir pretty primes primitive process - pseudo-boolean queue scientific semigroups sign stm - template-haskell temporary text time transformers - transformers-compat unordered-containers vector vector-space - xml-conduit zlib + case-insensitive clock containers data-default data-default-class + data-interval deepseq directory extended-reals filepath + finite-field ghc-prim hashable hashtables heaps intern lattices + log-domain loop megaparsec MIP mtl multiset mwc-random OptDir + pretty primes primitive process pseudo-boolean queue scientific + semigroups sign stm template-haskell temporary text time + transformers transformers-compat unordered-containers vector + vector-space xml-conduit zlib ]; executableHaskellDepends = [ ansi-wl-pprint array base bytestring bytestring-builder clock - containers data-default data-default-class directory filepath - haskeline intern megaparsec mtl mwc-random OptDir - optparse-applicative parsec process pseudo-boolean scientific - temporary text time transformers transformers-compat - unbounded-delays vector + containers data-default-class filepath haskeline intern megaparsec + MIP mtl mwc-random OptDir optparse-applicative parsec + pseudo-boolean scientific text time transformers + transformers-compat unbounded-delays vector ]; testHaskellDepends = [ array base bytestring bytestring-builder containers @@ -259997,18 +261039,18 @@ self: { }) {}; "trackit" = callPackage - ({ mkDerivation, base, brick, fsnotify, mtl, optparse-generic - , process, process-extras, stm, text, time, vty + ({ mkDerivation, base, brick, fsnotify, microlens-platform, mtl + , optparse-generic, process, process-extras, stm, text, time, vty }: mkDerivation { pname = "trackit"; - version = "0.6.3"; - sha256 = "0bjsvz1kc6i2zpzdcjrrncqs3rpl7rfp961njhihymazffhsx3l2"; + version = "0.7.2"; + sha256 = "1ha28wdc4dabr9qxkbpg9fasfnplicb2pyrn9zmija204nigbcdj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick fsnotify mtl optparse-generic process process-extras stm - text time vty + base brick fsnotify microlens-platform mtl optparse-generic process + process-extras stm text time vty ]; description = "A command-line tool for live monitoring"; license = lib.licenses.bsd3; @@ -261466,8 +262508,8 @@ self: { pname = "trifecta"; version = "2.1"; sha256 = "0fr326lzf38m20h2g4189nsyml9w3128924zbd3cd93cgfqcc9bs"; - revision = "3"; - editedCabalFile = "0ag08di787zqzz70nwhsfigsvqbmbg7bkq011znq145yg750jcwl"; + revision = "4"; + editedCabalFile = "0frzfh7xmaypbxcmszjvzbakz52p0fx79jg6ng0ygaaj62inv4ss"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal array base blaze-builder blaze-html blaze-markup @@ -263686,6 +264728,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "type-natural_1_1_0_0" = callPackage + ({ mkDerivation, base, constraints, equational-reasoning, ghc + , ghc-typelits-knownnat, ghc-typelits-natnormalise + , ghc-typelits-presburger, integer-logarithms, QuickCheck + , quickcheck-instances, tasty, tasty-discover, tasty-hunit + , tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "type-natural"; + version = "1.1.0.0"; + sha256 = "0asyjp426931j4ym2qvx5xy9fjyf734sy02gscpd1d0fa8d1xbjm"; + libraryHaskellDepends = [ + base constraints equational-reasoning ghc ghc-typelits-knownnat + ghc-typelits-natnormalise ghc-typelits-presburger + integer-logarithms template-haskell + ]; + testHaskellDepends = [ + base equational-reasoning integer-logarithms QuickCheck + quickcheck-instances tasty tasty-discover tasty-hunit + tasty-quickcheck template-haskell + ]; + testToolDepends = [ tasty-discover ]; + description = "Type-level natural and proofs of their properties"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "type-of-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim @@ -263693,8 +264762,8 @@ self: { }: mkDerivation { pname = "type-of-html"; - version = "1.6.1.2"; - sha256 = "0dgfj4jk9bs6fjmmvsjxjpnvrd4nxmrnhdgvmawlfs5nib4r4al6"; + version = "1.6.2.0"; + sha256 = "18cwsblbmdh301d4jy3b70rnfni2vf3yzg71353hahv2rgfilh3j"; libraryHaskellDepends = [ base bytestring containers double-conversion ghc-prim text ]; @@ -263943,8 +265012,8 @@ self: { ({ mkDerivation, base, containers, ghc }: mkDerivation { pname = "typecheck-plugin-nat-simple"; - version = "0.1.0.1"; - sha256 = "1d35zj6gi3h9ybgvdi16x1lrjg0fgn8lhi36ia04f56qmsc3bk4j"; + version = "0.1.0.2"; + sha256 = "1hdp2n8n75lr1rjn99nwrqgzh3xay18lkjm8sjv36bwavvbw9p90"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers ghc ]; testHaskellDepends = [ base containers ghc ]; @@ -264854,6 +265923,20 @@ self: { broken = true; }) {}; + "ucl" = callPackage + ({ mkDerivation, base, bytestring, containers, libucl, text, time + }: + mkDerivation { + pname = "ucl"; + version = "0.2.0.0"; + sha256 = "1ccf9zavmsk0msq4gz6alv5z32qwnap8a4zvajmqps69bh66b9wv"; + libraryHaskellDepends = [ base bytestring containers text time ]; + libraryPkgconfigDepends = [ libucl ]; + testHaskellDepends = [ base containers ]; + description = "Datatype and parser for the Universal Configuration Language (UCL) using libucl"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) libucl;}; + "uconv" = callPackage ({ mkDerivation, base, icu }: mkDerivation { @@ -265105,8 +266188,8 @@ self: { ({ mkDerivation, base, bytestring, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "ukrainian-phonetics-basic-array"; - version = "0.1.1.0"; - sha256 = "1v5nzcnyrkhz5r2igxdp07ac506p0nnmjiskxxil5rzhab9zf8kn"; + version = "0.1.2.0"; + sha256 = "1a1crwz47vrrqr3bydzhknacmv5yafrpc33417mmp68qqhccdc23"; libraryHaskellDepends = [ base bytestring mmsyn2-array mmsyn5 ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; @@ -266158,8 +267241,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.14.5.0"; - sha256 = "0c30dd5x1bgk40gzfa5wdrnlam0j41z0cpd1dhmcj6fzwd1l2nra"; + version = "0.15.0.0"; + sha256 = "0cgl2xnmp0m73iizmhbl33vgc6mf1wzj49nf9xm1c1d70ak21g1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266212,8 +267295,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-properties"; - version = "0.5.5.0"; - sha256 = "08pzazvgg0nldybbj1558xvipn3wafqm9491fk2xcrf4na5pc42l"; + version = "0.6.0.0"; + sha256 = "08c97g221xcbsrwzyv36gikilim2yz2v2kkrhqvaj102v7ygh6ih"; libraryHaskellDepends = [ base mmsyn6ukr mmsyn7s phonetic-languages-rhythmicity phonetic-languages-ukrainian uniqueness-periods-vector @@ -266583,32 +267666,6 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.5.0"; - sha256 = "17rzi17k2wj3p6dzd0dggzgyhh0c2mma4znkci1hqcihwr6rrljk"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable microlens - microlens-mtl mtl safe-exceptions stm text transformers - unordered-containers utf8-string vector - ]; - testHaskellDepends = [ - base bytestring doctest Glob hedgehog tasty tasty-hedgehog text - utf8-string - ]; - benchmarkHaskellDepends = [ - base containers gauge unordered-containers - ]; - description = "Custom prelude used in Serokell"; - license = lib.licenses.mit; - }) {}; - - "universum_1_7_2" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , gauge, ghc-prim, Glob, hashable, hedgehog, microlens - , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog - , text, transformers, unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "universum"; version = "1.7.2"; sha256 = "1ka7q5vr9xkf8z5mzpkp648mpf8az7b14lnhbvfakg3v5xy3f7gb"; libraryHaskellDepends = [ @@ -266624,7 +267681,6 @@ self: { ]; description = "Custom prelude used in Serokell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unix_2_7_2_2" = callPackage @@ -266633,8 +267689,8 @@ self: { pname = "unix"; version = "2.7.2.2"; sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq"; - revision = "5"; - editedCabalFile = "1hfpipkxmkr0fgjz1i4mm0ah1s7bgb28yb8sjn32rafj4lzszn2m"; + revision = "6"; + editedCabalFile = "1wjy6cr4ls9gaisbq97knkw4rzk7aavcwvl4szx1vs7dbrfzrf6x"; libraryHaskellDepends = [ base bytestring time ]; description = "POSIX functionality"; license = lib.licenses.bsd3; @@ -266656,25 +267712,11 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "unix-compat"; - version = "0.5.2"; - sha256 = "1a8brv9fax76b1fymslzyghwa6ma8yijiyyhn12msl3i5x24x6k5"; - revision = "1"; - editedCabalFile = "1yx38asvjaxxlfs8lpbq0dwd84ynhgi7hw91rn32i1hsmz7yn22m"; - libraryHaskellDepends = [ base unix ]; - description = "Portable POSIX-compatibility layer"; - license = lib.licenses.bsd3; - }) {}; - - "unix-compat_0_5_3" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "unix-compat"; version = "0.5.3"; sha256 = "1j75i3dj489rz60ij3nfza774mb7mw33amhdkm10dd0dxabvb4q8"; libraryHaskellDepends = [ base unix ]; description = "Portable POSIX-compatibility layer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unix-fcntl" = callPackage @@ -266767,6 +267809,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "unix-simple" = callPackage + ({ mkDerivation, base, bytestring, zenhack-prelude }: + mkDerivation { + pname = "unix-simple"; + version = "0.1.0.0"; + sha256 = "0f6hvfs651ciwnpshh9n2655jl8yddwhbpw7gqbn0fa3y6b214kc"; + libraryHaskellDepends = [ base bytestring zenhack-prelude ]; + testHaskellDepends = [ base bytestring zenhack-prelude ]; + description = "Straightforward bindings to the posix API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "unix-time" = callPackage ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover , old-locale, old-time, QuickCheck, time @@ -266843,8 +267899,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.13.1"; - sha256 = "08q00kqg934y9cpj18kcgzcw3a2wgs6kjvgldgvr2a3vndwn95m0"; + version = "0.2.14"; + sha256 = "0gwifnzfcpjhzch06vkx1jkl7jf6j844grd4frl7w513bipb7w0r"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -266937,8 +267993,8 @@ self: { }: mkDerivation { pname = "unliftio-streams"; - version = "0.1.1.0"; - sha256 = "0qp78c610anqpgpd13pz24x68kcpc69z2wjrz6a3qixvqjvp72bw"; + version = "0.1.1.1"; + sha256 = "1r9yn710nwx4h2ky2pmlhmap5ydx4fhcaq119dq7cysnygzi5q2n"; libraryHaskellDepends = [ base bytestring io-streams text unliftio-core ]; @@ -267709,6 +268765,8 @@ self: { pname = "uri-encode"; version = "1.5.0.7"; sha256 = "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767"; + revision = "1"; + editedCabalFile = "172mgdd8dgy8wphgl9vbvp26lrzp01prr5jshbng4rlhpyd340p1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269167,18 +270225,16 @@ self: { }) {}; "validate-input" = callPackage - ({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy - , QuickCheck, semigroups, string-conversions, text + ({ mkDerivation, base, bytestring, hspec, mtl, pcre-heavy + , QuickCheck, semigroups, string-conversions, text, transformers }: mkDerivation { pname = "validate-input"; - version = "0.4.0.0"; - sha256 = "1yd187xa762b6zwjsyh3qp11sn3cnwh8g5imp0izk7a22x5y5yi0"; - revision = "1"; - editedCabalFile = "0qfwr05111adjfy6j0cbhrzyxgl3ngfpm0irf1hcgmfxnb8psqli"; + version = "0.5.0.0"; + sha256 = "09bp771b4ccm3r635i5cdkcrqlfkd5rlgrh9ijknd42bpw9byvzi"; libraryHaskellDepends = [ - base bytestring either mtl pcre-heavy semigroups string-conversions - text + base bytestring mtl pcre-heavy semigroups string-conversions text + transformers ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Input validation combinator library"; @@ -269991,17 +271047,17 @@ self: { "vector" = callPackage ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit - , primitive, QuickCheck, random, semigroups, tasty, tasty-hunit + , primitive, QuickCheck, random, tasty, tasty-hunit , tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "vector"; - version = "0.12.1.2"; - sha256 = "1g8i806ph9l789pv2k665bbxlmsbwfwzml1mi9xv683g7xl2fviv"; + version = "0.12.2.0"; + sha256 = "0l3bs8zvw1da9gzqkmavj9vrcxv8hdv9zfw1yqzk6nbqr220paqp"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ - base base-orphans HUnit primitive QuickCheck random semigroups - tasty tasty-hunit tasty-quickcheck template-haskell transformers + base base-orphans HUnit primitive QuickCheck random tasty + tasty-hunit tasty-quickcheck template-haskell transformers ]; description = "Efficient Arrays"; license = lib.licenses.bsd3; @@ -270015,6 +271071,8 @@ self: { pname = "vector-algorithms"; version = "0.8.0.4"; sha256 = "0fxg6w0vh5g2vzw4alajj9ywdijfn9nyx28hbckhmwwbfxb6l5vn"; + revision = "1"; + editedCabalFile = "10zjr2cdsaxb71z9svl7h2bxrxbhr19ckqy9p2mhkvhg7ar60ixz"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -270122,8 +271180,8 @@ self: { }: mkDerivation { pname = "vector-circular"; - version = "0.1.2"; - sha256 = "1605yf9q8v6w8kxgsw5g9gmj39w23gzal3qf0mlssr4ay2psvg7y"; + version = "0.1.3"; + sha256 = "0xz2ih8x7a5731bbirhmkl7hyarzijnwgvj8zm9wxs1nky8yjyb7"; libraryHaskellDepends = [ base deepseq nonempty-vector primitive semigroupoids template-haskell vector @@ -270798,8 +271856,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "4.0.1"; - sha256 = "1s8bnxq3asq4wwgbsfvhkl6yih1sic9v8ylimcxwnvmdlh5ks58a"; + version = "4.0.2"; + sha256 = "1m7nyjqd0cyxnli5f7rbk1wrh6h7dk65i67k6xp787npf7hi6gdf"; libraryHaskellDepends = [ base deepseq hashable megaparsec parser-combinators text ]; @@ -270913,29 +271971,31 @@ self: { }) {}; "vgrep" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th - , containers, directory, doctest, fingertree, generic-deriving - , lens, lifted-base, mmorph, mtl, pipes, pipes-concurrency, process - , QuickCheck, stm, tasty, tasty-quickcheck, template-haskell, text - , transformers, unix, vty, yaml + ({ mkDerivation, aeson, async, attoparsec, base, containers + , directory, doctest, fingertree, generic-deriving, lifted-base + , microlens-mtl, microlens-platform, mmorph, mtl, pipes + , pipes-concurrency, process, QuickCheck, stm, tasty + , tasty-quickcheck, template-haskell, text, transformers, unix, vty + , yaml }: mkDerivation { pname = "vgrep"; - version = "0.2.2.0"; - sha256 = "11kcf59c1raqj4mwwjhr9435sqilgxgmryq1kimgra2j64ldyl3k"; + version = "0.2.3.0"; + sha256 = "1zzzmvhqcvgvni96b1zzqjwpmlncsjd08sqllrbp4d4a7j43b9g5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base containers directory fingertree - generic-deriving lens lifted-base mmorph mtl pipes - pipes-concurrency process stm text transformers unix vty yaml + generic-deriving lifted-base microlens-mtl microlens-platform + mmorph mtl pipes pipes-concurrency process stm text transformers + unix vty yaml ]; executableHaskellDepends = [ - async base cabal-file-th containers directory lens mtl pipes - pipes-concurrency process template-haskell text vty + async base containers directory microlens-platform mtl pipes + pipes-concurrency process template-haskell text unix vty ]; testHaskellDepends = [ - base containers doctest lens QuickCheck tasty tasty-quickcheck text + base containers doctest QuickCheck tasty tasty-quickcheck text ]; description = "A pager for grep"; license = lib.licenses.bsd3; @@ -271486,8 +272546,6 @@ self: { ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vivid-osc" = callPackage @@ -271500,8 +272558,6 @@ self: { testHaskellDepends = [ base bytestring cereal microspec time ]; description = "Open Sound Control encode/decode"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vivid-supercollider" = callPackage @@ -271521,8 +272577,6 @@ self: { ]; description = "Implementation of SuperCollider server specifications"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vk-aws-route53" = callPackage @@ -271571,6 +272625,77 @@ self: { license = lib.licenses.publicDomain; }) {}; + "vocoder" = callPackage + ({ mkDerivation, base, random, vector, vector-fftw }: + mkDerivation { + pname = "vocoder"; + version = "0.1.0.0"; + sha256 = "04j0rrf7i1cghk53dwy5y5s3igxsqa6ih94rgfrjf2prx3rwmbr2"; + libraryHaskellDepends = [ base random vector vector-fftw ]; + description = "Phase vocoder"; + license = lib.licenses.bsd2; + }) {}; + + "vocoder-audio" = callPackage + ({ mkDerivation, base, conduit, conduit-audio, containers + , mono-traversable, vector, vector-fftw, vocoder, vocoder-conduit + }: + mkDerivation { + pname = "vocoder-audio"; + version = "0.1.0.0"; + sha256 = "1hwnsmnqxwrbfjgv9rvprxnzpyb3w4nybzsz98fqvh9lslajrq4p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base conduit conduit-audio containers mono-traversable vector + vector-fftw vocoder vocoder-conduit + ]; + description = "Phase vocoder for conduit-audio"; + license = lib.licenses.bsd2; + }) {}; + + "vocoder-conduit" = callPackage + ({ mkDerivation, base, conduit, gauge, hspec, mono-traversable + , QuickCheck, vector, vector-fftw, vocoder + }: + mkDerivation { + pname = "vocoder-conduit"; + version = "0.1.0.0"; + sha256 = "0a1zhxzypxik62rzk5l6crv1413662gjq31qslvavwd248xn00dk"; + libraryHaskellDepends = [ + base conduit mono-traversable vector vector-fftw vocoder + ]; + testHaskellDepends = [ + base conduit hspec QuickCheck vector vector-fftw vocoder + ]; + benchmarkHaskellDepends = [ + base conduit gauge vector vector-fftw vocoder + ]; + description = "Phase vocoder for Conduit"; + license = lib.licenses.bsd2; + }) {}; + + "vocoder-dunai" = callPackage + ({ mkDerivation, base, dunai, gauge, hspec, QuickCheck, vector + , vector-fftw, vocoder + }: + mkDerivation { + pname = "vocoder-dunai"; + version = "0.1.0.0"; + sha256 = "1bns914d8yxyj9mblknw7n5xijf6vn8y099vzp3f9grjls81y4pw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dunai vector vector-fftw vocoder ]; + testHaskellDepends = [ + base dunai hspec QuickCheck vector vector-fftw vocoder + ]; + benchmarkHaskellDepends = [ + base dunai gauge vector vector-fftw vocoder + ]; + description = "Phase vocoder for Dunai and Rhine"; + license = lib.licenses.bsd2; + }) {}; + "voicebase" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL , hspec, http-client, http-client-openssl, lens, lens-aeson @@ -271856,8 +272981,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.9"; - sha256 = "00k23g4qszrhwbbc746y1z50mcnxw9b99rqfdqx6ncnzblc6b63z"; + version = "3.9.1"; + sha256 = "1rdhkxrjxcvdx3hd74xcgx28nd8ca8la5kclbxwbgciby8plpymv"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -274013,8 +275138,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.13"; - sha256 = "1yqgfx7bsjk97dxcrqwddfhi8mdw0q6cbgs5abaxqjlxh3rhihdx"; + version = "3.3.14"; + sha256 = "0whmh6dbl7321a2kg6ypngw5kgvvxqdk161li0l4hr3wqqddlc93"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -275383,8 +276508,8 @@ self: { pname = "webp"; version = "0.1.0.0"; sha256 = "153icv3911drnjkii2b0csdq3ksavmxpz26zm9xcp24kfbsr6gvk"; - revision = "1"; - editedCabalFile = "1gh6k398c8kq9h0cikggcy9jppnw0234c28sy5ikdiir1i0db1p3"; + revision = "2"; + editedCabalFile = "0ycp16b2fb4x3h6rs4j2wywy7la1b7ri3419p8mnpf1ipmq6d1vk"; libraryHaskellDepends = [ base bytestring JuicyPixels vector ]; libraryPkgconfigDepends = [ libwebp ]; libraryToolDepends = [ c2hs ]; @@ -275836,36 +276961,37 @@ self: { }) {}; "what4" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors - , bimap, bv-sized, bytestring, containers, data-binary-ieee754 + ({ mkDerivation, attoparsec, base, bifunctors, bimap, bv-sized + , bytestring, config-value, containers, data-binary-ieee754 , deepseq, deriving-compat, directory, exceptions, extra, filepath , fingertree, ghc-prim, hashable, hashtables, hedgehog, io-streams - , lens, mtl, panic, parameterized-utils, process, QuickCheck - , scientific, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, text, th-abstraction, transformers + , lens, libBF, mtl, panic, parameterized-utils, prettyprinter + , process, QuickCheck, scientific, tasty, tasty-hedgehog + , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , th-abstraction, th-lift, th-lift-instances, transformers , unordered-containers, utf8-string, vector, versions, zenc }: mkDerivation { pname = "what4"; - version = "1.0"; - sha256 = "0yyyq2gzl7srjq6inj1dqdhpxd58r1rhjajwxi0gr5pmxfzv7k8w"; - revision = "1"; - editedCabalFile = "04ab8nvnngb3bjv94mkcr17hh2m943m4pyk3klbnmpwyp9ip6pmf"; + version = "1.1"; + sha256 = "1656h3865vzd96ggibm1wkhnpmjrx6crv87kgmwphfy8hgl5j8kq"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-wl-pprint attoparsec base bifunctors bimap bv-sized bytestring + attoparsec base bifunctors bimap bv-sized bytestring config-value containers data-binary-ieee754 deepseq deriving-compat directory exceptions extra filepath fingertree ghc-prim hashable hashtables - io-streams lens mtl panic parameterized-utils process scientific - template-haskell temporary text th-abstraction transformers - unordered-containers utf8-string vector versions zenc + io-streams lens libBF mtl panic parameterized-utils prettyprinter + process scientific template-haskell temporary text th-abstraction + th-lift th-lift-instances transformers unordered-containers + utf8-string vector versions zenc ]; executableHaskellDepends = [ base parameterized-utils ]; testHaskellDepends = [ base bv-sized bytestring containers data-binary-ieee754 hedgehog - parameterized-utils QuickCheck tasty tasty-hedgehog tasty-hunit - tasty-quickcheck text transformers versions + libBF parameterized-utils QuickCheck tasty tasty-hedgehog + tasty-hunit tasty-quickcheck text transformers versions ]; description = "Solver-agnostic symbolic values support for issuing queries"; license = lib.licenses.bsd3; @@ -276044,6 +277170,8 @@ self: { pname = "wide-word"; version = "0.1.1.2"; sha256 = "10sj7nca2sba74bkiicnp95xrfq2j1al93ggw3z24982nm9x3j8r"; + revision = "1"; + editedCabalFile = "1gqw8d8j3wml0431lq1ygl5a3n36ymp1i77m7qaw0mz3ss982gl2"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck @@ -276409,8 +277537,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "0.0.0.4"; - sha256 = "1mph0zaz2dnhpchyiyspqsjghd8kn8sbqnhbyjmag51l2wr418vb"; + version = "0.0.0.5"; + sha256 = "1j12mh8zap8c0lb358bzk4sq29h64lv0jrwq9r4nssx4yybrz9gg"; libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ base bytestring containers hspec QuickCheck text @@ -277541,10 +278669,8 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.5.3.2"; - sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36"; - revision = "1"; - editedCabalFile = "0gz674sb266hv6si9l79c3bv7n2nbssl1262c24in79sk27887gb"; + version = "0.5.3.3"; + sha256 = "0zv51048p0r7vhamml3ps9nr11yi9fxz2w31qcz053bw3z9ivwxw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -278158,8 +279284,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.17"; - sha256 = "03raxspm7k5byx2gg5a2avgf7c3idcjq0vd7jh01vpv1mamap712"; + version = "1.1.18"; + sha256 = "0idxk1q0gsh1hq56w8jxnsb58p8z8d45qgj6zqzsszlccwzgr24f"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -278705,8 +279831,8 @@ self: { }: mkDerivation { pname = "xdot"; - version = "0.3.0.2"; - sha256 = "0k3lklghlj51nslv8pi8anj78hls2srmdr6hz5yibfhvycpib0c2"; + version = "0.3.0.3"; + sha256 = "06pgs74b3llyhhp2rr9a3rvgycnvg395q5ib9vwdiv9pqgq31kia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279282,6 +280408,8 @@ self: { pname = "xml-conduit-stylist"; version = "2.3.0.0"; sha256 = "15iznb6xpas8044p03w3vll4vv7zwpcbbrh59ywwjr8m45659p4w"; + revision = "1"; + editedCabalFile = "0ydqjrk5q3zzgrwk9cqcjlk3vafzcnxjvb7p74ywm5wfnhmfvmyn"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit @@ -279356,8 +280484,8 @@ self: { ({ mkDerivation, base, mtl, transformers, xml }: mkDerivation { pname = "xml-extractors"; - version = "0.4.0.2"; - sha256 = "0ivzl1ikijrbz5mi75rxa340dxf7ilyzlxzka25si91jmjq0a9xa"; + version = "0.4.0.3"; + sha256 = "0g1f5yhzipwyny0yrsns03l024yphz8978w05xfk09f5vkrfxb0w"; libraryHaskellDepends = [ base mtl transformers xml ]; description = "Extension to the xml package to extract data from parsed xml"; license = lib.licenses.bsd3; @@ -280175,8 +281303,8 @@ self: { }: mkDerivation { pname = "xmonad-extras"; - version = "0.15.2"; - sha256 = "1p20zc5k0s05ic2jjx01x0mx88y369dvq2ad43sfjbyf95msi7ls"; + version = "0.15.3"; + sha256 = "0nh8v057fjdr3lnx7mdbifw153z6nirx36zfsjz8lc6p45ik0qs9"; configureFlags = [ "-f-with_hlist" "-fwith_parsec" "-fwith_split" ]; @@ -282498,7 +283626,7 @@ self: { broken = true; }) {}; - "yesod-auth-oauth2_0_6_2_1" = callPackage + "yesod-auth-oauth2_0_6_2_2" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, errors , hoauth2, hspec, http-client, http-conduit, http-types, memory , microlens, safe-exceptions, text, uri-bytestring, yesod-auth @@ -282506,8 +283634,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.2.1"; - sha256 = "1kzz271y69l47wikfmfix5v9csh6xy7cv8b36gxzlwr6vil59bmy"; + version = "0.6.2.2"; + sha256 = "176iz5mg9jhrp8kp61f12j1jw3icnqp10dxln7046p1nqam0nv3d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -282604,6 +283732,34 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-bin_1_6_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, directory, file-embed, filepath + , fsnotify, http-client, http-client-tls, http-reverse-proxy + , http-types, network, optparse-applicative, process + , project-template, say, split, stm, streaming-commons, tar, text + , time, transformers, transformers-compat, unliftio + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.1"; + sha256 = "0saz5dcygyf91f8hqvsy9wpcc5pg7vd9gcp891fiz4cywsrqpzwx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal conduit conduit-extra containers + data-default-class directory file-embed filepath fsnotify + http-client http-client-tls http-reverse-proxy http-types network + optparse-applicative process project-template say split stm + streaming-commons tar text time transformers transformers-compat + unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib + ]; + description = "The yesod helper executable"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -283347,8 +284503,8 @@ self: { }: mkDerivation { pname = "yesod-page-cursor"; - version = "2.0.0.2"; - sha256 = "1wlwzxc2amnq1ma2lvclrc3dzhh8s6d8ffz6yk9rq88aijgvw35m"; + version = "2.0.0.3"; + sha256 = "1qj3qsrzjh0w0hc9ngbxd82pkwb8jylhf0nihhnk4dvrdqm2yvyb"; libraryHaskellDepends = [ aeson base bytestring containers http-link-header network-uri text unliftio yesod-core @@ -286088,8 +287244,8 @@ self: { pname = "zippers"; version = "0.3"; sha256 = "0hrsgk8sh9g3438kl79131s6vjydhivgya04yxv3h70m7pky1dpm"; - revision = "1"; - editedCabalFile = "1pdlng2wnzqg2fbafp78mxp3whsy0683x14gzdnif7pmhpzs145f"; + revision = "2"; + editedCabalFile = "131rmvifqf3dcvh9lnpjnm28ss7nzra1n2qnxa1fypnx1zmmljva"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base fail lens profunctors semigroupoids semigroups diff --git a/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix b/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix index 28b48bfcbc4a..2641892672af 100644 --- a/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix +++ b/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix @@ -327,6 +327,37 @@ in package-set { inherit pkgs lib callPackage; } self // { # packages. You should set this to true if you have benchmarks defined # in your local packages that you want to be able to run with cabal benchmark doBenchmark ? false + # An optional function that can modify the generic builder arguments + # for the fake package that shellFor uses to construct its environment. + # + # Example: + # let + # # elided... + # haskellPkgs = pkgs.haskell.packages.ghc884.override (hpArgs: { + # overrides = pkgs.lib.composeExtensions (hpArgs.overrides or (_: _: { })) ( + # _hfinal: hprev: { + # mkDerivation = args: hprev.mkDerivation ({ + # doCheck = false; + # doBenchmark = false; + # doHoogle = true; + # doHaddock = true; + # enableLibraryProfiling = false; + # enableExecutableProfiling = false; + # } // args); + # } + # ); + # }); + # in + # hpkgs.shellFor { + # packages = p: [ p.foo ]; + # genericBuilderArgsModifier = args: args // { doCheck = true; doBenchmark = true }; + # } + # + # This will disable tests and benchmarks for everything in "haskellPkgs" + # (which will invalidate the binary cache), and then re-enable them + # for the "shellFor" environment (ensuring that any test/benchmark + # dependencies for "foo" will be available within the nix-shell). + , genericBuilderArgsModifier ? (args: args) , ... } @ args: let @@ -443,7 +474,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # This is a derivation created with `haskellPackages.mkDerivation`. # # pkgWithCombinedDeps :: HaskellDerivation - pkgWithCombinedDeps = self.mkDerivation genericBuilderArgs; + pkgWithCombinedDeps = self.mkDerivation (genericBuilderArgsModifier genericBuilderArgs); # The derivation returned from `envFunc` for `pkgWithCombinedDeps`. # @@ -457,7 +488,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # pkgWithCombinedDepsDevDrv :: Derivation pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; }; - mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" "doBenchmark" ]; + mkDerivationArgs = builtins.removeAttrs args [ "genericBuilderArgsModifier" "packages" "withHoogle" "doBenchmark" ]; in pkgWithCombinedDepsDevDrv.overrideAttrs (old: mkDerivationArgs // { nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or []; diff --git a/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix index af317c92a5ab..4d66478f338d 100644 --- a/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -18,16 +18,6 @@ self: super: { # https://github.com/spacchetti/spago/issues/512 spago = self.callPackage ../tools/purescript/spago/spago.nix { }; - # HLS and its fork of ghcide that it uses - # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh - haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { }; - hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { }; - hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { }; - hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { }; - hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { }; - hls-class-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-class-plugin.nix { }; - hls-eval-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-eval-plugin.nix { }; - nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; # cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git diff --git a/nixpkgs/pkgs/development/idris-modules/tfrandom.nix b/nixpkgs/pkgs/development/idris-modules/tfrandom.nix index 5c6319503123..8249259075c0 100644 --- a/nixpkgs/pkgs/development/idris-modules/tfrandom.nix +++ b/nixpkgs/pkgs/development/idris-modules/tfrandom.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib , build-idris-package , fetchFromGitHub -, lib }: + build-idris-package { name = "tf-random"; version = "2020-01-15"; diff --git a/nixpkgs/pkgs/development/idris-modules/with-packages.nix b/nixpkgs/pkgs/development/idris-modules/with-packages.nix index 72b9067b6915..080cbe2778a6 100644 --- a/nixpkgs/pkgs/development/idris-modules/with-packages.nix +++ b/nixpkgs/pkgs/development/idris-modules/with-packages.nix @@ -1,6 +1,6 @@ # Build a version of idris with a set of packages visible # packages: The packages visible to idris -{ stdenv, lib, idris, symlinkJoin, makeWrapper }: packages: +{ lib, idris, symlinkJoin, makeWrapper }: packages: let paths = lib.closePropagation packages; in diff --git a/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index e10236fe1eee..790f8d1ef81b 100644 --- a/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { native-image \ -jar ${src} \ -H:Name=bb \ + ${optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \ -H:+ReportExceptionStackTraces \ -J-Dclojure.spec.skip-macros=true \ -J-Dclojure.compiler.direct-linking=true \ "-H:IncludeResources=BABASHKA_VERSION" \ "-H:IncludeResources=SCI_VERSION" \ -H:ReflectionConfigurationFiles=${reflectionJson} \ - --initialize-at-run-time=java.lang.Math\$RandomNumberGeneratorHolder \ --initialize-at-build-time \ -H:Log=registerResource: \ -H:EnableURLProtocols=http,https \ diff --git a/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/nixpkgs/pkgs/development/interpreters/clojure/default.nix index ab5422378599..89db33c5a8c5 100644 --- a/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.763"; + version = "1.10.2.774"; src = fetchurl { + # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "042d5bk59wv145fvjrk72g4hvaq7j2p4a2d1pg13b433qfkchgia"; + sha256 = "0z3j8m9k7prmx6n3kpyhj04pjdg7y0plyxv4kp7789shanr6y4qp"; }; nativeBuildInputs = [ @@ -20,6 +21,8 @@ stdenv.mkDerivation rec { binPath = lib.makeBinPath [ rlwrap jdk ]; in '' + runHook preInstall + clojure_lib_dir=$out bin_dir=$out/bin @@ -38,6 +41,8 @@ stdenv.mkDerivation rec { wrapProgram $bin_dir/clj --prefix PATH : $out/bin:${binPath} installManPage clj.1 clojure.1 + + runHook postInstall ''; doInstallCheck = true; diff --git a/nixpkgs/pkgs/development/interpreters/dart/default.nix b/nixpkgs/pkgs/development/interpreters/dart/default.nix index 7fa59a18c5f1..5fb180201b96 100644 --- a/nixpkgs/pkgs/development/interpreters/dart/default.nix +++ b/nixpkgs/pkgs/development/interpreters/dart/default.nix @@ -1,89 +1,42 @@ -{ lib, stdenv, fetchurl, unzip, version ? "2.7.2" }: - -let - - sources = let - +{ stdenv +, lib +, fetchurl +, unzip +, version ? "2.10.5" +, sources ? + let base = "https://storage.googleapis.com/dart-archive/channels"; - stable_version = "stable"; - dev_version = "dev"; x86_64 = "x64"; i686 = "ia32"; aarch64 = "arm64"; + # Make sure that if the user overrides version parameter they're + # also need to override sources, to avoid mistakes + version = "2.10.5"; + in + { + "${version}-x86_64-darwin" = fetchurl { + url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "1vb2m25w6v901id9syan9q69fa60sxxd7qpyzq21fn5dpah0g99i"; + }; + "${version}-x86_64-linux" = fetchurl { + url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; + sha256 = "1mb6m3vxjya1dz47mdna23c2015n3bz8dvz8fwggq6k3zp0a4dsh"; + }; + "${version}-i686-linux" = fetchurl { + url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; + sha256 = "10g4qrwvmabrdg4i8y0wq9g7whqcpkdfp05yilflg70ybplrscf7"; + }; + "${version}-aarch64-linux" = fetchurl { + url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; + sha256 = "0js83wy496swcwia144fhxk872irb5nr6i8558hxabkdrpv1bky5"; + }; + } +}: - in { - "1.24.3-x86_64-darwin" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "1n4cq4jrms4j0yl54b3w14agcgy8dbipv5788jziwk8q06a8c69l"; - }; - "1.24.3-x86_64-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3"; - }; - "1.24.3-i686-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0a559mfpb0zfd49zdcpld95h2g1lmcjwwsqf69hd9rw6j67qyyyn"; - }; - "1.24.3-aarch64-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh"; - }; - "2.7.2-x86_64-darwin" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "111zl075qdk2zd4d4mmfkn30jmzsri9nq3nspnmc2l245gdq34jj"; - }; - "2.7.2-x86_64-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v"; - }; - "2.7.2-i686-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0dj01d2wwrp3cc5x73vs6fzhs6db60gkbjlrw3w9j04wcx69i38m"; - }; - "2.7.2-aarch64-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p"; - }; - "2.10.0-x86_64-darwin" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "1n4qgsax5wi7krgvvs0dy7fz39nlykiw8gr0gdacc85hgyhqg09j"; - }; - "2.10.0-x86_64-linux" = fetchurl { - url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "0dncmsfbwcn3ygflhp83i6z4bvc02fbpaq1vzdzw8xdk3sbynchb"; - }; - "2.9.0-4.0.dev-x86_64-darwin" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0gj91pbvqrxsvxaj742cllqha2z65867gggzq9hq5139vkkpfj9s"; - }; - "2.9.0-4.0.dev-x86_64-linux" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r"; - }; - "2.9.0-4.0.dev-i686-linux" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "105wgyxmi491c7qw0z3zhn4lv52h80ngyz4ch9dyj0sq8nndz2rc"; - }; - "2.9.0-4.0.dev-aarch64-linux" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc"; - }; - "2.11.0-161.0.dev-x86_64-darwin" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0mlwxp7jkkjafxkc4vqlgwl62y0hk1arhfrvc9hpm9dv98g3bdjj"; - }; - "2.11.0-161.0.dev-x86_64-linux" = fetchurl { - url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "05difz4w2fyh2yq5p5pkrqk59jqljlxhc1i6lmy5kihh6z69r12i"; - }; - }; - -in - -with lib; +assert version != null && version != ""; +assert sources != null && (builtins.isAttrs sources); stdenv.mkDerivation { - pname = "dart"; inherit version; @@ -100,13 +53,13 @@ stdenv.mkDerivation { find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; - libPath = makeLibraryPath [ stdenv.cc.cc ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; dontStrip = true; - meta = { + meta = with lib; { homepage = "https://www.dartlang.org/"; - maintainers = with maintainers; [ grburst ]; + maintainers = with maintainers; [ grburst thiagokokada ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' Dart is a class-based, single inheritance, object-oriented language diff --git a/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix index 358fff039c6a..aaf368017ffb 100644 --- a/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix @@ -46,8 +46,7 @@ in b=$(basename $f) if [ "$b" = mix ]; then continue; fi wrapProgram $f \ - --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" \ - --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt + --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" done substituteInPlace $out/bin/mix \ @@ -69,6 +68,6 @@ in license = licenses.epl10; platforms = platforms.unix; - maintainers = with maintainers; [ havvy couchemar ankhers Br1ght0ne ]; + maintainers = teams.beam.members; }; }) diff --git a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index 4429dc1eaf37..538b4224909c 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -3,11 +3,10 @@ # TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 , openjdk8 ? null # javacSupport , unixODBC ? null # odbcSupport -, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport +, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null , parallelBuild ? false -, systemd +, systemd, wxSupport ? true }: - { baseName ? "erlang" , version , sha256 ? null @@ -21,7 +20,7 @@ , javacSupport ? false, javacPackages ? [ openjdk8 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , withSystemd ? stdenv.isLinux # systemd support in epmd -, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] +, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" @@ -126,7 +125,7 @@ in stdenv.mkDerivation ({ ''; platforms = platforms.unix; - maintainers = with maintainers; [ sjmackenzie couchemar gleber ]; + maintainers = teams.beam.members; license = licenses.asl20; } // meta); } diff --git a/nixpkgs/pkgs/development/interpreters/gauche/default.nix b/nixpkgs/pkgs/development/interpreters/gauche/default.nix index 75a931c55629..86dc7d666d2b 100644 --- a/nixpkgs/pkgs/development/interpreters/gauche/default.nix +++ b/nixpkgs/pkgs/development/interpreters/gauche/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, gaucheBootstrap, pkg-config, texinfo -, libiconv, gdbm, openssl, zlib, mbedtls, cacert }: +, libiconv, gdbm, openssl, zlib, mbedtls, cacert }: stdenv.mkDerivation rec { pname = "gauche"; @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ mnacamura ]; license = licenses.bsd3; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/interpreters/hy/default.nix b/nixpkgs/pkgs/development/interpreters/hy/default.nix index 6bfef26b4ddc..e39bf915cfcf 100644 --- a/nixpkgs/pkgs/development/interpreters/hy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/hy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "hy"; diff --git a/nixpkgs/pkgs/development/interpreters/janet/default.nix b/nixpkgs/pkgs/development/interpreters/janet/default.nix index 9f8ab5a849ff..ac1a52e1bba3 100644 --- a/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cI0kcY8aYDkmitoju/C6Ule5gzflIe0nLVxZp4iHXnc="; + sha256 = "sha256-NLPmuS7HTPY8OfeppqVhrj4iVZix4orr1oYilcXaAqI="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/nixpkgs/pkgs/development/interpreters/joker/default.nix b/nixpkgs/pkgs/development/interpreters/joker/default.nix index 3d36dde8e0f9..004d2732f3a6 100644 --- a/nixpkgs/pkgs/development/interpreters/joker/default.nix +++ b/nixpkgs/pkgs/development/interpreters/joker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "joker"; diff --git a/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix index d6090152d158..397be81e7c85 100644 --- a/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }: +{ lib, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }: { baseName ? "lfe" , version @@ -87,7 +87,7 @@ buildRebar3 { downloadPage = "https://github.com/rvirding/lfe/releases"; license = licenses.asl20; - maintainers = with maintainers; [ yurrriq ankhers ]; + maintainers = teams.beam.members; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/interpreters/metamath/default.nix b/nixpkgs/pkgs/development/interpreters/metamath/default.nix index 34591c4c84b8..a2b94667a6e4 100644 --- a/nixpkgs/pkgs/development/interpreters/metamath/default.nix +++ b/nixpkgs/pkgs/development/interpreters/metamath/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: let - version = "0.194"; + version = "0.196"; in stdenv.mkDerivation { pname = "metamath"; inherit version; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "metamath"; repo = "metamath-exe"; rev = "v${version}"; - sha256 = "1bc5h2jdqbgna8zbhqyphlqcldz4vddg72r2rnjjjzxnxb2skvj7"; + sha256 = "sha256-/ofH5fq7lUxbbRBAczsLNG3UPsOMbCdcxkB3el5OPcU="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix b/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix index 865d8fde9eac..da95b5a89647 100644 --- a/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix +++ b/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, perl, buildEnv, makeWrapper +{ lib, perl, buildEnv, makeWrapper , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" diff --git a/nixpkgs/pkgs/development/interpreters/php/7.3.nix b/nixpkgs/pkgs/development/interpreters/php/7.3.nix index 13b64e8cb6e2..d611cb7693c6 100644 --- a/nixpkgs/pkgs/development/interpreters/php/7.3.nix +++ b/nixpkgs/pkgs/development/interpreters/php/7.3.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.3.26"; - sha256 = "0klxnf6nhsib9b2mdls1x2wbpi04gmgwxajbn593rzalh5y5l7ip"; + version = "7.3.27"; + sha256 = "00z0vadxazm2flks9g8qmchj2pwkli880kg313jgbb1mx3shc84x"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/nixpkgs/pkgs/development/interpreters/php/7.4.nix b/nixpkgs/pkgs/development/interpreters/php/7.4.nix index 9ee0c9c9e7cc..42aa28b65e63 100644 --- a/nixpkgs/pkgs/development/interpreters/php/7.4.nix +++ b/nixpkgs/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.14"; - sha256 = "1xm1s2w9fsd8q7kjbpqw8s4bs7ggziwws23m0ykkmvmd0l3cm2b8"; + version = "7.4.15"; + sha256 = "0mvp7b16sy9j36v9v1mhixwz16hi8mhax7rwpqy3sv24jc1bxmqv"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/nixpkgs/pkgs/development/interpreters/php/8.0.nix b/nixpkgs/pkgs/development/interpreters/php/8.0.nix index 5779c836dd4f..a4aa4842dfa3 100644 --- a/nixpkgs/pkgs/development/interpreters/php/8.0.nix +++ b/nixpkgs/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.1"; - sha256 = "1vmx9rhks8v2198f9d6cq62bway5mrfsz72garjdwcyi82ppckn4"; + version = "8.0.2"; + sha256 = "1rm3gc2h9l0zd1ccawpg1wxqm8v8rllq417f2w5pqcdf7sgah3q0"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix index 668adf2c44a2..a9c71c6fcf70 100644 --- a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: let version = "0.9.5.1.1"; in diff --git a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix index 2c4c74baecf1..12429c05fe63 100644 --- a/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: let version = "0.9.6.4"; in diff --git a/nixpkgs/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix index 38b0382c2191..9549ad6d3d5e 100644 --- a/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -218,9 +218,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "1"; + patch = "2"; }; - sha256 = "08ckkhd0ix6j9873a7gr507c72d4cmnv5lwvprlljdca9i8p2dzs"; + sha256 = "1l98b7s9sf16a5w8y0fdn7a489l3gpykjasws1j67bahhc6li2c1"; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; @@ -234,9 +234,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "1"; + patch = "2"; }; - sha256 = "10zsk8jby8j6visk5mzikpb1cidvz27qq4pfpa26jv53klic6b0c"; + sha256 = "03f1fdw6yk2mypa9pbmgk26r8y1hhmw801l6g36zry9zsvz7aqgx"; pythonVersion = "3.6"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; @@ -251,9 +251,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "1"; + patch = "2"; }; - sha256 = "18xc5kwidj5hjwbr0w8v1nfpg5l4lk01z8cn804zfyyz8xjqhx5y"; # linux64 + sha256 = "0fx1kp13cgx3rijd0zf8rdjbai6mfhc9is4xfc7kl5cpd88hhkwd"; # linux64 pythonVersion = "2.7"; inherit passthruFun; }; @@ -264,9 +264,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "1"; + patch = "2"; }; - sha256 = "04nv0mkalaliphbjw7y0pmb372bxwjzwmcsqkf9kwsik99kg2z7n"; # linux64 + sha256 = "10xdx7q04fzy4v4rbj9bbdw8g9y68qgaih7z2n0s5aknj0bizafp"; # linux64 pythonVersion = "3.6"; inherit passthruFun; }; diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index bfd2bfa75836..c2079fa84f90 100644 --- a/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -2,6 +2,7 @@ echo "Sourcing pytest-check-hook" declare -ar disabledTests +declare -ar disabledTestFiles function _concatSep { local result @@ -36,6 +37,13 @@ function pytestCheckPhase() { disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}") args+=" -k \""$disabledTestsString"\"" fi + for file in "${disabledTestFiles[@]}"; do + if [ ! -f "$file" ]; then + echo "Disabled test file \"$file\" does not exist. Aborting" + exit 1 + fi + args+=" --ignore=$file" + done args+=" ${pytestFlagsArray[@]}" eval "@pythonCheckInterpreter@ $args" diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index cfa1ac71891c..b4e9343b5d4a 100644 --- a/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -45,7 +45,7 @@ in with passthru; stdenv.mkDerivation rec { inherit pname version; src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-src.tar.bz2"; + url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-src.tar.bz2"; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix index 6fd0ee2e925f..f301fd15f09c 100644 --- a/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -54,7 +54,7 @@ in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch b/nixpkgs/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch index 0b78caf7e075..15d03830e07e 100644 --- a/nixpkgs/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch +++ b/nixpkgs/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch @@ -1,13 +1,14 @@ ---- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py 2017-10-03 11:49:20.000000000 +0100 -+++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py 2017-11-21 13:20:51.398607530 +0000 -@@ -17,18 +17,14 @@ +--- a/lib_pypy/_tkinter/tklib_build.py ++++ b/lib_pypy/_tkinter/tklib_build.py +@@ -17,19 +17,14 @@ elif sys.platform == 'win32': incdirs = [] linklibs = ['tcl85', 'tk85'] libdirs = [] -elif sys.platform == 'darwin': -- incdirs = ['/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/'] -- linklibs = ['tcl', 'tk'] -- libdirs = [] +- # homebrew +- incdirs = ['/usr/local/opt/tcl-tk/include'] +- linklibs = ['tcl8.6', 'tk8.6'] +- libdirs = ['/usr/local/opt/tcl-tk/lib'] else: # On some Linux distributions, the tcl and tk libraries are # stored in /usr/include, so we must check this case also diff --git a/nixpkgs/pkgs/development/interpreters/python/tests.nix b/nixpkgs/pkgs/development/interpreters/python/tests.nix index 61fc497024be..ff27ca8ec208 100644 --- a/nixpkgs/pkgs/development/interpreters/python/tests.nix +++ b/nixpkgs/pkgs/development/interpreters/python/tests.nix @@ -1,3 +1,10 @@ +# Tests for the Python interpreters, package sets and environments. +# +# Each Python interpreter has a `passthru.tests` which is the attribute set +# returned by this function. For example, for Python 3 the tests are run with +# +# $ nix-build -A python3.tests +# { stdenv , python , runCommand @@ -7,6 +14,8 @@ }: let + # Test whether the interpreter behaves in the different types of environments + # we aim to support. environmentTests = let envs = let inherit python; @@ -83,6 +92,7 @@ let in lib.mapAttrs testfun envs; + # Integration tests involving the package set. # All PyPy package builds are broken at the moment integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 860ffc0aea0a..5eccebf02452 100644 --- a/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.9.4"; + version = "0.11.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "0h3lbznzxqmsv2816vr6y244sfdchj13yhbav86zy2m79p8b5lgq"; + sha256 = "sha256-wccVMEUAfTWs/8hnrT7nrxfYPHyNl+lXt+KUDkyplto="; }; buildInputs = [ rakudo makeWrapper ]; diff --git a/nixpkgs/pkgs/development/java-modules/build-maven-package.nix b/nixpkgs/pkgs/development/java-modules/build-maven-package.nix index cb895d9c6720..432f972b0ff6 100644 --- a/nixpkgs/pkgs/development/java-modules/build-maven-package.nix +++ b/nixpkgs/pkgs/development/java-modules/build-maven-package.nix @@ -5,7 +5,7 @@ with builtins; with lib; let - mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs stdenv; }; + mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs ; }; in stdenv.mkDerivation rec { inherit mavenDeps src name meta m2Path; diff --git a/nixpkgs/pkgs/development/java-modules/junit/default.nix b/nixpkgs/pkgs/development/java-modules/junit/default.nix index c4b02071ec04..2cb9ab001c29 100644 --- a/nixpkgs/pkgs/development/java-modules/junit/default.nix +++ b/nixpkgs/pkgs/development/java-modules/junit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, mavenbuild, fetchMaven }: +{ lib, pkgs, mavenbuild, fetchMaven }: with pkgs.javaPackages; diff --git a/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix b/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix index e0087e857a47..eac127b6dccc 100644 --- a/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix +++ b/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, mavenbuild }: +{ lib, pkgs, mavenbuild }: with pkgs.javaPackages; diff --git a/nixpkgs/pkgs/development/java-modules/maven-minimal.nix b/nixpkgs/pkgs/development/java-modules/maven-minimal.nix index 9019e3ba28e9..d966a75bb9d0 100644 --- a/nixpkgs/pkgs/development/java-modules/maven-minimal.nix +++ b/nixpkgs/pkgs/development/java-modules/maven-minimal.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs }: +{ lib, pkgs }: with lib; with pkgs.javaPackages; diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 5212421a7b8e..92bd85b1e8c9 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -25,11 +25,11 @@ with lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.12"; + version = "2.0.14"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il"; + sha256 = "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq"; }; dontDisableStatic = withStatic; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch b/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch index 69dde41c7e2f..a2e0c4837031 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch +++ b/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch @@ -1,6 +1,6 @@ -diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in ---- SDL2-2.0.12/sdl2-config.cmake.in 2020-03-11 02:36:18.000000000 +0100 -+++ SDL2-2.0.12-new/sdl2-config.cmake.in 2020-11-11 11:59:05.178703826 +0100 +diff -ru3 SDL2-2.0.14/sdl2-config.cmake.in SDL2-2.0.14-new/sdl2-config.cmake.in +--- SDL2-2.0.14/sdl2-config.cmake.in 2020-12-21 18:44:36.000000000 +0100 ++++ SDL2-2.0.14-new/sdl2-config.cmake.in 2021-01-16 23:53:40.721121792 +0100 @@ -6,7 +6,8 @@ set(SDL2_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@") @@ -18,7 +18,7 @@ diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in - INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/libSDL2.so" + IMPORTED_LOCATION "@libdir@/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}" INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") add_library(SDL2::SDL2-static STATIC IMPORTED) @@ -26,12 +26,11 @@ diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in - INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/libSDL2.a" + IMPORTED_LOCATION "@libdir@/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") -Només a SDL2-2.0.12-new/: sdl2-config.cmake.in.orig -diff -ru3 SDL2-2.0.12/sdl2-config.in SDL2-2.0.12-new/sdl2-config.in ---- SDL2-2.0.12/sdl2-config.in 2020-03-11 02:36:18.000000000 +0100 -+++ SDL2-2.0.12-new/sdl2-config.in 2020-11-11 11:56:26.432955479 +0100 +diff -ru3 SDL2-2.0.14/sdl2-config.in SDL2-2.0.14-new/sdl2-config.in +--- SDL2-2.0.14/sdl2-config.in 2020-12-21 18:44:36.000000000 +0100 ++++ SDL2-2.0.14-new/sdl2-config.in 2021-01-16 23:57:11.940353171 +0100 @@ -42,7 +42,11 @@ echo @SDL_VERSION@ ;; diff --git a/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix b/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix index 7f5e38f39b8d..291e9790e442 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }: +{ stdenv, lib, fetchurl +, SDL, libogg, libvorbis, smpeg, libmikmod +, fluidsynth +, enableNativeMidi ? false +}: stdenv.mkDerivation rec { pname = "SDL_mixer"; @@ -9,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; - buildInputs = [ SDL libogg libvorbis fluidsynth smpeg ]; + buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ]; - configureFlags = [ "--disable-music-ogg-shared" ] + configureFlags = [ "--disable-music-ogg-shared" "--disable-music-mod-shared" ] ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl" ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix index fb6cc7279671..1aca24ac8ea5 100644 --- a/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.4"; + version = "0.1.5"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "1bcvmxcnl1ig38fxqkx8ydidhxq6a0kn2k9waf0lygh4ap928sgk"; + sha256 = "1b5gj0r2z5fhh7k8b9s2kx4rjv8gi5y8ijgrbcvsa06n3acap3lm"; }; buildInputs = [ standard-library ]; diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix index 79bb783cc9ff..21883acd1958 100644 --- a/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub }: +{ lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { version = "compat-2.6.1"; diff --git a/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 7ec892bfe023..15603f293b4f 100644 --- a/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -1,7 +1,7 @@ -{ fetchFromGitHub, lib, stdenv, mkDerivation, standard-library }: +{ fetchFromGitHub, lib, mkDerivation, standard-library }: mkDerivation rec { - version = "0.1"; + version = "0.2"; pname = "functional-linear-algebra"; buildInputs = [ standard-library ]; @@ -10,9 +10,13 @@ mkDerivation rec { repo = "functional-linear-algebra"; owner = "ryanorendorff"; rev = "v${version}"; - sha256 = "09ri3jmgp9jjwi1mzv4c3w6rvcmyx6spa2qxpwlcn0f4bmfva6wm"; + sha256 = "1dz7kh92df23scl1pkhn70n1f2v3d0x84liphn9kpsd6wlsxccxc"; }; + preConfigure = '' + sh generate-everything.sh + ''; + meta = with lib; { homepage = "https://github.com/ryanorendorff/functional-linear-algebra"; description = '' diff --git a/nixpkgs/pkgs/development/libraries/agda/generic/default.nix b/nixpkgs/pkgs/development/libraries/agda/generic/default.nix index 08a1d8e12e03..ab2031214260 100644 --- a/nixpkgs/pkgs/development/libraries/agda/generic/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/generic/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "generic"; - version = "0.1.0.1"; + version = "0.1.0.2"; src = fetchFromGitHub { - repo = "Generic"; owner = "effectfully"; + repo = "Generic"; rev = "v${version}"; - sha256 = "07l44yzx1jly20kmkmkjk8q493bn6x7i3xxpz6mhadkqlxyhmc8s"; + sha256 = "05igsd2gaj6h9bkqwp8llhvn4qvc5gmi03x4fnz096ba8m6x8s3n"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 2ebb3f66ed08..1383cff9e55a 100644 --- a/nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub }: +{ lib, mkDerivation, fetchFromGitHub }: mkDerivation (rec { version = "1.5.0"; diff --git a/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix b/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix index 1d8dc03bbde9..4bd5de8bd48d 100644 --- a/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix @@ -1,19 +1,22 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }: +{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages }: mkDerivation rec { pname = "standard-library"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "1asjbisb7pfkgzqy7gf9b23z63bba8l8p1wqfd6ff5ddgqwj3dhp"; + sha256 = "16fcb7ssj6kj687a042afaa2gq48rc8abihpm14k684ncihb2k4w"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; preConfigure = '' runhaskell GenerateEverything.hs + # We will only build/consider Everything.agda, in particular we don't want Everything*.agda + # do be copied to the store. + rm EverythingSafe.agda EverythingSafeGuardedness.agda EverythingSafeSizedTypes.agda ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index fb48ef73905b..208c74981dcb 100644 --- a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q4.6"; + version = "2021.Q1.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "wminJxfku8Myag+SI7iLSvS+VzHlUd4c86BbpF/cr1w="; + sha256 = "x9VzPALIlgE3eIKY4/qbFg5w+zd2W/jbqFXgJfpvLP4="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/appstream/default.nix b/nixpkgs/pkgs/development/libraries/appstream/default.nix index 1e3c2bcd2eb5..6fa4a6e0a4ab 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext +{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection , pcre, itstool, gperf, vala, lmdb, libsoup @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "appstream"; - version = "0.13.1"; + version = "0.14.0"; outputs = [ "out" "dev" ]; @@ -14,9 +14,17 @@ stdenv.mkDerivation rec { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "16nxaw4fx78maldi3kvr8fiwzhmy5276wd4x2fxny16zzf01098j"; + sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q="; }; + patches = [ + # Fix hardcoded paths + (substituteAll { + src = ./fix-paths.patch; + libstemmer_includedir = "${lib.getDev libstemmer}/include"; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 @@ -25,14 +33,6 @@ stdenv.mkDerivation rec { buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ]; - prePatch = '' - substituteInPlace meson.build \ - --replace /usr/include ${libstemmer}/include - - substituteInPlace data/meson.build \ - --replace /etc $out/etc - ''; - mesonFlags = [ "-Dapidocs=false" "-Ddocs=false" diff --git a/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch b/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch new file mode 100644 index 000000000000..0da72a78cbcf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch @@ -0,0 +1,29 @@ +diff --git a/data/meson.build b/data/meson.build +index 1eb3dfb0..623b66ec 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -26,4 +26,4 @@ i18n.merge_file ( + ) + + install_data ('appstream.conf', +- install_dir: get_option('sysconfdir')) ++ install_dir: get_option('prefix') / 'etc') +diff --git a/meson.build b/meson.build +index dc1fb1a5..5ee03b73 100644 +--- a/meson.build ++++ b/meson.build +@@ -108,12 +108,12 @@ if get_option ('gir') + dependency('gobject-introspection-1.0', version: '>=1.56') + endif + +-stemmer_inc_dirs = include_directories(['/usr/include']) ++stemmer_inc_dirs = include_directories(['@libstemmer_includedir@']) + if get_option('stemming') + stemmer_lib = cc.find_library('stemmer', required: true) + if not cc.has_header('libstemmer.h') + if cc.has_header('libstemmer/libstemmer.h') +- stemmer_inc_dirs = include_directories('/usr/include/libstemmer') ++ stemmer_inc_dirs = include_directories('@libstemmer_includedir@/libstemmer') + else + error('Unable to find Snowball header "libstemmer.h". Please ensure libstemmer/Snowball is installed properly in order to continue.') + endif diff --git a/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/nixpkgs/pkgs/development/libraries/appstream/qt.nix index c9fc96b32512..0bcb4741ff12 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/qt.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/qt.nix @@ -1,10 +1,10 @@ -{ stdenv, mkDerivation, appstream, qtbase, qttools }: +{ mkDerivation, appstream, qtbase, qttools }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here mkDerivation { pname = "appstream-qt"; - inherit (appstream) version src prePatch; + inherit (appstream) version src patches; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 6696e5720e32..fe67cf04e602 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.2.0"; + version = "10.2.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-gvhNUmyNpyJAqwXLErPz8eZ00gzLOOAI5L9TNVsapoo="; + sha256 = "sha256-fY500kh2mvI/yJTYu4jwXjIxeTPL5NqPPFa+j4mp/MQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index a9e738f7e9a1..8a9074ccb904 100644 --- a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames , autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4 -, perl, python3, rapidjson, snappy, thrift, utf8proc, which, zlib, zstd +, perl, python3, rapidjson, re2, snappy, thrift, utf8proc, which, zlib, zstd , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -8,25 +8,25 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "860376d4e586a3ac34ec93089889da624ead6c2a"; - sha256 = "16k3lz4ji4y3qcjhr765q14jwwlac8iqscwndwd8ll3zr0vy69b0"; + rev = "d6c4deb22c4b4e9e3247a2f291046e3c671ad235"; + sha256 = "0cwhnqijam632zp07j98i8ym967wz6kd35fim1msv88x2rhqky1i"; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "d914f9d289488c7db1759d7a88a4a1b8f062c7dd"; - sha256 = "0xj3ynck2wv6l70xnmvs13bz1jycqjrl5k4lwhhwgag338048als"; + rev = "e31fe1a02c9e9f271e4bfb8002d403c52f1ef8eb"; + sha256 = "02f51dvx8w5mw0bx3hn70hkn55mn1m65kzdps1ifvga9hghpy0sh"; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1ghzqw0rx4rxa2d7i76y3szisv0bd9cl7vzadbc41cvvhk6440xy"; + sha256 = "0yp2b02wrc3s50zd56fmpz4nhhbihp0zw329v4zizaipwlxwrhkk"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -67,6 +67,7 @@ in stdenv.mkDerivation rec { gtest lz4 rapidjson + re2 snappy thrift utf8proc @@ -115,6 +116,15 @@ in stdenv.mkDerivation rec { if doInstallCheck then "${arrow-testing}/data" else null; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; + GTEST_FILTER = + if doInstallCheck then let + # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11398 + filteredTests = lib.optionals stdenv.hostPlatform.isAarch64 [ + "TestFilterKernelWithNumeric/3.CompareArrayAndFilterRandomNumeric" + "TestFilterKernelWithNumeric/7.CompareArrayAndFilterRandomNumeric" + "TestCompareKernel.PrimitiveRandomTests" + ]; + in "-${builtins.concatStringsSep ":" filteredTests}" else null; installCheckInputs = [ perl which ]; installCheckPhase = let diff --git a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix index 820ea1e49b9e..03048abcc321 100644 --- a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pulseaudio, rtmidi }: +{ stdenv +, lib +, config +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux +, libpulseaudio +, jackSupport ? true +, jack +, coreaudioSupport ? stdenv.hostPlatform.isDarwin +, CoreAudio +}: stdenv.mkDerivation rec { version = "5.1.0"; @@ -11,22 +26,40 @@ stdenv.mkDerivation rec { sha256 = "1pglnjz907ajlhnlnig3p0sx7hdkpggr8ss7b3wzf1lykzgv9l52"; }; - patches = [ ./rtaudio-pkgconfig.patch ]; + patches = [ + # Fixes missing headers & install location + # Drop with version > 5.1.0 + (fetchpatch { + name = "RtAudio-Adjust-CMake-public-header-installs-to-match-autotools.patch"; + url = "https://github.com/thestk/rtaudio/commit/4273cf7572b8f51b5996cf6b42e3699cc6b165da.patch"; + sha256 = "1p0idll0xsfk3jwjg83jkxkaf20gk0wqa7l982ni389rn6i4n26p"; + }) + ]; - enableParallelBuilding = true; + postPatch = '' + substituteInPlace rtaudio.pc.in \ + --replace 'Requires:' 'Requires.private:' + ''; - buildInputs = [ autoconf automake libtool libjack2 alsaLib pulseaudio rtmidi ]; + nativeBuildInputs = [ cmake pkg-config ]; - preConfigure = '' - ./autogen.sh --no-configure - ./configure - ''; + buildInputs = lib.optional alsaSupport alsaLib + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional jackSupport jack + ++ lib.optional coreaudioSupport CoreAudio; + + cmakeFlags = [ + "-DRTAUDIO_API_ALSA=${if alsaSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_PULSE=${if pulseaudioSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_JACK=${if jackSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_CORE=${if coreaudioSupport then "ON" else "OFF"}" + ]; meta = with lib; { description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; - homepage = "http://www.music.mcgill.ca/~gary/rtaudio/"; + homepage = "https://www.music.mcgill.ca/~gary/rtaudio/"; license = licenses.mit; - maintainers = [ maintainers.magnetophon ]; + maintainers = with maintainers; [ magnetophon ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch deleted file mode 100644 index 8536332d46d7..000000000000 --- a/nixpkgs/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/rtaudio.pc.in -+++ b/rtaudio.pc.in -@@ -9 +9 @@ Version: @PACKAGE_VERSION@ --Requires: @req@ -+Requires.private: @req@ diff --git a/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix index f6208bab6c60..540e152655f6 100644 --- a/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, jackSupport ? true +, jack +, coremidiSupport ? stdenv.hostPlatform.isDarwin +, CoreMIDI +, CoreAudio +, CoreServices +}: stdenv.mkDerivation rec { version = "4.0.0"; @@ -11,21 +25,45 @@ stdenv.mkDerivation rec { sha256 = "1g31p6a96djlbk9jh5r4pjly3x76lhccva9hrw6xzdma8dsjzgyq"; }; - enableParallelBuilding = true; + patches = [ + # PR #230, fix CMake problems + (fetchpatch { + name = "RtMidi-Fix-JACK_HAS_PORT_RENAME-define.patch"; + url = "https://github.com/thestk/rtmidi/pull/230/commits/768a30a61b60240b66cc2d43bc27a544ff9f1622.patch"; + sha256 = "1sym4f7nb2qyyxfhi1l0xsm2hfh6gddn81y36qvfq4mcs33vvid0"; + }) + (fetchpatch { + name = "RtMidi-Add-prefix-define-for-pkgconfig.patch"; + url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch"; + sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w"; + }) + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake libtool libjack2 alsaLib ]; - - preConfigure = '' - ./autogen.sh --no-configure - ./configure + postPatch = '' + substituteInPlace rtmidi.pc.in \ + --replace 'Requires:' 'Requires.private:' + substituteInPlace CMakeLists.txt \ + --replace 'PUBLIC_HEADER RtMidi.h' 'PUBLIC_HEADER "RtMidi.h;rtmidi_c.h"' \ + --replace 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}' 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}/rtmidi' ''; - meta = { + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = lib.optional alsaSupport alsaLib + ++ lib.optional jackSupport jack + ++ lib.optionals coremidiSupport [ CoreMIDI CoreAudio CoreServices ]; + + cmakeFlags = [ + "-DRTMIDI_API_ALSA=${if alsaSupport then "ON" else "OFF"}" + "-DRTMIDI_API_JACK=${if jackSupport then "ON" else "OFF"}" + "-DRTMIDI_API_CORE=${if coremidiSupport then "ON" else "OFF"}" + ]; + + meta = with lib; { description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output"; - homepage = "http://www.music.mcgill.ca/~gary/rtmidi/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = with lib.platforms; linux ++ darwin; + homepage = "https://www.music.mcgill.ca/~gary/rtmidi/"; + license = licenses.mit; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix b/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix index bf50401a213e..75b26695e2f2 100644 --- a/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb"; + sha256 = "sha256-fXu7GI2UR9QiBGP2n2pEFRjz9ZwA+BAK9zxhNnoYWt4="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix index 60417426f76c..03b89411168a 100644 --- a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix +++ b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "1mcw6gmacrzx4cyg4223dpwcmj3qf8l30mxsg43292lajzwsm2hz"; + sha256 = "sha256-nJ4F2faK0XZPj9GzUk3Ueap5h6rALFXISHqFQ30RuoU="; }; nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.59.nix b/nixpkgs/pkgs/development/libraries/boost/1.59.nix index fb65e49c500c..0f6e9a35b6e0 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.59.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.59.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.59.0"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.60.nix b/nixpkgs/pkgs/development/libraries/boost/1.60.nix index 646f4652f77d..4bc7a1cc7327 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.60.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.60.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.60.0"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.65.nix b/nixpkgs/pkgs/development/libraries/boost/1.65.nix index 922c09ba7fe9..764f38d5b747 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.65.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.65.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.65.1"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.66.nix b/nixpkgs/pkgs/development/libraries/boost/1.66.nix index 0a99717a7997..af61aa51944c 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.66.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.66.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.66.0"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.68.nix b/nixpkgs/pkgs/development/libraries/boost/1.68.nix index 4d98172c6d05..920dd9a300b1 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.68.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.68.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.68.0"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.69.nix b/nixpkgs/pkgs/development/libraries/boost/1.69.nix index 95c4aa854a46..7292356ecd1c 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.69.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.69.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.69.0"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.70.nix b/nixpkgs/pkgs/development/libraries/boost/1.70.nix index 45a8bdb93185..3b898cfc0ae5 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.70.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.70.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.70.0"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.71.nix b/nixpkgs/pkgs/development/libraries/boost/1.71.nix index 7b128e25bb60..bec741dd88a2 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.71.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.71.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.71.0"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.72.nix b/nixpkgs/pkgs/development/libraries/boost/1.72.nix index 680afe8bcb87..97dad9b6c8a8 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.72.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.72.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.72.0"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.73.nix b/nixpkgs/pkgs/development/libraries/boost/1.73.nix index 99a5486f197e..289bea197c35 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.73.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.73.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.73.0"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.74.nix b/nixpkgs/pkgs/development/libraries/boost/1.74.nix index 35b4013dcb36..a181ed94c266 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.74.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.74.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.74.0"; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.75.nix b/nixpkgs/pkgs/development/libraries/boost/1.75.nix index 9912032c7774..ff1073bd0268 100644 --- a/nixpkgs/pkgs/development/libraries/boost/1.75.nix +++ b/nixpkgs/pkgs/development/libraries/boost/1.75.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.75.0"; diff --git a/nixpkgs/pkgs/development/libraries/cfitsio/default.nix b/nixpkgs/pkgs/development/libraries/cfitsio/default.nix index 28bb0761777c..a430bc317930 100644 --- a/nixpkgs/pkgs/development/libraries/cfitsio/default.nix +++ b/nixpkgs/pkgs/development/libraries/cfitsio/default.nix @@ -1,21 +1,18 @@ -{ fetchurl, lib, stdenv - -# Optional dependencies -, bzip2 ? null }: +{ fetchurl, lib, stdenv, bzip2 }: stdenv.mkDerivation rec { pname = "cfitsio"; - version = "3.47"; + version = "3.49"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "1vzlxnrjckz78p2wf148v2z3krkwnykfqvlj42sz3q711vqid1a1"; + sha256 = "1cyl1qksnkl3cq1fzl4dmjvkd6329b57y9iqyv44wjakbh6s4rav"; }; buildInputs = [ bzip2 ]; patches = [ ./darwin-rpath-universal.patch ]; - configureFlags = lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}"; + configureFlags = "--with-bzip2=${bzip2.out}"; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix index eb55178db0df..9c89279cd51f 100644 --- a/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.4"; + version = "2.9.6"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "1sb0z5ryh34y80ghlr2agsl64gayjmxpl96l9fjaylf5k2m3fg2b"; + sha256 = "sha256-RdOfog5FOw5XESyDFX68Lb2MUyCeUuPaq/0UVNTjNKo="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/cjson/default.nix b/nixpkgs/pkgs/development/libraries/cjson/default.nix new file mode 100644 index 000000000000..b75b91508cbe --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cjson/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "cjson"; + version = "1.7.14"; + + src = fetchFromGitHub { + owner = "DaveGamble"; + repo = "cJSON"; + rev = "v${version}"; + sha256 = "1a3i9ydl65dgwgmlg79n5q8qilmjkaakq56sam1w25zcrd8jy11q"; + }; + + nativeBuildInputs = [ cmake ]; + + # cJSON actually uses C99 standard, not C89 + # https://github.com/DaveGamble/cJSON/issues/275 + postPatch = '' + substituteInPlace CMakeLists.txt --replace -std=c89 -std=c99 + ''; + + meta = with lib; { + homepage = "https://github.com/DaveGamble/cJSON"; + description = "Ultralightweight JSON parser in ANSI C"; + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/codec2/default.nix b/nixpkgs/pkgs/development/libraries/codec2/default.nix index 09ec21cc63e8..88b35f16c308 100644 --- a/nixpkgs/pkgs/development/libraries/codec2/default.nix +++ b/nixpkgs/pkgs/development/libraries/codec2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; homepage = "http://www.rowetel.com/blog/?page_id=452"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.unix; maintainers = with maintainers; [ markuskowa ]; }; diff --git a/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix b/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix new file mode 100644 index 000000000000..f0f0718ab10c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix @@ -0,0 +1,29 @@ +{ fetchFromGitHub +, lib +, stdenv +, boost +, zlib +, cmake +, maeparser +}: + +stdenv.mkDerivation rec { + pname = "coordgenlibs"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "schrodinger"; + repo = pname; + rev = "v${version}"; + sha256 = "18s3y9v6x246hapxy0cy4srnll4qqzqfx003j551l5f27b2ng8fn"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost zlib maeparser ]; + + meta = with lib; { + description = "Schrodinger-developed 2D Coordinate Generation"; + maintainers = [ maintainers.rmcgibbo ]; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index cec6feded139..d232e4e2208a 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.10.0"; + version = "5.10.1"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZqpgnxI6Py+Xrf+MK852j+kE2JGFz15kWAXOqy+bjVc="; + sha256 = "sha256-8upRrk2x2gaS+JwCmZblrRSRxy0uNfFLTW7ua2ix2wI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/nixpkgs/pkgs/development/libraries/crypto++/default.nix index 041e7d49d500..0402af92b3b3 100644 --- a/nixpkgs/pkgs/development/libraries/crypto++/default.nix +++ b/nixpkgs/pkgs/development/libraries/crypto++/default.nix @@ -1,47 +1,53 @@ -{ lib, stdenv, fetchFromGitHub, nasm, which }: +{ lib, stdenv, fetchFromGitHub, nasm, which +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !enableStatic +}: -with lib; stdenv.mkDerivation rec { pname = "crypto++"; - version = "8.2.0"; - underscoredVersion = strings.replaceStrings ["."] ["_"] version; + version = "8.4.0"; + underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; src = fetchFromGitHub { owner = "weidai11"; repo = "cryptopp"; rev = "CRYPTOPP_${underscoredVersion}"; - sha256 = "01zrrzjn14yhkb9fzzl57vmh7ig9a6n6fka45f8za0gf7jpcq3mj"; + sha256 = "1gwn8yh1mh41hkh6sgnhb9c3ygrdazd7645msl20i0zdvcp7f5w3"; }; + outputs = [ "out" "dev" ]; + postPatch = '' substituteInPlace GNUmakefile \ --replace "AR = libtool" "AR = ar" \ --replace "ARFLAGS = -static -o" "ARFLAGS = -cru" ''; - nativeBuildInputs = optionals stdenv.hostPlatform.isx86 [ nasm which ]; - - preBuild = optionalString stdenv.hostPlatform.isx86 "${stdenv.shell} rdrand-nasm.sh"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - buildFlags = [ "shared" "libcryptopp.pc" ]; + buildFlags = + lib.optional enableStatic "static" + ++ lib.optional enableShared "shared" + ++ [ "libcryptopp.pc" ]; enableParallelBuilding = true; doCheck = true; - preInstall = "rm libcryptopp.a"; # built for checks but we don't install static lib into the nix store + # built for checks but we don't install static lib into the nix store + preInstall = lib.optionalString (!enableStatic) "rm libcryptopp.a"; + installTargets = [ "install-lib" ]; installFlags = [ "LDCONF=true" ]; - postInstall = optionalString (!stdenv.hostPlatform.isDarwin) '' - ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.majorMinor version} - ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.major version} + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.majorMinor version} + ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.major version} ''; meta = { description = "Crypto++, a free C++ class library of cryptographic schemes"; homepage = "https://cryptopp.com/"; changelog = "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt"; - license = with licenses; [ boost publicDomain ]; - platforms = platforms.all; - maintainers = with maintainers; [ c0bw3b ]; + license = with lib.licenses; [ boost publicDomain ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ c0bw3b ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/cxxopts/default.nix b/nixpkgs/pkgs/development/libraries/cxxopts/default.nix new file mode 100644 index 000000000000..ddbc845e3b49 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cxxopts/default.nix @@ -0,0 +1,27 @@ +{ cmake, fetchFromGitHub, icu, lib, pkg-config, stdenv, enableUnicodeHelp ? true }: + +stdenv.mkDerivation rec { + name = "cxxopts"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "jarro2783"; + repo = name; + rev = "v${version}"; + sha256 = "0d3y747lsh1wkalc39nxd088rbypxigm991lk3j91zpn56whrpha"; + }; + + buildInputs = lib.optional enableUnicodeHelp [ icu.dev ]; + cmakeFlags = lib.optional enableUnicodeHelp [ "-DCXXOPTS_USE_UNICODE_HELP=TRUE" ]; + nativeBuildInputs = [ cmake ] ++ lib.optional enableUnicodeHelp [ pkg-config ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/jarro2783/cxxopts"; + description = "Lightweight C++ GNU-style option parser library"; + license = licenses.mit; + maintainers = [ maintainers.spease ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/cxxtest/default.nix b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix index 1a828cc451dc..3469cda3fc70 100644 --- a/nixpkgs/pkgs/development/libraries/cxxtest/default.nix +++ b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonApplication, fetchFromGitHub }: buildPythonApplication rec { pname = "cxxtest"; diff --git a/nixpkgs/pkgs/development/libraries/dbus/default.nix b/nixpkgs/pkgs/development/libraries/dbus/default.nix index 1f1eff189598..fd7df4d5ba37 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -17,12 +17,6 @@ , xmlto }: -assert - x11Support -> - libX11 != null && libICE != null && libSM != null; - -assert enableSystemd -> systemd != null; - stdenv.mkDerivation rec { pname = "dbus"; version = "1.12.20"; diff --git a/nixpkgs/pkgs/development/libraries/doctest/default.nix b/nixpkgs/pkgs/development/libraries/doctest/default.nix index 702015e5d38f..233e01e03803 100644 --- a/nixpkgs/pkgs/development/libraries/doctest/default.nix +++ b/nixpkgs/pkgs/development/libraries/doctest/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/onqtam/doctest"; description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; }; diff --git a/nixpkgs/pkgs/development/libraries/embree/default.nix b/nixpkgs/pkgs/development/libraries/embree/default.nix index 5dee84d10070..b5baab5972aa 100644 --- a/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.12.1"; + version = "3.12.2"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "0aznd16n7h8g3f6jcahzfp1dq4r7wayqvn03wsaskiq2dvsi4srd"; + sha256 = "sha256-aIZAkpAGvE332HxT4rR+rykww/ZLq2qKGLKiZTWyHCk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index 184d5dcc0517..93815308f9c0 100644 --- a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.13"; + version = "2.2.15"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "084aqsrkzz2c1ls47p759d9bsi26d0m6wq9901k37483g46zkfga"; + sha256 = "sha256-Ow8iFVeBFfKOKmqlSbNRKGADlDBL151vKLDTs9b0bAM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/farbfeld/default.nix b/nixpkgs/pkgs/development/libraries/farbfeld/default.nix index 9473d09ffc55..07957674bb31 100644 --- a/nixpkgs/pkgs/development/libraries/farbfeld/default.nix +++ b/nixpkgs/pkgs/development/libraries/farbfeld/default.nix @@ -1,27 +1,27 @@ -{ lib, stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: +{ lib, stdenv, fetchurl, makeWrapper, file, libpng, libjpeg }: stdenv.mkDerivation rec { pname = "farbfeld"; version = "4"; - src = fetchgit { - url = "https://git.suckless.org/farbfeld"; - rev = "refs/tags/${version}"; - sha256 = "0pkmkvv5ggpzqwqdchd19442x8gh152xy5z1z13ipfznhspsf870"; + src = fetchurl { + url = "https://dl.suckless.org/farbfeld/farbfeld-${version}.tar.gz"; + sha256 = "0ap7rcngffhdd57jw9j22arzkbrhwh0zpxhwbdfwl8fixlhmkpy7"; }; buildInputs = [ libpng libjpeg ]; nativeBuildInputs = [ makeWrapper ]; - installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; + installFlags = [ "PREFIX=$(out)" ]; postInstall = '' wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" ''; meta = with lib; { description = "Suckless image format with conversion tools"; + homepage = "https://tools.suckless.org/farbfeld/"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/fastjson/default.nix b/nixpkgs/pkgs/development/libraries/fastjson/default.nix index c56e05e07532..9c7f4893cbe4 100644 --- a/nixpkgs/pkgs/development/libraries/fastjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/fastjson/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { - version = "0.99.8"; + version = "0.99.9"; pname = "fastjson"; src = fetchFromGitHub { repo = "libfastjson"; owner = "rsyslog"; rev = "v${version}"; - sha256 = "0qhs0g9slj3p0v2z4s3cnsx44msrlb4k78ljg7714qiziqbrbwyl"; + sha256 = "sha256-2LyBdJR0dV1CElcGfrlmNwX52lVtx9X/Z4h/1XFjOIs="; }; buildInputs = [ autoconf automake libtool ]; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix index 629fdba5673a..be341d588c1d 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchpatch +{ callPackage, fetchpatch # Darwin frameworks , Cocoa, CoreMedia , ... diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 7e3941d3f378..2cc409fc0370 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchpatch +{ callPackage, fetchpatch # Darwin frameworks , Cocoa, CoreMedia, VideoToolbox , ... diff --git a/nixpkgs/pkgs/development/libraries/fftw/default.nix b/nixpkgs/pkgs/development/libraries/fftw/default.nix index f0632e1460a0..9385903b3f59 100644 --- a/nixpkgs/pkgs/development/libraries/fftw/default.nix +++ b/nixpkgs/pkgs/development/libraries/fftw/default.nix @@ -6,7 +6,7 @@ assert stdenv.cc.isClang -> llvmPackages != null; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; let - version = "3.3.8"; + version = "3.3.9"; withDoc = stdenv.cc.isGNU; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { "http://fftw.org/fftw-${version}.tar.gz" "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz" ]; - sha256 = "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1"; + sha256 = "sha256-vyx85AsEroEa9xTetRJRDMLBe5q51t3PSf5Eh+6nrz0="; }; outputs = [ "out" "dev" "man" ] diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 1480f42750dd..36c946e06f7b 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -1,12 +1,8 @@ { lib, stdenv , fetchurl -, fetchpatch -, autoconf -, automake -, libtool +, autoreconfHook , docbook_xml_dtd_412 -, docbook_xml_dtd_42 -, docbook_xml_dtd_43 +, docbook_xml_dtd_45 , docbook-xsl-nons , which , libxml2 @@ -49,7 +45,7 @@ , xorg , valgrind , glib-networking -, wrapGAppsHook +, wrapGAppsNoGuiHook , dconf , gsettings-desktop-schemas , librsvg @@ -57,14 +53,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.8.2"; + version = "1.10.1"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "eSZiXffCKCpe4aizwxevU9QKZjsbxrGKLch0fiZQhbA="; + sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1"; }; patches = [ @@ -104,24 +100,15 @@ stdenv.mkDerivation rec { # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. ./validate-icon-pixbuf.patch - - # Fix `flatpak/test-oci-registry@{user,system}.wrap.test` installed tests. - # https://github.com/flatpak/flatpak/pull/3762 - (fetchpatch { - url = "https://github.com/flatpak/flatpak/commit/c1447dadecd50f384b6d11dac18b014245267d00.patch"; - sha256 = "UAA/wGr8/aMbx5MV+8Ilro2kgKkx2QOn88lDUjCgeDA="; - }) ]; nativeBuildInputs = [ - autoconf - automake - libtool + autoreconfHook libxml2 - # TODO: replace with docbook_xml_dtd_45 https://github.com/flatpak/flatpak/pull/3760 + # Remove 4.1.2 again once the following is merged + # https://github.com/flatpak/flatpak/pull/4102 docbook_xml_dtd_412 - docbook_xml_dtd_42 - docbook_xml_dtd_43 + docbook_xml_dtd_45 docbook-xsl-nons which gobject-introspection @@ -132,7 +119,7 @@ stdenv.mkDerivation rec { xmlto appstream-glib yacc - wrapGAppsHook + wrapGAppsNoGuiHook ]; buildInputs = [ @@ -147,7 +134,7 @@ stdenv.mkDerivation rec { libseccomp libsoup lzma - # zstd # TODO: broken paths in .pc file + zstd polkit python3 systemd @@ -199,16 +186,6 @@ stdenv.mkDerivation rec { PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler ''; - preConfigure = '' - # TODO: remove the condition once autogen.sh is shipped in the tarball - # https://github.com/flatpak/flatpak/pull/3761 - if [[ -f autogen.sh ]]; then - NOCONFIGURE=1 ./autogen.sh - else - autoreconf --install --force --verbose - fi - ''; - passthru = { tests = { installedTests = nixosTests.installed-tests.flatpak; @@ -218,7 +195,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux application sandboxing and distribution framework"; homepage = "https://flatpak.org/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index 51666cb8828e..063678cbccc1 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2021.01.18.01"; + version = "2021.01.25.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-Q70zD+8maRQp+f1fqPyhJEpjVYt3eORD85fIk7Za9lw="; + sha256 = "sha256-n2cpXdjPZYNjvSHBZFFn3JFwqYCFWc8qSKwet80LtJE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/freeimage/default.nix b/nixpkgs/pkgs/development/libraries/freeimage/default.nix index c31f858850c9..5714131416d6 100644 --- a/nixpkgs/pkgs/development/libraries/freeimage/default.nix +++ b/nixpkgs/pkgs/development/libraries/freeimage/default.nix @@ -1,48 +1,40 @@ -{ lib, stdenv, fetchurl, unzip, darwin }: - -# TODO: consider unvendoring various dependencies (libpng, libjpeg, -# libwebp, zlib, ...) +{ lib, stdenv, fetchsvn, darwin, libtiff +, libpng, zlib, libwebp, libraw, openexr, openjpeg +, libjpeg, jxrlib, pkg-config }: stdenv.mkDerivation { - name = "freeimage-3.18.0"; + pname = "freeimage"; + version = "unstable-2020-07-04"; - src = fetchurl { - url = "mirror://sourceforge/freeimage/FreeImage3180.zip"; - sha256 = "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl"; + src = fetchsvn { + url = "svn://svn.code.sf.net/p/freeimage/svn/"; + rev = "1859"; + sha256 = "1d94935aqbkb994nqkw7m8xcynyz9rm6k7k59igrbjak8b63qpi6"; }; + sourceRoot = "svn-r1859/FreeImage/trunk"; - patches = lib.optional stdenv.isDarwin ./dylib.patch; - - buildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin darwin.cctools; - - prePatch = if stdenv.isDarwin then '' - sed -e 's/$(shell xcrun -find clang)/clang/g' \ - -e 's/$(shell xcrun -find clang++)/clang++/g' \ - -e "s|PREFIX = /usr/local|PREFIX = $out|" \ - -e 's|-Wl,-syslibroot $(MACOSX_SYSROOT)||g' \ - -e 's|-isysroot $(MACOSX_SYSROOT)||g' \ - -e 's| install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)||' \ - -e 's| -m 644 -o root -g wheel||g' \ - -i ./Makefile.osx - # Fix LibJXR performance timers - sed 's|^SRCS = \(.*\)$|SRCS = \1 Source/LibJXR/image/sys/perfTimerANSI.c|' -i ./Makefile.srcs - '' else '' - sed -e s@/usr/@$out/@ \ - -e 's@-o root -g root@@' \ - -e 's@ldconfig@echo not running ldconfig@' \ - -i Makefile.gnu Makefile.fip - ''; + # Ensure that the bundled libraries are not used at all + prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib"; + patches = [ ./unbundle.diff ]; + + nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin darwin.cctools; + buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; postBuild = lib.optionalString (!stdenv.isDarwin) '' make -f Makefile.fip ''; + INCDIR = "${placeholder "out"}/include"; + INSTALLDIR = "${placeholder "out"}/lib"; + preInstall = '' - mkdir -p $out/include $out/lib + mkdir -p $INCDIR $INSTALLDIR ''; postInstall = lib.optionalString (!stdenv.isDarwin) '' make -f Makefile.fip install + '' + lib.optionalString stdenv.isDarwin '' + ln -s $out/lib/libfreeimage.3.dylib $out/lib/libfreeimage.dylib ''; enableParallelBuilding = true; @@ -51,9 +43,7 @@ stdenv.mkDerivation { description = "Open Source library for accessing popular graphics image file formats"; homepage = "http://freeimage.sourceforge.net/"; license = "GPL"; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [viric l-as]; platforms = with lib.platforms; unix; - # see https://github.com/NixOS/nixpkgs/issues/77653 - broken = stdenv.isAarch64; }; } diff --git a/nixpkgs/pkgs/development/libraries/freeimage/dylib.patch b/nixpkgs/pkgs/development/libraries/freeimage/dylib.patch deleted file mode 100644 index 0d8188aca707..000000000000 --- a/nixpkgs/pkgs/development/libraries/freeimage/dylib.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/Makefile.osx -+++ b/Makefile.osx -@@ -60,1 +60,1 @@ --FreeImage: $(STATICLIB) -+FreeImage: $(STATICLIB) $(SHAREDLIB) -@@ -87,7 +87,7 @@ --$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -- $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) -+#$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -+# $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) - - $(SHAREDLIB)-i386: $(MODULES_I386) - $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386) - --$(SHAREDLIB)-x86_64: $(MODULES_X86_64) -+$(SHAREDLIB): $(MODULES_X86_64) diff --git a/nixpkgs/pkgs/development/libraries/freeimage/unbundle.diff b/nixpkgs/pkgs/development/libraries/freeimage/unbundle.diff new file mode 100644 index 000000000000..22dac720155a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/freeimage/unbundle.diff @@ -0,0 +1,584 @@ +diff --git a/Makefile.fip b/Makefile.fip +index 660a026..86b3040 100644 +--- a/Makefile.fip ++++ b/Makefile.fip +@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib + # Converts cr/lf to just lf + DOS2UNIX = dos2unix + +-LIBRARIES = -lstdc++ ++LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) + + MODULES = $(SRCS:.c=.o) + MODULES := $(MODULES:.cpp=.o) + ++INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) ++ + # C flags + CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden +-# OpenJPEG +-CFLAGS += -DOPJ_STATIC +-# LibRaw +-CFLAGS += -DNO_LCMS +-# LibJXR +-CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ + CFLAGS += $(INCLUDE) + + # C++ flags + CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy +-# LibJXR +-CXXFLAGS += -D__ANSI__ + CXXFLAGS += $(INCLUDE) + +-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) +- CFLAGS += -fPIC +- CXXFLAGS += -fPIC +-endif +- + TARGET = freeimageplus + STATICLIB = lib$(TARGET).a + SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so +@@ -76,10 +65,10 @@ $(SHAREDLIB): $(MODULES) + + install: + install -d $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) ++ install -m 644 $(HEADER) $(INCDIR) ++ install -m 644 $(HEADERFIP) $(INCDIR) ++ install -m 644 $(STATICLIB) $(INSTALLDIR) ++ install -m 755 $(SHAREDLIB) $(INSTALLDIR) + ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) + ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) + +diff --git a/Makefile.gnu b/Makefile.gnu +index a4f2601..be95476 100644 +--- a/Makefile.gnu ++++ b/Makefile.gnu +@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib + # Converts cr/lf to just lf + DOS2UNIX = dos2unix + +-LIBRARIES = -lstdc++ ++LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) + + MODULES = $(SRCS:.c=.o) + MODULES := $(MODULES:.cpp=.o) + ++INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) ++ + # C flags + CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden +-# OpenJPEG +-CFLAGS += -DOPJ_STATIC +-# LibRaw +-CFLAGS += -DNO_LCMS +-# LibJXR +-CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ + CFLAGS += $(INCLUDE) + + # C++ flags + CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy +-# LibJXR +-CXXFLAGS += -D__ANSI__ + CXXFLAGS += $(INCLUDE) + +-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) +- CFLAGS += -fPIC +- CXXFLAGS += -fPIC +-endif +- + TARGET = freeimage + STATICLIB = lib$(TARGET).a + SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so +@@ -75,12 +64,11 @@ $(SHAREDLIB): $(MODULES) + + install: + install -d $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) ++ install -m 644 $(HEADER) $(INCDIR) ++ install -m 644 $(STATICLIB) $(INSTALLDIR) ++ install -m 755 $(SHAREDLIB) $(INSTALLDIR) + ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) + ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) +-# ldconfig + + clean: + rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) +diff --git a/Makefile.osx b/Makefile.osx +index c39121d..3800e39 100644 +--- a/Makefile.osx ++++ b/Makefile.osx +@@ -10,24 +10,25 @@ MACOSX_SYSROOT = $(shell xcrun --show-sdk-path) + MACOSX_DEPLOYMENT_TARGET = 10.11 + + # General configuration variables: +-CC_I386 = $(shell xcrun -find clang) +-CC_X86_64 = $(shell xcrun -find clang) +-CPP_I386 = $(shell xcrun -find clang++) +-CPP_X86_64 = $(shell xcrun -find clang++) ++CC_I386 = clang ++CC_X86_64 = clang ++CPP_I386 = clang++ ++CPP_X86_64 = clang++ + MACOSX_DEPLOY = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) + COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ + COMPILERFLAGS_I386 = -arch i386 + COMPILERFLAGS_X86_64 = -arch x86_64 + COMPILERPPFLAGS = -Wno-ctor-dtor-privacy -D__ANSI__ -std=c++11 -stdlib=libc++ -Wc++11-narrowing +-INCLUDE += +-INCLUDE_I386 = -isysroot $(MACOSX_SYSROOT) +-INCLUDE_X86_64 = -isysroot $(MACOSX_SYSROOT) ++INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) ++INCLUDE_I386 = ++INCLUDE_X86_64 = + CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386) $(MACOSX_DEPLOY) + CFLAGS_X86_64 = $(COMPILERFLAGS) $(COMPILERFLAGS_X86_64) $(INCLUDE) $(INCLUDE_X86_64) $(MACOSX_DEPLOY) + CPPFLAGS_I386 = $(COMPILERPPFLAGS) $(CFLAGS_I386) + CPPFLAGS_X86_64 = $(COMPILERPPFLAGS) $(CFLAGS_X86_64) +-LIBRARIES_I386 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT) +-LIBRARIES_X86_64 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT) ++LIBS = $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) ++LIBRARIES_I386 = $(LIBS) $(MACOSX_DEPLOY) ++LIBRARIES_X86_64 = $(LIBS) $(MACOSX_DEPLOY) + LIBTOOL = libtool + LIPO = lipo + +@@ -57,7 +58,7 @@ dist: FreeImage + cp *.a Dist + cp Source/FreeImage.h Dist + +-FreeImage: $(STATICLIB) ++FreeImage: $(STATICLIB) $(SHAREDLIB) + + $(STATICLIB): $(STATICLIB)-x86_64 + cp -p $(STATICLIB)-x86_64 $(STATICLIB) +@@ -84,13 +85,10 @@ $(STATICLIB)-i386: $(MODULES_I386) + $(STATICLIB)-x86_64: $(MODULES_X86_64) + $(LIBTOOL) -arch_only x86_64 -o $@ $(MODULES_X86_64) + +-$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 +- $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) +- + $(SHAREDLIB)-i386: $(MODULES_I386) + $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386) + +-$(SHAREDLIB)-x86_64: $(MODULES_X86_64) ++$(SHAREDLIB): $(MODULES_X86_64) + $(CPP_X86_64) -arch x86_64 -dynamiclib $(LIBRARIES_X86_64) -o $@ $(MODULES_X86_64) + + .c.o-i386: +@@ -106,9 +104,8 @@ $(SHAREDLIB)-x86_64: $(MODULES_X86_64) + $(CPP_X86_64) $(CPPFLAGS_X86_64) -c $< -o $@ + + install: +- install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g wheel $(HEADER) $(INCDIR) +- install -m 644 -o root -g wheel $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) ++ install $(HEADER) $(INCDIR) ++ install $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) + ranlib -sf $(INSTALLDIR)/$(STATICLIB) + ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME) + +diff --git a/Makefile.srcs b/Makefile.srcs +index 0b8d3a0..b706fd0 100644 +--- a/Makefile.srcs ++++ b/Makefile.srcs +@@ -1,6 +1,6 @@ + VER_MAJOR = 3 + VER_MINOR = 19.0 +-SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzma.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/internal/dcraw_common.cpp Source/LibRawLite/internal/dcraw_fileio.cpp Source/LibRawLite/internal/demosaic_packs.cpp Source/LibRawLite/src/libraw_c_api.cpp Source/LibRawLite/src/libraw_cxx.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c +-INCLS = ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Examples/Generic/FIIO_Mem.h ./Source/MapIntrospector.h ./Source/CacheFile.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/transupp.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jerror.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jpegint.h ./Source/Plugin.h ./Source/Metadata/FreeImageTag.h ./Source/Metadata/FIRational.h ./Source/ToneMapping.h ./Source/LibTIFF4/tiffconf.vc.h ./Source/LibTIFF4/tif_config.h ./Source/LibTIFF4/tif_fax3.h ./Source/LibTIFF4/tif_config.vc.h ./Source/LibTIFF4/tiffvers.h ./Source/LibTIFF4/tiffio.h ./Source/LibTIFF4/tif_config.wince.h ./Source/LibTIFF4/tiffconf.wince.h ./Source/LibTIFF4/tiff.h ./Source/LibTIFF4/uvcode.h ./Source/LibTIFF4/tif_dir.h ./Source/LibTIFF4/t4.h ./Source/LibTIFF4/tif_predict.h ./Source/LibTIFF4/tiffiop.h ./Source/LibTIFF4/tiffconf.h ./Source/LibWebP/src/dec/alphai_dec.h ./Source/LibWebP/src/dec/common_dec.h ./Source/LibWebP/src/dec/vp8i_dec.h ./Source/LibWebP/src/dec/webpi_dec.h ./Source/LibWebP/src/dec/vp8li_dec.h ./Source/LibWebP/src/dec/vp8_dec.h ./Source/LibWebP/src/enc/cost_enc.h ./Source/LibWebP/src/enc/histogram_enc.h ./Source/LibWebP/src/enc/vp8li_enc.h ./Source/LibWebP/src/enc/backward_references_enc.h ./Source/LibWebP/src/enc/vp8i_enc.h ./Source/LibWebP/src/utils/bit_reader_utils.h ./Source/LibWebP/src/utils/endian_inl_utils.h ./Source/LibWebP/src/utils/huffman_encode_utils.h ./Source/LibWebP/src/utils/bit_writer_utils.h ./Source/LibWebP/src/utils/random_utils.h ./Source/LibWebP/src/utils/bit_reader_inl_utils.h ./Source/LibWebP/src/utils/quant_levels_dec_utils.h ./Source/LibWebP/src/utils/color_cache_utils.h ./Source/LibWebP/src/utils/thread_utils.h ./Source/LibWebP/src/utils/filters_utils.h ./Source/LibWebP/src/utils/rescaler_utils.h ./Source/LibWebP/src/utils/huffman_utils.h ./Source/LibWebP/src/utils/quant_levels_utils.h ./Source/LibWebP/src/utils/utils.h ./Source/LibWebP/src/mux/muxi.h ./Source/LibWebP/src/mux/animi.h ./Source/LibWebP/src/webp/mux.h ./Source/LibWebP/src/webp/types.h ./Source/LibWebP/src/webp/format_constants.h ./Source/LibWebP/src/webp/demux.h ./Source/LibWebP/src/webp/encode.h ./Source/LibWebP/src/webp/decode.h ./Source/LibWebP/src/webp/mux_types.h ./Source/LibWebP/src/dsp/msa_macro.h ./Source/LibWebP/src/dsp/yuv.h ./Source/LibWebP/src/dsp/common_sse41.h ./Source/LibWebP/src/dsp/neon.h ./Source/LibWebP/src/dsp/common_sse2.h ./Source/LibWebP/src/dsp/quant.h ./Source/LibWebP/src/dsp/lossless_common.h ./Source/LibWebP/src/dsp/mips_macro.h ./Source/LibWebP/src/dsp/dsp.h ./Source/LibWebP/src/dsp/lossless.h ./Source/FreeImageIO.h ./Source/FreeImage.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage/J2KHelper.h ./Source/ZLib/trees.h ./Source/ZLib/inffixed.h ./Source/ZLib/inflate.h ./Source/ZLib/zlib.h ./Source/ZLib/zconf.h ./Source/ZLib/inftrees.h ./Source/ZLib/zutil.h ./Source/ZLib/inffast.h ./Source/ZLib/crc32.h ./Source/ZLib/gzguts.h ./Source/ZLib/deflate.h ./Source/Quantizers.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/cidx_manager.h ./Source/LibOpenJPEG/function_list.h ./Source/LibOpenJPEG/indexbox_manager.h ./Source/LibOpenJPEG/opj_config.h ./Source/LibOpenJPEG/opj_clock.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/opj_codec.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/dwt.h ./Source/LibOpenJPEG/tgt.h ./Source/LibOpenJPEG/invert.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/opj_stdint.h ./Source/LibOpenJPEG/opj_config_private.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/opj_intmath.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/opj_inttypes.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/tcd.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/internal/dmp_include.h ./Source/LibRawLite/internal/libraw_const.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/x3f_tools.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/dcraw_fileio_defs.h ./Source/LibRawLite/internal/dcraw_defs.h ./Source/LibRawLite/internal/libraw_cxx_defs.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibPNG/png.h ./Source/LibPNG/pngdebug.h ./Source/LibPNG/pnginfo.h ./Source/LibPNG/pnglibconf.h ./Source/LibPNG/pngstruct.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngconf.h ./Source/LibJXR/common/include/wmspecstrings_strict.h ./Source/LibJXR/common/include/wmspecstring.h ./Source/LibJXR/common/include/guiddef.h ./Source/LibJXR/common/include/wmsal.h ./Source/LibJXR/common/include/wmspecstrings_undef.h ./Source/LibJXR/common/include/wmspecstrings_adt.h ./Source/LibJXR/jxrgluelib/JXRGlue.h ./Source/LibJXR/jxrgluelib/JXRMeta.h ./Source/LibJXR/image/sys/xplatform_image.h ./Source/LibJXR/image/sys/strTransform.h ./Source/LibJXR/image/sys/windowsmediaphoto.h ./Source/LibJXR/image/sys/strcodec.h ./Source/LibJXR/image/sys/ansi.h ./Source/LibJXR/image/sys/perfTimer.h ./Source/LibJXR/image/sys/common.h ./Source/LibJXR/image/decode/decode.h ./Source/LibJXR/image/x86/x86.h ./Source/LibJXR/image/encode/encode.h ./Source/Utilities.h ./Source/FreeImageToolkit/Resize.h ./Source/FreeImageToolkit/Filters.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/OpenEXR/IexMath/IexMathFloatExc.h ./Source/OpenEXR/IexMath/IexMathFpu.h ./Source/OpenEXR/IexMath/IexMathIeeeExc.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadForward.h ./Source/OpenEXR/IlmThread/IlmThreadExport.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmThread/IlmThreadNamespace.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexForward.h ./Source/OpenEXR/Iex/IexExport.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/Iex/IexNamespace.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathNamespace.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathExport.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathForward.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathFrustumTest.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressor.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfGenericOutputFile.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfOptimizedPixelReading.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfFastHuf.h ./Source/OpenEXR/IlmImf/dwaLookups.h ./Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h ./Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfInputPartData.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressorSimd.h ./Source/OpenEXR/IlmImf/ImfNamespace.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfInputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfPartType.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfInputPart.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfOutputPart.h ./Source/OpenEXR/IlmImf/ImfExport.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfMultiPartInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepCompositing.h ./Source/OpenEXR/IlmImf/ImfOutputPartData.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfDeepImageState.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfSystemSpecific.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfZip.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfForward.h ./Source/OpenEXR/IlmImf/ImfPartHelper.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfSimd.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfOutputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfRle.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfGenericInputFile.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/halfExport.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/toFloat.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImagePlus/dist/x64/FreeImagePlus.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h ./TestAPI/TestSuite.h ++SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp ++INCLS = ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Generic/FIIO_Mem.h ./Examples/Plugin/PluginCradle.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h ./TestAPI/TestSuite.h ./Source/FreeImage.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/Metadata/FreeImageTag.h ./Source/Metadata/FIRational.h ./Source/ToneMapping.h ./Source/FreeImageIO.h ./Source/Plugin.h ./Source/CacheFile.h ./Source/Utilities.h ./Source/MapIntrospector.h ./Source/Quantizers.h + +-INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib ++INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit +diff --git a/Source/FreeImage.h b/Source/FreeImage.h +index e8f1da6..235563e 100644 +--- a/Source/FreeImage.h ++++ b/Source/FreeImage.h +@@ -155,8 +155,8 @@ typedef uint8_t BYTE; + typedef uint16_t WORD; + typedef uint32_t DWORD; + typedef int32_t LONG; +-typedef int64_t INT64; +-typedef uint64_t UINT64; ++#define INT64 int64_t ++#define UINT64 uint64_t + #else + // MS is not C99 ISO compliant + typedef long BOOL; +diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp +index 1776c3b..538f1c5 100644 +--- a/Source/FreeImage/J2KHelper.cpp ++++ b/Source/FreeImage/J2KHelper.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include <openjpeg.h> + #include "J2KHelper.h" + + // -------------------------------------------------------------------------- +diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp +index b286430..9bf3ada 100644 +--- a/Source/FreeImage/PluginEXR.cpp ++++ b/Source/FreeImage/PluginEXR.cpp +@@ -28,16 +28,16 @@ + #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning) + #endif + +-#include "../OpenEXR/IlmImf/ImfIO.h" +-#include "../OpenEXR/Iex/Iex.h" +-#include "../OpenEXR/IlmImf/ImfOutputFile.h" +-#include "../OpenEXR/IlmImf/ImfInputFile.h" +-#include "../OpenEXR/IlmImf/ImfRgbaFile.h" +-#include "../OpenEXR/IlmImf/ImfChannelList.h" +-#include "../OpenEXR/IlmImf/ImfRgba.h" +-#include "../OpenEXR/IlmImf/ImfArray.h" +-#include "../OpenEXR/IlmImf/ImfPreviewImage.h" +-#include "../OpenEXR/Half/half.h" ++#include <OpenEXR/ImfIO.h> ++#include <OpenEXR/Iex.h> ++#include <OpenEXR/ImfOutputFile.h> ++#include <OpenEXR/ImfInputFile.h> ++#include <OpenEXR/ImfRgbaFile.h> ++#include <OpenEXR/ImfChannelList.h> ++#include <OpenEXR/ImfRgba.h> ++#include <OpenEXR/ImfArray.h> ++#include <OpenEXR/ImfPreviewImage.h> ++#include <OpenEXR/half.h> + + + // ========================================================== +diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp +index 0a083b4..e2f1241 100644 +--- a/Source/FreeImage/PluginG3.cpp ++++ b/Source/FreeImage/PluginG3.cpp +@@ -20,7 +20,7 @@ + // Use at your own risk! + // ========================================================== + +-#include "../LibTIFF4/tiffiop.h" ++#include <tiffiop.h> + + #include "FreeImage.h" + #include "Utilities.h" +diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp +index b8bcfc8..621a903 100644 +--- a/Source/FreeImage/PluginJ2K.cpp ++++ b/Source/FreeImage/PluginJ2K.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include <openjpeg.h> + #include "J2KHelper.h" + + // ========================================================== +diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp +index 742fe2c..c57f626 100644 +--- a/Source/FreeImage/PluginJP2.cpp ++++ b/Source/FreeImage/PluginJP2.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include <openjpeg.h> + #include "J2KHelper.h" + + // ========================================================== +diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp +index 8db177d..a7de637 100644 +--- a/Source/FreeImage/PluginJPEG.cpp ++++ b/Source/FreeImage/PluginJPEG.cpp +@@ -35,9 +35,9 @@ extern "C" { + #undef FAR + #include <setjmp.h> + +-#include "../LibJPEG/jinclude.h" +-#include "../LibJPEG/jpeglib.h" +-#include "../LibJPEG/jerror.h" ++#include <stdio.h> ++#include <jpeglib.h> ++#include <jerror.h> + } + + #include "FreeImage.h" +@@ -484,116 +484,6 @@ marker_is_icc(jpeg_saved_marker_ptr marker) { + return FALSE; + } + +-/** +- See if there was an ICC profile in the JPEG file being read; +- if so, reassemble and return the profile data. +- +- TRUE is returned if an ICC profile was found, FALSE if not. +- If TRUE is returned, *icc_data_ptr is set to point to the +- returned data, and *icc_data_len is set to its length. +- +- IMPORTANT: the data at **icc_data_ptr has been allocated with malloc() +- and must be freed by the caller with free() when the caller no longer +- needs it. (Alternatively, we could write this routine to use the +- IJG library's memory allocator, so that the data would be freed implicitly +- at jpeg_finish_decompress() time. But it seems likely that many apps +- will prefer to have the data stick around after decompression finishes.) +- +- NOTE: if the file contains invalid ICC APP2 markers, we just silently +- return FALSE. You might want to issue an error message instead. +-*/ +-static BOOL +-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { +- jpeg_saved_marker_ptr marker; +- int num_markers = 0; +- int seq_no; +- JOCTET *icc_data; +- unsigned total_length; +- +- const int MAX_SEQ_NO = 255; // sufficient since marker numbers are bytes +- BYTE marker_present[MAX_SEQ_NO+1]; // 1 if marker found +- unsigned data_length[MAX_SEQ_NO+1]; // size of profile data in marker +- unsigned data_offset[MAX_SEQ_NO+1]; // offset for data in marker +- +- *icc_data_ptr = NULL; // avoid confusion if FALSE return +- *icc_data_len = 0; +- +- /** +- this first pass over the saved markers discovers whether there are +- any ICC markers and verifies the consistency of the marker numbering. +- */ +- +- memset(marker_present, 0, (MAX_SEQ_NO + 1)); +- +- for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) { +- if (marker_is_icc(marker)) { +- if (num_markers == 0) { +- // number of markers +- num_markers = GETJOCTET(marker->data[13]); +- } +- else if (num_markers != GETJOCTET(marker->data[13])) { +- return FALSE; // inconsistent num_markers fields +- } +- // sequence number +- seq_no = GETJOCTET(marker->data[12]); +- if (seq_no <= 0 || seq_no > num_markers) { +- return FALSE; // bogus sequence number +- } +- if (marker_present[seq_no]) { +- return FALSE; // duplicate sequence numbers +- } +- marker_present[seq_no] = 1; +- data_length[seq_no] = marker->data_length - ICC_HEADER_SIZE; +- } +- } +- +- if (num_markers == 0) +- return FALSE; +- +- /** +- check for missing markers, count total space needed, +- compute offset of each marker's part of the data. +- */ +- +- total_length = 0; +- for(seq_no = 1; seq_no <= num_markers; seq_no++) { +- if (marker_present[seq_no] == 0) { +- return FALSE; // missing sequence number +- } +- data_offset[seq_no] = total_length; +- total_length += data_length[seq_no]; +- } +- +- if (total_length <= 0) +- return FALSE; // found only empty markers ? +- +- // allocate space for assembled data +- icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET)); +- if (icc_data == NULL) +- return FALSE; // out of memory +- +- // and fill it in +- for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) { +- if (marker_is_icc(marker)) { +- JOCTET FAR *src_ptr; +- JOCTET *dst_ptr; +- unsigned length; +- seq_no = GETJOCTET(marker->data[12]); +- dst_ptr = icc_data + data_offset[seq_no]; +- src_ptr = marker->data + ICC_HEADER_SIZE; +- length = data_length[seq_no]; +- while (length--) { +- *dst_ptr++ = *src_ptr++; +- } +- } +- } +- +- *icc_data_ptr = icc_data; +- *icc_data_len = total_length; +- +- return TRUE; +-} +- + /** + Read JPEG_APPD marker (IPTC or Adobe Photoshop profile) + */ +diff --git a/Source/FreeImage/PluginJXR.cpp b/Source/FreeImage/PluginJXR.cpp +index 85c6ff3..163a93b 100644 +--- a/Source/FreeImage/PluginJXR.cpp ++++ b/Source/FreeImage/PluginJXR.cpp +@@ -23,7 +23,7 @@ + #include "Utilities.h" + #include "../Metadata/FreeImageTag.h" + +-#include "../LibJXR/jxrgluelib/JXRGlue.h" ++#include <JXRGlue.h> + + // ========================================================== + // Plugin Interface +diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp +index 661f160..504fafe 100644 +--- a/Source/FreeImage/PluginPNG.cpp ++++ b/Source/FreeImage/PluginPNG.cpp +@@ -40,8 +40,8 @@ + + // ---------------------------------------------------------- + +-#include "../ZLib/zlib.h" +-#include "../LibPNG/png.h" ++#include <zlib.h> ++#include <png.h> + + // ---------------------------------------------------------- + +diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp +index ab0499f..2d3c9fd 100644 +--- a/Source/FreeImage/PluginRAW.cpp ++++ b/Source/FreeImage/PluginRAW.cpp +@@ -19,12 +19,16 @@ + // Use at your own risk! + // ========================================================== + +-#include "../LibRawLite/libraw/libraw.h" ++#include <libraw.h> + + #include "FreeImage.h" + #include "Utilities.h" + #include "../Metadata/FreeImageTag.h" + ++// What an ugly hack ++#undef INT64 ++#undef UINT64 ++ + // ========================================================== + // Plugin Interface + // ========================================================== +diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp +index a805319..3e318ba 100644 +--- a/Source/FreeImage/PluginTIFF.cpp ++++ b/Source/FreeImage/PluginTIFF.cpp +@@ -37,9 +37,9 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibTIFF4/tiffiop.h" ++#include <tiffiop.h> + #include "../Metadata/FreeImageTag.h" +-#include "../OpenEXR/Half/half.h" ++#include <OpenEXR/half.h> + + #include "FreeImageIO.h" + #include "PSDParser.h" +diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp +index 7c9f62f..c401447 100644 +--- a/Source/FreeImage/PluginWebP.cpp ++++ b/Source/FreeImage/PluginWebP.cpp +@@ -24,9 +24,9 @@ + + #include "../Metadata/FreeImageTag.h" + +-#include "../LibWebP/src/webp/decode.h" +-#include "../LibWebP/src/webp/encode.h" +-#include "../LibWebP/src/webp/mux.h" ++#include <webp/decode.h> ++#include <webp/encode.h> ++#include <webp/mux.h> + + // ========================================================== + // Plugin Interface +diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp +index 3ab6d32..0973475 100644 +--- a/Source/FreeImage/ZLibInterface.cpp ++++ b/Source/FreeImage/ZLibInterface.cpp +@@ -19,10 +19,9 @@ + // Use at your own risk! + // ========================================================== + +-#include "../ZLib/zlib.h" ++#include <zlib.h> + #include "FreeImage.h" + #include "Utilities.h" +-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */ + + /** + Compresses a source buffer into a target buffer, using the ZLib library. +@@ -115,7 +114,8 @@ FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_s + return 0; + case Z_OK: { + // patch header, setup crc and length (stolen from mod_trace_output) +- BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code ++ // OS_CODE is 0x03 on unix it seems, not sure how important this is ++ BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code + crc = crc32(crc, source, source_size); + memcpy(target + 4 + dest_len, &crc, 4); + memcpy(target + 8 + dest_len, &source_size, 4); +diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp +index 6f9ba8e..836bc90 100644 +--- a/Source/FreeImageToolkit/JPEGTransform.cpp ++++ b/Source/FreeImageToolkit/JPEGTransform.cpp +@@ -26,10 +26,10 @@ extern "C" { + #undef FAR + #include <setjmp.h> + +-#include "../LibJPEG/jinclude.h" +-#include "../LibJPEG/jpeglib.h" +-#include "../LibJPEG/jerror.h" +-#include "../LibJPEG/transupp.h" ++#include <stdio.h> ++#include <jpeglib.h> ++#include <jerror.h> ++#include <transupp.h> + } + + #include "FreeImage.h" +diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp +index d5be902..b6ecd11 100644 +--- a/Source/Metadata/XTIFF.cpp ++++ b/Source/Metadata/XTIFF.cpp +@@ -29,7 +29,7 @@ + #pragma warning (disable : 4786) // identifier was truncated to 'number' characters + #endif + +-#include "../LibTIFF4/tiffiop.h" ++#include <tiffiop.h> + + #include "FreeImage.h" + #include "Utilities.h" +diff --git a/fipMakefile.srcs b/fipMakefile.srcs +index 15ec099..72ba4fb 100644 +--- a/fipMakefile.srcs ++++ b/fipMakefile.srcs +@@ -1,4 +1,4 @@ + VER_MAJOR = 3 + VER_MINOR = 19.0 +-SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzma.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/internal/dcraw_common.cpp Source/LibRawLite/internal/dcraw_fileio.cpp Source/LibRawLite/internal/demosaic_packs.cpp Source/LibRawLite/src/libraw_c_api.cpp Source/LibRawLite/src/libraw_cxx.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp +-INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib -IWrapper/FreeImagePlus ++SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp ++INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -IWrapper/FreeImagePlus diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix index 8e6904a94b2f..0a9a4684e125 100644 --- a/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.42"; + version = "1.2.18"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "02phnk88zv4f8byx954784w8mh33knsslwvj266jfyrmxz6hxxxg"; + sha256 = "sha256-ENR+YJhs/FH4Fw+p6rpDEU7r3eC6bmscSBPYbwIaqt0="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix b/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix index f579da5f1d6c..ab62fdf3fa20 100644 --- a/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoLibs, buildPackages +{ lib, stdenvNoLibs, buildPackages , gcc, glibc , libiberty }: @@ -128,7 +128,7 @@ stdenvNoLibs.mkDerivation rec { "--disable-vtable-verify" "--with-system-zlib" - ] ++ stdenvNoLibs.lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") + ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") "--with-glibc-version=${glibc.version}"; configurePlatforms = [ "build" "host" ]; diff --git a/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix b/nixpkgs/pkgs/development/libraries/gdal/2.4.nix index 9cb9c448c1d2..5df29b38a263 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/2.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib , postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 @@ -9,22 +9,13 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "2.4.0"; + version = "2.4.4"; src = fetchurl { url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; - sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; + sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-17545.patch"; - url = "https://github.com/OSGeo/gdal/commit/8cd2d2eb6327cf782a74dae263ffa6f89f46c93d.patch"; - stripLen = 1; - sha256 = "06h88a659jcqf6ps1m91qy78s6s9krbkwnz28f5qh7032vlp6qpw"; - }) - ]; - buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] ++ (with pythonPackages; [ python numpy wrapPython ]) @@ -60,19 +51,6 @@ stdenv.mkDerivation rec { #ifdef swap\ #undef swap\ #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h - # poppler 0.73.0 support - patch -lp2 <${ - fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; - sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734"; - } - } || true - patch -p2 <${ - fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; - sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj"; - } - } ''; # - Unset CC and CXX as they confuse libtool. diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index a568078f9911..4efc713bb1d7 100644 --- a/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -1,6 +1,5 @@ { autoreconfHook , fetchFromGitHub -, fetchpatch , lib , nix-update-script , pkg-config @@ -9,23 +8,15 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.1"; + version = "2.2.4"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "083khzvyvcgi9j99hbaswglivm9s6dly6spjvisvyacavaybgwgb"; + sha256 = "sha256-tdMdIudB8zZWXF+Q0YhFo9Q4VHjLJh3rdfQsYhgo2DU="; }; - patches = [ - # Fix compilation without openipmi, can be dropped for the next release. - (fetchpatch { - url = "https://github.com/cminyard/gensio/commit/12f6203e6f7aa42172177d7b0870777b605af8d9.patch"; - sha256 = "19dr4iacccc4il3asdxkag6cj2yc4bxd8p451syfxdm6289rwxic"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/nixpkgs/pkgs/development/libraries/gjs/default.nix b/nixpkgs/pkgs/development/libraries/gjs/default.nix index a6b37c5efcc2..52b53a15b410 100644 --- a/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -29,11 +29,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.66.1"; + version = "1.66.2"; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld"; + sha256 = "vX9fixcSd8wLue4XVLAkC2Lwana4sYyWjPRxs0qzTlk="; }; outputs = [ "out" "dev" "installedTests" ]; diff --git a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index 8698b71567e2..e2e0ba3bccf4 100644 --- a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ] ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - - preConfigure = lib.optional (!stdenv.isDarwin) '' - substituteInPlace src/glx_context.c --replace "libGL.so.1" "${lib.getLib libGL}/lib/libGL.so.1" - ''; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ] ++ lib.optional (!stdenv.isDarwin) [ + "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" + ]; meta = with lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; diff --git a/nixpkgs/pkgs/development/libraries/glibc/2.32-25.patch.gz b/nixpkgs/pkgs/development/libraries/glibc/2.32-35.patch.gz index d26ba012df60..f77e490ebf54 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/2.32-25.patch.gz +++ b/nixpkgs/pkgs/development/libraries/glibc/2.32-35.patch.gz Binary files differdiff --git a/nixpkgs/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix index 6637a9bb2a39..54882ba67185 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-25"; + patchSuffix = "-35"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -62,11 +62,11 @@ stdenv.mkDerivation ({ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git or something would complicate bootstrapping. Fortunately it's not too big. - $ git checkout release/2.32/master; git describe - glibc-2.32-25-g0d9793e82a - $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-25.patch.gz + $ git checkout origin/release/2.32/master; git describe + glibc-2.32-35-g082798622d + $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-35.patch.gz */ - ./2.32-25.patch.gz + ./2.32-35.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix index 5b24955af437..51b259a3ca81 100644 --- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan , file, which, ncurses , texinfo @@ -8,7 +8,6 @@ }: let - inherit (stdenv) lib; inherit (stdenv.hostPlatform) system; in diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index 92cf619ab5bd..d6a1b44fe426 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf -, gflags, abseil-cpp, libnsl +, gflags, libnsl }: stdenv.mkDerivation rec { - version = "1.34.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.35.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0p6si9i0gg885ag2x87a7jyzhgd5lhx2bh2vjj2ra1jn6y3vg6qk"; + sha256 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd"; fetchSubmodules = true; }; patches = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ] + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ] ++ lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" - "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; diff --git a/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix b/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix index 115547a72f73..70b2c4d1e229 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtk-engines-2.20.2"; src = fetchurl { - url = "ftp://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"; + url = "mirror://gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"; sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; diff --git a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 43b7ff5f127f..4304cb388d1a 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -96,5 +96,6 @@ stdenv.mkDerivation rec { proprietary software with GTK without any license fees or royalties. ''; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; } diff --git a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 0e5c6edc9640..5180df634604 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -216,5 +216,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; platforms = platforms.all; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; } diff --git a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix new file mode 100644 index 000000000000..59b0b080a52a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -0,0 +1,233 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, graphene +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gtk-doc +, meson +, ninja +, python3 +, makeWrapper +, shared-mime-info +, isocodes +, glib +, cairo +, pango +, pandoc +, gdk-pixbuf +, gobject-introspection +, fribidi +, xorg +, epoxy +, json-glib +, libxkbcommon +, libxml2 +, librest +, libsoup +, ffmpeg +, gmp +, gnome3 +, gsettings-desktop-schemas +, gst_all_1 +, sassc +, trackerSupport ? stdenv.isLinux +, tracker +, x11Support ? stdenv.isLinux +, waylandSupport ? stdenv.isLinux +, mesa +, vulkan-loader +, vulkan-headers +, wayland +, wayland-protocols +, xineramaSupport ? stdenv.isLinux +, cupsSupport ? stdenv.isLinux +, withGtkDoc ? stdenv.isLinux +, cups ? null +, AppKit +, Cocoa +, broadwaySupport ? true +}: + +assert cupsSupport -> cups != null; + +stdenv.mkDerivation rec { + pname = "gtk4"; + version = "4.0.2"; + + outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; + outputBin = "dev"; + + setupHooks = [ + ./hooks/gtk4-clean-immodules-cache.sh + ./hooks/drop-icon-theme-cache.sh + ]; + + src = fetchurl { + url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; + sha256 = "115w3mzwm1xsi1q85qvwfm2yxpsjs2rcajgddzbnwhjicyn0frv2"; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + makeWrapper + meson + ninja + pkg-config + python3 + sassc + ] ++ setupHooks ++ lib.optionals withGtkDoc [ + pandoc + docbook_xml_dtd_43 + docbook-xsl-nons + gtk-doc + # For xmllint + libxml2 + ]; + + buildInputs = [ + libxkbcommon + epoxy + json-glib + isocodes + vulkan-headers + librest + libsoup + ffmpeg + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + fribidi + ] ++ (with xorg; [ + libICE + libSM + libXcomposite + libXcursor + libXi + libXrandr + libXrender + ]) ++ lib.optionals stdenv.isDarwin [ + AppKit + ] ++ lib.optionals trackerSupport [ + tracker + ] ++ lib.optionals waylandSupport [ + mesa + wayland + wayland-protocols + ] ++ lib.optionals xineramaSupport [ + xorg.libXinerama + ] ++ lib.optionals cupsSupport [ + cups + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; + #TODO: colord? + + propagatedBuildInputs = [ + # Required by pkg-config files. + cairo + gdk-pixbuf + glib + graphene + pango + vulkan-loader # TODO: Possibly not used on Darwin + + # Required for GSettings schemas at runtime. + # Will be picked up by wrapGAppsHook. + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dgtk_doc=${lib.boolToString withGtkDoc}" + "-Dtests=false" + "-Dtracker3=${lib.boolToString trackerSupport}" + "-Dbroadway_backend=${lib.boolToString broadwaySupport}" + ]; + + doCheck = false; # needs X11 + + separateDebugInfo = stdenv.isLinux; + + # These are the defines that'd you'd get with --enable-debug=minimum (default). + # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options + NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; + + postPatch = '' + files=( + build-aux/meson/post-install.py + demos/gtk-demo/geninclude.py + gdk/broadway/gen-c-array.py + gdk/gen-gdk-gresources-xml.py + gtk/gen-gtk-gresources-xml.py + gtk/gentypefuncs.py + docs/reference/gtk/gtk-markdown-to-docbook + ) + + chmod +x ''${files[@]} + patchShebangs ''${files[@]} + ''; + + postBuild = lib.optionalString withGtkDoc '' + # Meson not building `custom_target`s passed to `custom_files` argument of `gnome.gtkdoc` function + # as part of the `install` target. We have to build the docs manually first. + # https://github.com/mesonbuild/meson/issues/2831 + ninja g{t,d,s}k4-doc + ''; + + preInstall = '' + OLD_PATH="$PATH" + PATH="$PATH:$dev/bin" # so the install script finds gtk4-update-icon-cache + ''; + + postInstall = '' + PATH="$OLD_PATH" + '' + lib.optionalString (!stdenv.isDarwin) '' + # The updater is needed for nixos env and it's tiny. + moveToOutput bin/gtk4-update-icon-cache "$out" + # Launcher + moveToOutput bin/gtk-launch "$out" + + # TODO: patch glib directly + for f in $dev/bin/gtk4-encode-symbolic-svg; do + wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + done + ''; + + # Wrap demos + postFixup = lib.optionalString (!stdenv.isDarwin) '' + demos=(gtk4-demo gtk4-demo-application gtk4-icon-browser gtk4-widget-factory) + + for program in ''${demos[@]}; do + wrapProgram $dev/bin/$program \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" + done + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtk"; + attrPath = "gtk4"; + }; + }; + + meta = with lib; { + description = "A multi-platform toolkit for creating graphical user interfaces"; + longDescription = '' + GTK is a highly usable, feature rich toolkit for creating + graphical user interfaces which boasts cross platform + compatibility and an easy to use API. GTK it is written in C, + but has bindings to many other popular programming languages + such as C++, Python and C# among others. GTK is licensed + under the GNU LGPL 2.1 allowing development of both free and + proprietary software with GTK without any license fees or + royalties. + ''; + homepage = "https://www.gtk.org/"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; + platforms = platforms.all; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh b/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh new file mode 100644 index 000000000000..49f7051aabb6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh @@ -0,0 +1,11 @@ +# shellcheck shell=bash + +fixupOutputHooks+=(_gtk4CleanComments) + +# Clean comments that link to generator of the file +_gtk4CleanComments() { + local f="${prefix:?}/lib/gtk-4.0/4.0.0/immodules.cache" + if [ -f "$f" ]; then + sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" + fi +} diff --git a/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/nixpkgs/pkgs/development/libraries/gvfs/default.nix index c30d678e02d5..2c9bac002fd3 100644 --- a/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.46.1"; + version = "1.46.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2"; + sha256 = "2D+hYChmcMA+uJAkBgbYr6fqajqBjorRfu7Y2XZIe9c="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/hspell/default.nix b/nixpkgs/pkgs/development/libraries/hspell/default.nix index 9cf98bbbdc5d..2a65afad809a 100644 --- a/nixpkgs/pkgs/development/libraries/hspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/hspell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, zlib }: +{ lib, stdenv, fetchurl, perl, zlib, buildPackages }: stdenv.mkDerivation rec { name = "${passthru.pname}-${passthru.version}"; @@ -16,7 +16,18 @@ stdenv.mkDerivation rec { }; patchPhase = "patchShebangs ."; - buildInputs = [ perl zlib ]; + preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + make CC=${buildPackages.stdenv.cc}/bin/cc find_sizes + mv find_sizes find_sizes_build + make clean + + substituteInPlace Makefile --replace "./find_sizes" "./find_sizes_build" + substituteInPlace Makefile --replace "ar cr" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar cr" + substituteInPlace Makefile --replace "ranlib" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + substituteInPlace Makefile --replace "STRIP=strip" "STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" + ''; + nativeBuildInputs = [ perl zlib ]; +# buildInputs = [ zlib ]; meta = with lib; { description = "Hebrew spell checker"; diff --git a/nixpkgs/pkgs/development/libraries/inchi/default.nix b/nixpkgs/pkgs/development/libraries/inchi/default.nix index 6acdf340c91a..256e0d702434 100644 --- a/nixpkgs/pkgs/development/libraries/inchi/default.nix +++ b/nixpkgs/pkgs/development/libraries/inchi/default.nix @@ -1,4 +1,11 @@ -{ pkgs, fetchurl, lib, stdenv, unzip }: +{ pkgs +, fetchurl +, lib +, stdenv +, unzip +, fixDarwinDylibNames +}: + stdenv.mkDerivation { pname = "inchi"; version = "1.05"; @@ -7,15 +14,23 @@ stdenv.mkDerivation { sha1 = "e3872a46d58cb321a98f4fd4b93a989fb6920b9c"; }; - nativeBuildInputs = [ pkgs.unzip ]; + nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; outputs = [ "out" "doc" ]; enableParallelBuilding = true; - preBuild = '' + preConfigure = '' cd ./INCHI_API/libinchi/gcc + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace makefile \ + --replace ",--version-script=libinchi.map" "" \ + --replace "LINUX_Z_RELRO = ,-z,relro" "" \ + --replace "-soname" "-install_name" \ + --replace "gcc" $CC ''; installPhase = '' + runHook preInstall + cd ../../.. mkdir -p $out/lib mkdir -p $out/include/inchi @@ -29,6 +44,10 @@ stdenv.mkDerivation { runHook postInstall ''; + preFixup = lib.optionalString stdenv.isDarwin '' + fixDarwinDylibNames $(find "$out" -name "*.so.*") + ''; + postInstall = let src-doc = fetchurl { @@ -45,7 +64,6 @@ stdenv.mkDerivation { homepage = "https://www.inchi-trust.org/"; description = "IUPAC International Chemical Identifier library"; license = licenses.lgpl2Plus; - platforms = platforms.all; maintainers = with maintainers; [ rmcgibbo ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/inih/default.nix b/nixpkgs/pkgs/development/libraries/inih/default.nix index 11e49f7ddc49..cc979732787b 100644 --- a/nixpkgs/pkgs/development/libraries/inih/default.nix +++ b/nixpkgs/pkgs/development/libraries/inih/default.nix @@ -2,23 +2,17 @@ stdenv.mkDerivation rec { pname = "inih"; - version = "r52"; + version = "r53"; src = fetchFromGitHub { owner = "benhoyt"; repo = pname; rev = version; - sha256 = "0lsvm34zabvi1xlximybzvgc58zb90mm3b9babwxlqs05jy871m4"; + sha256 = "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6"; }; nativeBuildInputs = [ meson ninja ]; - mesonFlags = [ - "-Ddefault_library=shared" - "-Ddistro_install=true" - "-Dwith_INIReader=true" - ]; - meta = with lib; { description = "Simple .INI file parser in C, good for embedded systems"; homepage = "https://github.com/benhoyt/inih"; diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 6e62484ac681..01c6ef002e50 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.1.0"; + version = "21.1.1"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "17cgs52f42jdvfb6q3wpkxaz2b41z59jdribpgb9qmcvizsnglxc"; + sha256 = "1cgmpy2wqhv8zljz73wm4rggpk9w1prpmab5qphfp7ljajfv7k8r"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/java/junit/default.nix b/nixpkgs/pkgs/development/libraries/java/junit/default.nix index 1695d11cb25f..5a1079851772 100644 --- a/nixpkgs/pkgs/development/libraries/java/junit/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/junit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, antBuild, fetchgit, perl }: +{ lib, antBuild, fetchgit, perl }: let version = "4.11"; diff --git a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 71b0d7b9a922..b7754a186d1e 100644 --- a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; }; + patches = [ + # Fix for https://github.com/open-source-parsers/jsoncpp/issues/1235. + (fetchpatch { + url = "https://github.com/open-source-parsers/jsoncpp/commit/ac2870298ed5b5a96a688d9df07461b31f83e906.patch"; + sha256 = "02wswhiwypmf1jn3rj9q1fw164kljiv4l8h0q6wyijzr77hq4wsg"; + }) + ]; + /* During darwin bootstrap, we have a cp that doesn't understand the * --reflink=auto flag, which is used in the default unpackPhase for dirs */ diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index 9706cda03f8b..e35f83859159 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DENABLE_TESTS=OFF" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: + "-DCONFIG_RUNTIME_CPU_DETECT=0" ]; postFixup = '' diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix index a8fb7e382659..f53d1b1a12f7 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -12,13 +12,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "0dj01ayyac3q5a62rqxyskr4fjiq6iappd85zn3rx64xny5fl07d"; + sha256 = "sha256-RFPhe4PCq8OLwa6c7ir+5u9jBsUxS5M/fcZYAG9W6R0="; }; outputs = [ "out" "lib" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libaudec/default.nix b/nixpkgs/pkgs/development/libraries/libaudec/default.nix new file mode 100644 index 000000000000..a243e56c2fe3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libaudec/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub +, libsndfile, libsamplerate +, meson, ninja, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "libaudec"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "zrythm"; + repo = "libaudec"; + rev = "v${version}"; + sha256 = "1570m2dfia17dbkhd2qhx8jjihrpm7g8nnyg6n4wif4vv229s7dz"; + }; + + buildInputs = [ libsndfile libsamplerate ]; + nativeBuildInputs = [ meson ninja pkg-config ]; + + meta = with lib; { + homepage = "https://www.zrythm.org"; + description = "A library for reading and resampling audio files"; + license = licenses.agpl3Plus; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libav/default.nix b/nixpkgs/pkgs/development/libraries/libav/default.nix index 51aa634e4084..ad95edb68cb2 100644 --- a/nixpkgs/pkgs/development/libraries/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/libav/default.nix @@ -43,6 +43,7 @@ let patches = [] ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch + ++ optional (vpxSupport && hasPrefix "12." version) ./vpx-12.3-libvpx-1.8.patch ; postPatch = '' @@ -126,6 +127,10 @@ let license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; platforms = with platforms; linux ++ darwin; + knownVulnerabilities = + lib.optional (lib.versionOlder version "12.1") "CVE-2017-9051" + ++ lib.optionals (lib.versionOlder version "12.3") [ "CVE-2018-5684" "CVE-2018-5766" ] + ++ lib.optionals (lib.versionOlder version "12.4") [ "CVE-2019-9717" "CVE-2019-9720" ]; }; }; # libavFun diff --git a/nixpkgs/pkgs/development/libraries/libav/vpx-12.3-libvpx-1.8.patch b/nixpkgs/pkgs/development/libraries/libav/vpx-12.3-libvpx-1.8.patch new file mode 100644 index 000000000000..8f8e5003284f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libav/vpx-12.3-libvpx-1.8.patch @@ -0,0 +1,46 @@ +--- libav/libavcodec/libvpx.c.orig 2018-02-12 21:25:59 UTC ++++ libav/libavcodec/libvpx.c +@@ -25,6 +25,7 @@ + enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt_t img) + { + switch (img) { ++#if VPX_IMAGE_ABI_VERSION < 5 + case VPX_IMG_FMT_RGB24: return AV_PIX_FMT_RGB24; + case VPX_IMG_FMT_RGB565: return AV_PIX_FMT_RGB565BE; + case VPX_IMG_FMT_RGB555: return AV_PIX_FMT_RGB555BE; +@@ -36,10 +37,13 @@ enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt + case VPX_IMG_FMT_ARGB_LE: return AV_PIX_FMT_BGRA; + case VPX_IMG_FMT_RGB565_LE: return AV_PIX_FMT_RGB565LE; + case VPX_IMG_FMT_RGB555_LE: return AV_PIX_FMT_RGB555LE; ++#endif + case VPX_IMG_FMT_I420: return AV_PIX_FMT_YUV420P; + case VPX_IMG_FMT_I422: return AV_PIX_FMT_YUV422P; + case VPX_IMG_FMT_I444: return AV_PIX_FMT_YUV444P; ++#if VPX_IMAGE_ABI_VERSION < 5 + case VPX_IMG_FMT_444A: return AV_PIX_FMT_YUVA444P; ++#endif + #if VPX_IMAGE_ABI_VERSION >= 3 + case VPX_IMG_FMT_I440: return AV_PIX_FMT_YUV440P; + case VPX_IMG_FMT_I42016: return AV_PIX_FMT_YUV420P16BE; +@@ -53,6 +57,7 @@ enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt + vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelFormat pix) + { + switch (pix) { ++#if VPX_IMAGE_ABI_VERSION < 5 + case AV_PIX_FMT_RGB24: return VPX_IMG_FMT_RGB24; + case AV_PIX_FMT_RGB565BE: return VPX_IMG_FMT_RGB565; + case AV_PIX_FMT_RGB555BE: return VPX_IMG_FMT_RGB555; +@@ -64,10 +69,13 @@ vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelForm + case AV_PIX_FMT_BGRA: return VPX_IMG_FMT_ARGB_LE; + case AV_PIX_FMT_RGB565LE: return VPX_IMG_FMT_RGB565_LE; + case AV_PIX_FMT_RGB555LE: return VPX_IMG_FMT_RGB555_LE; ++#endif + case AV_PIX_FMT_YUV420P: return VPX_IMG_FMT_I420; + case AV_PIX_FMT_YUV422P: return VPX_IMG_FMT_I422; + case AV_PIX_FMT_YUV444P: return VPX_IMG_FMT_I444; ++#if VPX_IMAGE_ABI_VERSION < 5 + case AV_PIX_FMT_YUVA444P: return VPX_IMG_FMT_444A; ++#endif + #if VPX_IMAGE_ABI_VERSION >= 3 + case AV_PIX_FMT_YUV440P: return VPX_IMG_FMT_I440; + case AV_PIX_FMT_YUV420P16BE: return VPX_IMG_FMT_I42016; diff --git a/nixpkgs/pkgs/development/libraries/libcanberra/default.nix b/nixpkgs/pkgs/development/libraries/libcanberra/default.nix index a2dfe1322f84..0127c1ebe8a1 100644 --- a/nixpkgs/pkgs/development/libraries/libcanberra/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcanberra/default.nix @@ -47,9 +47,8 @@ stdenv.mkDerivation rec { gtkModule = "/lib/gtk-2.0/"; }; - meta = { + meta = with lib; { description = "An implementation of the XDG Sound Theme and Name Specifications"; - longDescription = '' libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops @@ -57,12 +56,12 @@ stdenv.mkDerivation rec { PulseAudio, OSS, GStreamer, null) and is designed to be portable. ''; - homepage = "http://0pointer.de/lennart/projects/libcanberra/"; - - license = lib.licenses.lgpl2Plus; - + license = licenses.lgpl2Plus; maintainers = [ ]; - platforms = lib.platforms.unix; + platforms = platforms.unix; + # canberra-gtk-module.c:28:10: fatal error: 'gdk/gdkx.h' file not found + # #include <gdk/gdkx.h> + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix b/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix index df8db3ac9f89..0bf654ee963c 100644 --- a/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, collectd }: +{ lib, collectd }: with lib; collectd.overrideAttrs (oldAttrs: { diff --git a/nixpkgs/pkgs/development/libraries/libcommuni/default.nix b/nixpkgs/pkgs/development/libraries/libcommuni/default.nix index 47360e11bc5e..0b0cc325a356 100644 --- a/nixpkgs/pkgs/development/libraries/libcommuni/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcommuni/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libcommuni"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "communi"; repo = "libcommuni"; rev = "v${version}"; - sha256 = "15crqc7a4kwrfbxs121rpdysw0694hh7dr290gg7pm61akvnrqcm"; + sha256 = "sha256-ABvrMoOVSycbQ8iRDzi7zkFnuSgHMMBgm9cDUWlD4uc="; }; buildInputs = [ qtbase qtdeclarative ]; diff --git a/nixpkgs/pkgs/development/libraries/libcyaml/default.nix b/nixpkgs/pkgs/development/libraries/libcyaml/default.nix new file mode 100644 index 000000000000..b316b6b63956 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libcyaml/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub +, libyaml +}: + +stdenv.mkDerivation rec { + pname = "libcyaml"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "tlsa"; + repo = "libcyaml"; + rev = "v${version}"; + sha256 = "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93"; + }; + + buildInputs = [ libyaml ]; + + makeFlags = [ "VARIANT=release" "PREFIX=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/tlsa/libcyaml"; + description = "C library for reading and writing YAML"; + license = licenses.isc; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index 3b5daad854c2..e575624f8152 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -1,19 +1,20 @@ -{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libpthreadstubs, libpciaccess -, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils +, libpthreadstubs, libpciaccess +, withValgrind ? valgrind-light.meta.available, valgrind-light }: stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.103"; + version = "2.4.104"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "08h2nnf4w96b4ql7485mvjgbbsb8rwc0qa93fdm1cq34pbyszq1z"; + sha256 = "1jqvx9c23hgwhq109zqj6vg3ng40pcvh3r1k2fn1a424qasxhsnn"; }; outputs = [ "out" "dev" "bin" ]; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja docutils ]; buildInputs = [ libpthreadstubs libpciaccess ] ++ lib.optional withValgrind valgrind-light; @@ -34,12 +35,24 @@ stdenv.mkDerivation rec { "-Detnaviv=true" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"; - enableParallelBuilding = true; - - meta = { - homepage = "https://dri.freedesktop.org/libdrm/"; - description = "Library for accessing the kernel's Direct Rendering Manager"; - license = "bsd"; - platforms = lib.platforms.unix; + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/mesa/drm"; + downloadPage = "https://dri.freedesktop.org/libdrm/"; + description = "Direct Rendering Manager library and headers"; + longDescription = '' + A userspace library for accessing the DRM (Direct Rendering Manager) on + Linux, BSD and other operating systems that support the ioctl interface. + The library provides wrapper functions for the ioctls to avoid exposing + the kernel interface directly, and for chipsets with drm memory manager, + support for tracking relocations and buffers. + New functionality in the kernel DRM drivers typically requires a new + libdrm, but a new libdrm will always work with an older kernel. + + libdrm is a low-level library, typically used by graphics drivers such as + the Mesa drivers, the X drivers, libva and similar projects. + ''; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libebml/default.nix b/nixpkgs/pkgs/development/libraries/libebml/default.nix index 5a8f1f003165..e7a877962ccd 100644 --- a/nixpkgs/pkgs/development/libraries/libebml/default.nix +++ b/nixpkgs/pkgs/development/libraries/libebml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libebml"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "052v4mjynndj9xgfl4lmlsnx9ai0pah0kjyr5fm34l7gj8vhc5s7"; + sha256 = "04bn1i7g4vwmkv3hv26rmcb59zkl2rh37qnfjm52j560bjlyd7im"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libebur128/default.nix b/nixpkgs/pkgs/development/libraries/libebur128/default.nix index ba4f84f8c803..db6c9f93faec 100644 --- a/nixpkgs/pkgs/development/libraries/libebur128/default.nix +++ b/nixpkgs/pkgs/development/libraries/libebur128/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.2.5"; pname = "libebur128"; src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; rev = "v${version}"; - sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g"; + sha256 = "sha256-B6MOSbLfPvadXtXHSvxZCIpAH1Bnj6sItYRp+xH5HDA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libewf/default.nix b/nixpkgs/pkgs/development/libraries/libewf/default.nix index f38f09410ff1..01c10dab60a0 100644 --- a/nixpkgs/pkgs/development/libraries/libewf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libewf/default.nix @@ -1,12 +1,12 @@ { fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config }: stdenv.mkDerivation rec { - version = "20201210"; + version = "20201230"; pname = "libewf"; src = fetchurl { url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; - sha256 = "sha256-dI1We2bsBRDcyqd6HLC7eBE99dpzSkhHtNgt0ZE4aDc="; + sha256 = "sha256-10r4jPzsA30nHQzjdg/VkwTG1PwOskwv8Bra34ZPMgc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/nixpkgs/pkgs/development/libraries/libextractor/default.nix index 59916bfb33f7..d99cf6ef6214 100644 --- a/nixpkgs/pkgs/development/libraries/libextractor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libextractor/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis -, exiv2, libgsf, rpm, pkg-config, fetchpatch +, exiv2, libgsf, rpm, pkg-config , gstreamerSupport ? true, gst_all_1 ? null # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -20,28 +20,15 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg_3 != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.9"; + pname = "libextractor"; + version = "1.11"; src = fetchurl { - url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh"; + url = "mirror://gnu/libextractor/${pname}-${version}.tar.gz"; + sha256 = "sha256-FvYzq4dGo4VHxKHaP0WRGSsIJa2DxDNvBXW4WEPYvY8="; }; - patches = [ - ./fix-gcc8-build.patch - # Fixes build with exiv2 0.27 - (fetchpatch { - name = "libextractor-exiv2-0.27.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53"; - sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6"; - }) - (fetchpatch { - name = "CVE-2019-15531.patch"; - url = "https://git.gnunet.org/libextractor.git/patch/?id=d2b032452241708bee68d02aa02092cfbfba951a"; - sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw"; - excludes = [ "ChangeLog" ]; - }) - ] ++ lib.optionals gstreamerSupport [ + patches = lib.optionals gstreamerSupport [ # Libraries cannot be wrapped so we need to hardcode the plug-in paths. (substituteAll { @@ -76,12 +63,11 @@ stdenv.mkDerivation rec { # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. - # FIXME: Tests currently fail and the test framework appears to be deeply - # broken anyway. doCheck = false; - #postInstall = "make check"; + doInstallCheck = true; + installCheckPhase = "make check"; - meta = { + meta = with lib; { description = "Simple library for keyword extraction"; longDescription = @@ -105,9 +91,9 @@ stdenv.mkDerivation rec { additional MIME types are detected. ''; - license = lib.licenses.gpl2Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = lib.platforms.linux; + maintainers = [ maintainers.jorsn ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch b/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch deleted file mode 100644 index e04d09be8998..000000000000 --- a/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c -index 072ffc5..a105840 100644 ---- a/src/plugins/ole2_extractor.c -+++ b/src/plugins/ole2_extractor.c -@@ -345,9 +345,8 @@ process_star_office (GsfInput *src, - gsf_input_read (src, size, (unsigned char*) buf); - if ( (buf[0] != 0x0F) || - (buf[1] != 0x0) || -- (0 != strncmp (&buf[2], -- "SfxDocumentInfo", -- strlen ("SfxDocumentInfo"))) || -+ (0 != strcmp (&buf[2], -+ "SfxDocumentInfo")) || - (buf[0x11] != 0x0B) || - (buf[0x13] != 0x00) || /* pw protected! */ - (buf[0x12] != 0x00) ) diff --git a/nixpkgs/pkgs/development/libraries/libfm/default.nix b/nixpkgs/pkgs/development/libraries/libfm/default.nix index dc8359241257..255ddfa22ad7 100644 --- a/nixpkgs/pkgs/development/libraries/libfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfm/default.nix @@ -1,32 +1,40 @@ -{ lib, stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala +{ lib +, stdenv +, fetchurl +, glib +, intltool +, menu-cache +, pango +, pkg-config +, vala , extraOnly ? false -, withGtk3 ? false, gtk2, gtk3 }: +, withGtk3 ? false, gtk2, gtk3 +}: + let gtk = if withGtk3 then gtk3 else gtk2; inherit (lib) optional; in stdenv.mkDerivation rec { - name = if extraOnly - then "libfm-extra-${version}" - else "libfm-${version}"; - version = "1.3.1"; + pname = if extraOnly + then "libfm-extra" + else "libfm"; + version = "1.3.2"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn"; + sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU="; }; nativeBuildInputs = [ vala pkg-config intltool ]; - buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; + buildInputs = [ glib gtk pango ] + ++ optional (!extraOnly) menu-cache; - configureFlags = [ - "--sysconfdir=/etc" - ] ++ optional extraOnly "--with-extra-only" - ++ optional withGtk3 "--with-gtk=3"; + configureFlags = [ "--sysconfdir=/etc" ] + ++ optional extraOnly "--with-extra-only" + ++ optional withGtk3 "--with-gtk=3"; - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - ]; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm postInstall = optional (!extraOnly) '' diff --git a/nixpkgs/pkgs/development/libraries/libftdi/default.nix b/nixpkgs/pkgs/development/libraries/libftdi/default.nix index 88c848397de3..0326b9c4f64f 100644 --- a/nixpkgs/pkgs/development/libraries/libftdi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libftdi/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, libusb-compat-0_1}: +{lib, stdenv, fetchurl, libusb-compat-0_1}: -with stdenv; mkDerivation rec { +stdenv.mkDerivation rec { name = "libftdi-0.20"; src = fetchurl { @@ -14,7 +14,7 @@ with stdenv; mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - configureFlags = lib.optional (!isDarwin) "--with-async-mode"; + configureFlags = lib.optional (!stdenv.isDarwin) "--with-async-mode"; # allow async mode. from ubuntu. see: # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix index f90ea502c406..b6968ff2d4e5 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/1.5.nix @@ -38,5 +38,16 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.all; repositories.git = "git://git.gnupg.org/libgcrypt.git"; + knownVulnerabilities = [ + "CVE-2014-3591" + "CVE-2015-0837" + "CVE-2015-7511" + "CVE-2017-0379" + "CVE-2017-7526" + "CVE-2017-9526" + "CVE-2018-0495" + "CVE-2018-6829" + "CVE-2018-12437" + ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libgda/6.x.nix b/nixpkgs/pkgs/development/libraries/libgda/6.x.nix new file mode 100644 index 000000000000..fc24fe41c4d3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libgda/6.x.nix @@ -0,0 +1,92 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, meson +, ninja +, itstool +, libxml2 +, python3 +, gtk3 +, json-glib +, isocodes +, openssl +, gnome3 +, gobject-introspection +, vala +, libgee +, sqlite +, gtk-doc +, yelp-tools +, mysqlSupport ? false +, libmysqlclient ? null +, postgresSupport ? false +, postgresql ? null +}: + +assert mysqlSupport -> libmysqlclient != null; +assert postgresSupport -> postgresql != null; + +stdenv.mkDerivation rec { + pname = "libgda"; + version = "6.0.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr"; + }; + + nativeBuildInputs = [ + pkg-config + intltool + meson + ninja + itstool + libxml2 + python3 + gobject-introspection + vala + gtk-doc + yelp-tools + ]; + + buildInputs = [ + gtk3 + json-glib + isocodes + openssl + libgee + sqlite + ] ++ lib.optionals mysqlSupport [ + libmysqlclient + ] ++ lib.optionals postgresSupport [ + postgresql + ]; + + postPatch = '' + patchShebangs \ + providers/raw_spec.py \ + providers/mysql/gen_bin.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "libgda6"; + }; + }; + + meta = with lib; { + description = "Database access library"; + homepage = "https://www.gnome-db.org/"; + license = with licenses; [ + # library + lgpl2Plus + # CLI tools + gpl2Plus + ]; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libgda/default.nix b/nixpkgs/pkgs/development/libraries/libgda/default.nix index 73e71de4aac6..307cc14a6efe 100644 --- a/nixpkgs/pkgs/development/libraries/libgda/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgda/default.nix @@ -1,7 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee -, overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools -, mysqlSupport ? false, libmysqlclient ? null -, postgresSupport ? false, postgresql ? null +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, itstool +, libxml2 +, gtk3 +, openssl +, gnome3 +, gobject-introspection +, vala +, libgee +, overrideCC +, gcc6 +, fetchpatch +, autoreconfHook +, gtk-doc +, autoconf-archive +, yelp-tools +, mysqlSupport ? false +, libmysqlclient ? null +, postgresSupport ? false +, postgresql ? null }: assert mysqlSupport -> libmysqlclient != null; @@ -24,7 +44,30 @@ assert postgresSupport -> postgresql != null; }) ]; - configureFlags = with lib; [ + nativeBuildInputs = [ + pkg-config + intltool + itstool + libxml2 + gobject-introspection + vala + autoreconfHook + gtk-doc + autoconf-archive + yelp-tools + ]; + + buildInputs = [ + gtk3 + openssl + libgee + ] ++ lib.optionals mysqlSupport [ + libmysqlclient + ] ++ lib.optionals postgresSupport [ + postgresql + ]; + + configureFlags = [ "--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}" @@ -40,11 +83,6 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ]; - buildInputs = with lib; [ gtk3 openssl libgee ] - ++ optional (mysqlSupport) libmysqlclient - ++ optional (postgresSupport) postgresql; - passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -54,8 +92,13 @@ assert postgresSupport -> postgresql != null; meta = with lib; { description = "Database access library"; homepage = "https://www.gnome-db.org/"; - license = [ licenses.lgpl2 licenses.gpl2 ]; + license = with licenses; [ + # library + lgpl2Plus + # CLI tools + gpl2Plus + ]; maintainers = teams.gnome.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/nixpkgs/pkgs/development/libraries/libgdata/default.nix index 86e3f4274fcf..2cd7da0784ac 100644 --- a/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgdata"; - version = "0.17.13"; + version = "0.18.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga"; + sha256 = "8MIBEvpTcrYsASVvJorvUTGhYd/COGjzk+z3uLN1JYA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libgroove/default.nix b/nixpkgs/pkgs/development/libraries/libgroove/default.nix index 963bf722b2a3..f14524df0dc5 100644 --- a/nixpkgs/pkgs/development/libraries/libgroove/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgroove/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ffmpeg_3, SDL2, chromaprint, libebur128 }: stdenv.mkDerivation rec { version = "4.3.0"; @@ -11,10 +11,17 @@ stdenv.mkDerivation rec { sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd"; }; - patches = [ ./no-warnings-as-errors.patch ]; + patches = [ + ./no-warnings-as-errors.patch + (fetchpatch { + name = "update-for-ffmpeg-3.0.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-update-for-ffmpeg-3.0.patch?h=libgroove&id=a9f3bd2a5afd3227733414a5d54c7a2aa0a1249e"; + sha256 = "0800drk9df1kwbv80f2ffv77xk888249fk0d961rp2a305hvyrk0"; + }) + ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ libav SDL2 chromaprint libebur128 ]; + buildInputs = [ ffmpeg_3 SDL2 chromaprint libebur128 ]; meta = with lib; { description = "Streaming audio processing library"; diff --git a/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix b/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix index ed5f67d43709..061fe51ed5ba 100644 --- a/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix @@ -1,26 +1,16 @@ -{ stdenv, lib, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { pname = "libhugetlbfs"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "https://github.com/libhugetlbfs/libhugetlbfs/releases/download/${version}/libhugetlbfs-${version}.tar.gz"; - sha256 = "11b7k8xvgx68rjzidm12a6l6b23hwi7hj149y9xxfz2j5kmakp4l"; + sha256 = "0ya4q001g111d3pqlzrf3yaifadl0ccirx5dndz1pih7x3qp41mp"; }; outputs = [ "bin" "dev" "man" "doc" "lib" "out" ]; - patches = [ - # Don't check that 32-bit and 64-bit libraries don't get installed - # to the same place if only one platform is being built for. - # Can be removed if build succeeds without it. - (fetchpatch { - url = "https://groups.google.com/forum/message/raw?msg=libhugetlbfs/IswjDAygfwA/PKy7MZbVAAAJ"; - sha256 = "00fyrhn380d6swil8pcf4x0krl1113ghswrvjn3m9czc3h4p385a"; - }) - ]; - postConfigure = '' patchShebangs ld.hugetlbfs ''; @@ -34,8 +24,8 @@ stdenv.mkDerivation rec { "LIBDIR64=$(lib)/$(LIB64)" "EXEDIR=$(bin)/bin" "DOCDIR=$(doc)/share/doc/libhugetlbfs" - ] ++ map (n: "MANDIR${n}=$(man)/share/man/man${n}") - (lib.genList (n: toString (n + 1)) 8); + "MANDIR=$(man)/share/man" + ]; # Default target builds tests as well, and the tests want a static # libc. diff --git a/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/nixpkgs/pkgs/development/libraries/libjcat/default.nix index 974f1f6674fb..2e75894eb834 100644 --- a/nixpkgs/pkgs/development/libraries/libjcat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.5"; + version = "0.1.6"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-xf/hzTzhxKJDL5Way0Qbrs8pXCvAQ+ADtgJO2GbEvmc="; + sha256 = "sha256-X+mFl0YZpnt6zzvVTGZN7PROVUaQ8ZmU3T0EgyoZX6g="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch new file mode 100644 index 000000000000..0a09a8845c13 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch @@ -0,0 +1,104 @@ +From 4a0584f7c05641143151ebdc1be1163bebf9d35d Mon Sep 17 00:00:00 2001 +From: Las <las@protonmail.ch> +Date: Sun, 3 Jan 2021 18:35:37 +0000 +Subject: [PATCH] Compile transupp.c as part of the library + +The exported symbols are made weak to not conflict with users +of the library that already vendor this functionality. +--- + CMakeLists.txt | 4 ++-- + transupp.c | 14 +++++++------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ca6f98..a9a0fae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -533,7 +533,7 @@ set(JPEG_SOURCES jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c + jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdicc.c jdinput.c + jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c + jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c +- jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c) ++ jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c transupp.c) + + if(WITH_ARITH_ENC OR WITH_ARITH_DEC) + set(JPEG_SOURCES ${JPEG_SOURCES} jaricom.c) +@@ -1489,7 +1489,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h + ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h +- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/transupp.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + include(cmakescripts/BuildPackages.cmake) +diff --git a/transupp.c b/transupp.c +index 6e86077..2da49a7 100644 +--- a/transupp.c ++++ b/transupp.c +@@ -1386,7 +1386,7 @@ jt_read_integer(const char **strptr, JDIMENSION *result) + * This code is loosely based on XParseGeometry from the X11 distribution. + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_parse_crop_spec(jpeg_transform_info *info, const char *spec) + { + info->crop = FALSE; +@@ -1486,7 +1486,7 @@ trim_bottom_edge(jpeg_transform_info *info, JDIMENSION full_height) + * and transformation is not perfect. Otherwise returns TRUE. + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_request_workspace(j_decompress_ptr srcinfo, + jpeg_transform_info *info) + { +@@ -2033,7 +2033,7 @@ adjust_exif_parameters(JOCTET *data, unsigned int length, JDIMENSION new_width, + * to jpeg_write_coefficients(). + */ + +-GLOBAL(jvirt_barray_ptr *) ++GLOBAL(jvirt_barray_ptr *) __attribute__((weak)) + jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jpeg_transform_info *info) +@@ -2152,7 +2152,7 @@ jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + * Note that some transformations will modify the source data arrays! + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jpeg_transform_info *info) +@@ -2264,7 +2264,7 @@ jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + * (may use custom action then) + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, + int MCU_width, int MCU_height, + JXFORM_CODE transform) +@@ -2303,7 +2303,7 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, + * This must be called before jpeg_read_header() to have the desired effect. + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) + { + #ifdef SAVE_MARKERS_SUPPORTED +@@ -2331,7 +2331,7 @@ jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) + * JFIF APP0 or Adobe APP14 markers if selected. + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jcopy_markers_execute(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JCOPY_OPTION option) + { +-- +2.29.2 + diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 5fe1c2ee9ecf..2426dfebe8a2 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -15,11 +15,16 @@ stdenv.mkDerivation rec { sha256 = "0njdxfmyk8smj8bbd6fs3lxjaq3lybivwgg16gpnbiyl984dpi9b"; }; - patches = - lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") + # This is needed by freeimage + patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ] + ++ lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; - outputs = [ "bin" "dev" "out" "man" "doc" ]; + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/transupp.h $dev_private + ''; nativeBuildInputs = [ cmake nasm ]; diff --git a/nixpkgs/pkgs/development/libraries/libjpeg/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix index f462d9824a42..65482e8e9c60 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.ijg.org/files/jpegsrc.v9d.tar.gz"; - sha256 = "0clwys9lcqlxqgcw8s1gwfm5ix2zjlqpklmd3mbvqmj5ibj51jwr"; + sha256 = "1vkip9rz4hz8f31a2kl7wl7f772wg1z0fg1fbd1653wzwlxllhvc"; }; configureFlags = optional static "--enable-static --disable-shared"; diff --git a/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix b/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix index d2aecccdedff..324e675f33bf 100644 --- a/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix +++ b/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,37 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, fftw, qtbase, qmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fftw, catch2 }: stdenv.mkDerivation rec { pname = "libkeyfinder"; - version = "2.1"; + version = "2.2.4"; src = fetchFromGitHub { - sha256 = "07kc0cl6kirgmpdgkgmp6r3yvyf7b1w569z01g8rfl1cig80qdc7"; + owner = "mixxxdj"; + repo = "libkeyfinder"; rev = "v${version}"; - repo = "libKeyFinder"; - owner = "ibsh"; + sha256 = "005qq81xfzi1iifvpgkqpizxcrfisafq2r0cjp4fxqh1ih7bfimv"; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ fftw qtbase ]; + # needed for finding libkeyfinder.so to link it into keyfinder-tests executable + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; - postPatch = '' - substituteInPlace LibKeyFinder.pro \ - --replace "/usr/local" "$out" \ - --replace "-stdlib=libc++" "" - ''; + nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; + buildInputs = [ fftw ]; - postInstall = '' - mkdir -p $out/include/keyfinder - install -m644 *.h $out/include/keyfinder - mkdir -p $out/lib - cp -a lib*.so* $out/lib - ''; + checkInputs = [ catch2 ]; + + doCheck = true; meta = with lib; { description = "Musical key detection for digital audio (C++ library)"; - homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; + homepage = "https://mixxxdj.github.io/libkeyfinder/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index f56e6a9a5c78..647fb6825afb 100644 --- a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.4.15"; + version = "4.4.21"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "16a31c0n5lix4r5xk7p447xlxbrhdlmj11kb4y1krb5fx8hf65cl"; + sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI="; }; # Do not build static libraries diff --git a/nixpkgs/pkgs/development/libraries/liblockfile/default.nix b/nixpkgs/pkgs/development/libraries/liblockfile/default.nix index a2587702bb3f..003991c80dde 100644 --- a/nixpkgs/pkgs/development/libraries/liblockfile/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblockfile/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { _name = "liblockfile"; - version = "1.16"; + version = "1.17"; name = "${_name}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz"; - sha256 = "0s8wj3y6mf1g47nvinkkm5avmqz0z6yxmdrnxpjwgz6krql3hvng"; + sha256 = "sha256-bpN/NlCvq0qsGY80i4mxykLtzrF/trsJGPZCFDzP0V4="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.70.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.70.nix index 1cd04b0b2777..c0321e327c52 100644 --- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.70.nix +++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.70.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: callPackage ./generic.nix ( rec { version = "0.9.70"; diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.71.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.71.nix index 74bd6cce42c4..7e60f8c72726 100644 --- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.71.nix +++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.71.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: callPackage ./generic.nix ( rec { version = "0.9.71"; diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix index 8eeb94cdc295..4c695218184c 100644 --- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix +++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: callPackage ./generic.nix ( rec { version = "0.9.72"; diff --git a/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix index 8a8d9adf53d8..f95d39a02da8 100644 --- a/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , substituteAll , fetchFromGitHub -, fetchpatch , pkg-config , meson , ninja @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libmodulemd"; - version = "2.9.2"; + version = "2.12.0"; outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { owner = "fedora-modularity"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0xl5f6a32hmli29b0rfp54h7vnagxdv9qa2r871mrgrr6fzjwvbn"; + sha256 = "1mq9as98q4wyka404f8xwfc44cn5j4bsk0fch5pf07v81sagc1q9"; }; patches = [ @@ -36,17 +35,6 @@ stdenv.mkDerivation rec { src = ./glib-devdoc.patch; glib_devdoc = glib.devdoc; }) - - # Install pygobject overrides to our prefix instead of python3 one. - # https://github.com/fedora-modularity/libmodulemd/pull/469 - (fetchpatch { - url = "https://github.com/fedora-modularity/libmodulemd/commit/f72a4bea092f4d84cfc48a3e820eb10270e828d0.patch"; - sha256 = "1rrf94q1yf98w6b9bm67mb6w6qv1zqi306iv1vzspvjhsqvzmzpg"; - }) - (fetchpatch { - url = "https://github.com/fedora-modularity/libmodulemd/commit/021ab08006b5cf601ce153174fdf403b910b8273.patch"; - sha256 = "0z35jpnnzzb5bvmc2lglrpfnwarhky2jqmhq9avnnki22fdw89i6"; - }) ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 4c00d6425880..40d814814caa 100644 --- a/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.21"; + version = "8.0.23"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "08z40419aip26z6ss30g59mvnddb8dfam82l556jyj3gxs0irqbh"; + sha256 = "sha256-mvBklaaggP7WLacJePHLDGbwWO3V6p7ak0WmS/jsaI8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/nixpkgs/pkgs/development/libraries/libngspice/default.nix index 72fbcd1ab084..2f8aab830da0 100644 --- a/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "33"; + version = "34"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr"; + sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U="; }; nativeBuildInputs = [ flex bison ]; diff --git a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index a6b170167198..c3852f25741f 100644 --- a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1988l5rykpzvml1l7bi2hcax0gdc811vja0f92cnr7r01nz35zs9"; + sha256 = "sha256-tPNBgVTvP0PZQggnKUkWrqGCcCGvwG4WRPxWlRgwo1k="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 80e6e6fe6689..a5b6e3b117ea 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.16.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0nrf03q3qrsvxf6kjpv69l49yfal79834a3jv75mzi6y674ach9g"; + sha256 = "sha256-mTxxiyN4t84BD4bBysvsrvP7L+DNbP6sMlcNFg4eMF8="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libqb/default.nix b/nixpkgs/pkgs/development/libraries/libqb/default.nix index 3f0a9a28d194..f5f255b111f1 100644 --- a/nixpkgs/pkgs/development/libraries/libqb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqb/default.nix @@ -1,19 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxml2 }: stdenv.mkDerivation rec { - name = "libqb-0.17.2"; + pname = "libqb"; + version = "2.0.2"; - src = fetchurl { - url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz"; - sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs"; + src = fetchFromGitHub { + owner = "ClusterLabs"; + repo = pname; + rev = "v${version}"; + sha256 = "1gpfcz84igqncky09hdibxmzapzl37y8914avgq89rsizynj1wsm"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libxml2 ]; meta = with lib; { homepage = "https://github.com/clusterlabs/libqb"; description = "A library providing high performance logging, tracing, ipc, and poll"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix index e616fae92502..7bd3fa97029a 100644 --- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.26.6"; + version = "1.26.8"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "1fbwz6534q6n4bgabdx4svbgkf4mdyisjh3y51jjd94p22xn66d7"; + sha256 = "sha256-73bclasKBjIaG9Jeh1SJy6Esn2YRl0ygE1zwZ7sgyWA="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/librelp/default.nix b/nixpkgs/pkgs/development/libraries/librelp/default.nix index edf927e86647..8d950d66bd21 100644 --- a/nixpkgs/pkgs/development/libraries/librelp/default.nix +++ b/nixpkgs/pkgs/development/libraries/librelp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "librelp"; - version = "1.7.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "0miqjck9zh1hgsx1v395n0d4f1a1p5a8khybv2nsfjq04g9359c9"; + sha256 = "sha256-nE7YavjZj+nHcTNkcl/xVAaP+9XfHlTEsW18aPO/ABY="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libschrift/default.nix b/nixpkgs/pkgs/development/libraries/libschrift/default.nix index 3781d9346125..96b8c7ac2e57 100644 --- a/nixpkgs/pkgs/development/libraries/libschrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/libschrift/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "libschrift"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "tomolt"; repo = pname; - rev = "c6d20460d6e602e8829d3a227fd7be4c4c3cda86"; - hash = "sha256-BuTmWaWFZ0DXujlbhbmK3Woit8fR9F4DWmKszHX6gOI="; + rev = "c207585486b3e78ec5506f55f5d56178f421a53c"; + sha256 = "13qrplsi2a53s84giwnzqmn0zbslyaagvjn89wsn9fd90m2v2bs1"; }; + # fix a compilation failure related to darwin integers, remove at next release + patches = [ + (fetchpatch { + url = "https://github.com/tomolt/libschrift/commit/1b1292f2cf4b582d66b2f6c87105997391f9fa08.patch"; + sha256 = "076l3n28famgi74nr5bz47yn192bm76p8c8558fm5zj5c21pcfsv"; + }) + ]; + postPatch = '' substituteInPlace config.mk \ --replace "PREFIX = /usr/local" "PREFIX = $out" diff --git a/nixpkgs/pkgs/development/libraries/libsixel/default.nix b/nixpkgs/pkgs/development/libraries/libsixel/default.nix index e82ecde5ddd2..0d5a54f9693e 100644 --- a/nixpkgs/pkgs/development/libraries/libsixel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsixel/default.nix @@ -22,5 +22,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ vrthra ]; license = licenses.mit; platforms = with platforms; unix; + knownVulnerabilities = [ + "CVE-2020-11721" # https://github.com/saitoha/libsixel/issues/134 + "CVE-2020-19668" # https://github.com/saitoha/libsixel/issues/136 + ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libsnark/default.nix b/nixpkgs/pkgs/development/libraries/libsnark/default.nix index 3864a99f5e98..c3e6d0e049e4 100644 --- a/nixpkgs/pkgs/development/libraries/libsnark/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsnark/default.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: let rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; - inherit (stdenv) lib; in stdenv.mkDerivation rec { name = "libsnark-pre${version}"; version = lib.substring 0 8 rev; diff --git a/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/nixpkgs/pkgs/development/libraries/libsolv/default.nix index bfacecde256d..089fbe4b3512 100644 --- a/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.16"; + version = "0.7.17"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "1arw7p83s5yq36pw94b76zfiqsh90fjjnayni54a5wgm0zvbkki8"; + sha256 = "sha256-LPOS+yDwNpyO9tkFoIy4SCQymytOGB26Pfyd/EFEYnc="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/nixpkgs/pkgs/development/libraries/libtiff/default.nix index 3d3b3529483a..2fad29888982 100644 --- a/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -2,6 +2,7 @@ , fetchurl , pkg-config +, cmake , zlib , libjpeg @@ -17,15 +18,29 @@ stdenv.mkDerivation rec { sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax"; }; - outputs = [ "bin" "dev" "out" "man" "doc" ]; + cmakeFlags = if stdenv.isDarwin then [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + ] else null; - nativeBuildInputs = [ pkg-config ]; + # FreeImage needs this patch + patches = [ ./headers.patch ]; + + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_config.h $dev_private + moveToOutput include/tiffiop.h $dev_private + ''; + + nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) enableParallelBuilding = true; - doCheck = true; # not cross; + doInstallCheck = true; + installCheckTarget = "test"; meta = with lib; { description = "Library and utilities for working with the TIFF image file format"; diff --git a/nixpkgs/pkgs/development/libraries/libtiff/headers.patch b/nixpkgs/pkgs/development/libraries/libtiff/headers.patch new file mode 100644 index 000000000000..5a00502ef281 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtiff/headers.patch @@ -0,0 +1,13 @@ +diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt +--- a/libtiff/CMakeLists.txt 2019-05-31 13:05:22.849705817 +0000 ++++ b/libtiff/CMakeLists.txt 2020-11-27 21:50:03.527831837 +0000 +@@ -42,6 +42,9 @@ + libtiffxx.map) + + set(tiff_HEADERS ++ tiffiop.h ++ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h ++ tif_dir.h + tiff.h + tiffio.h + tiffvers.h) diff --git a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix index 443791f24519..8bf2e2acff9f 100644 --- a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; - doCheck = true; + doCheck = !stdenv.isi686; # tests fail on i686 meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; diff --git a/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/nixpkgs/pkgs/development/libraries/libusb1/default.nix index 33cd34ea5a0e..d69c8d670c4a 100644 --- a/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusb1/default.nix @@ -3,14 +3,12 @@ , autoreconfHook , pkg-config , enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl -, udev ? null +, udev , libobjc , IOKit , withStatic ? false }: -assert enableUdev -> udev != null; - stdenv.mkDerivation rec { pname = "libusb"; version = "1.0.24"; diff --git a/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index 8c164f354990..86dd461ea07d 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -21,7 +21,7 @@ the nix store, but read them from the root filesystem. 12 files changed, 53 insertions(+), 42 deletions(-) diff --git a/meson.build b/meson.build -index 2e57a435df..4a72902a63 100644 +index b5164f6..33719f1 100644 --- a/meson.build +++ b/meson.build @@ -39,6 +39,8 @@ if host_machine.system() == 'windows' @@ -48,7 +48,7 @@ index 2e57a435df..4a72902a63 100644 # sysconfdir as this makes a lot of things break in testing situations if prefix == '/usr' diff --git a/meson_options.txt b/meson_options.txt -index 74de064384..0a21eb845e 100644 +index e5d79c2..081cd32 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ @@ -58,7 +58,7 @@ index 74de064384..0a21eb845e 100644 option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version') diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 3bb6cc5f2e..78d7be0ace 100644 +index 3bb6cc5..78d7be0 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') @@ -74,7 +74,7 @@ index 3bb6cc5f2e..78d7be0ace 100644 ] endif diff --git a/src/locking/meson.build b/src/locking/meson.build -index 8a28310e40..9da81cc574 100644 +index 8a28310..9da81cc 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') @@ -97,7 +97,7 @@ index 8a28310e40..9da81cc574 100644 endif endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index f8e2a8852a..96d6687c5d 100644 +index f8e2a88..96d6687 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -182,8 +182,8 @@ if conf.has('WITH_LXC') @@ -113,7 +113,7 @@ index f8e2a8852a..96d6687c5d 100644 ] endif diff --git a/src/meson.build b/src/meson.build -index 29c8210ab2..bc960e0b69 100644 +index 7c47821..d33d16a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -669,7 +669,7 @@ endforeach @@ -176,7 +176,7 @@ index 29c8210ab2..bc960e0b69 100644 meson.add_install_script( diff --git a/src/network/meson.build b/src/network/meson.build -index 13dd2c26b2..1be020081f 100644 +index 3ec598c..b02040b 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') @@ -191,24 +191,14 @@ index 13dd2c26b2..1be020081f 100644 + install_prefix + runstatedir / 'libvirt' / 'network', ] - uuidgen_prog = find_program('uuidgen', required: false) -@@ -98,7 +98,7 @@ if conf.has('WITH_NETWORK') - ], - capture: true, - install: true, -- install_dir: confdir / 'qemu' / 'networks', -+ install_dir: install_prefix + confdir / 'qemu' / 'networks', - ) - else - configure_file( -@@ -106,13 +106,13 @@ if conf.has('WITH_NETWORK') - output: '@BASENAME@', - copy: true, - install: true, -- install_dir: confdir / 'qemu' / 'networks', -+ install_dir: install_prefix + confdir / 'qemu' / 'networks', - ) - endif + configure_file( +@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK') + output: '@BASENAME@', + copy: true, + install: true, +- install_dir: confdir / 'qemu' / 'networks', ++ install_dir: install_prefix + confdir / 'qemu' / 'networks', + ) meson.add_install_script( meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(), @@ -218,17 +208,17 @@ index 13dd2c26b2..1be020081f 100644 ) diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build -index 95af75bb15..7fe99076f4 100644 +index 0d96c54..66c92a1 100644 --- a/src/nwfilter/xml/meson.build +++ b/src/nwfilter/xml/meson.build -@@ -19,4 +19,4 @@ nwfilter_xml_files = [ +@@ -25,4 +25,4 @@ nwfilter_xml_files = [ 'qemu-announce-self.xml', ] -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 4e599d1e69..ba558d78f8 100644 +index 90640b0..8802cec 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') @@ -252,7 +242,7 @@ index 4e599d1e69..ba558d78f8 100644 ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build -index 9ad2f6ab1c..429a15b326 100644 +index 9ad2f6a..429a15b 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') @@ -283,7 +273,7 @@ index 9ad2f6ab1c..429a15b326 100644 ) endif diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build -index af43780211..e2d6c812f8 100644 +index af43780..e2d6c81 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build @@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles @@ -314,7 +304,7 @@ index af43780211..e2d6c812f8 100644 rename: 'usr.lib.libvirt.virt-aa-helper', ) diff --git a/tools/meson.build b/tools/meson.build -index b8c6802f0a..dacd0ff1ce 100644 +index b8c6802..dacd0ff 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') @@ -334,7 +324,3 @@ index b8c6802f0a..dacd0ff1ce 100644 + install_dir: install_prefix + sysconfdir / 'sysconfig', rename: 'libvirt-guests', ) - --- -2.29.2 - diff --git a/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix b/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix index 76466a1a9f50..c11d698079b0 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix @@ -133,5 +133,10 @@ in stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ fpletz globin ]; + knownVulnerabilities = [ + "https://security.libvirt.org/2019/0008.html" + "https://security.libvirt.org/2019/0009.html" + "https://security.libvirt.org/2020/0001.html" + ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index f3f48cec770b..100f79ae4e83 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -31,19 +31,19 @@ let }; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "6.8.0"; + version = "7.0.0"; src = if buildFromTarball then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "0hhk2r0dnm9zmfwmnsnmnacm4pik6z60llp22axx7kcpqxv98nv5"; + sha256 = "12fxkpy7j2qhfxypw9jg3bzdd9xx6vf6x96iy5kjihh89n236f6a"; } else fetchgit { url = "https://gitlab.com/libvirt/libvirt.git"; rev = "v${version}"; - sha256 = "sha256-BQZPdmDE0g7xWd6QOHMKosP2HgVpIjsfgfohA9VxEHs="; + sha256 = "0xg9d410008mny73r2cp5ipghqpk0gz9gy7j32vcfk691dq75b3c"; fetchSubmodules = true; }; @@ -111,7 +111,6 @@ in stdenv.mkDerivation rec { "-Ddriver_esx=enabled" "-Ddriver_remote=enabled" "-Dpolkit=enabled" - "-Ddbus=enabled" (opt "storage_iscsi" enableIscsi) ] ++ optionals stdenv.isLinux [ (opt "storage_zfs" (zfs != null)) @@ -119,8 +118,6 @@ in stdenv.mkDerivation rec { "-Dapparmor=enabled" "-Dsecdriver_apparmor=enabled" "-Dnumad=enabled" - "-Dmacvtap=enabled" - "-Dvirtualport=enabled" "-Dstorage_disk=enabled" (opt "storage_rbd" enableCeph) ] ++ optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix index 14b996145aff..f4418ec1bc4d 100644 --- a/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.6"; + version = "1.7"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "10wphlk5v591mlvcyr6bjqp60zmhbpqg3lmsq9dza738v97ws8ci"; + sha256 = "sha256-kF4Q3ACiVlUbEjS2YqwHA42QknKMLqX9US31PmXtS/I="; }; nativeBuildInputs = [ pkg-config meson ninja doxygen ]; diff --git a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index 8f749d9fe6aa..33c1cecfbc81 100644 --- a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -32,7 +32,9 @@ let throughput in both directions. ''; homepage = "https://libwebsockets.org/"; - license = licenses.lgpl21; + # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation + # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE + license = with licenses; [ mit publicDomain bsd3 asl20 ]; platforms = platforms.all; }; }; @@ -50,7 +52,12 @@ rec { }; libwebsockets_4_0 = generic { - version = "4.0.1"; - sha256 = "1pf7km0w5q7dqlwcwqizdpfqgg10prfq8g2c093f5nghwsfv8mmf"; + version = "4.0.21"; + sha256 = "01k05x4711ngin598jr9dag4ml3m7hi6pkgr4dsb02ryh1kc6146"; + }; + + libwebsockets_4_1 = generic { + version = "4.1.6"; + sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg"; }; } diff --git a/nixpkgs/pkgs/development/libraries/libwpe/default.nix b/nixpkgs/pkgs/development/libraries/libwpe/default.nix index 102d658000c3..4397f65ac4b6 100644 --- a/nixpkgs/pkgs/development/libraries/libwpe/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwpe/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0h6kh8wy2b370y705pl2vp6vp18dkdsgdxh0243ji2v51kxbg157"; + sha256 = "sha256-pvAKfQkcvU21f+fuO0wSxjUJIdZU7XmBKACibIiEgdI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index d26518c7de98..0a93babb4599 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -1,32 +1,39 @@ -{ lib, stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "4.3.4"; + version = "5.1.0"; in stdenv.mkDerivation { pname = "libxc"; inherit version; - src = fetchurl { - url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; - sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8"; + + src = fetchFromGitLab { + owner = "libxc"; + repo = "libxc"; + rev = version; + sha256 = "0qbxh0lfx4cab1fk1qfnx72g4yvs376zqrq74jn224vy32nam2x7"; }; buildInputs = [ gfortran ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl cmake ]; preConfigure = '' patchShebangs ./ ''; - configureFlags = [ "--enable-shared" ]; + cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd) + ''; doCheck = true; enableParallelBuilding = true; meta = with lib; { description = "Library of exchange-correlation functionals for density-functional theory"; - homepage = "https://octopus-code.org/wiki/Libxc"; - license = licenses.lgpl3; + homepage = "https://www.tddft.org/programs/Libxc/"; + license = licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ markuskowa ]; }; diff --git a/nixpkgs/pkgs/development/libraries/libxls/default.nix b/nixpkgs/pkgs/development/libraries/libxls/default.nix index 3e8034f8baa8..3b9c2768f45e 100644 --- a/nixpkgs/pkgs/development/libraries/libxls/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxls/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxls"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; - sha256 = "1y7wk55blk16hmvf9dz5ci84hlhv6pw6mnr1mfnibfw3gsxmzhyv"; + sha256 = "sha256-XazDTZS/IRWSbIDG+2nk570u1kA9Uc/0kEGpQXL143E="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/lief/default.nix b/nixpkgs/pkgs/development/libraries/lief/default.nix index 3b57d0c2f7ae..953eee3b8bdb 100644 --- a/nixpkgs/pkgs/development/libraries/lief/default.nix +++ b/nixpkgs/pkgs/development/libraries/lief/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { url = "https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/maeparser/default.nix b/nixpkgs/pkgs/development/libraries/maeparser/default.nix new file mode 100644 index 000000000000..cd7cc70907cc --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/maeparser/default.nix @@ -0,0 +1,28 @@ +{ fetchFromGitHub +, lib +, stdenv +, boost +, zlib +, cmake +}: + +stdenv.mkDerivation rec { + pname = "maeparser"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "schrodinger"; + repo = "maeparser"; + rev = "v${version}"; + sha256 = "1qzp8d58ksy88y4fx1b0x65wycslm7zxzbb8ns28gkjh12xpzhwz"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost zlib ]; + + meta = with lib; { + description = "maestro file parser"; + maintainers = [ maintainers.rmcgibbo ]; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/mapnik/default.nix b/nixpkgs/pkgs/development/libraries/mapnik/default.nix index 40ef1fde563a..d4f11c1d126a 100644 --- a/nixpkgs/pkgs/development/libraries/mapnik/default.nix +++ b/nixpkgs/pkgs/development/libraries/mapnik/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "mapnik"; - version = "3.0.23"; + version = "3.1.0"; src = fetchzip { # this one contains all git submodules and is cheaper than fetchgit url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2"; - sha256 = "1754m8y7fyk0dyf7cglhavsk66g5kdqhnmgicib1jkcgjbl69f15"; + sha256 = "sha256-qqPqN4vs3ZsqKgnx21yQhX8OzHca/0O+3mvQ/vnC5EY="; }; # a distinct dev output makes python-mapnik fail diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index e3e0d2ecd78d..38a9b78b6d10 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -11,14 +11,13 @@ stdenv.mkDerivation rec { pname = "mbedtls"; - name = "mbedtls-${version}"; - version = "2.16.3"; # nixpkgs-update: no auto update + version = "2.16.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "1mzh92yyz93099a1gb2wvwc76jv12d1k1wg9k3dimbgczxgrkirc"; + sha256 = "0mz7n373b8d287crwi6kq2hb8ryyi228j38h25744lqai23qj5cf"; }; nativeBuildInputs = [ cmake ninja perl python ]; diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 44dddac7d32c..11d6cdd1b2a5 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.3.2"; + version = "20.3.3"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0gakhsj5qgm4wran7nlnz7kzgg3aj0a8f4q4dfbznfnjhnv03q6c"; + sha256 = "0mnic7mfv5lgnn3swj7lbif8bl8pi2czlgr01jhq5s9q90nj2kpp"; }; prePatch = "patchShebangs ."; @@ -65,12 +65,6 @@ stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) - # Fix for pre macOS SDK 10.13: - (fetchpatch { # util: Disable memstream for Apple builds - # MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8269 - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/f4403f70fe5bf2ec41af5546122f0d78caffa984.patch"; - sha256 = "03j2aj255m7ms848nkb41vj3s3yb72zb5rz3w3fzp5l9wzzargw5"; - }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/metal/default.nix b/nixpkgs/pkgs/development/libraries/metal/default.nix index 18b1f116b876..b98ae8e217c7 100644 --- a/nixpkgs/pkgs/development/libraries/metal/default.nix +++ b/nixpkgs/pkgs/development/libraries/metal/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "metal"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "brunocodutra"; repo = "metal"; rev = "v${version}"; - sha256 = "07n1aqyaixbd66l24km5ip3pkmidkx9m3saygf7cfp6vvbgmi42l"; + sha256 = "sha256-1I+EZtIz/2y4+dJGBONhTlUQGHgRdvXc1ZAOC9pmStw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix index 633a7325b098..b45c2d92b2f8 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "6.22.1"; + version = "6.24.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k"; + sha256 = "1my43ica2qax2622307dv4gn3w8hkchy643i9pq8r9yh2hd4pvs9"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 7004a5e11c04..5a4b6e34e9dc 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , SDL , ffmpeg @@ -26,13 +26,13 @@ let inherit (lib) getDev; in mkDerivation rec { pname = "mlt"; - version = "6.22.1"; + version = "6.24.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k"; + sha256 = "1my43ica2qax2622307dv4gn3w8hkchy643i9pq8r9yh2hd4pvs9"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix index f7cdf7f97c02..49af2593e51e 100644 --- a/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -1,24 +1,52 @@ -{ lib, stdenv, fetchurl, perl, gfortran -, openssh, hwloc +{ stdenv, lib, fetchurl, perl, gfortran +, openssh, hwloc, autoconf, automake, libtool +# device options are ch3 or ch4 +, device ? "ch4" +# backend option are libfabric or ucx +, ch4backend ? "libfabric" +, ucx, libfabric +# Process manager to build +, withPm ? "hydra:gforker" } : +assert (ch4backend == "ucx" || ch4backend == "libfabric"); + stdenv.mkDerivation rec { pname = "mpich"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "1farz5zfx4cd0c3a0wb9pgfypzw0xxql1j1294z1sxslga1ziyjb"; + sha256 = "09wpfw9lsrc84vcmfw94razd4xv4znx4mmg7rqmljvgg0jc96dl8"; }; + patches = [ + # Reverts an upstream change that causes json-c test to fail + ./jsonc-test.patch + ]; + + # Required for the json-c patch + nativeBuildInputs = [ autoconf automake libtool ]; + + # Update configure after patch + postPatch = '' + cd modules/json-c + ./autogen.sh + cd ../.. + ''; + + configureFlags = [ "--enable-shared" "--enable-sharedlib" + "--with-pm=${withPm}" ]; enableParallelBuilding = true; - buildInputs = [ perl gfortran openssh hwloc ]; + buildInputs = [ perl gfortran openssh hwloc ] + ++ lib.optional (ch4backend == "ucx") ucx + ++ lib.optional (ch4backend == "libfabric") libfabric; doCheck = true; @@ -27,14 +55,7 @@ stdenv.mkDerivation rec { sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort - '' - + lib.optionalString (!stdenv.isDarwin) '' - # /tmp/nix-build... ends up in the RPATH, fix it manually - for entry in $out/bin/mpichversion $out/bin/mpivars; do - echo "fix rpath: $entry" - patchelf --set-rpath "$out/lib" $entry - done - ''; + ''; meta = with lib; { description = "Implementation of the Message Passing Interface (MPI) standard"; diff --git a/nixpkgs/pkgs/development/libraries/mpich/jsonc-test.patch b/nixpkgs/pkgs/development/libraries/mpich/jsonc-test.patch new file mode 100644 index 000000000000..2f8d87b409b4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mpich/jsonc-test.patch @@ -0,0 +1,62 @@ +--- b/modules/json-c/configure.ac ++++ a/modules/json-c/configure.ac +@@ -75,7 +75,7 @@ + AC_FUNC_VPRINTF + AC_FUNC_MEMCMP + AC_CHECK_FUNCS([realloc]) ++AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf vasprintf open strncasecmp setlocale) +-AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf open strncasecmp setlocale) + AC_CHECK_DECLS([INFINITY], [], [], [[#include <math.h>]]) + AC_CHECK_DECLS([nan], [], [], [[#include <math.h>]]) + AC_CHECK_DECLS([isnan], [], [], [[#include <math.h>]]) +--- b/modules/json-c/json_pointer.c ++++ a/modules/json-c/json_pointer.c +@@ -208,7 +208,7 @@ + } + + va_start(args, path_fmt); ++ rc = vasprintf(&path_copy, path_fmt, args); +- rc = json_vasprintf(&path_copy, path_fmt, args); + va_end(args); + + if (rc < 0) +@@ -287,7 +287,7 @@ + + /* pass a working copy to the recursive call */ + va_start(args, path_fmt); ++ rc = vasprintf(&path_copy, path_fmt, args); +- rc = json_vasprintf(&path_copy, path_fmt, args); + va_end(args); + + if (rc < 0) +--- b/modules/json-c/printbuf.c ++++ a/modules/json-c/printbuf.c +@@ -129,7 +129,7 @@ + would have been written - this code handles both cases. */ + if(size == -1 || size > 127) { + va_start(ap, msg); ++ if((size = vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; } +- if((size = json_vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; } + va_end(ap); + printbuf_memappend(p, t, size); + free(t); +--- b/modules/json-c/vasprintf_compat.h ++++ a/modules/json-c/vasprintf_compat.h +@@ -8,8 +8,9 @@ + + #include "snprintf_compat.h" + ++#if !defined(HAVE_VASPRINTF) + /* CAW: compliant version of vasprintf */ ++static int vasprintf(char **buf, const char *fmt, va_list ap) +-static int json_vasprintf(char **buf, const char *fmt, va_list ap) + { + #ifndef WIN32 + static char _T_emptybuffer = '\0'; +@@ -40,5 +41,6 @@ + + return chars; + } ++#endif /* !HAVE_VASPRINTF */ + + #endif /* __vasprintf_compat_h */ diff --git a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index d1834de55588..761026440f78 100644 --- a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "1x820rcfz5r203dc8a0rzavcjjx10fsv1dicqg65m6kxx1w95j5r"; + sha256 = "1044zil3izhb3whhfjah7w0kg5mr3hys32cjffky681d3mb3wi5n"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/ndi/default.nix b/nixpkgs/pkgs/development/libraries/ndi/default.nix index 75d2a2db0218..81465b61acc1 100644 --- a/nixpkgs/pkgs/development/libraries/ndi/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ndi"; - fullVersion = "4.5.3"; + fullVersion = "4.6.0"; version = builtins.head (builtins.splitVersion fullVersion); src = requireFile rec { name = "InstallNDISDK_v${version}_Linux.tar.gz"; - sha256 = "0w9f4a4a3xzg0nvmvrlda1wwkyi0m5aqvk07immmwgg7f1z1sqj5"; + sha256 = "19jrj2v7x1amdpc9pdq3042vm2l3szwqbzb83lirgbc24s2q043m"; message = '' In order to use NDI SDK version ${fullVersion}, you need to comply with NewTek's license and download the appropriate Linux tarball from: diff --git a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix index f2510d6f6bbe..3fb3fc305a33 100644 --- a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://named-data.net/"; + homepage = "https://named-data.net/"; description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; longDescription = '' ndn-cxx is a C++ library, implementing Named Data Networking (NDN) diff --git a/nixpkgs/pkgs/development/libraries/neon/default.nix b/nixpkgs/pkgs/development/libraries/neon/default.nix index c0c62deb0ace..739c5e07d206 100644 --- a/nixpkgs/pkgs/development/libraries/neon/default.nix +++ b/nixpkgs/pkgs/development/libraries/neon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxml2, pkg-config, perl +{ lib, stdenv, fetchurl, libxml2, pkg-config , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? stdenv.hostPlatform.isStatic @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.31.0"; + version = "0.31.2"; pname = "neon"; src = fetchurl { - url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; - sha256 = "19dx4rsqrck9jl59y4ad9jf115hzh6pz1hcl2dnlfc84hc86ymc0"; + url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; + sha256 = "0y46dbhiblcvg8k41bdydr3fivghwk73z040ki5825d24ynf67ng"; }; patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; @@ -37,12 +37,10 @@ stdenv.mkDerivation rec { passthru = {inherit compressionSupport sslSupport;}; - checkInputs = [ perl ]; - doCheck = false; # fails, needs the net - meta = with lib; { description = "An HTTP and WebDAV client library"; - homepage = "http://www.webdav.org/neon/"; + homepage = "https://notroj.github.io/neon/"; + changelog = "https://github.com/notroj/${pname}/blob/${version}/NEWS"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/nixpkgs/pkgs/development/libraries/ntbtls/default.nix b/nixpkgs/pkgs/development/libraries/ntbtls/default.nix index 98ea6fa943f8..b6dcfc782f3a 100644 --- a/nixpkgs/pkgs/development/libraries/ntbtls/default.nix +++ b/nixpkgs/pkgs/development/libraries/ntbtls/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "ntbtls"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2"; - sha256 = "1rywgdyj7prmwdi5r1rpglakqpnjskgln1mqksqm28qcwn2dnh42"; + sha256 = "sha256-ZJ/nSjEdE+Q7FrJuuqkWZd22MpJbc5AlkurD7TBRnhc="; }; outputs = [ "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/opendkim/default.nix b/nixpkgs/pkgs/development/libraries/opendkim/default.nix index 90c7fb85d426..b3d18748f74b 100644 --- a/nixpkgs/pkgs/development/libraries/opendkim/default.nix +++ b/nixpkgs/pkgs/development/libraries/opendkim/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, libbsd, openssl, libmilter +{ lib, stdenv, fetchFromGitHub, pkg-config, libbsd, openssl, libmilter , autoreconfHook, perl, makeWrapper }: stdenv.mkDerivation rec { pname = "opendkim"; - version = "2.10.3"; + version = "2.11.0-Beta2"; - src = fetchurl { - url = "mirror://sourceforge/opendkim/files/${pname}-${version}.tar.gz"; - sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; + src = fetchFromGitHub { + owner = "trusteddomainproject"; + repo = "OpenDKIM"; + rev = "rel-opendkim-${lib.replaceChars ["."] ["-"] version}"; + sha256 = "0nx3in8sa6xna4vfacj8g60hfzk61jpj2ldag80xzxip9c3rd2pw"; }; configureFlags= [ @@ -20,8 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ libbsd openssl libmilter perl ]; - patches = [ ./openssl-1.1.patch ]; - postInstall = '' wrapProgram $out/sbin/opendkim-genkey \ --prefix PATH : ${openssl.bin}/bin diff --git a/nixpkgs/pkgs/development/libraries/opendkim/openssl-1.1.patch b/nixpkgs/pkgs/development/libraries/opendkim/openssl-1.1.patch deleted file mode 100644 index c36559cf16cd..000000000000 --- a/nixpkgs/pkgs/development/libraries/opendkim/openssl-1.1.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -864,26 +864,28 @@ - AC_SEARCH_LIBS([ERR_peek_error], [crypto], , - AC_MSG_ERROR([libcrypto not found])) - -- AC_SEARCH_LIBS([SSL_library_init], [ssl], , -- [ -- if test x"$enable_shared" = x"yes" -- then -- AC_MSG_ERROR([Cannot build shared opendkim -- against static openssl libraries. -- Configure with --disable-shared -- to get this working or obtain a -- shared libssl library for -- opendkim to use.]) -- fi -- -- # avoid caching issue - last result of SSL_library_init -- # shouldn't be cached for this next check -- unset ac_cv_search_SSL_library_init -- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" -- AC_SEARCH_LIBS([SSL_library_init], [ssl], , -- AC_MSG_ERROR([libssl not found]), [-ldl]) -- ] -- ) -+ -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], -+ [[SSL_library_init();]])], -+ [od_have_ossl="yes";], -+ [od_have_ossl="no";]) -+ if test x"$od_have_ossl" = x"no" -+ then -+ if test x"$enable_shared" = x"yes" -+ then -+ AC_MSG_ERROR([Cannot build shared opendkim -+ against static openssl libraries. -+ Configure with --disable-shared -+ to get this working or obtain a -+ shared libssl library for -+ opendkim to use.]) -+ fi -+ -+ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" -+ AC_SEARCH_LIBS([SSL_library_init], [ssl], , -+ AC_MSG_ERROR([libssl not found]), [-ldl]) -+ fi - - AC_CHECK_DECL([SHA256_DIGEST_LENGTH], - AC_DEFINE([HAVE_SHA256], 1, ---- a/opendkim/opendkim-crypto.c -+++ b/opendkim/opendkim-crypto.c -@@ -222,7 +222,11 @@ - { - assert(pthread_setspecific(id_key, ptr) == 0); - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+ OPENSSL_thread_stop(); -+#else - ERR_remove_state(0); -+#endif - - free(ptr); - -@@ -392,11 +396,15 @@ - { - if (crypto_init_done) - { -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+ OPENSSL_thread_stop(); -+#else - CRYPTO_cleanup_all_ex_data(); - CONF_modules_free(); - EVP_cleanup(); - ERR_free_strings(); - ERR_remove_state(0); -+#endif - - if (nmutexes > 0) - { diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/1.x.nix b/nixpkgs/pkgs/development/libraries/openjpeg/1.x.nix deleted file mode 100644 index beb151f0d2de..000000000000 --- a/nixpkgs/pkgs/development/libraries/openjpeg/1.x.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.5.2"; - branch = "1.5"; - revision = "version.1.5.2"; - sha256 = "1dvvpvb597i5z8srz2v4c5dsbxb966h125jx3m2z0r2gd2wvpfkp"; - testsSupport = false; -}) diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/2.x.nix b/nixpkgs/pkgs/development/libraries/openjpeg/2.x.nix deleted file mode 100644 index edb9c9bf8c90..000000000000 --- a/nixpkgs/pkgs/development/libraries/openjpeg/2.x.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ callPackage, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.4.0"; - branch = "2.4"; - revision = "v${version}"; - sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf"; - - extraFlags = [ - "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}" - "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/openjpeg-${branch}" - ]; - - patches = [ - ./fix-cmake-config-includedir.patch - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch"; - sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8"; - }) - ]; -}) diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix b/nixpkgs/pkgs/development/libraries/openjpeg/default.nix index 8c1f18b987d5..32bfa6f24584 100644 --- a/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/openjpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , libpng, libtiff, lcms2, jpylyzer , mj2Support ? true # MJ2 executables , jpwlLibSupport ? true # JPWL library & executables @@ -10,8 +10,6 @@ , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build , testsSupport ? true , jdk ? null -# Inherit generics -, branch, version, revision, sha256, patches ? [], extraFlags ? [], ... }: assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; @@ -23,18 +21,24 @@ let mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openjpeg"; - inherit version; + version = "2.4.0"; # don't forget to change passthru.incDir src = fetchFromGitHub { owner = "uclouvain"; repo = "openjpeg"; - rev = revision; - inherit sha256; + rev = "v${version}"; + sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf"; }; - inherit patches; + patches = [ + ./fix-cmake-config-includedir.patch + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch"; + sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8"; + }) + ]; outputs = [ "out" "dev" ]; @@ -52,7 +56,9 @@ stdenv.mkDerivation { (mkFlag jp3dSupport "BUILD_JP3D") (mkFlag thirdPartySupport "BUILD_THIRDPARTY") (mkFlag testsSupport "BUILD_TESTING") - ] ++ extraFlags; + "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/${passthru.incDir}" + "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/${passthru.incDir}" + ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -71,7 +77,7 @@ stdenv.mkDerivation { ''; passthru = { - incDir = "openjpeg-${branch}"; + incDir = "openjpeg-2.4"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/openldap/default.nix b/nixpkgs/pkgs/development/libraries/openldap/default.nix index 4d4ec1763f0f..a71b2a61910e 100644 --- a/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openldap"; - version = "2.4.56"; + version = "2.4.57"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - sha256 = "1q0m26kbab96r73y0dll0c36411kvfillal0i75kngy9cc1hwli5"; + sha256 = "sha256-x7pH4ebstbQ289Qygd9Xq+/6mSYhQa7IImKLwiD2tFo="; }; # TODO: separate "out" and "bin" diff --git a/nixpkgs/pkgs/development/libraries/openslp/CVE-2019-5544.patch b/nixpkgs/pkgs/development/libraries/openslp/CVE-2019-5544.patch new file mode 100644 index 000000000000..2afc0aed3302 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/openslp/CVE-2019-5544.patch @@ -0,0 +1,165 @@ +diff -ur openslp-2.0.0.orig/common/slp_buffer.c openslp-2.0.0/common/slp_buffer.c +--- openslp-2.0.0.orig/common/slp_buffer.c 2012-12-10 15:31:53.000000000 -0800 ++++ openslp-2.0.0/common/slp_buffer.c 2019-11-26 21:54:20.000000000 -0800 +@@ -30,6 +30,13 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *-------------------------------------------------------------------------*/ + ++/* Copyright (c) 2019 VMware, Inc. ++ * SPDX-License-Identifier: BSD-3-Clause ++ * This file is provided under the BSD-3-Clause license. ++ * See COPYING file for more details and other copyrights ++ * that may apply. ++ */ ++ + /** Functions for managing SLP message buffers. + * + * This file provides a higher level abstraction over malloc and free that +@@ -153,4 +160,20 @@ + xfree(buf); + } + ++/** Report remaining free buffer size in bytes. ++ * ++ * Check if buffer is allocated and if so return bytes left in a ++ * @c SLPBuffer object. ++ * ++ * @param[in] buf The SLPBuffer to be freed. ++ */ ++size_t ++RemainingBufferSpace(SLPBuffer buf) ++{ ++ if (buf->allocated == 0) { ++ return 0; ++ } ++ return buf->end - buf->curpos; ++} ++ + /*=========================================================================*/ +diff -ur openslp-2.0.0.orig/common/slp_buffer.h openslp-2.0.0/common/slp_buffer.h +--- openslp-2.0.0.orig/common/slp_buffer.h 2012-11-28 09:07:04.000000000 -0800 ++++ openslp-2.0.0/common/slp_buffer.h 2019-11-26 21:54:32.000000000 -0800 +@@ -30,6 +30,13 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *-------------------------------------------------------------------------*/ + ++/* Copyright (c) 2019 VMware, Inc. ++ * SPDX-License-Identifier: BSD-3-Clause ++ * This file is provided under the BSD-3-Clause license. ++ * See COPYING file for more details and other copyrights ++ * that may apply. ++ */ ++ + /** Header file that defines SLP message buffer management routines. + * + * Includes structures, constants and functions that used to handle memory +@@ -78,6 +85,8 @@ + + SLPBuffer SLPBufferListAdd(SLPBuffer * list, SLPBuffer buf); + ++size_t RemainingBufferSpace(SLPBuffer buf); ++ + /*! @} */ + + #endif /* SLP_BUFFER_H_INCLUDED */ +diff -ur openslp-2.0.0.orig/slpd/slpd_process.c openslp-2.0.0/slpd/slpd_process.c +--- openslp-2.0.0.orig/slpd/slpd_process.c 2012-12-12 09:38:54.000000000 -0800 ++++ openslp-2.0.0/slpd/slpd_process.c 2019-11-26 21:55:10.000000000 -0800 +@@ -30,6 +30,13 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *-------------------------------------------------------------------------*/ + ++/* Copyright (c) 2019 VMware, Inc. ++ * SPDX-License-Identifier: BSD-3-Clause ++ * This file is provided under the BSD-3-Clause license. ++ * See COPYING file for more details and other copyrights ++ * that may apply. ++ */ ++ + /** Processes incoming SLP messages. + * + * @file slpd_process.c +@@ -514,13 +521,27 @@ + { + for (i = 0; i < db->urlcount; i++) + { +- /* urlentry is the url from the db result */ + urlentry = db->urlarray[i]; ++ if (urlentry->opaque != NULL) { ++ const int64_t newsize = size + urlentry->opaquelen; ++ if (urlentry->opaquelen <= 0 || newsize > INT_MAX) ++ { ++ SLPDLog("Invalid opaquelen %d or sizeo of opaque url is too big, size=%d\n", ++ urlentry->opaquelen, size); ++ errorcode = SLP_ERROR_PARSE_ERROR; ++ goto FINISHED; ++ } ++ size += urlentry->opaquelen; ++ } ++ else ++ { ++ /* urlentry is the url from the db result */ ++ size += urlentry->urllen + 6; /* 1 byte for reserved */ ++ /* 2 bytes for lifetime */ ++ /* 2 bytes for urllen */ ++ /* 1 byte for authcount */ ++ } + +- size += urlentry->urllen + 6; /* 1 byte for reserved */ +- /* 2 bytes for lifetime */ +- /* 2 bytes for urllen */ +- /* 1 byte for authcount */ + #ifdef ENABLE_SLPv2_SECURITY + /* make room to include the authblock that was asked for */ + if (G_SlpdProperty.securityEnabled +@@ -594,7 +615,7 @@ + urlentry = db->urlarray[i]; + + #ifdef ENABLE_SLPv1 +- if (urlentry->opaque == 0) ++ if (urlentry->opaque == NULL) + { + /* url-entry reserved */ + *result->curpos++ = 0; +@@ -606,8 +627,18 @@ + PutUINT16(&result->curpos, urlentry->urllen); + + /* url-entry url */ +- memcpy(result->curpos, urlentry->url, urlentry->urllen); +- result->curpos += urlentry->urllen; ++ if (RemainingBufferSpace(result) >= urlentry->urllen) ++ { ++ memcpy(result->curpos, urlentry->url, urlentry->urllen); ++ result->curpos = result->curpos + urlentry->urllen; ++ } ++ else ++ { ++ SLPDLog("Url too big (ask: %d have %" PRId64 "), failing request\n", ++ urlentry->opaquelen, (int64_t) RemainingBufferSpace(result)); ++ errorcode = SLP_ERROR_PARSE_ERROR; ++ goto FINISHED; ++ } + + /* url-entry auths */ + *result->curpos++ = 0; +@@ -621,8 +652,18 @@ + + /* TRICKY: Fix up the lifetime. */ + TO_UINT16(urlentry->opaque + 1, urlentry->lifetime); +- memcpy(result->curpos, urlentry->opaque, urlentry->opaquelen); +- result->curpos += urlentry->opaquelen; ++ if (RemainingBufferSpace(result) >= urlentry->opaquelen) ++ { ++ memcpy(result->curpos, urlentry->opaque, urlentry->opaquelen); ++ result->curpos = result->curpos + urlentry->opaquelen; ++ } ++ else ++ { ++ SLPDLog("Opaque Url too big (ask: %d have %" PRId64 "), failing request\n", ++ urlentry->opaquelen, (int64_t) RemainingBufferSpace(result)); ++ errorcode = SLP_ERROR_PARSE_ERROR; ++ goto FINISHED; ++ } + } + } + } diff --git a/nixpkgs/pkgs/development/libraries/openslp/default.nix b/nixpkgs/pkgs/development/libraries/openslp/default.nix index ddc0e893596f..4fa03c5e7c1b 100644 --- a/nixpkgs/pkgs/development/libraries/openslp/default.nix +++ b/nixpkgs/pkgs/development/libraries/openslp/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { sha256 = "0zp61axx93b7nrbsyhn2x4dnw7n9y6g4rys21hyqxk4khrnc2yr9"; }) ./CVE-2016-4912.patch + ./CVE-2019-5544.patch ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 2f901f0e4128..452f72146d95 100644 --- a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0znhv7x81bvqijk5xhc5w760d5yy6vr5c2y271wpk9lkmxbbcpl1"; + sha256 = "sha256-ZmaxHm4MPd2q83PLduoavoynqRPEI79IpMfW32gkV14="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index 0e09d563ea1f..5e99c644ebef 100644 --- a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.23.21"; + version = "0.23.22"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - sha256 = "1w24brn8j3vwfp07p2hldw2ci06pk1cx1dvjk8jjxkccp20fk958"; + sha256 = "sha256-erWqElJr0iESNUk9EZiJRmSMYhns8GxuFLNw7mIIIWs="; }; outputs = [ "out" "dev"]; diff --git a/nixpkgs/pkgs/development/libraries/packr/default.nix b/nixpkgs/pkgs/development/libraries/packr/default.nix index 7bf0cb2c5fbc..e3abc6e5d62e 100644 --- a/nixpkgs/pkgs/development/libraries/packr/default.nix +++ b/nixpkgs/pkgs/development/libraries/packr/default.nix @@ -1,7 +1,7 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv + , symlinkJoin }: diff --git a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix index 0b1b1f8fa578..d4b98d57e110 100644 --- a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "hepmc3"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; - sha256 = "0h9dbsbbf3y7iia27ms9cy4pfk2yyrkdnxcqsbvkhkl0izvv930f"; + sha256 = "sha256-jKrazCyWmIPNH5lLYieV/IhftLFdrYyK5kvL2/DL1H0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/pkger/default.nix b/nixpkgs/pkgs/development/libraries/pkger/default.nix index 4d7c682f0229..f2e984c8c816 100644 --- a/nixpkgs/pkgs/development/libraries/pkger/default.nix +++ b/nixpkgs/pkgs/development/libraries/pkger/default.nix @@ -1,7 +1,7 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv + }: buildGoModule rec { diff --git a/nixpkgs/pkgs/development/libraries/podofo/default.nix b/nixpkgs/pkgs/development/libraries/podofo/default.nix index e50a2111b437..ee99ab5de6f7 100644 --- a/nixpkgs/pkgs/development/libraries/podofo/default.nix +++ b/nixpkgs/pkgs/development/libraries/podofo/default.nix @@ -1,25 +1,16 @@ { lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig -, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch +, openssl, libpng, lua5, pkg-config, libidn, expat }: stdenv.mkDerivation rec { - version = "0.9.6"; + version = "0.9.7"; pname = "podofo"; src = fetchurl { url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz"; - sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9"; + sha256 = "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw"; }; - patches = [ - # https://sourceforge.net/p/podofo/tickets/24/ - (fetchpatch { - url = "https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch"; - extraPrefix = ""; - sha256 = "087h51x60zrakzx09baan77hwz99cwb5l1j802r5g4wj7pbjz0mb"; - }) - ]; - outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -41,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://podofo.sourceforge.net"; description = "A library to work with the PDF file format"; platforms = platforms.all; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix b/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix index 1f0ee81da951..cdfd376add1c 100644 --- a/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchFromGitHub +, fetchFromGitLab , autoreconfHook , pkg-config , glib @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - src = fetchFromGitHub { - owner = "Mattey40"; - repo = "poly2tri-c"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "jtojnar"; + repo = pname; rev = "p2tc-${version}"; sha256 = "158vm3wqfxs22b74kqc4prlvjny38qqm3kz5wrgasmx0qciwh0g8"; }; diff --git a/nixpkgs/pkgs/development/libraries/protolock/default.nix b/nixpkgs/pkgs/development/libraries/protolock/default.nix index b923898cc996..ef1fa6efec7b 100644 --- a/nixpkgs/pkgs/development/libraries/protolock/default.nix +++ b/nixpkgs/pkgs/development/libraries/protolock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protolock"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "nilslice"; repo = "protolock"; rev = "v${version}"; - sha256 = "0qg26vcqdhgy91p6wiv16dq73ay0fymran3d8ylca9264zwi2vxw"; + sha256 = "sha256-rnsHVJHFE/8JIOfMWqGBfIbIuOFyHtT54Vu/DaRY9js="; }; - vendorSha256 = "0ap1iwcapvvvmwgdc4zbsp8mglrhbswkdgm4dw8baw8qk0nlci6y"; + vendorSha256 = "sha256-3kRGLZgYcbUQb6S+NrleMNNX0dXrE9Yer3vvqxiP4So="; doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/prototypejs/default.nix b/nixpkgs/pkgs/development/libraries/prototypejs/default.nix index 81e72036694b..fd06b49604ad 100644 --- a/nixpkgs/pkgs/development/libraries/prototypejs/default.nix +++ b/nixpkgs/pkgs/development/libraries/prototypejs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ... }: +{ lib, fetchurl, ... }: let version = "1.7.3.0"; in fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/psol/generic.nix b/nixpkgs/pkgs/development/libraries/psol/generic.nix index 57784c3a5028..aa2522a5dad1 100644 --- a/nixpkgs/pkgs/development/libraries/psol/generic.nix +++ b/nixpkgs/pkgs/development/libraries/psol/generic.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib, stdenv }: +{ fetchzip, lib }: { version, sha256 }: { inherit version; } // fetchzip { inherit sha256; diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index aba9e77691a9..4d9e91157243 100644 --- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "10.0.4"; + version = "10.1.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "release-qpdf-${version}"; - sha256 = "1jqijnni2pmbbdk2g3pi14178j7mls8dj2bcwf1lds5ar0ghsagc"; + sha256 = "sha256-abPT1u/ceBrE1U+omOHiU3UjLrmcpdSpe1vgar0wUGk="; }; nativeBuildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix index 7dddd2bc67d2..a4ac41d81df7 100644 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -5,8 +5,7 @@ , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , alsaLib , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, flashplayerFix ? false, gdk-pixbuf -, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 +, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2, gdk-pixbuf , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs , developerBuild ? false , docs ? false @@ -108,10 +107,6 @@ stdenv.mkDerivation rec { libgnomeui = libgnomeui.out; gnome_vfs = gnome_vfs.out; })) - ++ lib.optional flashplayerFix (substituteAll { - src = ./dlopen-webkit-nsplugin.diff; - gtk = gtk2.out; - }) ++ lib.optional stdenv.isAarch64 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl"; diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff deleted file mode 100644 index d2ebbf3b45a8..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index 19941d6..0ec15e2 100644 ---- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -121,7 +121,7 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -index 2fe69d1..b658e4a 100644 ---- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -857,7 +857,7 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - -diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp -index 2c9b465..56b3074 100644 ---- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp -+++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp -@@ -42,7 +42,7 @@ namespace WebKit { - #if PLATFORM(QT) - static void initializeGTK() - { -- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = reinterpret_cast<gtk_init_check_ptr>(library.resolve("gtk_init_check")); -diff --git a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index b8c8f2a..e7f4dc5 100644 ---- a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -54,7 +54,7 @@ static Display *getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index cf5a0de11ad1..261374b7d93e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -89,15 +89,6 @@ let sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) - # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 - (fetchpatch { - name = "qtwebengine-bison-3.7-build.patch"; - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; - sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; - stripLen = 1; - extraPrefix = "src/3rdparty/"; - }) - ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-darwin-fix-failed-static-assertion.patch ]; @@ -124,7 +115,7 @@ let # to avoid cyclic dependencies between Qt modules. mkDerivation = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + { inherit lib; inherit debug; wrapQtAppsHook = null; } stdenvActual.mkDerivation; } { inherit self srcs patches; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh index e93c9acd3f05..6d2cf551dd5b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.9/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.10/submodules/ \ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/srcs.nix index f2ed6d13714f..03f8973766a9 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/srcs.nix @@ -4,323 +4,323 @@ { qt3d = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qt3d-everywhere-src-5.12.9.tar.xz"; - sha256 = "6fcde8c99bc5d09a5d2de99cab10c6f662d7db48139e6d5a3904fa0c580070ad"; - name = "qt3d-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qt3d-everywhere-src-5.12.10.tar.xz"; + sha256 = "1fnhdy0vwh1npq04pw3lzb15rsp0nx8wh57c8lvz9jn945xwc3vd"; + name = "qt3d-everywhere-src-5.12.10.tar.xz"; }; }; qtactiveqt = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtactiveqt-everywhere-src-5.12.9.tar.xz"; - sha256 = "e9df2dacfa4f93b42753066d14d3c504a30b259c177b366e32e6119f714f6527"; - name = "qtactiveqt-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtactiveqt-everywhere-src-5.12.10.tar.xz"; + sha256 = "0lf96ziba5g8izwcjzzaf4n2j336j6627rb3dzwvmsdkd9168zax"; + name = "qtactiveqt-everywhere-src-5.12.10.tar.xz"; }; }; qtandroidextras = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtandroidextras-everywhere-src-5.12.9.tar.xz"; - sha256 = "d6ab58d382feb1d79b7f28033eaa15ecab0c1f97c760fad50f20608189ab1a95"; - name = "qtandroidextras-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtandroidextras-everywhere-src-5.12.10.tar.xz"; + sha256 = "0blapv4jd80wcvzp96zxlrsyca7lwax17y6yij1d14a51353hrnc"; + name = "qtandroidextras-everywhere-src-5.12.10.tar.xz"; }; }; qtbase = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtbase-everywhere-src-5.12.9.tar.xz"; - sha256 = "331dafdd0f3e8623b51bd0da2266e7e7c53aa8e9dc28a8eb6f0b22609c5d337e"; - name = "qtbase-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtbase-everywhere-src-5.12.10.tar.xz"; + sha256 = "0h39r3irahdms4gidg5l4a1kr7kagc4bd0y02sapg3njwrsg3240"; + name = "qtbase-everywhere-src-5.12.10.tar.xz"; }; }; qtcanvas3d = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtcanvas3d-everywhere-src-5.12.9.tar.xz"; - sha256 = "351b105507b97e61eef17a5ce8a96fe090a523101e41c20ea373266203dd3ca0"; - name = "qtcanvas3d-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtcanvas3d-everywhere-src-5.12.10.tar.xz"; + sha256 = "0pbxw89m2s19yk2985c49msd7s1mapydka9b7nzg9phs9nrzvf1m"; + name = "qtcanvas3d-everywhere-src-5.12.10.tar.xz"; }; }; qtcharts = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtcharts-everywhere-src-5.12.9.tar.xz"; - sha256 = "9fc2a64a96b73746389c257684af557e70c5360bead53d61d059f968efdc5b04"; - name = "qtcharts-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtcharts-everywhere-src-5.12.10.tar.xz"; + sha256 = "0cndm8llvfl9jdzn34b886gxgxwsibb24amhblh96cadhhkpwadc"; + name = "qtcharts-everywhere-src-5.12.10.tar.xz"; }; }; qtconnectivity = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtconnectivity-everywhere-src-5.12.9.tar.xz"; - sha256 = "e5457ebc22059954bba6a08b03fd1e6f30e4c8f3146636065bf12c2e6044f41c"; - name = "qtconnectivity-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtconnectivity-everywhere-src-5.12.10.tar.xz"; + sha256 = "19l816zfpx87vwzj18mbib5x3mb9hy1msacpy8i9bagfw9p0i6c0"; + name = "qtconnectivity-everywhere-src-5.12.10.tar.xz"; }; }; qtdatavis3d = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtdatavis3d-everywhere-src-5.12.9.tar.xz"; - sha256 = "0cd4f7535bf26e4e59f89fac991fc8a400bd6193680578f31693235f185f4562"; - name = "qtdatavis3d-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdatavis3d-everywhere-src-5.12.10.tar.xz"; + sha256 = "1ximhph17kkh40v2ksk51lq21mbjs2ajyf5l32ckhc7n7bmaryb6"; + name = "qtdatavis3d-everywhere-src-5.12.10.tar.xz"; }; }; qtdeclarative = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtdeclarative-everywhere-src-5.12.9.tar.xz"; - sha256 = "c11ae68aedcdea7e721ec22a95265ac91b5e128a5c12d3b61b5b732d3a02be80"; - name = "qtdeclarative-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdeclarative-everywhere-src-5.12.10.tar.xz"; + sha256 = "05la1zlijcaargfh4ljnmxvvksdwzl409wl7w3m96kwm8s370mmf"; + name = "qtdeclarative-everywhere-src-5.12.10.tar.xz"; }; }; qtdoc = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtdoc-everywhere-src-5.12.9.tar.xz"; - sha256 = "a9d751af85a07bdfc2a30e8f1b08aa249547a8100801f286e77280a9c9ede624"; - name = "qtdoc-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdoc-everywhere-src-5.12.10.tar.xz"; + sha256 = "0ljc29hnn8knncvq8hsk0rdcwrxbsk1ywlprknkvyb4pggp9rkp6"; + name = "qtdoc-everywhere-src-5.12.10.tar.xz"; }; }; qtgamepad = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtgamepad-everywhere-src-5.12.9.tar.xz"; - sha256 = "da3333af6b9dccd7dd3a25b01de65e317fe4b70b9d39eeb84e01c232063211fe"; - name = "qtgamepad-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtgamepad-everywhere-src-5.12.10.tar.xz"; + sha256 = "1bs50wghy3n8af656angkkkaac0swkq3mfllg3dkjg236ngzdhdh"; + name = "qtgamepad-everywhere-src-5.12.10.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtgraphicaleffects-everywhere-src-5.12.9.tar.xz"; - sha256 = "1eb4b913d5cb6d0b46a231288b9717f4785fbd212936e98a8b2a8c9024e3a8bf"; - name = "qtgraphicaleffects-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtgraphicaleffects-everywhere-src-5.12.10.tar.xz"; + sha256 = "0hnsb757ircqmid34d0cxbh0mi4qnil22k5ka9a1b8xy00ydkfky"; + name = "qtgraphicaleffects-everywhere-src-5.12.10.tar.xz"; }; }; qtimageformats = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtimageformats-everywhere-src-5.12.9.tar.xz"; - sha256 = "cd8193698f830cce30959564c191e7bb698877aca3a263c652b4a23907c72b6a"; - name = "qtimageformats-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtimageformats-everywhere-src-5.12.10.tar.xz"; + sha256 = "1bh38xp4v914ksg91p9pij1gsdzs3y7sn7diy3d7wn5i039syn0i"; + name = "qtimageformats-everywhere-src-5.12.10.tar.xz"; }; }; qtlocation = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtlocation-everywhere-src-5.12.9.tar.xz"; - sha256 = "be31870104af2910690850c4e28bab3ccb76f1aa8deef1e870bcbc6b276aa2c1"; - name = "qtlocation-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtlocation-everywhere-src-5.12.10.tar.xz"; + sha256 = "1czg0z69ilnxp1sqk0jawlnyp2gx87yb57g8dwjznqxxvaq744dc"; + name = "qtlocation-everywhere-src-5.12.10.tar.xz"; }; }; qtmacextras = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtmacextras-everywhere-src-5.12.9.tar.xz"; - sha256 = "5458f3e13c37eb8bff8588b29703fb33b61d5ea19989c56c99d36f221e269f35"; - name = "qtmacextras-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtmacextras-everywhere-src-5.12.10.tar.xz"; + sha256 = "0mh9p3f1f22pj4i8yxnn56amy53dapmcikza04ll4fvx5hy340v8"; + name = "qtmacextras-everywhere-src-5.12.10.tar.xz"; }; }; qtmultimedia = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtmultimedia-everywhere-src-5.12.9.tar.xz"; - sha256 = "59a2f2418cefe030094687dff0846fb8957abbc0e060501a4fee40cb4a52838c"; - name = "qtmultimedia-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtmultimedia-everywhere-src-5.12.10.tar.xz"; + sha256 = "0g50jzhwbrl5r0lmfz5ffpkp54mf0zfc8m884x51yn2bnngg366c"; + name = "qtmultimedia-everywhere-src-5.12.10.tar.xz"; }; }; qtnetworkauth = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtnetworkauth-everywhere-src-5.12.9.tar.xz"; - sha256 = "a0979689eda667e299fd9cf5a8859bd9c37eabc0a6d9738103a1143035baf0e4"; - name = "qtnetworkauth-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtnetworkauth-everywhere-src-5.12.10.tar.xz"; + sha256 = "12n3xqlskrk2mbcgz5p613sx219j6rmpq8yn7p97xdv7li61gzl2"; + name = "qtnetworkauth-everywhere-src-5.12.10.tar.xz"; }; }; qtpurchasing = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtpurchasing-everywhere-src-5.12.9.tar.xz"; - sha256 = "565587811b3cfd201907d3fcbf7120783de32a4d1d3c59a9efff3720cf0af3e5"; - name = "qtpurchasing-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtpurchasing-everywhere-src-5.12.10.tar.xz"; + sha256 = "1azdg03vxyk140i9z93x0zzlazbmd3qrqxgwk747jsd1ibns9ddy"; + name = "qtpurchasing-everywhere-src-5.12.10.tar.xz"; }; }; qtquickcontrols = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtquickcontrols-everywhere-src-5.12.9.tar.xz"; - sha256 = "d89084ebccf155f4c966d4a2a188e6e870c37535a7751740960f5c38088373f6"; - name = "qtquickcontrols-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtquickcontrols-everywhere-src-5.12.10.tar.xz"; + sha256 = "1cy9vjl9zf95frnydzljqwbx3is8p8w27kdgszvmb67p6xkpblk7"; + name = "qtquickcontrols-everywhere-src-5.12.10.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtquickcontrols2-everywhere-src-5.12.9.tar.xz"; - sha256 = "ea1c2864630c6ba2540228f81ec5b582619d5ce9e4cb98e91109b4181a65a31d"; - name = "qtquickcontrols2-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtquickcontrols2-everywhere-src-5.12.10.tar.xz"; + sha256 = "0541n8n012d0xwxrfznv1jwh28d35mdx6cl8jadsaxaspgwz4vb3"; + name = "qtquickcontrols2-everywhere-src-5.12.10.tar.xz"; }; }; qtremoteobjects = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtremoteobjects-everywhere-src-5.12.9.tar.xz"; - sha256 = "f87af7e9931280f2b44a529dc174cae14247e1b50f9dc9bde8966adb0406babd"; - name = "qtremoteobjects-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtremoteobjects-everywhere-src-5.12.10.tar.xz"; + sha256 = "147p0xdi22xz2d3501ig78bs97gbyz8ccyhn6dhbw2yalx33gma6"; + name = "qtremoteobjects-everywhere-src-5.12.10.tar.xz"; }; }; qtscript = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtscript-everywhere-src-5.12.9.tar.xz"; - sha256 = "8f2e12e37ff1e7629923cf3b9d446f85e005b2248386e33879ba3b790f1416df"; - name = "qtscript-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtscript-everywhere-src-5.12.10.tar.xz"; + sha256 = "1cfcfwq4shr6yphgwq2jnvgzjjqjrz10qnzr7dccksmfg3i0ad02"; + name = "qtscript-everywhere-src-5.12.10.tar.xz"; }; }; qtscxml = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtscxml-everywhere-src-5.12.9.tar.xz"; - sha256 = "d68d04d83366f11b10a101766baf5253e53ad76a683e0bc15e7dd403d475e61c"; - name = "qtscxml-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtscxml-everywhere-src-5.12.10.tar.xz"; + sha256 = "057zchhm1s5ly2a685y4105pgmzgqp1jkkf9w0ca8xd05z4clb4r"; + name = "qtscxml-everywhere-src-5.12.10.tar.xz"; }; }; qtsensors = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtsensors-everywhere-src-5.12.9.tar.xz"; - sha256 = "77054e2449bcac786cc8f07c0d65c503a22bc629af4844259ff0def27b9889e9"; - name = "qtsensors-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtsensors-everywhere-src-5.12.10.tar.xz"; + sha256 = "10f00njvc7kwjci0g4g3pibl9ra798iplvj2ymql3zppxqqdq25m"; + name = "qtsensors-everywhere-src-5.12.10.tar.xz"; }; }; qtserialbus = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtserialbus-everywhere-src-5.12.9.tar.xz"; - sha256 = "08b16363a47f9b41f87e3b7cf63eaed2435bb6b7e27775c9717ff863e56141ed"; - name = "qtserialbus-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtserialbus-everywhere-src-5.12.10.tar.xz"; + sha256 = "0zd0crs2nrsvncj070fl05g0nm3j5bf16g54c7m9603b6q7bryrx"; + name = "qtserialbus-everywhere-src-5.12.10.tar.xz"; }; }; qtserialport = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtserialport-everywhere-src-5.12.9.tar.xz"; - sha256 = "24a10b65b03fc598acd30f4a52b0b71218e9c03ec4bb31a4ca50aae1b52a986d"; - name = "qtserialport-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtserialport-everywhere-src-5.12.10.tar.xz"; + sha256 = "0anndf6pyssiygj0kk2j80vwil2z0765gccs87djhsni1xvk3n9r"; + name = "qtserialport-everywhere-src-5.12.10.tar.xz"; }; }; qtspeech = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtspeech-everywhere-src-5.12.9.tar.xz"; - sha256 = "2efdaf5f49d2fad4a6c4cde12dfee2ff2c66ab4298f22d6c203ecd6019186847"; - name = "qtspeech-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtspeech-everywhere-src-5.12.10.tar.xz"; + sha256 = "11fycm604r1xswb9dg1g568jxd68zd9m2dzfy4qda6sr4mdaj6jg"; + name = "qtspeech-everywhere-src-5.12.10.tar.xz"; }; }; qtsvg = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtsvg-everywhere-src-5.12.9.tar.xz"; - sha256 = "32ec251e411d31734b873dd82fd68b6a3142227fdf06fe6ad879f16997fb98d2"; - name = "qtsvg-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtsvg-everywhere-src-5.12.10.tar.xz"; + sha256 = "0jrkz8y225g93pznsvc1icanxxc5cfm23ic2y6rprqaqw77z9zxm"; + name = "qtsvg-everywhere-src-5.12.10.tar.xz"; }; }; qttools = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qttools-everywhere-src-5.12.9.tar.xz"; - sha256 = "002dc23410a9d1af6f1cfc696ee18fd3baeddbbfeb9758ddb04bbdb17b2fffdf"; - name = "qttools-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qttools-everywhere-src-5.12.10.tar.xz"; + sha256 = "0v339a1w3kqvfl8hcds032g8zafp8d4c1b2rzihpq6y4mbksdkxh"; + name = "qttools-everywhere-src-5.12.10.tar.xz"; }; }; qttranslations = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qttranslations-everywhere-src-5.12.9.tar.xz"; - sha256 = "50bd3a329e86f14af05ef0dbef94c7a6cd6c1f89ca4d008088a44ba76e6ecf40"; - name = "qttranslations-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qttranslations-everywhere-src-5.12.10.tar.xz"; + sha256 = "1pjkkkkjvs9harz70sir67yf3i528vyn1shmi09hlzlb23nmipp1"; + name = "qttranslations-everywhere-src-5.12.10.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtvirtualkeyboard-everywhere-src-5.12.9.tar.xz"; - sha256 = "7598ee3312a2f4e72edf363c16c506740a8b91c5c06544da068a3c0d73f7f807"; - name = "qtvirtualkeyboard-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtvirtualkeyboard-everywhere-src-5.12.10.tar.xz"; + sha256 = "0afw3lj5cg3zj0hzxlhz5l7s1j2y491yxwylc4vchbqjpyvsadgg"; + name = "qtvirtualkeyboard-everywhere-src-5.12.10.tar.xz"; }; }; qtwayland = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwayland-everywhere-src-5.12.9.tar.xz"; - sha256 = "6f416948a98586b9c13c46b36be5ac6bb96a1dde9f50123b5e6dcdd102e9d77e"; - name = "qtwayland-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwayland-everywhere-src-5.12.10.tar.xz"; + sha256 = "1bs61xmc4l03w21wkrxx0llfg5bbnq5ij7w0bnfkx3rk0vncy0q6"; + name = "qtwayland-everywhere-src-5.12.10.tar.xz"; }; }; qtwebchannel = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebchannel-everywhere-src-5.12.9.tar.xz"; - sha256 = "d55a06a0929c86664496e1113e74425d56d175916acd8abbb95c371eb16b43eb"; - name = "qtwebchannel-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebchannel-everywhere-src-5.12.10.tar.xz"; + sha256 = "1jmprqgavqwknnnl6qp0psxz7bc69ivxhm7y4qci95vpx9k5yjg8"; + name = "qtwebchannel-everywhere-src-5.12.10.tar.xz"; }; }; qtwebengine = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebengine-everywhere-src-5.12.9.tar.xz"; - sha256 = "27a9a19e4deb5e7a0fabc13e38fe5a8818730c92f6a343b9084aa17977468e25"; - name = "qtwebengine-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebengine-everywhere-src-5.12.10.tar.xz"; + sha256 = "16zbyfc7qy9f20anfrdi25f6nf1j7zw8kps60mqb18nfjw411d50"; + name = "qtwebengine-everywhere-src-5.12.10.tar.xz"; }; }; qtwebglplugin = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebglplugin-everywhere-src-5.12.9.tar.xz"; - sha256 = "cb7ba4cb66900e5d4315809e2b5ad3e4e381d576a14f6224f8ea58373f997c42"; - name = "qtwebglplugin-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebglplugin-everywhere-src-5.12.10.tar.xz"; + sha256 = "0nhim67rl9dbshnarismnd54qzks8v14a08h8qi7x0dm9bj9ij7q"; + name = "qtwebglplugin-everywhere-src-5.12.10.tar.xz"; }; }; qtwebsockets = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebsockets-everywhere-src-5.12.9.tar.xz"; - sha256 = "08a92c36d52b4d93a539a950698bb2912ea36055015d421f874bf672637f21ef"; - name = "qtwebsockets-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebsockets-everywhere-src-5.12.10.tar.xz"; + sha256 = "0p74ds53d3a30i7pq85b9ql9i4z1p0yyanhmaizw2bv9225py4jr"; + name = "qtwebsockets-everywhere-src-5.12.10.tar.xz"; }; }; qtwebview = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebview-everywhere-src-5.12.9.tar.xz"; - sha256 = "3e0506411d101cc08232946bcacef2fb90884c27eb91eeb97a1a68ed3788a7b6"; - name = "qtwebview-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebview-everywhere-src-5.12.10.tar.xz"; + sha256 = "07pz7wfhyijfdlxnaqpn4hwgvpglma6dfmkcb8xw6hfhg30riaxd"; + name = "qtwebview-everywhere-src-5.12.10.tar.xz"; }; }; qtwinextras = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwinextras-everywhere-src-5.12.9.tar.xz"; - sha256 = "7bab5053197148a5e1609cab12331e4a3f2e1a86bcbde137948330b288803754"; - name = "qtwinextras-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwinextras-everywhere-src-5.12.10.tar.xz"; + sha256 = "1x5k0z0p94zppqsw2fz8ki9v5abf0crzva16wllznn89ylqjyn0j"; + name = "qtwinextras-everywhere-src-5.12.10.tar.xz"; }; }; qtx11extras = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtx11extras-everywhere-src-5.12.9.tar.xz"; - sha256 = "09432392641b56205cbcda6be89d0835bfecad64ad61713a414b951b740c9cec"; - name = "qtx11extras-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtx11extras-everywhere-src-5.12.10.tar.xz"; + sha256 = "0xk10iynkfs31vgpadrmw30k4s1hlnggxy2f3q988qyqd37dh5h8"; + name = "qtx11extras-everywhere-src-5.12.10.tar.xz"; }; }; qtxmlpatterns = { - version = "5.12.9"; + version = "5.12.10"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtxmlpatterns-everywhere-src-5.12.9.tar.xz"; - sha256 = "8d0e92fce6b4cbe7f1ecd1e90f6c7d71681b9b8870a577c0b18cadd93b8713b2"; - name = "qtxmlpatterns-everywhere-src-5.12.9.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtxmlpatterns-everywhere-src-5.12.10.tar.xz"; + sha256 = "1qg09yxagz36sry03kv3swwfjc8lrik1asjk2lxlpzzcl2q95lbv"; + name = "qtxmlpatterns-everywhere-src-5.12.10.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix index 7139a3b73541..14b99fab4e27 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix @@ -123,12 +123,12 @@ let import ../qtModule.nix { inherit perl; - inherit (stdenv) lib; + inherit lib; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + { inherit lib; inherit debug; wrapQtAppsHook = null; } stdenvActual.mkDerivation; } { inherit self srcs patches; }; @@ -140,7 +140,7 @@ let mkDerivationWith = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; + { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; mkDerivation = mkDerivationWith stdenvActual.mkDerivation; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index a3a0496f160f..6333f889b684 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -84,7 +84,10 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ ] - ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; + ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch + ./qtwebengine-mac-dont-set-dsymutil-path.patch + ]; qtwebkit = [ (fetchpatch { name = "qtwebkit-bison-3.7-build.patch"; @@ -103,12 +106,12 @@ let import ../qtModule.nix { inherit perl; - inherit (stdenv) lib; + inherit lib; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + { inherit lib; inherit debug; wrapQtAppsHook = null; } stdenvActual.mkDerivation; } { inherit self srcs patches; }; @@ -120,7 +123,7 @@ let mkDerivationWith = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; + { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; mkDerivation = mkDerivationWith stdenvActual.mkDerivation; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch index 546e753144d0..44df09299251 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch @@ -1,27 +1,31 @@ -diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf ---- a/mkspecs/features/platform.prf -+++ b/mkspecs/features/platform.prf -@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { - } else:osx { - # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 - !isMinXcodeVersion(8, 3, 3) { -- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") -- return(false) +diff a/configure.pri b/configure.pri +--- a/configure.pri ++++ b/configure.pri +@@ -439,8 +439,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) { + + defineTest(qtwebengine_isMacOsPlatformSupported) { + !qtwebengine_isMinXcodeVersion(10, 0, 0) { +- qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.") +- return(false) } !clang|intel_icc { - skipBuild("Qt WebEngine on macOS requires Clang.") -@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { - return(false) + qtwebengine_platformError("requires Clang.") +@@ -449,12 +447,6 @@ defineTest(qtwebengine_isMacOsPlatformSupported) { + # We require macOS 10.13 (darwin version 17.0.0) or newer. + darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) + lessThan(darwin_major_version, 17) { +- qtwebengine_platformError("requires macOS version 10.13 or newer.") +- return(false) +- } +- !qtwebengine_isMinOSXSDKVersion(10, 13): { +- qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) } - !isMinOSXSDKVersion(10, 12): { -- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") -- return(false) - } - } else { - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") -diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri ---- a/src/core/config/mac_osx.pri -+++ b/src/core/config/mac_osx.pri + return(true) + } +diff a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri +--- a/src/buildtools/config/mac_osx.pri ++++ b/src/buildtools/config/mac_osx.pri @@ -5,8 +5,6 @@ load(functions) # otherwise query for it. QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) @@ -29,5 +33,5 @@ diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri - QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") - isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") } - - QMAKE_CLANG_DIR = "/usr" + + # chromium/build/mac/find_sdk.py expects the SDK version (mac_sdk_min) in Major.Minor format. diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch new file mode 100644 index 000000000000..dcdf5f57ffdc --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch @@ -0,0 +1,12 @@ +diff a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn +--- a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn ++++ b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn +@@ -184,8 +184,6 @@ template("mac_toolchain") { + # If dSYMs are enabled, this flag will be added to the link tools. + if (_enable_dsyms) { + dsym_switch = " -Wcrl,dsym,{{root_out_dir}} " +- dsym_switch += "-Wcrl,dsymutilpath," + +- "${prefix}dsymutil" + " " + + dsym_output_dir = + "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM" diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 6639e4c8d697..5e7ccf702045 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, qtModule, qtbase }: +{ lib, qtModule, qtbase }: qtModule { name = "qtmacextras"; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index b79479e5dbab..7e5582cca481 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -16,6 +16,7 @@ , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_3 ? null , lib, stdenv, fetchpatch +, qtCompatVersion }: with lib; @@ -66,21 +67,31 @@ qtModule { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' - + optionalString stdenv.isDarwin ('' + + optionalString stdenv.isDarwin ( + (if (lib.versionAtLeast qtCompatVersion "5.14") then '' + substituteInPlace src/buildtools/config/mac_osx.pri \ + --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' + '' else '' substituteInPlace src/core/config/mac_osx.pri \ --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' - '' + '') # Following is required to prevent a build error: # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it + '' substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ --replace '$sysroot/usr' "${darwin.xnu}" '' - + '' # Apple has some secret stuff they don't share with OpenBSM + + (if (lib.versionAtLeast qtCompatVersion "5.14") then '' + substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \ + --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ + --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" + '' else '' substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - + '') + + '' substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \ --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' ''); diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index ed41a4ac9bc0..288a0e30f690 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -1,10 +1,9 @@ { qtModule, stdenv, lib, fetchurl , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel -, fontconfig, gtk2, libwebp, libxml2, libxslt +, fontconfig, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake , bison, flex, gdb, gperf, perl, pkg-config, python2, ruby , darwin -, flashplayerFix ? false }: let @@ -58,12 +57,6 @@ qtModule { ++ optional stdenv.cc.isGNU "-Wno-class-memaccess" # with clang this warning blows the log over Hydra's limit ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override" - ++ optionals flashplayerFix - [ - ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' - # this file used to exist in gdk_pixbuf? - ''-DNIXPKGS_LIBGDK2="${getLib gtk2}/lib/libgdk-x11-2.0"'' - ] ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; doCheck = false; # fails 13 out of 13 tests (ctest) diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix index 84d7f46a2b29..4587bf461624 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: mkDerivation { name = "qtstyleplugins-2017-03-11"; diff --git a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index 2a4f9973bde6..a42941cbb689 100644 --- a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "12cc7l5vpxyrm8ca0cpm8sdl54hb8dranal8sz55r9y8igz1q1wb"; + sha256 = "sha256-VCGR0Q8FcoDLr+CFTk/OLMI4zs87K/IdZS1ANmkeb4s="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/relibc/default.nix b/nixpkgs/pkgs/development/libraries/relibc/default.nix index cedffcaaef9f..5f27f902fa9b 100644 --- a/nixpkgs/pkgs/development/libraries/relibc/default.nix +++ b/nixpkgs/pkgs/development/libraries/relibc/default.nix @@ -1,7 +1,7 @@ -{ stdenvNoCC, buildPackages, makeRustPlatform }: +{ lib, stdenvNoCC, buildPackages, makeRustPlatform }: let - rpath = stdenvNoCC.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ buildPackages.stdenv.cc.libc "$out" ]; @@ -30,7 +30,7 @@ let "{}" \; ''; - meta.platforms = with stdenvNoCC.lib; platforms.redox ++ platforms.linux; + meta.platforms = with lib; platforms.redox ++ platforms.linux; }; redoxRustPlatform = buildPackages.makeRustPlatform { @@ -68,7 +68,7 @@ redoxRustPlatform.buildRustPackage rec { cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz"; - meta = with stdenvNoCC.lib; { + meta = with lib; { homepage = "https://gitlab.redox-os.org/redox-os/relibc"; description = "C Library in Rust for Redox and Linux"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/reproc/default.nix b/nixpkgs/pkgs/development/libraries/reproc/default.nix new file mode 100644 index 000000000000..6531414601db --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/reproc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, cmake +}: + +stdenv.mkDerivation rec { + pname = "reproc"; + version = "14.1.0"; + + src = fetchFromGitHub { + owner = "DaanDeMeyer"; + repo = "reproc"; + rev = "v${version}"; + sha256 = "1n71wb50qv2dmhjgw7azx5gigbrp19l2n3d41g9p05l5l0y1qg0q"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DBUILD_SHARED_LIBS=ON" + "-DREPROC++=ON" + "-DREPROC_TEST=ON" + ]; + + meta = with lib; { + homepage = "https://github.com/DaanDeMeyer/reproc"; + description = "A cross-platform (C99/C++11) process library"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/nixpkgs/pkgs/development/libraries/rocclr/default.nix index 9337680f55c7..278fdecc1a67 100644 --- a/nixpkgs/pkgs/development/libraries/rocclr/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocclr/default.nix @@ -32,11 +32,8 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace CMakeLists.txt \ - --replace 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_CURRENT_BINARY_DIR}/amdrocclr_staticTargets.cmake")' \ - 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_INSTALL_LIBDIR}/cmake/amdrocclr_staticTargets.cmake")' \ --replace 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_CURRENT_BINARY_DIR}/lib)' \ - 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})' \ - --replace 'find_library( OpenCL REQUIRED' 'find_library( OpenCL' + 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})' substituteInPlace device/comgrctx.cpp \ --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so" ''; diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index d6f685ff4dee..e4ee3c473075 100644 --- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.14.6"; + version = "6.15.5"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0cp0jgzwkwamykgnmsg0zvzakq58f1ihs7lslnn4nh4p9gm75rq5"; + sha256 = "sha256-o7bi0xcWaH5DXcEJgfY7MxhYfntqhzGoko6EqgrKyY8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index b631def3bb2e..34fea3162a9c 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , callPackage , stdenvNoCC , fetchurl @@ -135,7 +136,7 @@ in stdenvNoCC.mkDerivation { ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt} - '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3" ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3" ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3" @@ -145,7 +146,7 @@ in stdenvNoCC.mkDerivation { # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool # explicitly and ignore the error. - postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin '' + postFixup = lib.optionalString stdenvNoCC.isDarwin '' for f in $out/lib/*.dylib; do install_name_tool -id $out/lib/$(basename $f) $f || true done @@ -160,7 +161,7 @@ in stdenvNoCC.mkDerivation { passthru.tests.pkg-config = callPackage ./test { }; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Intel Math Kernel Library"; longDescription = '' Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort diff --git a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 2c4198d9679a..5bfef9e8ba3b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "0m3khv7qidhfly634bf5w0ci5qnvndmihc4a836a0cy047pw9g6k"; + sha256 = "sha256-61hSBNbJlWkeVUXqT/y4h8FZvwXMXuG7+Spvzd4vzK4="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 7696b18e7ca4..151a0eef8916 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.3.3"; + version = "4.0.3"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "1nmygb2yny0mdqp0mc6760gbxklq1jjm0c6s39qkdwzf3n9f8j7p"; + sha256 = "sha256-Bf3+w/kQtFpeUGp2zWVqja535EbaUw7DbhCw54B6A8k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix b/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix index c2beda45ab3a..e3c8ea00f446 100644 --- a/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix +++ b/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchurl, unzip, ... }: + +stdenv.mkDerivation rec { pname = "scriptaculous"; version = "1.9.0"; diff --git a/nixpkgs/pkgs/development/libraries/sharness/default.nix b/nixpkgs/pkgs/development/libraries/sharness/default.nix new file mode 100644 index 000000000000..43a102686e9c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/sharness/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchurl +, perl +, perlPackages +, sharnessExtensions ? {} }: + +stdenv.mkDerivation rec { + pname = "sharness"; + version = "1.1.0-dev"; + + src = fetchFromGitHub { + owner = "chriscool"; + repo = pname; + rev = "3f238a740156dd2082f4bd60ced205e05894d367"; # 2020-12-09 + sha256 = "FCYskpIqkrpNaWCi2LkhEkiow4/rXLe+lfEWNUthLUg="; + }; + + # Used for testing + nativeBuildInputs = [ perl perlPackages.IOTty ]; + + outputs = [ "out" "doc" ]; + + makeFlags = [ "prefix=$(out)" ]; + + extensions = lib.mapAttrsToList (k: v: "${k}.sh ${v}") sharnessExtensions; + + postInstall = lib.optionalString (sharnessExtensions != {}) '' + extDir=$out/share/sharness/sharness.d + mkdir -p "$extDir" + linkExtensions() { + set -- $extensions + while [ $# -ge 2 ]; do + ln -s "$2" "$extDir/$1" + shift 2 + done + } + linkExtensions + ''; + + doCheck = true; + + meta = with lib; { + description = "Portable shell library to write, run and analyze automated tests adhering to Test Anything Protocol (TAP)"; + homepage = "https://github.com/chriscool/sharness"; + license = licenses.gpl2Only; + maintainers = [ maintainers.spacefrogg ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix index e41d08c7cd38..448270183a5f 100644 --- a/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "0lpb8la74xwd78d5mgwnzx4fy632jbmh0ip19v0dydwm0kagm0a3"; + sha256 = "1x5f8b5s67kf9sjx04rp81q0f3dlnqfngn3h0lrfnphipald5fji"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix b/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix index 7fb6b1adb5a8..e617ba58e8b4 100644 --- a/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix +++ b/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "smarty-i18n"; version = "1.0"; diff --git a/nixpkgs/pkgs/development/libraries/smarty3/default.nix b/nixpkgs/pkgs/development/libraries/smarty3/default.nix index 2070a3bab790..29f640dedfcb 100644 --- a/nixpkgs/pkgs/development/libraries/smarty3/default.nix +++ b/nixpkgs/pkgs/development/libraries/smarty3/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "smarty3"; version = "3.1.36"; diff --git a/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix index ac74b74ccf1e..7b6c98bebe80 100644 --- a/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -14,7 +14,8 @@ let }; nativeBuildInputs = [ cmake ]; - buildInputs = [ fmt ]; + # spdlog <1.3 uses a bundled version of fmt + propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt; cmakeFlags = [ "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" @@ -25,7 +26,9 @@ let "-DSPDLOG_FMT_EXTERNAL=ON" ]; - outputs = [ "out" "doc" ]; + outputs = [ "out" "doc" ] + # spdlog <1.4 is header only, no need to split libraries and headers + ++ lib.optional (lib.versionAtLeast version "1.4") "dev"; postInstall = '' mkdir -p $out/share/doc/spdlog diff --git a/nixpkgs/pkgs/development/libraries/spglib/default.nix b/nixpkgs/pkgs/development/libraries/spglib/default.nix new file mode 100644 index 000000000000..12d696b65a8e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/spglib/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, cmake } : + +stdenv.mkDerivation rec { + pname = "spglib"; + version = "1.16.1"; + + src = fetchFromGitHub { + owner = "atztogo"; + repo = "spglib"; + rev = "v${version}"; + sha256 = "1sk59nnar9npka4mdcfh4154ja46i35y4gbq892kwqidzyfs80in"; + }; + + nativeBuildInputs = [ cmake ]; + + checkTarget = "check"; + doCheck = true; + + meta = with lib; { + description = "C library for finding and handling crystal symmetries"; + homepage = "https://atztogo.github.io/spglib/"; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index cc5656dcc643..9097d5abe54f 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.4.0"; + version = "4.4.2"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "0mx0n5n3s39r25b31sdkrd4psxjqqgcv6rpm9d57w5rlk75g2fiv"; + sha256 = "0zhww6fpnfflnzp6091npz38ab6cpq75v3ghqvcj5kqg09vqm5na"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index 2b7a472d1e78..bf1b8b7aa3b2 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -12,12 +12,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.34.0"; + version = "3.34.1"; # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1vlsvlp5nvhd5pdjpmdczfsv7mml2gsalykl6x3palbxwgxbfvdz"; + url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz"; + sha256 = "129ynp0qbxrfj1ys9hdi0jk8svds0cwfzl31af7bicqp25cclfra"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index 3ec528719e9e..b423e557a56e 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,11 +4,11 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.34.0"; + version = "3.34.1"; src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0giklai05shqalj1wwadi9hg5dx6vff8nrblqh9xxljnrq701hm5"; + url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip"; + sha256 = "0giklai05shqalj1wwadi9hg5dx6vff8nrblqh9xxljnrq701h00"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix b/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix index 8badf60d9421..f55c72bd2095 100644 --- a/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix +++ b/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, cfitsio, gsl, wcslib, withTester ? false }: mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix index f8db8f3c379a..3536ebd586e4 100644 --- a/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , cmake , fetchurl -, fetchpatch , python , blas , lapack @@ -13,24 +12,15 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "5.6.1"; + version = "5.7.0"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "Frd5mex+fyFXqh0Eyh3kojccqBUOBW0klR0MWJZvKoM="; + sha256 = "jW3QlP7Mu41uzEE0DsFqZfq6yC7UQVAj9tfBwjkOovM="; }; - patches = [ - # Fixing an upstream regression in treating cmake prefix directories: - # https://github.com/LLNL/sundials/pull/58 - (fetchpatch { - url = "https://github.com/LLNL/sundials/commit/dd32ff9baa05618f36e44aadb420bbae4236ea1e.patch"; - sha256 = "kToAuma+2iHFyL1v/l29F3+nug4AdK5cPG6IcXv2afc="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/tagparser/default.nix b/nixpkgs/pkgs/development/libraries/tagparser/default.nix new file mode 100644 index 000000000000..deeb7552069f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/tagparser/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, pkgs +, fetchFromGitHub +, cmake +, cpp-utilities +, zlib +}: + +stdenv.mkDerivation rec { + pname = "tagparser"; + version = "9.4.0"; + + src = fetchFromGitHub { + owner = "Martchus"; + repo = "tagparser"; + rev = "v${version}"; + sha256 = "097dq9di19d3mvnlrav3fm78gzjni5babswyv10xnrxfhnf14f6x"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + cpp-utilities zlib + ]; + + meta = with pkgs.lib; { + homepage = "https://github.com/Martchus/tagparser"; + description = "C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags"; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} + diff --git a/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 560a991c44af..4e6e49d68c45 100644 --- a/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.1.3"; + version = "2.2.3"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "1ia00bk6dc1176arf84lx08x4c7c74q7ycn7dqjnmyxkg3kmr21g"; + sha256 = "sha256-QYJ5dJQyVy0GLVKRcwb2WBK4IE1q/jXl1OQGau0HBSg="; }; # (bundled) blosc headers have a warning on some archs that it will be using diff --git a/nixpkgs/pkgs/development/libraries/tkrzw/default.nix b/nixpkgs/pkgs/development/libraries/tkrzw/default.nix new file mode 100644 index 000000000000..17375125bd27 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/tkrzw/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "tkrzw"; + version = "0.9.3"; + # TODO: defeat multi-output reference cycles + + src = fetchurl { + url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; + sha256 = "1ap93fsw7vhn329kvy8g20l8p4jdygfl8r8mrgsfcpa20a29fnwl"; + }; + + enableParallelBuilding = true; + + doCheck = false; # memory intensive + + meta = with lib; { + description = "A set of implementations of DBM"; + homepage = "https://dbmx.net/tkrzw/"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/tllist/default.nix b/nixpkgs/pkgs/development/libraries/tllist/default.nix index 9134ade0e187..11e61e93a0c1 100644 --- a/nixpkgs/pkgs/development/libraries/tllist/default.nix +++ b/nixpkgs/pkgs/development/libraries/tllist/default.nix @@ -1,26 +1,41 @@ -{ stdenv, lib, fetchgit, meson, ninja }: +{ stdenv +, lib +, fetchgit +, meson +, ninja +}: stdenv.mkDerivation rec { pname = "tllist"; - version = "1.0.4"; + version = "1.0.5"; src = fetchgit { url = "https://codeberg.org/dnkl/tllist.git"; rev = version; - sha256 = "sha256-+u8p/VmI61SGRhZHaJBwgcVNetNOrYzg2NVQehbfRqg="; + sha256 = "wJEW7haQBtCR2rffKOFyqH3aq0eBr6H8T6gnBs2bNRg="; }; - nativeBuildInputs = [ - meson ninja - ]; + nativeBuildInputs = [ meson ninja ]; doCheck = true; meta = with lib; { homepage = "https://codeberg.org/dnkl/tllist"; description = "C header file only implementation of a typed linked list"; - maintainers = with maintainers; [ fionera ]; + longDescription = '' + Most C implementations of linked list are untyped. That is, their data + carriers are typically void *. This is error prone since your compiler + will not be able to help you correct your mistakes (oh, was it a + pointer-to-a-pointer... I thought it was just a pointer...). + + tllist addresses this by using pre-processor macros to implement dynamic + types, where the data carrier is typed to whatever you want; both + primitive data types are supported as well as aggregated ones such as + structs, enums and unions. + ''; + license = licenses.mit; + maintainers = with maintainers; [ fionera AndersonTorres ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index edbe51998c3e..faf74bcab477 100644 --- a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -137,12 +137,12 @@ version = "${versionMajor}.${versionMinor}.${versionAdditional}-1"; versionMajor = "17"; - versionMinor = "5"; + versionMinor = "7"; versionAdditional = "1.1"; src = fetchurl { - url = "https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb"; - sha256 = "0ysrl01z5ca72qw8n8kwwcl432cgiyw4pibfwg5nifx0kd7i7z4z"; + url = "https://packages.microsoft.com/debian/10/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb"; + sha256 = "0vwirnp56jibm3qf0kmi4jnz1w7xfhnsfr8imr0c9hg6av4sk3a6"; }; nativeBuildInputs = [ dpkg patchelf ]; diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix index 76b50a10907e..f9ebed197522 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromBitbucket +{ lib, mkDerivation, fetchFromBitbucket , python3, vapoursynth , qmake, qtbase, qtwebsockets }: diff --git a/nixpkgs/pkgs/development/libraries/wavpack/default.nix b/nixpkgs/pkgs/development/libraries/wavpack/default.nix index 41f3076dbe94..e3527ac32a46 100644 --- a/nixpkgs/pkgs/development/libraries/wavpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/wavpack/default.nix @@ -1,21 +1,25 @@ -{ lib, stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libiconv }: stdenv.mkDerivation rec { pname = "wavpack"; - version = "5.3.0"; + version = "5.4.0"; enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; - src = fetchurl { - url = "http://www.wavpack.com/${pname}-${version}.tar.bz2"; - sha256 = "00baiag7rlkzc6545dqdp4p5sr7xc3n97n7qdkgx58c544x0pw5n"; + src = fetchFromGitHub { + owner = "dbry"; + repo = "WavPack"; + rev = version; + sha256 = "1b6szk2vmnqnv5w7h8yc1iazjlidlraq1lwjbmc3fi0snbn6qj44"; }; meta = with lib; { description = "Hybrid audio compression format"; - homepage = "http://www.wavpack.com/"; + homepage = "https://www.wavpack.com/"; + changelog = "https://github.com/dbry/WavPack/releases/tag/${version}"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 1abfd3a9194c..9bf91da6cd90 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -51,8 +51,6 @@ , xdg-dbus-proxy , substituteAll , glib -, libwpe -, libwpe-fdo }: assert enableGeoLocation -> geoclue2 != null; @@ -122,8 +120,6 @@ stdenv.mkDerivation rec { libsecret libtasn1 libwebp - libwpe - libwpe-fdo libxkbcommon libxml2 libxslt @@ -158,6 +154,7 @@ stdenv.mkDerivation rec { "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" + "-DUSE_WPE_RENDERER=OFF" ] ++ optionals stdenv.isDarwin [ "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" "-DENABLE_GTKDOC=OFF" diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index c0c0218a318f..48178e774093 100644 --- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -2,21 +2,33 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "138ppnwkqkfi7nnqpd0b93dqaph72ma65m9286bz2qzlis1x8r0v"; + sha256 = "0hk3bnzznxj047gwxdxw2v3w6jqq47996m7g72iwj6c2ai9g6h4m"; }; - configureFlags = [ "--enable-all" ]; + # almost same as Debian but for now using --enable-all instead of --enable-distro to ensure options.h gets installed + configureFlags = [ "--enable-all --enable-pkcs11 --enable-tls13 --enable-base64encode" ]; outputs = [ "out" "dev" "doc" "lib" ]; nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + # fix recursive cycle: + # build flags (including location of header files) are exposed in the + # public API of wolfssl, causing lib to depend on dev + substituteInPlace configure.ac \ + --replace '#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"' ' ' + substituteInPlace configure.ac \ + --replace '#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"' ' ' + ''; + + postInstall = '' # fix recursive cycle: # wolfssl-config points to dev, dev propagates bin diff --git a/nixpkgs/pkgs/development/libraries/zydis/default.nix b/nixpkgs/pkgs/development/libraries/zydis/default.nix new file mode 100644 index 000000000000..dd3f4b916314 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/zydis/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "zydis"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "zyantific"; + repo = "zydis"; + rev = "bfee99f49274a0eec3ffea16ede3a5bda9cda88f"; + sha256 = "0x2lpc33ynd0zzirdxp2lycvg3545wh1ssgy4qlv81471iwwzv6b"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Fast and lightweight x86/x86-64 disassembler library"; + license = licenses.mit; + maintainers = [ maintainers.jbcrail ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix b/nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix index 41b971ebae28..e2f655a5b6ea 100644 --- a/nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix +++ b/nixpkgs/pkgs/development/lisp-modules/asdf/2.26.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -31,11 +31,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; description = "Standard software-system definition library for Common Lisp"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = [maintainers.raskin]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix b/nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix index 9149155fb2f2..7e697d3a6376 100644 --- a/nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix +++ b/nixpkgs/pkgs/development/lisp-modules/asdf/3.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -30,11 +30,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; description = "Standard software-system definition library for Common Lisp"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit ; + maintainers = [maintainers.raskin]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/lisp-modules/asdf/default.nix b/nixpkgs/pkgs/development/lisp-modules/asdf/default.nix index 579788194473..eecea3f98b63 100644 --- a/nixpkgs/pkgs/development/lisp-modules/asdf/default.nix +++ b/nixpkgs/pkgs/development/lisp-modules/asdf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -31,11 +31,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; description = "Standard software-system definition library for Common Lisp"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit ; + maintainers = [maintainers.raskin]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix b/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix index 821fe8920484..69872eb41af6 100644 --- a/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, asdf, which, bash, lisp ? null}: +{lib, stdenv, asdf, which, bash, lisp ? null}: stdenv.mkDerivation { name = "cl-wrapper-script"; @@ -52,6 +52,6 @@ stdenv.mkDerivation { meta = { description = "Script used to wrap Common Lisp implementations"; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = [lib.maintainers.raskin]; }; } diff --git a/nixpkgs/pkgs/development/lisp-modules/define-package.nix b/nixpkgs/pkgs/development/lisp-modules/define-package.nix index 96ceb76f6f22..ca969ab2327d 100644 --- a/nixpkgs/pkgs/development/lisp-modules/define-package.nix +++ b/nixpkgs/pkgs/development/lisp-modules/define-package.nix @@ -1,4 +1,4 @@ -args @ {stdenv, clwrapper, baseName, packageName ? baseName +args @ {lib, stdenv, clwrapper, baseName, packageName ? baseName , parasites ? [] , buildSystems ? ([packageName] ++ parasites) , version ? "latest" @@ -89,7 +89,7 @@ basePackage = { env -i \ NIX_LISP="$NIX_LISP" \ NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn - ${stdenv.lib.concatMapStrings (system: '' + ${lib.concatMapStrings (system: '' (asdf:compile-system :${system}) (asdf:load-system :${system}) (asdf:operate (quote asdf::compile-bundle-op) :${system}) diff --git a/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix index 63b9540522ec..831edcaee279 100644 --- a/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix +++ b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix @@ -1,6 +1,6 @@ -{stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}: +{lib, stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}: let lispPackages = rec { - inherit pkgs clwrapper stdenv; + inherit lib pkgs clwrapper stdenv; nixLib = pkgs.lib; callPackage = nixLib.callPackageWith lispPackages; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix index cbaa13af9624..df6d908ba9d0 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, pkgs, clwrapper}: +{lib, stdenv, fetchurl, pkgs, clwrapper}: let quicklisp-to-nix-packages = rec { - inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; + inherit lib stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages; buildLispPackage = callPackage ./define-package.nix; diff --git a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index 8ec44d17016a..85f392285841 100644 --- a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul These packages are manually refined in lua-overrides.nix */ -{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, lib, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { diff --git a/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix b/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix index b565c6d2f5d9..baacee29ff20 100644 --- a/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix +++ b/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ../../node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix b/nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix index a58f58e05c64..c8a611ff160f 100644 --- a/nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix +++ b/nixpkgs/pkgs/development/misc/google-clasp/node-packages.nix @@ -1,34 +1,34 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "@nodelib/fs.scandir-2.1.3" = { + "@nodelib/fs.scandir-2.1.4" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha512 = "07zn0jp8b7nrrpkxwx715n68ncr51xiyz46j8g1fdvy07cr3s60npwhds1difzwdgz762zwirirppmc5dwl5pdqmww1m0zp15hv0sbq"; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; }; }; - "@nodelib/fs.stat-2.0.3" = { + "@nodelib/fs.stat-2.0.4" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha512 = "2n8008qx9kqgxsgsd22r2xrkm56nwsnwjfws9s4jjmbrk4gz8vfhdw7vp70kn59mqfihkdks6s0101javrpfi7hg8l0qk3nwjp4a03d"; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; }; }; - "@nodelib/fs.walk-1.2.4" = { + "@nodelib/fs.walk-1.2.6" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha512 = "2nsw6dfpkrkm8pxp2d9jlva5mnwqfzssj9r3xlyvrybb26xvjjkw7c0jvfilz08xvvgaanjxvqz6ycqh35avnqwg8mns39biqwmfpym"; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -37,7 +37,7 @@ let version = "0.14.0"; src = fetchurl { url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; - sha512 = "0nvckjkw0vk0vs1c689m143ml2ibm8cd3h8pc5ncq4lnm0k6c7vki57paf57s16k4wf7xi2mg7a1qw3vsrjq9q6kq7s4d83bpvi7lgl"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -46,25 +46,16 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha512 = "148vnx878hajsqb1aimsqg8wz9kja37pmfrf7ac501q2rci4v3cwwar8z3425pnd6pwvsinymy5qmc6gp2j1pw8g2idwk67pifpd02w"; - }; - }; - "@types/events-3.0.0" = { - name = "_at_types_slash_events"; - packageName = "@types/events"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; - sha512 = "3v6shgxnlkc7izsc00g8ilpxi1q2mpcmbjyfawyqcj8mwfhlx2cnkm3hj87gsd39yyq33pilb0dbb4cdc8wwhn7dcwj4srg0amrp8qi"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; - "@types/glob-7.1.1" = { + "@types/glob-7.1.3" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; - version = "7.1.1"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; - sha512 = "3dhbgdkzpgx010hfgkhndrb094kbd3z6s4waicihnl0rp3jk0f0gs8vvzi84xzissrhml1dfgvbdhahzbh75nny1g6429fnqvlp866l"; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz"; + sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; }; }; "@types/minimatch-3.0.3" = { @@ -73,16 +64,16 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "2ff7lcgph45bp2v5zsaxcy00rbh5n5h4njbicwhqilz66pd1lw7xfrpfl4i4ppfcx78zg9cp582b5fjif0dg7r18m44vxfksslvlyml"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-13.9.1" = { + "@types/node-14.14.22" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.9.1"; + version = "14.14.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz"; - sha512 = "2linpd9l89509ib4fbfw2pwgybl5wb23w9cxfxw9vmpbqhklappmlhfg89znkpajqbpvjl40z0srmmwyivdw40zczighzz58qvkm8qk"; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz"; + sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw=="; }; }; "abort-controller-3.0.0" = { @@ -91,25 +82,25 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; - sha512 = "1x70yq0brkpbwyss5m5z3q41f4w6wf2pp1xdy31q49kwshyvmxadwdzwb53vdhbx1sfkzrrf864xswgkc44wl7kvv8qjrcwsvr51jc7"; + sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; - "agent-base-6.0.0" = { + "agent-base-6.0.2" = { name = "agent-base"; packageName = "agent-base"; - version = "6.0.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz"; - sha512 = "2mlsi3nqlanwznzfz3dgmwv412vs83liaiifwqkh671z6j5s1qc7giv90s6dya7dmv9rrxsj0v3zkd9w2fgmpb0mqqf0dxa41qknm4g"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "aggregate-error-3.0.1" = { + "aggregate-error-3.1.0" = { name = "aggregate-error"; packageName = "aggregate-error"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz"; - sha512 = "00ccx66xcda4wlic1naxckbz0vbzyp0wrcj1wd5dqlr08n264s7c00i4dbq41fnq9b6ip7w1j9n3qyg2kd8hwpfd76i5z3xqrg1msma"; + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; }; "ansi-escapes-3.2.0" = { @@ -118,7 +109,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "12pp3q4c44hrzr2xl9vqjigwjn2wr1j0lhvshl75z5m6a97hqkd047sdcma1inzjvxhpkzk1qkvag7cw3sya32s9wsfasr6xsnnj63h"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; "ansi-regex-3.0.0" = { @@ -136,7 +127,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; "ansi-styles-3.2.1" = { @@ -145,7 +136,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; "array-differ-3.0.0" = { @@ -154,7 +145,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz"; - sha512 = "0r28zgr6s5xc89py7m7slvhh08whrm0bg278byz4218hgw6gd11dc6hpirl0jgblv8n2h55vqixfpmsfqv2l8c0r0zw3d4a5rhmyysc"; + sha512 = "THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg=="; }; }; "array-union-2.1.0" = { @@ -163,7 +154,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; - sha512 = "35whnhqnw23y121ilf8kl79pyqb9bjsg32gsazzlmww9zgk22c5jycf0vlkpsnp67rqw05hhw97hxw216hpnm6bxa620lyqwjhb2v0w"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; "arrify-2.0.1" = { @@ -172,7 +163,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"; - sha512 = "2xd8y87g4h0dfnifdci7lhbx35fjxaxrdmcb80kgxahcrqqpnykfkmxxgvpmrfjc7l4rxwk3k81l7n903gk1047idm4rwxwv3189nyx"; + sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="; }; }; "balanced-match-1.0.0" = { @@ -184,22 +175,22 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "base64-js-1.3.1" = { + "base64-js-1.5.1" = { name = "base64-js"; packageName = "base64-js"; - version = "1.3.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; }; - "bignumber.js-7.2.1" = { + "bignumber.js-9.0.1" = { name = "bignumber.js"; packageName = "bignumber.js"; - version = "7.2.1"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz"; - sha512 = "1sxpshc5qga6sjamj8h1jlswqv7fh7ixr77hbg9x07cwkr19n7vn7a76189gh2003d0p07i2iappgjyfg53bjxzf68iyc3c9q3g71ab"; + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz"; + sha512 = "IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="; }; }; "brace-expansion-1.1.11" = { @@ -208,7 +199,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; "braces-3.0.2" = { @@ -217,7 +208,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "38dmhgggv4r7xf3chli957yj4gzfv9xhif8zzaqjnxavkrs1qbmj9m84vxh42n1jl9sddy16ryp4g93l1p8dvrc1pbcvk2ippwadjvg"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -235,7 +226,16 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha512 = "214hpw087zbwnf1naz9184bbz0gn773j70jjvfj0vd7lll2i62j58606l281sz3dngjlhb2v5j00rnqy94y3yhwxmbyda62cc0dqg9s"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + }; + }; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; "chalk-2.4.2" = { @@ -244,7 +244,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; "chardet-0.7.0" = { @@ -253,7 +253,7 @@ let version = "0.7.0"; src = fetchurl { url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; - sha512 = "1qg04aw34n3l68g6s6li7pfdspkj3zmb7qsqf096h19jwc34mv8sbhik4xcx9aazys1ycb5k736f4lql46s0rhl361pmlz1r86j4gwr"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; "clean-stack-2.2.0" = { @@ -262,7 +262,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; - sha512 = "3a11z08fhd0c5rib496gi10xdi7al80hqy8y4r3zpckaqwgmm9iaarm5arkjr1rwlfg6yk8kics0h1qqqd0x8f5028y44wkfvs85n71"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; }; }; "cli-cursor-2.1.0" = { @@ -280,16 +280,16 @@ let version = "0.2.10"; src = fetchurl { url = "https://registry.npmjs.org/cli-spinner/-/cli-spinner-0.2.10.tgz"; - sha512 = "3ysg16xq4z00px0j02wqkmsj8znxkw3bs3vx8v56xz7gbxg31by6h7vh2g0hqnfrg2f3rpmr873q862ljfbh64hsvi25ga9w91i4jsk"; + sha512 = "U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q=="; }; }; - "cli-width-2.2.0" = { + "cli-width-2.2.1" = { name = "cli-width"; packageName = "cli-width"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz"; + sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; }; }; "clone-response-1.0.2" = { @@ -307,7 +307,7 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; "color-name-1.1.3" = { @@ -325,7 +325,7 @@ let version = "2.20.3"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; }; "concat-map-0.0.1" = { @@ -337,13 +337,13 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "debug-4.1.1" = { + "debug-4.3.2" = { name = "debug"; packageName = "debug"; - version = "4.1.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055"; + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; "decompress-response-3.3.0" = { @@ -361,7 +361,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha512 = "1aidgab75g8sx8hi5491l2y5k4aag4j6f55kbmyapvyy4hmqdmvh0asr9p8bz2710awqak65jym8w00k6brb1a8v19zc7mcicv9v16h"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; }; }; "define-properties-1.1.3" = { @@ -370,7 +370,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; }; "del-5.1.0" = { @@ -379,7 +379,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz"; - sha512 = "2fc139fcwy724dim9b5m6b6880q0s716r00ycmd8j13fhwasfrghks9w6mwzyqgvq0c4sgiadqixdv906pmp26xihyklwz7a4wp2zy0"; + sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA=="; }; }; "dir-glob-3.0.1" = { @@ -388,7 +388,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "0h761rklv8qk0vhv6ms98gsvdiyk8455iqqh6wh8dfal5xjx87gmmpyg7773zdrxwvhnzw58pan4rdqjfwkhcv653gsbq4is6kxcjjs"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; }; "dns-packet-5.2.1" = { @@ -397,25 +397,25 @@ let version = "5.2.1"; src = fetchurl { url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.2.1.tgz"; - sha512 = "3znyrkkjkq0kvh1ik1n597rflifrrmy83r8jkwf5mmivv3nx44l96xa6z5gbqq16ypic0xg723rz8g7bpfs967brmqsjflajz4gcy14"; + sha512 = "JHj2yJeKOqlxzeuYpN1d56GfhzivAxavNwHj9co3qptECel27B1rLY5PifJAvubsInX5pGLDjAHuCfCUc2Zv/w=="; }; }; - "dns-socket-4.2.0" = { + "dns-socket-4.2.1" = { name = "dns-socket"; packageName = "dns-socket"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/dns-socket/-/dns-socket-4.2.0.tgz"; - sha512 = "2nqakl6510w3f70ia79lms1y0njjggg2dpp2937qh04bjfkvh179fbizkhy9mxs1hg3d4jbds0aj23wpa4qmnziirvip3mw7pgq6yz1"; + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-4.2.1.tgz"; + sha512 = "fNvDq86lS522+zMbh31X8cQzYQd6xumCNlxsuZF5TKxQThF/e+rJbVM6K8mmlsdcSm6yNjKJQq3Sf38viAJj8g=="; }; }; - "dotf-1.5.0" = { + "dotf-1.5.3" = { name = "dotf"; packageName = "dotf"; - version = "1.5.0"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/dotf/-/dotf-1.5.0.tgz"; - sha512 = "3b4bpb8nr856zyfi210cp77js41mpq4mvks3qq1xrq8gyamzy41cxy12kis2qyxhbfl34vi3ycb8jhg3g3pn78m1xiwvbfj93776i5p"; + url = "https://registry.npmjs.org/dotf/-/dotf-1.5.3.tgz"; + sha512 = "hYztBLJ6AoY0GO5qNDy+MH8lNZavrAkVqrfvv9sQSImDo553JRLRjMre11EW4ZPRg8Y4Uha7qwqiMJQDVXxVqg=="; }; }; "duplexer3-0.1.4" = { @@ -433,7 +433,7 @@ let version = "1.0.11"; src = fetchurl { url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; - sha512 = "1qianmi7icfcsfp04wpjqrf9fg9s0l3s8189a5s25494h9zvqf4mx72b7gwiynwpvv1yb3hrg5mklp8dn5287h9j7xdnv1b2vfjba4x"; + sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; "ellipsize-0.1.0" = { @@ -451,16 +451,16 @@ let version = "1.4.4"; src = fetchurl { url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "3jyw0a0c7m1yxglwk7i5jh8zb3vvx7f9l4frbskxkgf9cyf4i8ww26p8bimnsryrh1dx7lwrxq64vbpjwfcv1svd4lg8m07fa53bv7s"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "es-abstract-1.17.4" = { + "es-abstract-1.18.0-next.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.4"; + version = "1.18.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz"; - sha512 = "24sx605c7x5di53nzw0x2brrfvy4nw76ws0gsd1hskdifrcxafn8fwk0n11si002zxhfs9c8nba1acaj2zkrqrgp8k5vw0vz2dyxv81"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz"; + sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw=="; }; }; "es-to-primitive-1.2.1" = { @@ -469,7 +469,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; "escape-string-regexp-1.0.5" = { @@ -487,7 +487,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; - sha512 = "1czwwj9g33wdi578wfrx6cfs8fmh6yvjrpk620d415f4fiajm084fylyqywq45rc4mf7vrnrr6879c097akbgjf158yrzmkfip9gzcb"; + sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; }; }; "exec-sh-0.2.2" = { @@ -496,7 +496,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz"; - sha512 = "01xwgxaanmd0h0i1pvqy0fk6sqxmab59mjww1mzj3dc25zzrw4z7n7rcl5wd1y7s38lvgcg815qc700kw36ipd42jsf8vji7lkh518l"; + sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw=="; }; }; "extend-3.0.2" = { @@ -505,7 +505,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "external-editor-3.1.0" = { @@ -514,34 +514,34 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; - sha512 = "1xm0arqcf7jp9kgq1g67ss2jvj8kblzbb7dd7sj2gm1g8cj4ilcwnn8vwspz3rh83yjphbl1lvqdyivrji6ccmnp3k2rmk9gl4kii44"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; }; }; - "fast-glob-3.2.2" = { + "fast-glob-3.2.5" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.2"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz"; - sha512 = "3n0a23s3nq6f339d9hw9mw4plbzcdmglhzm09w7azz5fb34xiw60rhhhsvcvqw8c86h3ryfvmk1k624jlf36w3wrrijjhrfivd7qdah"; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; + sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; }; }; - "fast-text-encoding-1.0.1" = { + "fast-text-encoding-1.0.3" = { name = "fast-text-encoding"; packageName = "fast-text-encoding"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.1.tgz"; - sha512 = "04pv2mmlav6kal13gnqyh44v5ikdv2myqr9higzdiwcp2i0nlk9807hiwwgd59xksrxcmnp7c60q6avhycsiigj4mnx9k7pmj0l90f7"; + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz"; + sha512 = "dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="; }; }; - "fastq-1.6.1" = { + "fastq-1.10.1" = { name = "fastq"; packageName = "fastq"; - version = "1.6.1"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz"; - sha512 = "0vr0q4q5s3glb32wlf6a2c58iixn3mqi4l7bqly16v32krfhh2mj2d5mna93fmjanjdk0h25m30xjx3anmw5297cdvyifcqqbk0g4ls"; + url = "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz"; + sha512 = "AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA=="; }; }; "figures-2.0.0" = { @@ -559,7 +559,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "2jrai6ri6sni8xyi8yji49ai8vkczbbiw6pb3pd9bcdizb58ncgnhnfmghhw87flm8y96y2z16738lwdyshby665nv60ljcwwbkvsm8"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; "find-up-4.1.0" = { @@ -568,7 +568,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; - sha512 = "2bi4wmj1qymhj4ap1nay5isn0w7x6ymxp30h5y1jv0hx7q0inmirmr09mn621h4alg0gpv2hjwl6ai2giw6pz7qvb85aqizsh0v14ry"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; }; "fs-extra-8.1.0" = { @@ -577,7 +577,7 @@ let version = "8.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "3i4dsx067a564yx62qy0gz15zvsihqybmmx56lqz4cbgh4fiv5ikrj53wa1rfcijlnkywx18az05m1541dm04gb51af57561s0506fa"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; "fs.realpath-1.0.0" = { @@ -595,7 +595,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; "fuzzy-0.1.3" = { @@ -607,13 +607,13 @@ let sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"; }; }; - "gaxios-2.3.2" = { + "gaxios-2.3.4" = { name = "gaxios"; packageName = "gaxios"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/gaxios/-/gaxios-2.3.2.tgz"; - sha512 = "23w1hwvfpjhg7rllvid6w45irrya9qhxaffx2xm0pzy822jrbnm40pmg375dyx1wqrw73n613xnpc9aj6w982h12gd10a9gnp5skzrb"; + url = "https://registry.npmjs.org/gaxios/-/gaxios-2.3.4.tgz"; + sha512 = "US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA=="; }; }; "gcp-metadata-2.0.4" = { @@ -622,7 +622,16 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-2.0.4.tgz"; - sha512 = "0p21f317hgbp2yvxfflhhdfvj07vg284pn1jnq8m5nkxzhxrs1npn2v7g6qxhky4hs906bcfk4n9bb5g13qc5zlb53z4anwkf25fnd7"; + sha512 = "p1lXhJvcKvJHWfQXhkd4Za1kyXRsGZA0JH7Cjs07W9hrg84d/j5tqQhbGewlSLx9gNyuQUid69uLux48YbggLg=="; + }; + }; + "get-intrinsic-1.1.0" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz"; + sha512 = "M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg=="; }; }; "get-stream-4.1.0" = { @@ -631,16 +640,16 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "3pwlllj9naaqzlc5axbxz4jqg3v533xd9jz945mjd3zmca3hh3pr1dpwc7416kjszw6igk060v6x2dgwpr7m1rd4djavmvr8bhavihq"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; - "get-stream-5.1.0" = { + "get-stream-5.2.0" = { name = "get-stream"; packageName = "get-stream"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; - sha512 = "21v525x0f3qrc6f343xp3wjwwrjf1l3x0lmp34hivvvmdcz0a681s0b9wx4k5r3r8jyhc5kd6dqrwqjhpbl285xg333gkgbxhagayhi"; + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; "glob-7.1.6" = { @@ -649,16 +658,16 @@ let version = "7.1.6"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; - "glob-parent-5.1.0" = { + "glob-parent-5.1.1" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz"; - sha512 = "23qivv79xv6rvb8fsi8hj0ic91ijfkw6dynzp8716bzafazq27dqc9ibxxlkfs7wqnhyzzimaa3xn8i22838ds157kyg60mfa152fxa"; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; "globby-10.0.2" = { @@ -667,7 +676,7 @@ let version = "10.0.2"; src = fetchurl { url = "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz"; - sha512 = "151032pigk461rknfg3y4n80dcxsl597vl4hqkz4ylb620zzbh45bn3zl4lc8brn0klvjpqs2lfi79p9gvs6zybdbqkz8f23gnj5mgd"; + sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg=="; }; }; "google-auth-library-4.2.6" = { @@ -676,7 +685,7 @@ let version = "4.2.6"; src = fetchurl { url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-4.2.6.tgz"; - sha512 = "0bmmlc0lyr2qddknl3kwnpv2c2d5ag4dvydh3jgr557nfvb2qrna61a7x9aw26ni6x77pbkmf2vcxhlrz19jgjn44gccvkb1w4av7m0"; + sha512 = "oJ6tCA9rbsYeIVY+mcLPFHa2hatz3XO6idYIrlI/KhhlMxZrO3tKyU8O2Pxu5KnSBBP7Wj4HtbM1LLKngNFaFw=="; }; }; "google-p12-pem-2.0.4" = { @@ -685,7 +694,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.4.tgz"; - sha512 = "3706hz8l4jq8b7a99hckrmgw5jbm64d6lxz5ni6kbzlg2m9zg0p573yj3mzxnfhhipj81xa03wr3m9gscg723lfbg21jr8n2hffb1jb"; + sha512 = "S4blHBQWZRnEW44OcR7TL9WR+QCqByRvhNDZ/uuQfpxywfupikf/miba8js1jZi6ZOGv5slgSuoshCWh6EMDzg=="; }; }; "googleapis-40.0.1" = { @@ -694,7 +703,7 @@ let version = "40.0.1"; src = fetchurl { url = "https://registry.npmjs.org/googleapis/-/googleapis-40.0.1.tgz"; - sha512 = "1mqr5nfznqp27fm9i5z2axh5h8c4yf3fm650bmvfng6l0f7gywnnw2wy2jps54iw606q6b47gxhhppkk78vnss8ljnf7d5f4ra9kah7"; + sha512 = "B6qZVCautOOspEhru9GZ814I+ztkGWyA4ZEUfaXwXHBruX/HAWqedbsuUEx1w3nCECywK/FLTNUdcbH9zpaMaw=="; }; }; "googleapis-common-2.0.4" = { @@ -703,7 +712,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-2.0.4.tgz"; - sha512 = "3vsp91n82bbrz1l0zzi84jqwd2cbf3vyq88dkl08rnf5g3axvsxq8npswrg99cq8avrkrsm06gldi03arqs5d905345igxqpp36857i"; + sha512 = "8RRkxr24v1jIKCC1onFWA8RGnwFV55m3Qpil9DLX1yLc9e5qvOJsRoDOhhD2e7jFRONYEhT/BzT8vJZANqSr9w=="; }; }; "got-9.6.0" = { @@ -712,16 +721,16 @@ let version = "9.6.0"; src = fetchurl { url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; - sha512 = "3whcjwqag287wncrji9r9bi3jv8ynkn1hpwdqghqdf8fms01xrjfsaf3z27k14kfjy55aa8gmfbx3nymxgpjd1vi9q8q6gfsnk9dds7"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; "gtoken-3.0.2" = { @@ -730,7 +739,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/gtoken/-/gtoken-3.0.2.tgz"; - sha512 = "2w9lx15w046817mg36fyrnfzzk3173v1c3v45n0mr2mqdzjbhzlrwfg60gpfiqjbds1vfzjwdn0ig3m0c969l91hpqrgm7pkkln5q04"; + sha512 = "BOBi6Zz31JfxhSHRZBIDdbwIbOPyux10WxJHdx8wz/FMP1zyN1xFrsAWsgcLe5ww5v/OZu/MePUEZAjgJXSauA=="; }; }; "has-1.0.3" = { @@ -739,7 +748,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; "has-flag-3.0.0" = { @@ -757,7 +766,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; }; }; "http-cache-semantics-4.1.0" = { @@ -766,7 +775,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "1qvqr3inc283iggn9x9wwiv1zb634i5zmlh8dnl2c5n4czaf2yibs4dncrgxfg7zrdfkcali22mvys4pgyhmfqjb57b91qlay9czaki"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; }; "https-proxy-agent-5.0.0" = { @@ -775,7 +784,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "1n8bc76isd6i45f468ydmgdl77xp7k226d38ij8z6d79b5xjm0fq07bqbsgd914wdd4ld2n4cz3wjm655qvglhwpffnhl0a2zj2cihj"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; }; }; "iconv-lite-0.4.24" = { @@ -784,16 +793,16 @@ let version = "0.4.24"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; - "ignore-5.1.4" = { + "ignore-5.1.8" = { name = "ignore"; packageName = "ignore"; - version = "5.1.4"; + version = "5.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz"; - sha512 = "3q41bskh27g3dd95nqaf3lg1ck1iv1dbb6hhzg1jqlkk6j80q5sxb4i3n4k6rfw5nmnvrflaxvi281c7cv2ljlsxip6skb4m14x8dik"; + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; }; }; "indent-string-4.0.0" = { @@ -802,7 +811,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; - sha512 = "3172bpzypayzfssbv1vi2anfh58k8bib049cd8m3fy1cvc480k43jnfq45i24acki0kbm54pfcn63pvqrngzsxj5f4frn00xrkc7l0i"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; }; }; "inflight-1.0.6" = { @@ -829,7 +838,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; "inquirer-6.5.2" = { @@ -838,7 +847,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz"; - sha512 = "1qz47j4jjik343ic5fx92q3jv1mfspj9ka574l6jbxr0mh8w1as4945qnl70m5v6rrgxcw64lg0p27j4bx3mfgfp0i1vf11k03nayvj"; + sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; }; }; "inquirer-autocomplete-prompt-1.0.1" = { @@ -847,7 +856,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.0.1.tgz"; - sha512 = "3j8f2ryrwa0x1qhmmh7gx22158sw3cknqcv96a86lj08r5s8fn3qxl0jskl40zvwlkzbfd616pa2hk1pj5ba11p6rmv7x1fy24pm1b3"; + sha512 = "Y4V6ifAu9LNrNjcEtYq8YUKhrgmmufUn5fsDQqeWgHY8rEO6ZAQkNUiZtBm2kw2uUQlC9HdgrRCHDhTPPguH5A=="; }; }; "ip-1.1.5" = { @@ -859,22 +868,22 @@ let sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; - "ip-regex-4.1.0" = { + "ip-regex-4.3.0" = { name = "ip-regex"; packageName = "ip-regex"; - version = "4.1.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz"; - sha512 = "0q6z0axsvzqxwaxmspfj4gv06ndlwybjvj5rm928fwh4bj9wwdbkh4kn4cz6a3lrw7662zk2mcpxx9zdvkr9j6jskzz2k82p2jxkad4"; + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz"; + sha512 = "B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q=="; }; }; - "is-callable-1.1.5" = { + "is-callable-1.2.3" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.5"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; + sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; }; }; "is-date-object-1.0.2" = { @@ -883,7 +892,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; "is-extglob-2.1.1" = { @@ -910,7 +919,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; "is-ip-3.1.0" = { @@ -919,7 +928,16 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz"; - sha512 = "3shj9n4j2lm2ls8bzxgfcj28jad9ci5bdy3pmdvgqr7zrbgpaiw9i03qg3p9l4myp3y4vnn42gidb3s07v7gqsknhib4fwwfzkdv6yz"; + sha512 = "35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q=="; + }; + }; + "is-negative-zero-2.0.1" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; }; }; "is-number-7.0.0" = { @@ -928,16 +946,16 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "2g7332xqrb0cm36cn6rwdmgq7sllf9w19sf6jy4w0s4vgqdq1kngsnpz0z49i3vnknk8ms442yjllrdbqxbap9ajprc8yrs91za4l73"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-online-8.2.1" = { + "is-online-8.5.1" = { name = "is-online"; packageName = "is-online"; - version = "8.2.1"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-online/-/is-online-8.2.1.tgz"; - sha512 = "1hmzlq6v9pq270smya3b58h7g47k6ib733nf6q2qw0b4pia3zz0680knvr5gqs449smlhja5mzzyizbwhbdbrsy1p2gyvrnjbiyk7gk"; + url = "https://registry.npmjs.org/is-online/-/is-online-8.5.1.tgz"; + sha512 = "RKyTQx/rJqw2QOXHwy7TmXdlkpe0Hhj7GBsr6TQJaj4ebNOfameZCMspU5vYbwBBzJ2brWArdSvNVox6T6oCTQ=="; }; }; "is-path-cwd-2.2.0" = { @@ -946,7 +964,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; - sha512 = "0aws7clcb9cyvvb4430df9fhfnpg9bl1n07ymzp7jdzia0bvjg25gyd39xp2xhgkgpkqazw8csglblifdql0rpj4kfwg1r26xnkdpn3"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; }; }; "is-path-inside-3.0.2" = { @@ -955,25 +973,16 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz"; - sha512 = "1b02q8dp20gbph14ccd8fd9cm9kmxvqncp92j49c7bfnraidy0m27ic454xrza7iyhfz147d5jz1qwfqz8g0wabsqlardi650yhcrgz"; + sha512 = "/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg=="; }; }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - }; - "is-regex-1.0.5" = { + "is-regex-1.1.2" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.5"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz"; + sha512 = "axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg=="; }; }; "is-stream-2.0.0" = { @@ -982,7 +991,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "09j5ybpil7bgiffzq9gw66svm3rrgx634aghkwyslbdx382iqpy991cf3kwfk2jh9bi8fjz5wa996wsjwmq21lzz5svgbsld7wk4ajw"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; "is-symbol-1.0.3" = { @@ -991,7 +1000,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; }; }; "is-wsl-1.1.0" = { @@ -1003,13 +1012,13 @@ let sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; - "json-bigint-0.3.0" = { + "json-bigint-0.3.1" = { name = "json-bigint"; packageName = "json-bigint"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.0.tgz"; - sha1 = "0ccd912c4b8270d05f056fbd13814b53d3825b1e"; + url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.1.tgz"; + sha512 = "DGWnSzmusIreWlEupsUelHrhwmPPE+FiQvg+drKfk2p+bdEYa5mp4PJ8JsCWqae0M2jQNb0HPvnwvf1qOTThzQ=="; }; }; "json-buffer-3.0.0" = { @@ -1030,13 +1039,13 @@ let sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; - "jsonfile-6.0.1" = { + "jsonfile-6.1.0" = { name = "jsonfile"; packageName = "jsonfile"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz"; - sha512 = "038bg8hpg0xbzfcas7llqd4fn4mimcr0xfl7azcsi3kqrra3x0lbrn1dvq0nh082ik799mnj1z4i9hl5myc6znbp87g5nnxzvk9n7cd"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; }; "jwa-1.4.1" = { @@ -1045,7 +1054,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"; - sha512 = "10ayxzbvjd8a52s9dzlxbvjqab1fchaq0vfvj7smqp0gyp0v4v731rdsapsbwvvxib4xjpk0ksg1kbs3c9qi1cy02a5442433zxf8ma"; + sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; }; }; "jws-3.2.2" = { @@ -1054,7 +1063,7 @@ let version = "3.2.2"; src = fetchurl { url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"; - sha512 = "0fb9ijf27cljn3nlj1r7xvqjzz71pbrpavhxmvqapb219f31v7ikrdlphxbdxdbaw2fplmlqj5yqx35zxy3qlivb1jkjcd53q45jyb0"; + sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; }; }; "keyv-3.1.0" = { @@ -1063,7 +1072,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; - sha512 = "1a1q61z26z860lq8pvcbaz1fii1ipafnk7iab6zs7dqijwiq8mr83cnh1h30jird29s2q4345gszcs3fg48kv6g7i5gydwjivzhjagp"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; "locate-path-5.0.0" = { @@ -1072,16 +1081,16 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "3r6llra9imfvg31342986kfkzm34ficva43avn7cng5inb9f5xrnr64jm4pykjjjbjs9np0mhia370ysnf97w4m6jqgnniyjbv71f5p"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; }; - "lodash-4.17.15" = { + "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; - version = "4.17.15"; + version = "4.17.20"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; + sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; }; }; "lowercase-keys-1.0.1" = { @@ -1090,7 +1099,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; }; "lowercase-keys-2.0.0" = { @@ -1099,7 +1108,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha512 = "2c8fy71cr597nqfq7savid5rdk1msa2pcvxkn504w8bksci9vpm7x3a9yy87zc1lb5chzqnii12rd1h0jpc8k3kxy2c787w5snmg8xn"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; }; "lru-cache-5.1.1" = { @@ -1108,7 +1117,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "3vjhn04mjkxbkfb4fh7xnlghlgmqffqp5i1w2vg1ndgh5izv7nwvr8lq1n1hypfs5pm3bvbk7wf3fjm2pavld1hipz0n8rp012l14ra"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; }; "merge-1.2.1" = { @@ -1117,16 +1126,16 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz"; - sha512 = "2yh381iph3hr5c720br83iwv18hncwqhqgp9ilnl3dgblm2s7p36skfcqlbv6xqkf6lmlf9h638gb75ds0b3wy2pvwdi1jnzvh6hcan"; + sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; }; }; - "merge2-1.3.0" = { + "merge2-1.4.1" = { name = "merge2"; packageName = "merge2"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz"; - sha512 = "1inz1swib3crzbwlqrpy74dhmn520qgzg5lkfmm3k1334lpb98d0xjpa6ydpdgwnp013j1n5m2yqkac4r75w6lbcj94hfj1v40h6gns"; + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; }; }; "micromatch-4.0.2" = { @@ -1135,16 +1144,16 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "3jiz9pr94hycvjgzxbxi0jfz7n142n3z5w14im7i0088lymjpvj8xrapr8s66xcp13ylh374hbpm9ixp8rln55n7lrcll6c4qfnkcfb"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; }; }; - "mime-2.4.4" = { + "mime-2.5.0" = { name = "mime"; packageName = "mime"; - version = "2.4.4"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"; - sha512 = "0c4qs0w88nqz2v7441rw9bbsgrsh50cifwmqm2i7c96yz2ncdy35cb5g42zhr6z0wmqqcwq5la04nnf1n4y3zncvgyg8b721hvnc71d"; + url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz"; + sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag=="; }; }; "mimic-fn-1.2.0" = { @@ -1153,7 +1162,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; }; "mimic-response-1.0.1" = { @@ -1162,7 +1171,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; - sha512 = "32nwz24nh1f2nbpk8i638ff8hsg1ajmc6746abkssjr951z28362k5a92dd1cfr7bd1l9f507cn0pbam04ixfgsaygskv87g6v1r4cg"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; }; "minimatch-3.0.4" = { @@ -1171,16 +1180,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; "minimist-1.2.5" = { @@ -1189,16 +1189,16 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; "ms-2.1.2" = { @@ -1207,7 +1207,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; "multimatch-4.0.0" = { @@ -1216,7 +1216,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz"; - sha512 = "02j464lazavd58a1qw29i6lj1g4rkilw7clssc5dp3pmkac528qpi95aazwdqqypsdk4338lqkz6mmbixh68x6w8jxsikxmvkpv2fcl"; + sha512 = "lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ=="; }; }; "mute-stream-0.0.7" = { @@ -1228,22 +1228,22 @@ let sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; }; }; - "node-fetch-2.6.0" = { + "node-fetch-2.6.1" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"; - sha512 = "0s2drvlvgsan0f7cs66kbxxhqj4c399kf35h0jaya2v5syck1afzsx0pbyrlvpncg6ch93r5m88gcz5s3bvp59rm1ig2zm3kcgvilgi"; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"; + sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; }; }; - "node-forge-0.9.1" = { + "node-forge-0.9.2" = { name = "node-forge"; packageName = "node-forge"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.1.tgz"; - sha512 = "2yn7gwj5adkc0156lv28w32q7mj2ln5af006cvgs9qdf72qnzga4j4fknvbiislxp9xk1ikld3ylrhn3vwqbvrm0y682vsjvr16b90v"; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.2.tgz"; + sha512 = "naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw=="; }; }; "normalize-url-4.5.0" = { @@ -1252,16 +1252,16 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "02k93b4vrh4rvz479dc5rjv43v54pzz5k5kn21cx6gl2b1c45s3sb29cy4cyifvfl9zqghs9m1f5kcv0hp4cwp8sigyqx9i6p5kpkns"; + sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; }; }; - "object-inspect-1.7.0" = { + "object-inspect-1.9.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.7.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb"; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"; + sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; }; }; "object-keys-1.1.1" = { @@ -1270,16 +1270,16 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; - "object.assign-4.1.0" = { + "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; }; "once-1.4.0" = { @@ -1306,7 +1306,7 @@ let version = "6.4.0"; src = fetchurl { url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz"; - sha512 = "0da91ydfkavxd733v8b3bvcrp681xirng4nyrazinl5bc2y3aacjd2g1bnapmzpp7g85bk42qh064hclbflj7jrkg94gvq5z1aafmr0"; + sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; }; }; "os-tmpdir-1.0.2" = { @@ -1324,7 +1324,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-any/-/p-any-2.1.0.tgz"; - sha512 = "0p0ndn153xzq9szwxrshsvfl0g14jhj3rjn6svhrq2r3a0yhsbjc9a95q3a3xpbr8xzmyrv3s1467pvz86n7s7bmf684b81ldqi2094"; + sha512 = "JAERcaMBLYKMq+voYw36+x5Dgh47+/o7yuv2oQYuSSUml4YeqJEFznBrY2UeEkoSHqBua6hz518n/PsowTYLLg=="; }; }; "p-cancelable-1.1.0" = { @@ -1333,7 +1333,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha512 = "2bmkd9ncr81p8w6jy9v676ajg9q27znbjk80r723ydvf8gxk000q13693dhbd22dcagrmhwyjxblmm8w4xnfn6ng5srpkkqwv2dggdk"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; "p-cancelable-2.0.0" = { @@ -1342,7 +1342,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz"; - sha512 = "0va49l2crhr6kr1lgbrjc69hz9scdrarzbrzpvddkfdb9wdr16bv48qajb2m0n6fjammxhvj68d4r35wyfy209rnajfv6nccq7dgwy2"; + sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; }; }; "p-finally-1.0.0" = { @@ -1354,13 +1354,13 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-limit-2.2.2" = { + "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; - sha512 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q"; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; "p-locate-4.1.0" = { @@ -1369,7 +1369,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; - sha512 = "3n0ljmpk3p2j4aaz345w5gkqr128xkhflcb83k75fgns5ddd4bpx7l0q50w9kwy5792xb8d3dpf8bwgzif3463spf3140rhzmkmkgs7"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; "p-map-3.0.0" = { @@ -1378,7 +1378,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz"; - sha512 = "32jjm4kiyqvq9n9z6x2zwd31ylcwil7qq1mzq7gcx7qf9n7jqs9b1zvh1c6rxhcjshqchchq2gpc1fbf1ph6yfj16zfbcvz65arfykp"; + sha512 = "d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ=="; }; }; "p-some-4.1.0" = { @@ -1387,7 +1387,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-some/-/p-some-4.1.0.tgz"; - sha512 = "3baac22g5wchcsla36c7f1h69g658kvp05vb4vk0j04i714j8h09f7a18q9s81d2r05hz5a9wcy9g5ri69rgj5l9rmf06dsp8hwfprh"; + sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g=="; }; }; "p-timeout-3.2.0" = { @@ -1396,7 +1396,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; - sha512 = "03cbpzps5mxhlp6hywp92mnnrj4b6ag82f8vdqyz59xrxsrpn58qbh8nzrpiix2asj2d333i81aq0pw9bhki4yw7yf05hr04x9k04mf"; + sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; "p-try-2.2.0" = { @@ -1405,7 +1405,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; "path-0.12.7" = { @@ -1423,7 +1423,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "3zvnv1dp30y10br2qy98z8760jssvps6g9swamdclgxsmhm14dyq0yacrj0d4mk915qhr1z0yh8l3dyd68wn7h7bgv8d39vjk5m0kva"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; }; "path-is-absolute-1.0.1" = { @@ -1441,16 +1441,16 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "2zw0czk4p8vimrxap6mlnw17lbjrhisby3z1m2j0qdhjcnxlv9lk5d8yxirrqy4ax6ar5qx14rpshmbpvzg9b4mnpzy03aclvqrncl0"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; - "picomatch-2.2.1" = { + "picomatch-2.2.2" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz"; - sha512 = "12a2jzmkj24c6k3x71z0knzflw9qqhqx0lk27nrryjs6m7gjmszvgz5pp29xx1h7h7xxaj8cl3i5h98hlx3mpif5h26qdjhrh1ml811"; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; }; }; "pluralize-8.0.0" = { @@ -1459,7 +1459,7 @@ let version = "8.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz"; - sha512 = "048n73397ya45yj4w1pkxy058nkpkzgqcfv89xb3nqs9fi2227kndyi2qhcqzs90zlmkq5jl86kp6iy09kskq5qgm9zkkc7ki7wik9m"; + sha512 = "Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA=="; }; }; "prepend-http-2.0.0" = { @@ -1480,13 +1480,13 @@ let sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; }; }; - "public-ip-3.2.0" = { + "public-ip-4.0.3" = { name = "public-ip"; packageName = "public-ip"; - version = "3.2.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/public-ip/-/public-ip-3.2.0.tgz"; - sha512 = "1prlx3m3fp1d3qh4wxmc9j54fvnq0svqjv5hw4kjiwl45wh0day6xnbv3wscz25ii7g4ksdiysndprcljhwzf1127himkkrvsivh6hc"; + url = "https://registry.npmjs.org/public-ip/-/public-ip-4.0.3.tgz"; + sha512 = "IofiJJWoZ8hZHBk25l4ozLvcET0pjZSxocbUfh4sGkjidMOm4iZNzzWxezGqGsVY7HuxiK7SkyJKHNeT0YQ7uw=="; }; }; "pump-3.0.0" = { @@ -1495,16 +1495,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; }; - "qs-6.9.1" = { + "qs-6.9.6" = { name = "qs"; packageName = "qs"; - version = "6.9.1"; + version = "6.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz"; - sha512 = "343mpmbfcwx584cqi6siamc4m9z7ljzikmkvgsjm1kncmi1ci4b9k7k9li1gm2l694zxh38l216m0clzivcb4km61vzdjxz4kyvn68b"; + url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; }; }; "recursive-readdir-2.2.2" = { @@ -1513,7 +1513,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; + sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; }; }; "responselike-1.0.2" = { @@ -1540,7 +1540,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "37z410bxpvfjlxmd0rfrzmvd4dl33kqqgi51xp8hbbxxwzdddy5q1b20x9msvqhxvhj93w85fr2hlizsi7rfx91j3gcyzdpqvrwgnak"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; }; }; "rimraf-3.0.2" = { @@ -1549,43 +1549,43 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "0h97b8bvn1w87brifdhlnq9qnjxm0pmw87igc4fvvcfzx3h83shp3fszy2k09ff5q44zk1i1c34rjbcryamsak67x7m2600k4qhk695"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; - "run-async-2.4.0" = { + "run-async-2.4.1" = { name = "run-async"; packageName = "run-async"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz"; - sha512 = "2k7xr99g0l8qvqzd66mpwp3wylfay2i27dh5ca3bmr92l5yixlk0dh53z9ljvyrm3mi7jz89il8gq55sgdv8d8p0v96wbkvyy3xp564"; + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; - "run-parallel-1.1.9" = { + "run-parallel-1.1.10" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; - sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc"; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; + sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; }; }; - "rxjs-6.5.4" = { + "rxjs-6.6.3" = { name = "rxjs"; packageName = "rxjs"; - version = "6.5.4"; + version = "6.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz"; - sha512 = "3nzzg67sr57cc5n1065xsxjgrwa405bgbgqm9l8w01lnr660cy8zdjk99hm2n0did4kd75nwiz3843mfbrw7bs100n7g8q4r1fi18wx"; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz"; + sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; }; }; - "safe-buffer-5.2.0" = { + "safe-buffer-5.2.1" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; "safer-buffer-2.1.2" = { @@ -1594,16 +1594,16 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "signal-exit-3.0.2" = { + "signal-exit-3.0.3" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; "slash-3.0.0" = { @@ -1612,7 +1612,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; - sha512 = "3cj4cvlh36f0h6f3dslbkwa3y9nnny8qmwbf4kw3xy8vfbg5mypknds3j2cdhf7xg82hm8smdl8cq88xn4nyw1b9677xjwvly2kbm43"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; "split-lines-2.0.0" = { @@ -1621,7 +1621,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/split-lines/-/split-lines-2.0.0.tgz"; - sha512 = "2cbq8cchi0fyxiqvfppd5nxc33zkv62my7cmhh82yfxf83w62bkxsz2ax6adanq2x7j9hhxz63k7wb6f315wkzramzix45ipa2iv8l1"; + sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA=="; }; }; "string-width-2.1.1" = { @@ -1630,34 +1630,34 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; - "string.prototype.padend-3.1.0" = { + "string.prototype.padend-3.1.1" = { name = "string.prototype.padend"; packageName = "string.prototype.padend"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz"; - sha512 = "1l02s91pznws3jzzip0dkcpj5vb41p716rcnw5msglxjyxg87ycmxjvj94bwiy0rklnmbgj4dk981m50q8w32y8iwcw39yxazq2z8nx"; + url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz"; + sha512 = "eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg=="; }; }; - "string.prototype.trimleft-2.1.1" = { - name = "string.prototype.trimleft"; - packageName = "string.prototype.trimleft"; - version = "2.1.1"; + "string.prototype.trimend-1.0.3" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha512 = "013lf0f398s2xb9jhq9acspdnnk52k7whcga9am4b8a2wrgpc2w7xgkydg4sg4ah9z3i1syimzqs7dc89390xmwlx8zxf6gvlcq1vca"; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz"; + sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw=="; }; }; - "string.prototype.trimright-2.1.1" = { - name = "string.prototype.trimright"; - packageName = "string.prototype.trimright"; - version = "2.1.1"; + "string.prototype.trimstart-1.0.3" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha512 = "3x2qc2fc2fh9sj3vw9w45h246vspjfn88b0k356ldazylhap91vg825bppg73s9n63kwpql3gpw24lv8zx0b2arblcqhh7ygwpxcnx8"; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz"; + sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg=="; }; }; "strip-ansi-4.0.0" = { @@ -1675,7 +1675,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; "strip-bom-4.0.0" = { @@ -1684,7 +1684,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz"; - sha512 = "39mszh7y7d23gk9n6hz9h26hj7f0yr4gdgl5804gflghmz6qi56gqkzv51x65jhw1vyixfih8h09777d6dz0qknvyi0h4kdzqban6yz"; + sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; }; }; "supports-color-5.5.0" = { @@ -1693,7 +1693,7 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; "through-2.3.8" = { @@ -1711,7 +1711,7 @@ let version = "0.0.33"; src = fetchurl { url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; "to-readable-stream-1.0.0" = { @@ -1720,7 +1720,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha512 = "38v92prncngfq4yfdn3frpy3j9x6bslii3spk436f0fhs6ls7gydxp23lrwjkd3f21s7zkn4j1zzp8lqrajsrgqlikkxk3s3dfbkb92"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; }; }; "to-regex-range-5.0.1" = { @@ -1729,25 +1729,25 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "2qkrna8q80arai14s6f17djc3cgwiilnhibfykwzkif4gs9ny3fmqmxqf56fvc7fjwyr01p97nk1ckd67s8476cslmj3rwp7s5zp4zb"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; - "ts2gas-3.6.1" = { + "ts2gas-3.6.4" = { name = "ts2gas"; packageName = "ts2gas"; - version = "3.6.1"; + version = "3.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/ts2gas/-/ts2gas-3.6.1.tgz"; - sha512 = "2z54dgic26rzizkbw21p5w5icq508rqasvb4m1w2m17q90h824bgaizvn1hidfbk11k4pzjqy3p91ij6i216l8bljnhr5dcj9j0xzh7"; + url = "https://registry.npmjs.org/ts2gas/-/ts2gas-3.6.4.tgz"; + sha512 = "TJgFvXnoUSZ40pRH4FzqtTYhbJfaF6LmeXKWd813cRV31v55DZTyVatYUyhqF7GCAHhbkKRH7HuCFcFhxeZFag=="; }; }; - "tslib-1.11.1" = { + "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; "type-fest-0.3.1" = { @@ -1756,16 +1756,25 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz"; - sha512 = "1hy8c4b243psdw221rnqcsn8j4hd5ndyy8fw6mnhlaxyf98f61gxlfdf6wb0dcvhil0b45yjrx44lx5bg8si87hg3dj9qbb4yf8jhbi"; + sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; + }; + }; + "typescript-3.9.7" = { + name = "typescript"; + packageName = "typescript"; + version = "3.9.7"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz"; + sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; }; }; - "typescript-3.8.3" = { + "typescript-4.1.3" = { name = "typescript"; packageName = "typescript"; - version = "3.8.3"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz"; - sha512 = "3rwcbg3l3w3l2zr5y9lszqs30s29jzvh1w594rbdljyr582yi6vajzs2fg04s9p79klh3iv0980b91mbr94sl77h9nb7b2mgrz4929i"; + url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; + sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; }; }; "universalify-0.1.2" = { @@ -1774,16 +1783,16 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "29d9b6i7rf460m0c5761z6xzzjdl2q81ri19x5qcnvi9l85jp71f7lbr7bdk7sx3k3sqwcp9vfpmlh7srgfnzlmssr5j0lpj0imw4mc"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; - "universalify-1.0.0" = { + "universalify-2.0.0" = { name = "universalify"; packageName = "universalify"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz"; - sha512 = "2x2m7gasg0x9mp1grwg5r1bvsp5r32xn7dm3i1zp7n02saxc18hj6jj8kmn0l1j5nycwxm2z14xmqzj244ycq008plxxwbrdparggmd"; + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; }; "url-parse-lax-3.0.0" = { @@ -1810,7 +1819,7 @@ let version = "0.10.4"; src = fetchurl { url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz"; - sha512 = "3sbbgsya51i86ih8bn3nfwi3f9556xlnwh32z4k54dwcpi0jibhfa5dpbfmpzyla63yh2zlxs9chl6wkhc8bqjmjxjyxc9p6j2vvyfh"; + sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="; }; }; "uuid-3.4.0" = { @@ -1819,7 +1828,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; "watch-1.0.2" = { @@ -1846,7 +1855,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; }; }; @@ -1858,21 +1867,20 @@ in version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/@google/clasp/-/clasp-2.2.1.tgz"; - sha512 = "20a3hyw676q12x4ac3knv45b88y6q10gy49clmnwrn40rdy959qw7qbrxkdn0zq3qpzrnkamqrv9bp1gvb9wdcsyxfjvf0fzh2l8ivm"; + sha512 = "dUdEBfwOuC1d95o1ntZ+4a60M65q2vwvHvgD22bPCx+OU0m+ZUBs5rZSloh/IGDjEVqFbDsHU6SLgM0x3MOhgA=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/events-3.0.0" - sources."@types/glob-7.1.1" + sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-14.14.22" sources."abort-controller-3.0.0" - sources."agent-base-6.0.0" - sources."aggregate-error-3.0.1" + sources."agent-base-6.0.2" + sources."aggregate-error-3.1.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -1880,51 +1888,52 @@ in sources."array-union-2.1.0" sources."arrify-2.0.1" sources."balanced-match-1.0.0" - sources."base64-js-1.3.1" - sources."bignumber.js-7.2.1" + sources."base64-js-1.5.1" + sources."bignumber.js-9.0.1" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-equal-constant-time-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) + sources."call-bind-1.0.2" sources."chalk-2.4.2" sources."chardet-0.7.0" sources."clean-stack-2.2.0" sources."cli-cursor-2.1.0" sources."cli-spinner-0.2.10" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clone-response-1.0.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."commander-2.20.3" sources."concat-map-0.0.1" - sources."debug-4.1.1" + sources."debug-4.3.2" sources."decompress-response-3.3.0" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."del-5.1.0" sources."dir-glob-3.0.1" sources."dns-packet-5.2.1" - sources."dns-socket-4.2.0" - sources."dotf-1.5.0" + sources."dns-socket-4.2.1" + sources."dotf-1.5.3" sources."duplexer3-0.1.4" sources."ecdsa-sig-formatter-1.0.11" sources."ellipsize-0.1.0" sources."end-of-stream-1.4.4" - sources."es-abstract-1.17.4" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."event-target-shim-5.0.1" sources."exec-sh-0.2.2" sources."extend-3.0.2" sources."external-editor-3.1.0" - sources."fast-glob-3.2.2" - sources."fast-text-encoding-1.0.1" - sources."fastq-1.6.1" + sources."fast-glob-3.2.5" + sources."fast-text-encoding-1.0.3" + sources."fastq-1.10.1" sources."figures-2.0.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -1937,18 +1946,19 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" - sources."gaxios-2.3.2" + sources."gaxios-2.3.4" sources."gcp-metadata-2.0.4" + sources."get-intrinsic-1.1.0" sources."get-stream-4.1.0" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."globby-10.0.2" sources."google-auth-library-4.2.6" sources."google-p12-pem-2.0.4" sources."googleapis-40.0.1" sources."googleapis-common-2.0.4" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gtoken-3.0.2" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -1956,57 +1966,57 @@ in sources."http-cache-semantics-4.1.0" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" - sources."ignore-5.1.4" + sources."ignore-5.1.8" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inquirer-6.5.2" sources."inquirer-autocomplete-prompt-1.0.1" sources."ip-1.1.5" - sources."ip-regex-4.1.0" - sources."is-callable-1.1.5" + sources."ip-regex-4.3.0" + sources."is-callable-1.2.3" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-ip-3.1.0" + sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-online-8.2.1" + sources."is-online-8.5.1" sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.2" - sources."is-promise-2.1.0" - sources."is-regex-1.0.5" + sources."is-regex-1.1.2" sources."is-stream-2.0.0" sources."is-symbol-1.0.3" sources."is-wsl-1.1.0" - sources."json-bigint-0.3.0" + sources."json-bigint-0.3.1" sources."json-buffer-3.0.0" - sources."jsonfile-6.0.1" + sources."jsonfile-6.1.0" sources."jwa-1.4.1" sources."jws-3.2.2" sources."keyv-3.1.0" sources."locate-path-5.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.20" sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" sources."merge-1.2.1" - sources."merge2-1.3.0" + sources."merge2-1.4.1" sources."micromatch-4.0.2" - sources."mime-2.4.4" + sources."mime-2.5.0" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."multimatch-4.0.0" sources."mute-stream-0.0.7" - sources."node-fetch-2.6.0" - sources."node-forge-0.9.1" + sources."node-fetch-2.6.1" + sources."node-forge-0.9.2" sources."normalize-url-4.5.0" - sources."object-inspect-1.7.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-6.4.0" @@ -2018,7 +2028,7 @@ in }) sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-map-3.0.0" (sources."p-some-4.1.0" // { @@ -2032,24 +2042,24 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pluralize-8.0.0" sources."prepend-http-2.0.0" sources."process-0.11.10" - sources."public-ip-3.2.0" + sources."public-ip-4.0.3" sources."pump-3.0.0" - sources."qs-6.9.1" + sources."qs-6.9.6" sources."recursive-readdir-2.2.2" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-async-2.4.0" - sources."run-parallel-1.1.9" - sources."rxjs-6.5.4" - sources."safe-buffer-5.2.0" + sources."run-async-2.4.1" + sources."run-parallel-1.1.10" + sources."rxjs-6.6.3" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slash-3.0.0" sources."split-lines-2.0.0" (sources."string-width-2.1.1" // { @@ -2057,9 +2067,9 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.padend-3.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.padend-3.1.1" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" (sources."strip-ansi-5.2.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -2071,11 +2081,15 @@ in sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."ts2gas-3.6.1" - sources."tslib-1.11.1" + (sources."ts2gas-3.6.4" // { + dependencies = [ + sources."typescript-4.1.3" + ]; + }) + sources."tslib-1.14.1" sources."type-fest-0.3.1" - sources."typescript-3.8.3" - sources."universalify-1.0.0" + sources."typescript-3.9.7" + sources."universalify-2.0.0" sources."url-parse-lax-3.0.0" sources."url-template-2.0.8" (sources."util-0.10.4" // { @@ -2084,11 +2098,7 @@ in ]; }) sources."uuid-3.4.0" - (sources."watch-1.0.2" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."watch-1.0.2" sources."wrappy-1.0.2" sources."yallist-3.1.1" ]; diff --git a/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix index 55b070a9f773..2770e74a6988 100644 --- a/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix +++ b/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable -, hpack, lib, stdenv, template-haskell, text, th-lift-instances +, hpack, lib, template-haskell, text, th-lift-instances , unordered-containers }: mkDerivation { diff --git a/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix index 3cf840c15e15..9e7d448e4c1e 100644 --- a/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix +++ b/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix @@ -13,7 +13,7 @@ , optparse-applicative, pem, pg-client, postgresql-binary , postgresql-libpq, process, profunctors, psqueues, QuickCheck , regex-tdfa, safe, scientific, semver, shakespeare, split -, Spock-core, lib, stdenv, stm, stm-containers, template-haskell, text +, Spock-core, lib, stm, stm-containers, template-haskell, text , text-builder, text-conversions, th-lift-instances, these, time , transformers, transformers-base, unix, unordered-containers , uri-encode, uuid, vector, wai, wai-websockets, warp, websockets diff --git a/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix index 82314a7485ba..dbd3edf00641 100644 --- a/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix +++ b/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, attoparsec, base, bytestring, containers , criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter -, protolude, regex-tdfa, scientific, lib, stdenv, template-haskell, text +, protolude, regex-tdfa, scientific, lib, template-haskell, text , text-builder, th-lift-instances, unordered-containers, vector }: mkDerivation { diff --git a/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix index aa780abd8e99..bccb3f6eda3d 100644 --- a/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix +++ b/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix @@ -2,7 +2,7 @@ , criterion, fetchgit, file-embed, hashable, hashtables, hasql , hasql-pool, hasql-transaction, monad-control, mtl , postgresql-binary, postgresql-libpq, resource-pool, retry -, scientific, lib, stdenv, template-haskell, text, text-builder, th-lift +, scientific, lib, template-haskell, text, text-builder, th-lift , th-lift-instances, time, transformers-base, uuid, vector }: mkDerivation { diff --git a/nixpkgs/pkgs/development/misc/loc/default.nix b/nixpkgs/pkgs/development/misc/loc/default.nix index 74b5ca09d2a2..fb518279d00b 100644 --- a/nixpkgs/pkgs/development/misc/loc/default.nix +++ b/nixpkgs/pkgs/development/misc/loc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/nixpkgs/pkgs/development/misc/msp430/gcc-support.nix b/nixpkgs/pkgs/development/misc/msp430/gcc-support.nix index e9ed959c2fd0..fa143173c70c 100644 --- a/nixpkgs/pkgs/development/misc/msp430/gcc-support.nix +++ b/nixpkgs/pkgs/development/misc/msp430/gcc-support.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let mspgccVersion = "6_1_1_0"; @@ -19,7 +19,7 @@ in stdenvNoCC.mkDerivation rec { touch $out/lib/lib ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = '' Development headers and linker scripts for TI MSP430 microcontrollers ''; diff --git a/nixpkgs/pkgs/development/misc/yelp-tools/default.nix b/nixpkgs/pkgs/development/misc/yelp-tools/default.nix index 9d5eb2af4968..bf348d68041a 100644 --- a/nixpkgs/pkgs/development/misc/yelp-tools/default.nix +++ b/nixpkgs/pkgs/development/misc/yelp-tools/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkg-config }: +{ lib +, stdenv +, fetchurl +, libxml2 +, libxslt +, itstool +, gnome3 +, pkg-config +}: stdenv.mkDerivation rec { pname = "yelp-tools"; @@ -9,22 +17,30 @@ stdenv.mkDerivation rec { sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30"; }; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libxml2 + libxslt + itstool + gnome3.yelp-xsl + ]; + + doCheck = true; + passthru = { updateScript = gnome3.updateScript { packageName = pname; }; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; - - doCheck = true; - meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Yelp/Tools"; description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; - platforms = platforms.linux; + maintainers = teams.gnome.members ++ (with maintainers; [ domenkozar ]); + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix index 4f9db98c0062..f23558ebc5c4 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation ({ packageBaseDir=$out/libexec/android-sdk/${package.path} mkdir -p $packageBaseDir cd $packageBaseDir - cp -av $sourceRoot/* . + cp -a $sourceRoot/* . ${patchInstructions} ''; diff --git a/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/nixpkgs/pkgs/development/mobile/genymotion/default.nix index b44315065155..5602f598e9d6 100644 --- a/nixpkgs/pkgs/development/mobile/genymotion/default.nix +++ b/nixpkgs/pkgs/development/mobile/genymotion/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon -, xdg_utils +, xdg-utils # For glewinfo , libXmu, libXi, libXext }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; }; - buildInputs = [ makeWrapper which xdg_utils ]; + buildInputs = [ makeWrapper which xdg-utils ]; unpackPhase = '' mkdir -p phony-home $out/share/applications diff --git a/nixpkgs/pkgs/development/node-packages/composition.nix b/nixpkgs/pkgs/development/node-packages/composition.nix index 027a981ea57f..64326c6b2160 100644 --- a/nixpkgs/pkgs/development/node-packages/composition.nix +++ b/nixpkgs/pkgs/development/node-packages/composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/development/node-packages/default.nix b/nixpkgs/pkgs/development/node-packages/default.nix index 175cde7bed55..7f493b5a8080 100644 --- a/nixpkgs/pkgs/development/node-packages/default.nix +++ b/nixpkgs/pkgs/development/node-packages/default.nix @@ -17,7 +17,7 @@ let buildInputs = [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} + wrapProgram "$out/bin/$prog" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; }; @@ -100,7 +100,7 @@ let makam = super.makam.override { buildInputs = [ pkgs.nodejs pkgs.makeWrapper ]; postFixup = '' - wrapProgram "$out/bin/makam" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nodejs ]} + wrapProgram "$out/bin/makam" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nodejs ]} ${ if stdenv.isLinux then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\"" @@ -147,7 +147,7 @@ let node2nix = super.node2nix.override { buildInputs = [ pkgs.makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + wrapProgram "$out/bin/node2nix" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]} ''; }; @@ -177,7 +177,7 @@ let ''; postInstall = let - pnpmLibPath = stdenv.lib.makeBinPath [ + pnpmLibPath = pkgs.lib.makeBinPath [ nodejs.passthru.python nodejs ]; @@ -194,7 +194,7 @@ let nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/pulp" --suffix PATH : ${stdenv.lib.makeBinPath [ + wrapProgram "$out/bin/pulp" --suffix PATH : ${pkgs.lib.makeBinPath [ pkgs.purescript ]} ''; @@ -229,7 +229,7 @@ let nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/typescript-language-server" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ self.typescript ]} + --prefix PATH : ${pkgs.lib.makeBinPath [ self.typescript ]} ''; }; diff --git a/nixpkgs/pkgs/development/node-packages/node-env.nix b/nixpkgs/pkgs/development/node-packages/node-env.nix index f65cb65cf8da..c2b723195b77 100644 --- a/nixpkgs/pkgs/development/node-packages/node-env.nix +++ b/nixpkgs/pkgs/development/node-packages/node-env.nix @@ -1,8 +1,11 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + python = if nodejs ? python then nodejs.python else python2; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise @@ -38,8 +41,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +103,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +164,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +186,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -242,8 +245,8 @@ let if(fs.existsSync("./package-lock.json")) { var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - if(packageLock.lockfileVersion !== 1) { - process.stderr.write("Sorry, I only understand lock file version 1!\n"); + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); process.exit(1); } @@ -344,8 +347,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +364,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -388,17 +391,16 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" - , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; in stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -444,15 +446,10 @@ let # Run post install hook, if provided runHook postInstall ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; } // extraArgs); - # Builds a development shell - buildNodeShell = + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = { name , packageName , version @@ -471,13 +468,13 @@ let let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ + in + stdenv.mkDerivation ({ name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -497,7 +494,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -506,23 +503,44 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin ''; } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; in stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -535,14 +553,15 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeDependencies = lib.makeOverridable buildNodeDependencies; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.json b/nixpkgs/pkgs/development/node-packages/node-packages.json index 96165097316c..7e78691b20ca 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -96,6 +96,7 @@ , "graphql-cli" , "grunt-cli" , "makam" +, "meshcommander" , "gqlint" , "gtop" , "gulp" @@ -114,7 +115,7 @@ , "indium" , "insect" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v4.5.0.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" @@ -199,6 +200,7 @@ , "stackdriver-statsd-backend" , "stf" , "stylelint" +, "svelte-language-server" , "svgo" , "swagger" , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.nix b/nixpkgs/pkgs/development/node-packages/node-packages.nix index 94c0b38fc76f..b40d868f2a65 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -22,13 +22,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1100.5" = { + "@angular-devkit/architect-0.1102.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1100.5"; + version = "0.1102.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.5.tgz"; - sha512 = "yOYfucNouc1doTbcGbCNMXGMSc36+j97XpdNoeGyzFQ7GwezLAro0a9gxc5PdOxndfelkND7J1JuOjxdW5O17A=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.0.tgz"; + sha512 = "d9Da6SiTiDb5N1avxWLcPHSyWCq3G62TlROXxr32WkcQRko8wtgW5VOzgSkdmY2p6UTSME89naUojfzgu2Wh6g=="; }; }; "@angular-devkit/core-11.0.3" = { @@ -40,13 +40,22 @@ let sha512 = "gJRiBj0gWDR2VtIvLvwwc/GM2MZvg1xw69ZbBJ1VuUgDqPBHdC8q3UMW3B82wdhxK+RBYa7ZOJxtIVggaHkm9g=="; }; }; - "@angular-devkit/core-11.0.5" = { + "@angular-devkit/core-11.1.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "11.0.5"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.0.tgz"; + sha512 = "O2oIcqpQKGvYJH88d/NCgLYZGc9laA1eo2d1s0FH1Udu4c2L+bAsviQqtTKNmzyaqODHrlkt+eKx7uakdwWtnQ=="; + }; + }; + "@angular-devkit/core-11.2.0" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.0.5.tgz"; - sha512 = "hwV8fjF8JNPJkiVWw8MNzeIfDo01aD/OAOlC4L5rQnVHn+i2EiU3brSDmFqyeHPPV3h/QjuBkS3tkN7gSnVWaQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.0.tgz"; + sha512 = "qqYEH8m/bwpngoLDMFuth8ykvoHxQ3aHHnAWfRXz9NXydwSfathG0VSYCctB126sK39JKIn+xq16CQAExxNu+Q=="; }; }; "@angular-devkit/schematics-11.0.3" = { @@ -58,13 +67,22 @@ let sha512 = "VZnqgnnfyzyMluIDvGp+ZlDU2P9BnjrhacBOdqBS/jNQ7oxyE0AWrUApGXcejOJ13Z7pEf31E64P3bImcjwP+A=="; }; }; - "@angular-devkit/schematics-11.0.5" = { + "@angular-devkit/schematics-11.1.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "11.0.5"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.0.5.tgz"; - sha512 = "0NKGC8Nf/4vvDpWKB7bwxIazvNnNHnZBX6XlyBXNl+fW8tpTef3PNMJMSErTz9LFnuv61vsKbc36u/Ek2YChWg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.1.0.tgz"; + sha512 = "6qfR5w1jyk8MC+5Tfimz+Czsq3WlsVoB57dpxSZfhGGsv1Vxc8Q41y5f3BrAyEqHYjcH7NtaoLQoJjtra5KaAg=="; + }; + }; + "@angular-devkit/schematics-11.2.0" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "11.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.0.tgz"; + sha512 = "sMDacACJbA4pykiqgJf/RdW0damcf4mDqErGgEqs/bGG+SBUb8+wgt4cQnUwwVX5V2nMdvv7f0A84rgR6I3G2w=="; }; }; "@angular-devkit/schematics-cli-0.1100.3" = { @@ -184,13 +202,13 @@ let sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; - "@apidevtools/json-schema-ref-parser-9.0.6" = { + "@apidevtools/json-schema-ref-parser-9.0.7" = { name = "_at_apidevtools_slash_json-schema-ref-parser"; packageName = "@apidevtools/json-schema-ref-parser"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz"; - sha512 = "M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg=="; + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz"; + sha512 = "QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg=="; }; }; "@apollo/federation-0.20.7" = { @@ -301,31 +319,31 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/code-frame-7.12.11" = { + "@babel/code-frame-7.12.13" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"; - sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; }; }; - "@babel/compat-data-7.12.7" = { + "@babel/compat-data-7.12.13" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz"; - sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.13.tgz"; + sha512 = "U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg=="; }; }; - "@babel/core-7.12.10" = { + "@babel/core-7.12.16" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.10"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz"; - sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.16.tgz"; + sha512 = "t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw=="; }; }; "@babel/core-7.9.0" = { @@ -337,184 +355,175 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.12.10" = { + "@babel/generator-7.12.11" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.10"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz"; - sha512 = "6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz"; + sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA=="; }; }; - "@babel/generator-7.12.11" = { + "@babel/generator-7.12.15" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.11"; + version = "7.12.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz"; - sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz"; + sha512 = "6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ=="; }; }; - "@babel/helper-annotate-as-pure-7.12.10" = { + "@babel/helper-annotate-as-pure-7.12.13" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz"; - sha512 = "XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; + sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; - sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; + sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; }; }; - "@babel/helper-compilation-targets-7.12.5" = { + "@babel/helper-compilation-targets-7.12.16" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.12.5"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; - sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.16.tgz"; + sha512 = "dBHNEEaZx7F3KoUYqagIhRIeqyyuI65xMndMZ3WwGwEBI609I4TleYQHcrS627vbKyNTXqShoN+fvYD9HuQxAg=="; }; }; - "@babel/helper-create-class-features-plugin-7.12.1" = { + "@babel/helper-create-class-features-plugin-7.12.16" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.12.1"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; - sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.16.tgz"; + sha512 = "KbSEj8l9zYkMVHpQqM3wJNxS1d9h3U9vm/uE5tpjMbaj3lTp+0noe3KPsV5dSD9jxKnf9jO9Ip9FX5PKNZCKow=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.12.7" = { + "@babel/helper-create-regexp-features-plugin-7.12.16" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz"; - sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ=="; - }; - }; - "@babel/helper-define-map-7.10.5" = { - name = "_at_babel_slash_helper-define-map"; - packageName = "@babel/helper-define-map"; - version = "7.10.5"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; - sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.16.tgz"; + sha512 = "jAcQ1biDYZBdaAxB4yg46/XirgX7jBDiMHDbwYQOgtViLBXGxJpZQ24jutmBqAIB/q+AwB6j+NbBXjKxEY8vqg=="; }; }; - "@babel/helper-explode-assignable-expression-7.12.1" = { + "@babel/helper-explode-assignable-expression-7.12.13" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; - sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz"; + sha512 = "5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw=="; }; }; - "@babel/helper-function-name-7.12.11" = { + "@babel/helper-function-name-7.12.13" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz"; - sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; }; }; - "@babel/helper-get-function-arity-7.12.10" = { + "@babel/helper-get-function-arity-7.12.13" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz"; - sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; }; }; - "@babel/helper-hoist-variables-7.10.4" = { + "@babel/helper-hoist-variables-7.12.13" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; - sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz"; + sha512 = "KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw=="; }; }; - "@babel/helper-member-expression-to-functions-7.12.7" = { + "@babel/helper-member-expression-to-functions-7.12.16" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.12.7"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; - sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz"; + sha512 = "zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ=="; }; }; - "@babel/helper-module-imports-7.12.5" = { + "@babel/helper-module-imports-7.12.13" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; - sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz"; + sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g=="; }; }; - "@babel/helper-module-transforms-7.12.1" = { + "@babel/helper-module-transforms-7.12.13" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; - sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz"; + sha512 = "acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA=="; }; }; - "@babel/helper-optimise-call-expression-7.12.10" = { + "@babel/helper-optimise-call-expression-7.12.13" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz"; - sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; + sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; }; }; - "@babel/helper-plugin-utils-7.10.4" = { + "@babel/helper-plugin-utils-7.12.13" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; - sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz"; + sha512 = "C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA=="; }; }; - "@babel/helper-remap-async-to-generator-7.12.1" = { + "@babel/helper-remap-async-to-generator-7.12.13" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; - sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz"; + sha512 = "Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA=="; }; }; - "@babel/helper-replace-supers-7.12.11" = { + "@babel/helper-replace-supers-7.12.13" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz"; - sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; + sha512 = "pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg=="; }; }; - "@babel/helper-simple-access-7.12.1" = { + "@babel/helper-simple-access-7.12.13" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; - sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz"; + sha512 = "0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { @@ -526,13 +535,13 @@ let sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; }; }; - "@babel/helper-split-export-declaration-7.12.11" = { + "@babel/helper-split-export-declaration-7.12.13" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz"; - sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; }; }; "@babel/helper-validator-identifier-7.12.11" = { @@ -544,49 +553,49 @@ let sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; }; }; - "@babel/helper-validator-option-7.12.11" = { + "@babel/helper-validator-option-7.12.16" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.12.11"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz"; - sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.16.tgz"; + sha512 = "uCgsDBPUQDvzr11ePPo4TVEocxj8RXjUVSC/Y8N1YpVAI/XDdUwGJu78xmlGhTxj2ntaWM7n9LQdRtyhOzT2YQ=="; }; }; - "@babel/helper-wrap-function-7.12.3" = { + "@babel/helper-wrap-function-7.12.13" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.12.3"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; - sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz"; + sha512 = "t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw=="; }; }; - "@babel/helpers-7.12.5" = { + "@babel/helpers-7.12.13" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; - sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.13.tgz"; + sha512 = "oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ=="; }; }; - "@babel/highlight-7.10.4" = { + "@babel/highlight-7.12.13" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; - sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz"; + sha512 = "kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww=="; }; }; - "@babel/parser-7.12.11" = { + "@babel/parser-7.12.16" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.11"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz"; - sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.16.tgz"; + sha512 = "c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -598,130 +607,130 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.12.12" = { + "@babel/plugin-proposal-async-generator-functions-7.12.13" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz"; - sha512 = "nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz"; + sha512 = "1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA=="; }; }; - "@babel/plugin-proposal-class-properties-7.12.1" = { + "@babel/plugin-proposal-class-properties-7.12.13" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; - sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz"; + sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.12.1" = { + "@babel/plugin-proposal-dynamic-import-7.12.16" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.12.1"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; - sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.16.tgz"; + sha512 = "yiDkYFapVxNOCcBfLnsb/qdsliroM+vc3LHiZwS4gh7pFjo5Xq3BDhYBNn3H3ao+hWPvqeeTdU+s+FIvokov+w=="; }; }; - "@babel/plugin-proposal-export-default-from-7.12.1" = { + "@babel/plugin-proposal-export-default-from-7.12.13" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.1.tgz"; - sha512 = "z5Q4Ke7j0AexQRfgUvnD+BdCSgpTEKnqQ3kskk2jWtOBulxICzd1X9BGt7kmWftxZ2W3++OZdt5gtmC8KLxdRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.13.tgz"; + sha512 = "idIsBT+DGXdOHL82U+8bwX4goHm/z10g8sGGrQroh+HCRcm7mDv/luaGdWJQMTuCX2FsdXS7X0Nyyzp4znAPJA=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.12.1" = { + "@babel/plugin-proposal-export-namespace-from-7.12.13" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; - sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; + sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw=="; }; }; - "@babel/plugin-proposal-json-strings-7.12.1" = { + "@babel/plugin-proposal-json-strings-7.12.13" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; - sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz"; + sha512 = "v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = { + "@babel/plugin-proposal-logical-assignment-operators-7.12.13" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; - sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz"; + sha512 = "fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; - sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz"; + sha512 = "Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.7" = { + "@babel/plugin-proposal-numeric-separator-7.12.13" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz"; - sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; + sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.12.1" = { + "@babel/plugin-proposal-object-rest-spread-7.12.13" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; - sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz"; + sha512 = "WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.12.1" = { + "@babel/plugin-proposal-optional-catch-binding-7.12.13" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; - sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz"; + sha512 = "9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.12.7" = { + "@babel/plugin-proposal-optional-chaining-7.12.16" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.12.7"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; - sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.16.tgz"; + sha512 = "O3ohPwOhkwji5Mckb7F/PJpJVJY3DpPsrt/F0Bk40+QMk9QpAIqeGusHWqu/mYqsM8oBa6TziL/2mbERWsUZjg=="; }; }; - "@babel/plugin-proposal-private-methods-7.12.1" = { + "@babel/plugin-proposal-private-methods-7.12.13" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; - sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz"; + sha512 = "sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.12.1" = { + "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; - sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; + sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -742,13 +751,13 @@ let sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; }; }; - "@babel/plugin-syntax-class-properties-7.12.1" = { + "@babel/plugin-syntax-class-properties-7.12.13" = { name = "_at_babel_slash_plugin-syntax-class-properties"; packageName = "@babel/plugin-syntax-class-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; - sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -760,13 +769,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.12.1" = { + "@babel/plugin-syntax-export-default-from-7.12.13" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.1.tgz"; - sha512 = "dP5eGg6tHEkhnRD2/vRG/KJKRSg8gtxu2i+P/8/yFPJn/CfPU5G0/7Gks2i3M6IOVAPQekmsLN9LPsmXFFL4Uw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.13.tgz"; + sha512 = "gVry0zqoums0hA+EniCYK3gABhjYSLX1dVuwYpPw9DrLNA4/GovXySHVg4FGRsZht09ON/5C2NVx3keq+qqVGQ=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -778,13 +787,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.12.1" = { + "@babel/plugin-syntax-flow-7.12.13" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz"; - sha512 = "1lBLLmtxrwpm4VKmtVFselI/P3pX+G63fAtUUt6b2Nzgao77KNDwyuRt90Mj2/9pKobtt68FdvjfqohZjg/FCA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz"; + sha512 = "J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -805,13 +814,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.12.1" = { + "@babel/plugin-syntax-jsx-7.12.13" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz"; - sha512 = "1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; + sha512 = "d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -868,373 +877,373 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.12.1" = { + "@babel/plugin-syntax-top-level-await-7.12.13" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; - sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; + sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; }; }; - "@babel/plugin-syntax-typescript-7.12.1" = { + "@babel/plugin-syntax-typescript-7.12.13" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz"; - sha512 = "UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; + sha512 = "cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w=="; }; }; - "@babel/plugin-transform-arrow-functions-7.12.1" = { + "@babel/plugin-transform-arrow-functions-7.12.13" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; - sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz"; + sha512 = "tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg=="; }; }; - "@babel/plugin-transform-async-to-generator-7.12.1" = { + "@babel/plugin-transform-async-to-generator-7.12.13" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; - sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz"; + sha512 = "psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.12.1" = { + "@babel/plugin-transform-block-scoped-functions-7.12.13" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; - sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; + sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; }; }; - "@babel/plugin-transform-block-scoping-7.12.12" = { + "@babel/plugin-transform-block-scoping-7.12.13" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz"; - sha512 = "VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz"; + sha512 = "Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ=="; }; }; - "@babel/plugin-transform-classes-7.12.1" = { + "@babel/plugin-transform-classes-7.12.13" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; - sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz"; + sha512 = "cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA=="; }; }; - "@babel/plugin-transform-computed-properties-7.12.1" = { + "@babel/plugin-transform-computed-properties-7.12.13" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; - sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz"; + sha512 = "dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA=="; }; }; - "@babel/plugin-transform-destructuring-7.12.1" = { + "@babel/plugin-transform-destructuring-7.12.13" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; - sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz"; + sha512 = "Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ=="; }; }; - "@babel/plugin-transform-dotall-regex-7.12.1" = { + "@babel/plugin-transform-dotall-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; - sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; + sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.12.1" = { + "@babel/plugin-transform-duplicate-keys-7.12.13" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; - sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; + sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.12.1" = { + "@babel/plugin-transform-exponentiation-operator-7.12.13" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; - sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; + sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.12.10" = { + "@babel/plugin-transform-flow-strip-types-7.12.13" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.10.tgz"; - sha512 = "0ti12wLTLeUIzu9U7kjqIn4MyOL7+Wibc7avsHhj4o1l5C0ATs8p2IMHrVYjm9t9wzhfEO6S3kxax0Rpdo8LTg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.13.tgz"; + sha512 = "39/t9HtN+Jlc7EEY6oCSCf3kRrKIl2JULOGPnHZiaRjoYZEFaDXDZI32uE2NosQRh8o6N9B+8iGvDK7ToJhJaw=="; }; }; - "@babel/plugin-transform-for-of-7.12.1" = { + "@babel/plugin-transform-for-of-7.12.13" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; - sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz"; + sha512 = "xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ=="; }; }; - "@babel/plugin-transform-function-name-7.12.1" = { + "@babel/plugin-transform-function-name-7.12.13" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; - sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; + sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; }; }; - "@babel/plugin-transform-literals-7.12.1" = { + "@babel/plugin-transform-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; - sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; + sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.12.1" = { + "@babel/plugin-transform-member-expression-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; - sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; + sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; }; }; - "@babel/plugin-transform-modules-amd-7.12.1" = { + "@babel/plugin-transform-modules-amd-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; - sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz"; + sha512 = "JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.12.1" = { + "@babel/plugin-transform-modules-commonjs-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; - sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz"; + sha512 = "OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.12.1" = { + "@babel/plugin-transform-modules-systemjs-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; - sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz"; + sha512 = "aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA=="; }; }; - "@babel/plugin-transform-modules-umd-7.12.1" = { + "@babel/plugin-transform-modules-umd-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; - sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz"; + sha512 = "BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; - sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; + sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; }; }; - "@babel/plugin-transform-new-target-7.12.1" = { + "@babel/plugin-transform-new-target-7.12.13" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; - sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; + sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; }; }; - "@babel/plugin-transform-object-assign-7.12.1" = { + "@babel/plugin-transform-object-assign-7.12.13" = { name = "_at_babel_slash_plugin-transform-object-assign"; packageName = "@babel/plugin-transform-object-assign"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.1.tgz"; - sha512 = "geUHn4XwHznRAFiuROTy0Hr7bKbpijJCmr1Svt/VNGhpxmp0OrdxURNpWbOAf94nUbL+xj6gbxRVPHWIbRpRoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.13.tgz"; + sha512 = "4QxDMc0lAOkIBSfCrnSGbAJ+4epDBF2XXwcLXuBcG1xl9u7LrktNVD4+LwhL47XuKVPQ7R25e/WdcV+h97HyZA=="; }; }; - "@babel/plugin-transform-object-super-7.12.1" = { + "@babel/plugin-transform-object-super-7.12.13" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; - sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; + sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; }; }; - "@babel/plugin-transform-parameters-7.12.1" = { + "@babel/plugin-transform-parameters-7.12.13" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; - sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz"; + sha512 = "e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA=="; }; }; - "@babel/plugin-transform-property-literals-7.12.1" = { + "@babel/plugin-transform-property-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; - sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; + sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; }; }; - "@babel/plugin-transform-react-display-name-7.12.1" = { + "@babel/plugin-transform-react-display-name-7.12.13" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz"; - sha512 = "cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz"; + sha512 = "MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA=="; }; }; - "@babel/plugin-transform-react-jsx-7.12.12" = { + "@babel/plugin-transform-react-jsx-7.12.16" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.12.12"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz"; - sha512 = "JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.16.tgz"; + sha512 = "dNu0vAbIk8OkqJfGtYF6ADk6jagoyAl+Ks5aoltbAlfoKv8d6yooi3j+kObeSQaCj9PgN6KMZPB90wWyek5TmQ=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.12.1" = { + "@babel/plugin-transform-react-jsx-source-7.12.13" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz"; - sha512 = "keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz"; + sha512 = "O5JJi6fyfih0WfDgIJXksSPhGP/G0fQpfxYy87sDc+1sFmsCS6wr3aAn+whbzkhbjtq4VMqLRaSzR6IsshIC0Q=="; }; }; - "@babel/plugin-transform-regenerator-7.12.1" = { + "@babel/plugin-transform-regenerator-7.12.13" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; - sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz"; + sha512 = "lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA=="; }; }; - "@babel/plugin-transform-reserved-words-7.12.1" = { + "@babel/plugin-transform-reserved-words-7.12.13" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; - sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; + sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; }; }; - "@babel/plugin-transform-runtime-7.12.10" = { + "@babel/plugin-transform-runtime-7.12.15" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.12.10"; + version = "7.12.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz"; - sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.15.tgz"; + sha512 = "OwptMSRnRWJo+tJ9v9wgAf72ydXWfYSXWhnQjZing8nGZSDFqU1MBleKM3+DriKkcbv7RagA8gVeB0A1PNlNow=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.12.1" = { + "@babel/plugin-transform-shorthand-properties-7.12.13" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; - sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; + sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; }; }; - "@babel/plugin-transform-spread-7.12.1" = { + "@babel/plugin-transform-spread-7.12.13" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; - sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz"; + sha512 = "dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.12.7" = { + "@babel/plugin-transform-sticky-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz"; - sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; + sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; }; }; - "@babel/plugin-transform-template-literals-7.12.1" = { + "@babel/plugin-transform-template-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; - sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz"; + sha512 = "arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.12.10" = { + "@babel/plugin-transform-typeof-symbol-7.12.13" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz"; - sha512 = "JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; + sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; }; }; - "@babel/plugin-transform-typescript-7.12.1" = { + "@babel/plugin-transform-typescript-7.12.16" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.12.1"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz"; - sha512 = "VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.16.tgz"; + sha512 = "88hep+B6dtDOiEqtRzwHp2TYO+CN8nbAV3eh5OpBGPsedug9J6y1JwLKzXRIGGQZDC8NlpxpQMIIxcfIW96Wgw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.12.1" = { + "@babel/plugin-transform-unicode-escapes-7.12.13" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; - sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; + sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.12.1" = { + "@babel/plugin-transform-unicode-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; - sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; + sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; }; }; "@babel/polyfill-7.12.1" = { @@ -1246,22 +1255,22 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.12.11" = { + "@babel/preset-env-7.12.16" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.12.11"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz"; - sha512 = "j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.16.tgz"; + sha512 = "BXCAXy8RE/TzX416pD2hsVdkWo0G+tYd16pwnRV4Sc0fRwTLRS/Ssv8G5RLXUGQv7g4FG7TXkdDJxCjQ5I+Zjg=="; }; }; - "@babel/preset-flow-7.12.1" = { + "@babel/preset-flow-7.12.13" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.12.1.tgz"; - sha512 = "UAoyMdioAhM6H99qPoKvpHMzxmNVXno8GYU/7vZmGaHk6/KqfDYL1W0NxszVbJ2EP271b7e6Ox+Vk2A9QsB3Sw=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.12.13.tgz"; + sha512 = "gcEjiwcGHa3bo9idURBp5fmJPcyFPOszPQjztXrOjUE2wWVqc6fIVJPgWPIQksaQ5XZ2HWiRsf2s1fRGVjUtVw=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -1282,22 +1291,31 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.12.7" = { + "@babel/preset-typescript-7.12.16" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.12.7"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz"; - sha512 = "nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.16.tgz"; + sha512 = "IrYNrpDSuQfNHeqh7gsJsO35xTGyAyGkI1VxOpBEADFtxCqZ77a1RHbJqM3YJhroj7qMkNMkNtcw0lqeZUrzow=="; }; }; - "@babel/register-7.12.10" = { + "@babel/register-7.12.13" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.12.10.tgz"; - sha512 = "EvX/BvMMJRAA3jZgILWgbsrHwBQvllC5T8B29McyME8DvkdOxk4ujESfrMvME8IHSDvWXrmMXxPvA/lx2gqPLQ=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.12.13.tgz"; + sha512 = "fnCeRXj970S9seY+973oPALQg61TRvAaW0nRDe1f4ytKqM3fZgsNXewTZWmqZedg74LFIRpg/11dsrPZZvYs2g=="; + }; + }; + "@babel/runtime-7.12.13" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz"; + sha512 = "8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw=="; }; }; "@babel/runtime-7.12.5" = { @@ -1318,22 +1336,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/template-7.12.7" = { + "@babel/template-7.12.13" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz"; - sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; + sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; }; }; - "@babel/traverse-7.12.12" = { + "@babel/traverse-7.12.13" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz"; - sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz"; + sha512 = "3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA=="; }; }; "@babel/types-7.10.4" = { @@ -1345,13 +1363,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.12" = { + "@babel/types-7.12.13" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz"; - sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz"; + sha512 = "oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1363,22 +1381,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.5.4" = { + "@bugsnag/browser-7.6.0" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.5.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.4.tgz"; - sha512 = "WyhDWeE2MXQTo9uJjpCOxqTWDlVgX/yKE/VZ0nVm4em2AxUmjAPM8jk9YOTYCKQfQFnIpgf62DjVlsszikUIBw=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.6.0.tgz"; + sha512 = "8sth20TM8BVfebkqxqJQOCM2P2L4foOgFH2QA3ruG0iknDKZDhE7XcoWgmUP9zVSNJqkCyiIzcBOuiwZW8JaSQ=="; }; }; - "@bugsnag/core-7.5.4" = { + "@bugsnag/core-7.6.0" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.5.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.5.4.tgz"; - sha512 = "QOvtWzM0XJTk5QCpiDFTva6FJXCKuKQHJu7sjrZwYA/7fblypl+ClP7inz9At5ijkKGm2pLyvZ9vvT2rq9TXuw=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.6.0.tgz"; + sha512 = "hBYAZJw4ScqoyM1jA1x/m2e4iS2EqYEs0I2hdzBCZFv2ls17ILmU58eRSyVdUfyzbv0J7Hi6DwwBGC4Yb6ROZA=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1390,22 +1408,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.5.4" = { + "@bugsnag/js-7.6.0" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.5.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.4.tgz"; - sha512 = "V1+482YPndAD0c0ju7Ik1dXunyKAssZWUIqOMs7Ff3PtZb1107sJ4Hw1E7ZusQvvI/IjA6FO3ZJkmzjIJjQ+UA=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.6.0.tgz"; + sha512 = "EcI3sTpyOs94/OOjwI7fOg1iZ800o3kkOAipAnULRoP62j1vmErH2l/2xubny7g0JTOL59iZEkt+5O5MhbQJ2A=="; }; }; - "@bugsnag/node-7.5.4" = { + "@bugsnag/node-7.6.0" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.5.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.5.4.tgz"; - sha512 = "lfHEU2wsBO/hhHjsY6kqD/Ga6A3bzROeZEuE7/cT0xzDUvBnUsrw75/xZ5EyY3Xpyfe/Gw9t336semIqz46+cw=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.6.0.tgz"; + sha512 = "n3BVb04bq4z16nOM4gbWoXsi6k8R9bryWS/NAYi/jQg6tgyBkNYzmK0ojf3fYJ7uAgCjUJNMX6S9UHSJy/MMcQ=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1570,6 +1588,24 @@ let sha512 = "HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg=="; }; }; + "@emmetio/abbreviation-2.2.0" = { + name = "_at_emmetio_slash_abbreviation"; + packageName = "@emmetio/abbreviation"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.0.tgz"; + sha512 = "NPGVUmnr7cLj4i6MKS4c8NjuoIIJROrruJl/8nXsp2MdbDRHvtfq25foySvv/NbfqTQm+P9JzVLDD9JxGIpvkQ=="; + }; + }; + "@emmetio/css-abbreviation-2.1.2" = { + name = "_at_emmetio_slash_css-abbreviation"; + packageName = "@emmetio/css-abbreviation"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.2.tgz"; + sha512 = "CvYTzJltVpLqJaCZ1Qn97LVAKsl2Uwl2fzir1EX/WuMY3xWxgc3BWRCheL6k65km6GyDrLVl6RhrrNb/pxOiAQ=="; + }; + }; "@emmetio/extract-abbreviation-0.1.6" = { name = "_at_emmetio_slash_extract-abbreviation"; packageName = "@emmetio/extract-abbreviation"; @@ -1579,6 +1615,15 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; + "@emmetio/scanner-1.0.0" = { + name = "_at_emmetio_slash_scanner"; + packageName = "@emmetio/scanner"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.0.tgz"; + sha512 = "8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA=="; + }; + }; "@emotion/is-prop-valid-0.8.8" = { name = "_at_emotion_slash_is-prop-valid"; packageName = "@emotion/is-prop-valid"; @@ -1633,6 +1678,15 @@ let sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ=="; }; }; + "@eslint/eslintrc-0.3.0" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; + sha512 = "1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg=="; + }; + }; "@evocateur/libnpmaccess-3.1.2" = { name = "_at_evocateur_slash_libnpmaccess"; packageName = "@evocateur/libnpmaccess"; @@ -1678,6 +1732,15 @@ let sha512 = "GoXw0U2Qaa33m3eUcxuHnHpNvHjNlLo0gtV091XBpaRINaB4X6FGCG5XKxSFNFiPpugUDqNruHzaqpTdDm4AOg=="; }; }; + "@expo/apple-utils-0.0.0-alpha.17" = { + name = "_at_expo_slash_apple-utils"; + packageName = "@expo/apple-utils"; + version = "0.0.0-alpha.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-0.0.0-alpha.17.tgz"; + sha512 = "ecpC6e3xTtMVVKWpp231L8vptoSPqwtKSmfJ8sXfMlQRtWbq8Bu1pCHR/pdAx9X4IYzygjrTa9IDAPpbGuSaMg=="; + }; + }; "@expo/babel-preset-cli-0.2.18" = { name = "_at_expo_slash_babel-preset-cli"; packageName = "@expo/babel-preset-cli"; @@ -1696,22 +1759,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.22" = { + "@expo/config-3.3.28" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.22"; + version = "3.3.28"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.22.tgz"; - sha512 = "BzahndK+Uxsvzui1+9QiJXptjVPgbSCQ3saNVF4N3Wrxjyr0WXHNp3Gz3VAGkoHhoBlxZheslmiNoMwjG25xjw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.28.tgz"; + sha512 = "0zJBOZIl/p4KejUkz6G6uzMjGnWsooWayDk7TeFSCxWZ84HWGCx+LIXbEkc8c/CmMm9HyjYlhESw96mwZZzpPQ=="; }; }; - "@expo/config-plugins-1.0.13" = { + "@expo/config-plugins-1.0.18" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "1.0.13"; + version = "1.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.13.tgz"; - sha512 = "/Wt1uZJlwMSi20GlKX4FOijX8wYMj7zVVp091M9hXeIc7btq84nkhhtdwa60qnM0RACHWqv25uVTQochjNQrfw=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.18.tgz"; + sha512 = "8Ey+22cEAOxK+SBJY+OazaLsPyL5FXdsykfBg/QQJE2Y/DTFebUVlr5bQyeqavbASDvmDxg3Fd71A8Se8+qT1g=="; }; }; "@expo/config-types-40.0.0-beta.2" = { @@ -1723,184 +1786,58 @@ let sha512 = "t9pHCQMXOP4nwd7LGXuHkLlFy0JdfknRSCAeVF4Kw2/y+5OBbR9hW9ZVnetpBf0kORrekgiI7K/qDaa3hh5+Qg=="; }; }; - "@expo/configure-splash-screen-0.3.2" = { + "@expo/configure-splash-screen-0.3.3" = { name = "_at_expo_slash_configure-splash-screen"; packageName = "@expo/configure-splash-screen"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.3.2.tgz"; - sha512 = "+KvcPWv/EpAi9ng7KWsRCHUgN8qYcbpvrY8Pc3AtfPVHBhWuy7FhTdT0HUqjhOvqvwPF2Ygr//DHl8WBVg2ICA=="; + url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.3.3.tgz"; + sha512 = "fWy6Z52Mj2a7yjdvpIJkP9G3kfkoXE79aHvTDwgggIE0KLhwnPF27v+KS0wJUf7b4JM6w0zKOlUZjQhn0kSNyA=="; }; }; - "@expo/dev-server-0.1.48" = { + "@expo/dev-server-0.1.54" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.48"; + version = "0.1.54"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.48.tgz"; - sha512 = "aiuoVLfF+NzFBU6WvLRbVjYDhoLky22q0hiTQ5by3996drF0XUj752lUI8ckN5+8qX4Aaij++wkPMaLiHQ1vNw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.54.tgz"; + sha512 = "15JC58wiL1N6N95lxM7pG42SY8geMYq19i0FSp5CsEvNZrbc1tuzaRGZhrW7I1EwOhNNdR2teyoLaIKCP7ynSg=="; }; }; - "@expo/dev-tools-0.13.74" = { + "@expo/dev-tools-0.13.82" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.74"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.74.tgz"; - sha512 = "at58TNplT3FT1UWEYzpCMwtP4mzBDT81ApIlyudsd4k+uX74wSf+4v5WPUbgu1UCZBUuo/40ddhS3rgUozu4eQ=="; - }; - }; - "@expo/eas-build-job-0.1.2" = { - name = "_at_expo_slash_eas-build-job"; - packageName = "@expo/eas-build-job"; - version = "0.1.2"; + version = "0.13.82"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.1.2.tgz"; - sha512 = "hBYVWlEWi8Iu+jWmbzKy2bMsYoWvRwY7MZ+SdKpNvAl+sMpp8rwvxRyRs7cRTa6DuiQ2sdOxqemnw9MJ6S5cRA=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.82.tgz"; + sha512 = "Uq3HoRP0/+w/c6LHdRAMEPLqO3NZS4cailJCYR/MXcZ6xGMrAOjBZwB64H7SP12ADyzhjOsISvr+JG5SE/lRRA=="; }; }; - "@expo/image-utils-0.3.9" = { + "@expo/image-utils-0.3.10" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.9"; + version = "0.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.9.tgz"; - sha512 = "VarvpeNXtvPexmJSEllDF1RRHrjznsgf2Y0bZ2IehmOZwxdqz/YssGxY2ztMx5pn3utuhc9Enx140BHDBOp8UQ=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.10.tgz"; + sha512 = "EebukeUnzyk4ts1E1vMQSb0p8otYqWKsZNDZEoqHtERhxMSO7WhQLqa7/z2kB/YMHRJjrhaa3Aa2X5zjYot1kA=="; }; }; - "@expo/json-file-8.2.25" = { + "@expo/json-file-8.2.27" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.25"; + version = "8.2.27"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.25.tgz"; - sha512 = "KFX6grWVzttaDskq/NK8ByqFPgpDZGFnyeZVeecGoKx5kU61zuR7/xQM04OvN6BNXq3jTUst1TyS8fXEfJuscA=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.27.tgz"; + sha512 = "Iyqg1jbXOTg0JfCGwMrkaaRmVFjQrWDBQAhYLTdvOD3GrXYuKI1vUV+3Wqw0NnU+TYoNUpi7aB8dNzPvLj0oag=="; }; }; - "@expo/metro-config-0.1.48" = { + "@expo/metro-config-0.1.54" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.48"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.48.tgz"; - sha512 = "U2VkpNoecfCgju5Cfk9RyulrCwqWiGPCV1RSZPhP/yb6pSUyuQfYaxH5ULmrsYztp8hSfV0mqaVq5LPyhzczkw=="; - }; - }; - "@expo/ngrok-2.4.3" = { - name = "_at_expo_slash_ngrok"; - packageName = "@expo/ngrok"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok/-/ngrok-2.4.3.tgz"; - sha512 = "JOct+0BMTOTkTb2RreQc6uzhwCjX8Z/EYRo3EcbHMr5/3Zk+0YuujaM4Z84GeZcWz2sBMhnJj0LeJnhEkmd95Q=="; - }; - }; - "@expo/ngrok-bin-2.2.8-beta.3" = { - name = "_at_expo_slash_ngrok-bin"; - packageName = "@expo/ngrok-bin"; - version = "2.2.8-beta.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin/-/ngrok-bin-2.2.8-beta.3.tgz"; - sha512 = "VzL67ybSvSYhFJxwBm19VMEHAcgg6bDhE9p8HKDOXL2tdHIzqYtqAYxOyhv2mS263WYqdomtoAChSOb449of+g=="; - }; - }; - "@expo/ngrok-bin-darwin-ia32-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-darwin-ia32"; - packageName = "@expo/ngrok-bin-darwin-ia32"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-darwin-ia32/-/ngrok-bin-darwin-ia32-2.2.8.tgz"; - sha512 = "Mgept4WvXobcNQbxV0f8Nqrukl4HsAM4ExfFOC5BJ1PinlZisb1lQYp+PGu/3DuOYAinAspbL/3m77JkhT5Oow=="; - }; - }; - "@expo/ngrok-bin-darwin-x64-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-darwin-x64"; - packageName = "@expo/ngrok-bin-darwin-x64"; - version = "2.2.8"; + version = "0.1.54"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-darwin-x64/-/ngrok-bin-darwin-x64-2.2.8.tgz"; - sha512 = "hEVxBAKTT9G+jCy+2NOjgFrPrrzmdxljLhz3cQIb4izjooQXGCbTFvnEntB0odgsf6Dpa2jWNNt18H6t2nneOQ=="; - }; - }; - "@expo/ngrok-bin-freebsd-ia32-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-freebsd-ia32"; - packageName = "@expo/ngrok-bin-freebsd-ia32"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-freebsd-ia32/-/ngrok-bin-freebsd-ia32-2.2.8.tgz"; - sha512 = "yGdq06wUxreCPxXnhqlL3GzvLtArJ6eDOQinv4SiDK+ftQPY4TloEMQr/rwohvtx63O+bT9jAtgJW44jlfIQ2Q=="; - }; - }; - "@expo/ngrok-bin-freebsd-x64-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-freebsd-x64"; - packageName = "@expo/ngrok-bin-freebsd-x64"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-freebsd-x64/-/ngrok-bin-freebsd-x64-2.2.8.tgz"; - sha512 = "1uSZRastddaUIrK/2B5MANhV7LDKJ8/4cSQxn+E2+U296VKkU6n1ZfZ207a7hA1ctQeBcvwkRx9biFxDa99How=="; - }; - }; - "@expo/ngrok-bin-linux-arm-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-linux-arm"; - packageName = "@expo/ngrok-bin-linux-arm"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-linux-arm/-/ngrok-bin-linux-arm-2.2.8.tgz"; - sha512 = "qruRsoEuFvaVsSSlhNtHR8uWgF7aA6jdRtCuVKO4pMW32lTZfGS+U/y6hB0YBxXv4xhEn8o1x/15oLU7cNUxEA=="; - }; - }; - "@expo/ngrok-bin-linux-arm64-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-linux-arm64"; - packageName = "@expo/ngrok-bin-linux-arm64"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-linux-arm64/-/ngrok-bin-linux-arm64-2.2.8.tgz"; - sha512 = "9iXr88LlzBCp7+NwfPDsSg2sIy5GfWFXrhU8+vGLnFvZ5MO6ZoRmXbw2VRPFm7ekMa0Losddny4aiLDJkr9hXw=="; - }; - }; - "@expo/ngrok-bin-linux-ia32-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-linux-ia32"; - packageName = "@expo/ngrok-bin-linux-ia32"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-linux-ia32/-/ngrok-bin-linux-ia32-2.2.8.tgz"; - sha512 = "Cm3BH4nv55A6KF+XjrK8oLe1Ktn4WrUabd6TcErQRM6/2454A+vh1r6CEKWOVWy4bg7ceTbjgHhCdj9WMv8WTg=="; - }; - }; - "@expo/ngrok-bin-linux-x64-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-linux-x64"; - packageName = "@expo/ngrok-bin-linux-x64"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-linux-x64/-/ngrok-bin-linux-x64-2.2.8.tgz"; - sha512 = "jNhnnfMR/yAgUV1LnAheq/WWB/Tkdgm5sxZhN0fjN00CeiYTVyNuCsii2tdjXJCGrxdpb6RzvOxjLGstIT0mUQ=="; - }; - }; - "@expo/ngrok-bin-sunos-x64-2.2.8" = { - name = "_at_expo_slash_ngrok-bin-sunos-x64"; - packageName = "@expo/ngrok-bin-sunos-x64"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-sunos-x64/-/ngrok-bin-sunos-x64-2.2.8.tgz"; - sha512 = "Ogcn/6jNN2PMMaZ1PJu7JBiZz92Yowa119cclI2E2RKyIqQaOYol2g72oHzm8SQ49KfzEJMGDmQA4Xh29cKmrQ=="; - }; - }; - "@expo/ngrok-bin-win32-ia32-2.2.8-beta.1" = { - name = "_at_expo_slash_ngrok-bin-win32-ia32"; - packageName = "@expo/ngrok-bin-win32-ia32"; - version = "2.2.8-beta.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-win32-ia32/-/ngrok-bin-win32-ia32-2.2.8-beta.1.tgz"; - sha512 = "Pva9ZNjUieD2/RVav7LYGAXZ1O6MVXlvOnJmHSmjP4rhreek7/Ez7b5HsCEN3YLjZIcPHH8SV8Duix1NO2zB5A=="; - }; - }; - "@expo/ngrok-bin-win32-x64-2.2.8-beta.1" = { - name = "_at_expo_slash_ngrok-bin-win32-x64"; - packageName = "@expo/ngrok-bin-win32-x64"; - version = "2.2.8-beta.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/ngrok-bin-win32-x64/-/ngrok-bin-win32-x64-2.2.8-beta.1.tgz"; - sha512 = "tVn0jkRC7cbDL502FU7iVI4jbaEKcbTER7pYo2xdUZgM02n4u0AS+FFuzUN+irDiRYZQIFdmDIhxDGl+SHkzbA=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.54.tgz"; + sha512 = "DOlTzNheS5IZDDmQjWt60mAmbFreH8xT3ZXc6y/k4UVq7khQ41/g5kl1AJOC9WzE6xgPtmDQqTWanBprn+OhzA=="; }; }; "@expo/osascript-2.0.24" = { @@ -1912,13 +1849,13 @@ let sha512 = "oqar3vmvxkVx1OBG7hTjTbCaVVUX2o+aEMLxZWLUiubL0ly1qxgQKEt5p3g3pzkxTft+b1oMf8bT7jMi6iOv+Q=="; }; }; - "@expo/package-manager-0.0.34" = { + "@expo/package-manager-0.0.38" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.34"; + version = "0.0.38"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.34.tgz"; - sha512 = "/zxESSNAjeBI7BlrFlmmLbEDNblJhR0fd9rZGPOwNlRoeojCJ0yh+nTUWXQtBgolffQMYq0LkTTjTDszqs4M+g=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.38.tgz"; + sha512 = "meuDK53dkORUCRnIMBOkgPNWMfH47KJgUFZ3b1shYD+JFpsk4OX4OieKdyFX/J6Q7HgHwFSJvdCCFxgPbsAQyg=="; }; }; "@expo/plist-0.0.11" = { @@ -1939,13 +1876,13 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.23" = { + "@expo/schemer-1.3.26" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.23"; + version = "1.3.26"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.23.tgz"; - sha512 = "ORDxT7mCTtiJZj1R44L5R8HvSMfTJk31qBAb57yx7WXY2crUrwZGwmZryUjGs0Z3BlrbwbsWTvF7CvVa6zy+Sg=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.26.tgz"; + sha512 = "++PmBy75BpaPRrbIzmgpp3r73gtoa2PkSKucTXRH8OfADlF0FDJ7W0S1L6iKMhZml3339pjUMLo7a9A7OlgU6g=="; }; }; "@expo/simple-spinner-1.0.2" = { @@ -1966,40 +1903,22 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/traveling-fastlane-darwin-1.15.1" = { - name = "_at_expo_slash_traveling-fastlane-darwin"; - packageName = "@expo/traveling-fastlane-darwin"; - version = "1.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/traveling-fastlane-darwin/-/traveling-fastlane-darwin-1.15.1.tgz"; - sha512 = "7sjG83+o9BT4MVPNq2UVqy1Oyg3n47FpEIDxc0M9CQvbC1WgYsAKloOJ85g5GRXZAjqzPOPUZF+lBhGbOwmQvg=="; - }; - }; - "@expo/traveling-fastlane-linux-1.15.1" = { - name = "_at_expo_slash_traveling-fastlane-linux"; - packageName = "@expo/traveling-fastlane-linux"; - version = "1.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/traveling-fastlane-linux/-/traveling-fastlane-linux-1.15.1.tgz"; - sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; - }; - }; - "@expo/webpack-config-0.12.52" = { + "@expo/webpack-config-0.12.58" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.52"; + version = "0.12.58"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.52.tgz"; - sha512 = "OOxIMaKa2O4JPDZpNMc+G40Z5MoOoRwvfU+331+ydqGzPDAev8/PtalnQbJTuqjVaU99QzVlrn1BfLWwJ/3fig=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.58.tgz"; + sha512 = "c3UrHaNll4+nBmmNA/1HU7OYm7USsaqzMqExfC+mB3E1RnPi0qft83zf7wgwNwQCcqs06NH3VRKxpmQ7qzKuNw=="; }; }; - "@expo/xdl-59.0.14" = { + "@expo/xdl-59.0.22" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "59.0.14"; + version = "59.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.14.tgz"; - sha512 = "h2czzd9nBhiafVp1JFPcP/VYqefKpNb8Om7oY6twm7GCFkX+tlZ8zYtkVfgE9WlOhtAOu8b56eKfjAOdUsqlGQ=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.22.tgz"; + sha512 = "1kfDyr5Gg9f1d93eJJ2JXiMXvhtf5IGWMp4C+aSPcH1ajxaWGak9SRpkTGv0Mi0VN9jIimTFT+kTkWZv9W1VMQ=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2038,31 +1957,31 @@ let sha512 = "w40gi8fzCpwa7U8cONiuu8rszPStkVOL/weDf5pCbYEb1gdaV7MDPSNkgM6IV0Kz+k017noDgK9Fv4ru1Dwz1g=="; }; }; - "@fluentui/keyboard-key-0.2.12" = { + "@fluentui/keyboard-key-0.2.13" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.12"; + version = "0.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.12.tgz"; - sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.13.tgz"; + sha512 = "HLZNtkETFUuCP76Wk/oF54+tVp6aPGzsoJRsmnkh78gloC9CGp8JK+LQUYfj9dtzcHDHq64/dAA2e4j2tzjhaQ=="; }; }; - "@fluentui/react-7.155.3" = { + "@fluentui/react-7.160.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.155.3"; + version = "7.160.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.155.3.tgz"; - sha512 = "bVK9qMUqjWQ68UPkQGHCMnCKeH8uSlCLF2QgR9ESMV/g0sHUvRqCO1Yuj9JyO4NDanqfX62NDgJzimHKj1/MQg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.160.0.tgz"; + sha512 = "ckbM7zFAob59vHqfKz+K9Gmivqp9YmAF1TIMJX6RKC/MEVpeA4s5G412/J0SgFNsWwwdCYaqh0UL9W/pnwuE8A=="; }; }; - "@fluentui/react-focus-7.17.0" = { + "@fluentui/react-focus-7.17.4" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.17.0"; + version = "7.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.0.tgz"; - sha512 = "xr5LExRnLW9CNyWDkcMmvOAgOXru/GBTIKcVqNahgRf7CIyHraY0m/0gFblwNtPYQOS9ltM3c+fbyYvCXBZvEw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.4.tgz"; + sha512 = "L7MK538JOSpLQubyVxYZV1ftd3hViBQhcFftuJfah/mdekQkIcFTS0fsymQ4MK5i7bn13jE7lPM8QfH23wpaJg=="; }; }; "@fluentui/react-window-provider-1.0.1" = { @@ -2074,13 +1993,22 @@ let sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w=="; }; }; - "@fluentui/theme-1.7.0" = { + "@fluentui/theme-1.7.3" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.7.0"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.0.tgz"; - sha512 = "pzqDZC2bVD6/S45Bnve4wmrXi4cN7XiCr+OhzvgmoQfDkm5vyXsa82/cVtif/zy1OFU96S9zOTtt3e+QQuGUUg=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.3.tgz"; + sha512 = "S97i1SBL5ytQtZQpygAIvOnQSg9tFZM25843xCY40eWRA/eAdPixzWvVmV8PPQs/K5WmXhghepWaC1SjxVO90g=="; + }; + }; + "@gardenapple/yargs-17.0.0-candidate.0" = { + name = "_at_gardenapple_slash_yargs"; + packageName = "@gardenapple/yargs"; + version = "17.0.0-candidate.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@gardenapple/yargs/-/yargs-17.0.0-candidate.0.tgz"; + sha512 = "/x7vm8duSSZvfDEXVdG1lX3HXnvnRGsNbilKquUK3t1RQmnsiEEcXKQet1lTTvYi3CTFoQoIJEOg1P005B0OXg=="; }; }; "@google-cloud/paginator-3.0.5" = { @@ -2119,13 +2047,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.7.0" = { + "@google-cloud/pubsub-2.8.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.7.0.tgz"; - sha512 = "wc/XOo5Ibo3GWmuaLu80EBIhXSdu2vf99HUqBbdsSSkmRNIka2HqoIhLlOFnnncQn0lZnGL7wtKGIDLoH9LiBg=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.8.0.tgz"; + sha512 = "AoSKAbpHCoLq6jO9vMX+K6hJhkayafan24Rs2RKHU8Y0qF6IGSm1+ly0OG12TgziHWg818/6dljWWKgwDcp8KA=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2155,31 +2083,31 @@ let sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q=="; }; }; - "@graphql-tools/delegate-7.0.8" = { + "@graphql-tools/delegate-7.0.10" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "7.0.8"; + version = "7.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.8.tgz"; - sha512 = "pS1wci7ZxzdCITRrMI66UA+6/E0Z1Yczd3QxJBDb4Kp0nTGy1xy7enGa0+i55EmCvKvuwyx+tzXzwA1fNGRJzg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.10.tgz"; + sha512 = "6Di9ia5ohoDvrHuhj2cak1nJGhIefJmUsd3WKZcJ2nu2yZAFawWMxGvQImqv3N7iyaWKiVhrrK8Roi/JrYhdKg=="; }; }; - "@graphql-tools/graphql-file-loader-6.2.6" = { + "@graphql-tools/graphql-file-loader-6.2.7" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.2.6"; + version = "6.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.6.tgz"; - sha512 = "L+RdYl5C6+X0zdOTUotY0K5zwqvSGpqI/qcZpVvCDenoAcVTyaNLmnd/ViErwedhCaGqAAV0wI1nPtyKFPlMUg=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.7.tgz"; + sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/import-6.2.5" = { + "@graphql-tools/import-6.2.6" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.2.5"; + version = "6.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.5.tgz"; - sha512 = "ZGXT5tDod7m+LO38fc+o0JzR1LstL0RF35HKEWoUdxRIVaaeYH9VMuan9Gn+9M9RDME3RnzEa9aGzf9ATj8bTA=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.6.tgz"; + sha512 = "/0H/bDjNK1MnKonk8fMbB7wIYU6QLCwbQOHtSHbFJ4j2qki5CqfAxpF+fGX6KovDtkdigcgRMvSKKi14oiuHPA=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -2200,31 +2128,31 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.6" = { + "@graphql-tools/merge-6.2.7" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.6"; + version = "6.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.6.tgz"; - sha512 = "G6x0QlIzFHoJ3dyF9a4gxmBtaEYJ+EoAAGqXHsE/drRr58K1jscQdfKZdF1wZWZgxkgakHqgt1+oFMeQg/O6ug=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.7.tgz"; + sha512 = "9acgDkkYeAHpuqhOa3E63NZPCX/iWo819Q320sCCMkydF1xgx0qCRYz/V03xPdpQETKRqBG2i2N2csneeEYYig=="; }; }; - "@graphql-tools/schema-7.1.2" = { + "@graphql-tools/schema-7.1.3" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.2.tgz"; - sha512 = "GabNT51ErVHE2riDH4EQdRusUsI+nMElT8LdFHyuP53v8gwtleAj+LePQ9jif4NYUe/JQVqO8V28vPcHrA7gfQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.3.tgz"; + sha512 = "ZY76hmcJlF1iyg3Im0sQ3ASRkiShjgv102vLTVcH22lEGJeCaCyyS/GF1eUHom418S60bS8Th6+autRUxfBiBg=="; }; }; - "@graphql-tools/url-loader-6.7.1" = { + "@graphql-tools/url-loader-6.8.0" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.7.1"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.7.1.tgz"; - sha512 = "7NJ1G5diJAuWYZszQf0mNwPipVMOjIIMteNkutdExBq4CgN0V1xa3/iC25CUrI7sZiq+D367zZNONmKf+3bA2Q=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.0.tgz"; + sha512 = "x4f93UnH7kNr9iHFpJHL6kYWogRFlxMEnXybHS9xNCFd08+ftMO22bUb8esnFsyNrtMMlkLtshDSyNb3LbIMQg=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -2236,13 +2164,13 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.2.3" = { + "@graphql-tools/utils-7.2.5" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.2.3"; + version = "7.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.3.tgz"; - sha512 = "9MvSKeo+8DM72706FvrUP8figQjRzSwBswWrXviyWyt3wSkk6MU2cURQKfMpc0I6nswZvkDSqYoQQ/6mazoXxA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.5.tgz"; + sha512 = "S9RUkPimq+5eEDohDjiq/JCPUsiZblKRG8ve+diUwF1f8+r6FV2xGXrOt0qhQJiMxIO+BOK3DU9c+U3tX9Jo0w=="; }; }; "@graphql-tools/wrap-7.0.5" = { @@ -2254,31 +2182,22 @@ let sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ=="; }; }; - "@grpc/grpc-js-1.1.8" = { + "@grpc/grpc-js-1.2.6" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.1.8.tgz"; - sha512 = "64hg5rmEm6F/NvlWERhHmmgxbWU8nD2TMWE+9TvG7/WcOrFT3fzg/Uu631pXRFwmJ4aWO/kp9vVSlr8FUjBDLA=="; - }; - }; - "@grpc/proto-loader-0.5.5" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.5.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.5.tgz"; - sha512 = "WwN9jVNdHRQoOBo9FDH7qU+mgfjPc8GygPYms3M+y3fbQLfnCe/Kv/E01t7JRgnrsOHH8euvSbed3mIalXhwqQ=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.6.tgz"; + sha512 = "wfYwFy7CvVEmBKzeDX1kQQYrv5NBpe8Z+VwXipFvqof3lCXKch7k+4T3grKtptaH5GQ5KP9iKwPr9hMDSynIUw=="; }; }; - "@grpc/proto-loader-0.6.0-pre9" = { + "@grpc/proto-loader-0.5.6" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.6.0-pre9"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.0-pre9.tgz"; - sha512 = "oM+LjpEjNzW5pNJjt4/hq1HYayNeQT+eGrOPABJnYHv7TyNPDNzkQ76rDYZF86X5swJOa4EujEMzQ9iiTdPgww=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.6.tgz"; + sha512 = "DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2839,58 +2758,58 @@ let sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.14" = { + "@joplin/fork-htmlparser2-4.1.23" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.14"; + version = "4.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.14.tgz"; - sha512 = "uE5StVO3A6XcQLd5CxRU+XU7ecAKX8lmTFnHlnhBkgn8V8CHsHIUfZy1uw+fZ4gnC0kenq6uiZavhDPBAkibKA=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.23.tgz"; + sha512 = "nTbOVZJbF02d32AhvwhWME2uQbbCZsFYulMgqRZ/I4realfJgqkaUfXclLxYcyOPAjzngXd+Wb1/M/Pz6luXGw=="; }; }; - "@joplin/fork-sax-1.2.18" = { + "@joplin/fork-sax-1.2.27" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.18"; + version = "1.2.27"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.18.tgz"; - sha512 = "tlsBwoayPjEVjAsylCosflTtF4EgGrSP4b/2r5Ci640846YDPdg0nqKuOUs82Xmptc3QQcnjzRKW8+7Up9+lfQ=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.27.tgz"; + sha512 = "ON/8pg90WCRHKj8HttziC7Rtef+DKSSDZD9J3zjHYUvrXB0pu+7eZvRP8vF3Y2MSZnlshtFGQqiIRbwk3GVA+Q=="; }; }; - "@joplin/lib-1.0.15" = { + "@joplin/lib-1.0.18" = { name = "_at_joplin_slash_lib"; packageName = "@joplin/lib"; - version = "1.0.15"; + version = "1.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.0.15.tgz"; - sha512 = "wOA+fxi93b9qfuRV7Ynhc+uUmW2XDVMugHWzqDdiOPd394mYQSX21/Eqvxhd049SsHiqmsMo2scz7rNtFLMnuA=="; + url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.0.18.tgz"; + sha512 = "r0Z+bolszlPUsanaQIUk/tog3jHw0rGtUxXTHDMtycFWkWYVpjlT3bvxiYrV5MwLjyn/xnfUCIdHeUi/Lz3LPQ=="; }; }; - "@joplin/renderer-1.0.23" = { + "@joplin/renderer-1.0.26" = { name = "_at_joplin_slash_renderer"; packageName = "@joplin/renderer"; - version = "1.0.23"; + version = "1.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.0.23.tgz"; - sha512 = "1gddYqDLxeyR96m1/9WQ7Ri2tbaIOEW+JmbZKst9HDsgj8LiNwtBha+y35KqRAS6pWimbcXh0RZDkA4DmQ2VOw=="; + url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.0.26.tgz"; + sha512 = "RDRYjuPCn1ltematEZQhgvZbIGBQ+2F3jgAdXpqByg71pmxrMZyOLLbNVYJyKK4w2Ecvmbpwuo0h9RbMb/56Ow=="; }; }; - "@joplin/turndown-4.0.36" = { + "@joplin/turndown-4.0.45" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.36"; + version = "4.0.45"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.36.tgz"; - sha512 = "lks0n5HTAsg0O71L9kLoTaASAU4NILG3SyDcX/10K1g2wpoUadmXQmznaa3WqY4RgN0gzRKaZV51d7JtO9ZwXQ=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.45.tgz"; + sha512 = "u4J/ka4szy34ioQ5UVaCdLlfzfOxEQH/lDReHauYoNhH+H+EWt1qOwMh9A8fuTfoK2vnUUiPKHsWhOYCe+LRiw=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.18" = { + "@joplin/turndown-plugin-gfm-1.0.27" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.18"; + version = "1.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.18.tgz"; - sha512 = "6uUXRU5PILzKAUP50t9FOyMrpGgfpw2ugrZ8hAfV+PhNZsjSgsc+cSBBdjn/HIEgNCr9m7TlHSzscxrHg496Iw=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.27.tgz"; + sha512 = "4BPgTSkhvxPI3tbjG4BPiBq0VuNZji1Y77DRWHb09GnzsrgwBI+gpo3EI6obkyIeRuN/03wzf98W5u1iau2vpQ=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -2902,13 +2821,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.16.0" = { + "@jsii/spec-1.20.1" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.16.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.16.0.tgz"; - sha512 = "DH3rDGa781UmRtg/ykFyxrfhjaz1SRz2BblNXDxwArhl0aUiN5HOdzi9icX8CFwdB9+ZxTtXuxap3BwvLa5xnA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.20.1.tgz"; + sha512 = "+ot9SPb/lFnRiPlhWUGLMp8owpr/pnpFX0/iIUhZ0kJ1LIAUde7TSuaz70mV6x+ES2wvVXKsgfu2WTMFHIAwZQ=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3496,22 +3415,22 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.141" = { + "@microsoft/load-themed-styles-1.10.147" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.141"; + version = "1.10.147"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.141.tgz"; - sha512 = "IWqbTWhxpp10X2nZI14oqbPtzrRLvXtyX7sV/QDfVBtQQivLilZFynr/X69SAZtbSp/wi7WI8gKl2/6TuTNN1A=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.147.tgz"; + sha512 = "fqkftQUoc2fjR9F+4uZkCt2hJhgZlkgM33k4qD4UdI75+SDOK9Zp5iU3dWzvwDWWVIXTOE+GKMFlmUtrlKZ+fg=="; }; }; - "@mozilla/readability-0.3.0" = { + "@mozilla/readability-0.4.1" = { name = "_at_mozilla_slash_readability"; packageName = "@mozilla/readability"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@mozilla/readability/-/readability-0.3.0.tgz"; - sha512 = "q8f1CAZsRKK1j+O0BmikGIlKSK03RpT4woT0PCQwhw0nH0z4+rG026AkxoPcjT7Dsgh1ifGscW8tOpvjoyOjvw=="; + url = "https://registry.npmjs.org/@mozilla/readability/-/readability-0.4.1.tgz"; + sha512 = "yar/f0w0fRUVM895s6yd5Z2oIxjG/6c3ROB/uQboSOBaDlri/nqI4aKtdqrldWciTLcdpjB2Z6MiVF2Bl9b8LA=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -3532,13 +3451,13 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; - "@nestjs/schematics-7.2.6" = { + "@nestjs/schematics-7.2.7" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "7.2.6"; + version = "7.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.6.tgz"; - sha512 = "4geGO9pjYG4Sc4Qi+pkUVIbaxPEeySHi/z17po8nP9uaPPo8AUKP9rXjNL+mhMrXqFlB/hhN6xBBYtMyL5pB2Q=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.7.tgz"; + sha512 = "71XqMPf7s2P1Q6PVMDLbSLphVWgGDK2CgURVYyreuIWXVSoi9pcPIeO5k0Qb5n5jELlKwdrf66g05U2I6TIxzg=="; }; }; "@netflix/nerror-1.1.3" = { @@ -3550,13 +3469,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-8.0.1" = { + "@netlify/build-9.1.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "8.0.1"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-8.0.1.tgz"; - sha512 = "DOBUR4x0GEmi4hD8LagJfPCtxnaAtjRTJgZdTx9lFngC2OHY+xIwGZ3Ilct1b3vbAcl0SzHA+HZ4xrG2V/EWdw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-9.1.2.tgz"; + sha512 = "GvAx6f3T8MZRHDEPNOsGdsAfW188FjKTGpA04G2QoMJdLHgzAp6gI6J6m7B9b16Sw7qs5U+JX2A9JjZRHmOAsg=="; }; }; "@netlify/cache-utils-1.0.6" = { @@ -3568,67 +3487,58 @@ let sha512 = "Pz/TzLZhMUACT+X7Un6jZCXgEUwLPVNbx69DQtEOMZ6hNBE1b1ErTHFbSaHA0KfDn/yqCII5vS274DERvNuRwg=="; }; }; - "@netlify/config-0.11.11" = { + "@netlify/config-4.0.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "0.11.11"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-0.11.11.tgz"; - sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-4.0.1.tgz"; + sha512 = "qI/PxBx5RGuQbVgYOtbEJ498+yDWqfqetDOHYzxJEFZYpZjS5Effu4jt92amnW55pzOZvTk/vQZQx8zLb4N2WQ=="; }; }; - "@netlify/config-2.4.3" = { - name = "_at_netlify_slash_config"; - packageName = "@netlify/config"; - version = "2.4.3"; + "@netlify/framework-info-2.3.0" = { + name = "_at_netlify_slash_framework-info"; + packageName = "@netlify/framework-info"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.3.tgz"; - sha512 = "Uz7Oo3tJP2VTgNgsJtRlwAhO5jTozkpNMCKALb814ssJKx7nE/4QvNxJPCQNBDXY9BSeXVIPfy0vMfshxatL+g=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-2.3.0.tgz"; + sha512 = "vqy9wbBRP8qWnkzA/OQsThr1+cfqapMrORJ4hWcrjhIPRmXIJtwB6OWuLIUalMeSGCwqZjYpKfudc4BLuxxvjw=="; }; }; - "@netlify/functions-utils-1.3.4" = { + "@netlify/functions-utils-1.3.12" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.4"; + version = "1.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.4.tgz"; - sha512 = "AkVd03D6K7Uwli+t5xTMm5c1jn1HRFY3YgslLV91huHI++3CjOsGpsnDfhoN2kj1aN8OLqliTOvs4PQHC2dKpw=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.12.tgz"; + sha512 = "u2t6AVKsg9MuXicYETMqWubOXUayNdCU0GuMl2u5T3bz9E7mVCnCB4VVkEVDqlC8GnrdbVHzEu+OPmbv+dkzJA=="; }; }; - "@netlify/git-utils-1.0.6" = { + "@netlify/git-utils-1.0.7" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.6.tgz"; - sha512 = "JpuvzCTf9QXVEgVA4mSshH6fi9Dtg0Pqe5d19yaN2f1H9DNnWro3kJUaoR68Hfo0rBls6kYwWJuNZ/csb03VuQ=="; - }; - }; - "@netlify/open-api-0.18.1" = { - name = "_at_netlify_slash_open-api"; - packageName = "@netlify/open-api"; - version = "0.18.1"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-0.18.1.tgz"; - sha512 = "kkRCzA71HugJxmPOcWv2B4ArHhSMKjs2ArGBr10ndocVLdAHwCYoJm0X4Xt8IYaOcGD9Lm4fbLjpXDLDRGDzPw=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.7.tgz"; + sha512 = "+CT/1D13Uxi3Qlnf0/F2XpmBsTYGCax0SQJhIrq6hLJXJt0Ej2FBA3Rq7XxOXibAptK1Dw2LUi1JWHQ36H/3aw=="; }; }; - "@netlify/open-api-1.0.0" = { + "@netlify/open-api-1.3.0" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; - version = "1.0.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-1.0.0.tgz"; - sha512 = "LAicAlsAZXybGtKzaOTmIYelSe82vgZlc17IeNUQxab2IlUCH7VhTKCx9EyJEgiXhLvmYoOjuYE1Ee9ZsnrybA=="; + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-1.3.0.tgz"; + sha512 = "GcCPXIWI8VDBsLN4nPvb6sKS9tbi4lrHLhex90hT27nwTDeu4HgGE93YilcsgZ1LLODJNxC5LdfTNLtvEHMKVg=="; }; }; - "@netlify/plugin-edge-handlers-1.10.0" = { + "@netlify/plugin-edge-handlers-1.11.3" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.10.0"; + version = "1.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.10.0.tgz"; - sha512 = "ZgabL4Q+DfB5lqq36QYvGIhLifoiVz5oDfqLp1w7hRsJYwUhUPqeJx/0zph17ZaJB4CvHRadFOeyJeDSkzrERg=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.3.tgz"; + sha512 = "ewAXDU46PONZ279M1S7hrwIvdyBjwDJL+DkA1iRFKydEMAIl5Z/HyAM4bX2OoRDi2eaIKLRO06dMAjaYgzpaog=="; }; }; "@netlify/plugins-list-2.2.0" = { @@ -3649,112 +3559,103 @@ let sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q=="; }; }; - "@netlify/traffic-mesh-agent-0.27.0" = { + "@netlify/traffic-mesh-agent-0.27.10" = { name = "_at_netlify_slash_traffic-mesh-agent"; packageName = "@netlify/traffic-mesh-agent"; - version = "0.27.0"; + version = "0.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.0.tgz"; - sha512 = "a+jXM75Ir9PavNTzDRkZWQT7jHc02wWF8mRYXWbvku+VLqmmkA61RyhAgSeo5dMWSdMofSRkoifnW7leyv7Obw=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.10.tgz"; + sha512 = "HZXEdIXzg8CpysYRDVXkBpmjOj/C8Zb8Q/qkkt9x+npJ56HeX6sXAE4vK4SMCRLkkbQ2VyYTaDKg++GefeB2Gg=="; }; }; - "@netlify/traffic-mesh-agent-darwin-x64-0.27.0" = { + "@netlify/traffic-mesh-agent-darwin-x64-0.27.10" = { name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64"; packageName = "@netlify/traffic-mesh-agent-darwin-x64"; - version = "0.27.0"; + version = "0.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.0.tgz"; - sha512 = "a0EDNrdLBjxp+GYj/WQSifuQZorFQkY6spO4wuOl3mQV3tKTkBmu09+FsfitYpgZHDMoPzfhvURJrUtJIHTgqQ=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.10.tgz"; + sha512 = "j2blCh3TKNV35VPF9Zf/LM3v6pH/gz/Y7uu/78RLbgNvCW0vGN7b1GgFnXQKwrvbL6tRGumJS2P5PWUfEsKOBA=="; }; }; - "@netlify/traffic-mesh-agent-linux-x64-0.27.0" = { + "@netlify/traffic-mesh-agent-linux-x64-0.27.10" = { name = "_at_netlify_slash_traffic-mesh-agent-linux-x64"; packageName = "@netlify/traffic-mesh-agent-linux-x64"; - version = "0.27.0"; + version = "0.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.0.tgz"; - sha512 = "m7p/0eTXKILxCpTqQOmBkYdIjYKwSC2KZbPpDJ4sYfnMIF3qa9uMp8qrK9At/oGPckeiTq4Id775veldhwt2lw=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.10.tgz"; + sha512 = "JdeGT356TtqbxY6IjsS+wik68V0iNGdRsGV4cYOx/aAfclAyZ9DL29A4nzobyq5J+s5binrbKpix26/WKi+sqA=="; }; }; - "@netlify/traffic-mesh-agent-win32-x64-0.27.0" = { + "@netlify/traffic-mesh-agent-win32-x64-0.27.10" = { name = "_at_netlify_slash_traffic-mesh-agent-win32-x64"; packageName = "@netlify/traffic-mesh-agent-win32-x64"; - version = "0.27.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.0.tgz"; - sha512 = "u6Beazs0KWRcEx9q2n417Sj7+WGrDTtDGmmKPTE6WexFt6uY1oiq3AR+ohCtu1lIIsmAfAYd8O5dSOnyAT8dFg=="; - }; - }; - "@netlify/zip-it-and-ship-it-1.7.0" = { - name = "_at_netlify_slash_zip-it-and-ship-it"; - packageName = "@netlify/zip-it-and-ship-it"; - version = "1.7.0"; + version = "0.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.7.0.tgz"; - sha512 = "7Fatc5OoRZ7V2tusx1CBWIdk9hXrr0JWoW547wsmopCkCl5O4TaLxw12CgfW6EQsjaufSnuQddzvnx5y1b5gGQ=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.10.tgz"; + sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; }; }; - "@netlify/zip-it-and-ship-it-2.0.0" = { + "@netlify/zip-it-and-ship-it-2.3.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "2.0.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.0.0.tgz"; - sha512 = "DQQldFTRmEPHpvvKxAKLNk/RqVIfzZGsBcbmruy3zupPG2W+pGHnQUSMNXrUZmMkqekDh0nCHf8MfG0EakRqGg=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.3.0.tgz"; + sha512 = "dqYXA/e2ZY6bO7fvp18YKXLYE/CK8cAbjBE2mo339sA+xchoV3ryYEjsLpoYqFWofUBLQnCYahm4D9a4H7RT0A=="; }; }; - "@node-red/editor-api-1.2.6" = { + "@node-red/editor-api-1.2.9" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.6"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.6.tgz"; - sha512 = "RM243A8AgpoHEc8cu8STCYsJVx790clVxvRUCaLfbAyb+dKn+9b0TOKWsmLUW4fhrMqwwVlFOMulVHPhg0HhGg=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.9.tgz"; + sha512 = "KsN5Cp/YMfYM6E/rclWuEoNpTe3krRbKhc3X+TGOirZZ5JVW4qbpdP1p0jRmcBkhZPc1i6yOh5PE7qN7LoPH5A=="; }; }; - "@node-red/editor-client-1.2.6" = { + "@node-red/editor-client-1.2.9" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.6"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.6.tgz"; - sha512 = "2hMnMVcqhR77mHqHzVj3hNJGZ8VcaO+lhggNYhORJXEqYCeAULj92hMCeoA4pjHDqGBn2F+gldli1WOs1/JgJg=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.9.tgz"; + sha512 = "L8zDaeVLjo7dZzqVTTj0XcQFj6QlnLJOPpnpt9V0sSQDwWzA+lWTP6nNwUcXiGuchN/WeXQXrsfBEemHgKUNLg=="; }; }; - "@node-red/nodes-1.2.6" = { + "@node-red/nodes-1.2.9" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.6"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.6.tgz"; - sha512 = "1LlECIzKKBHUOsWGLw31FT1mWL2mSecr9gBh2FqwnP7gNejebYjwP2zuHKOYs9sPRm3550zOJ5mlutXiiFKwYg=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.9.tgz"; + sha512 = "ZQ3NCzl7gC3KIGgjmRZTqO3W0W03nnu4r8IX/OeiM4ewlhDlrvfoejOX1zTtIHnmgzFM+FjweyLeWEQ7bpy8jA=="; }; }; - "@node-red/registry-1.2.6" = { + "@node-red/registry-1.2.9" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.6"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.6.tgz"; - sha512 = "+zwHxnMr9Adve627dtw2jl/KSjTY+a5JrwJN10TSKMxVLwYeBLm/ugRTA9tkGiCjr2w9pgsnMUZRFFLfdyRZCQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.9.tgz"; + sha512 = "OxFbHU7UrisBEM0413KSsPRXzQCJIwNQtg1E+oPDiFuMtHwVhUiVicnqbo8IiftO58PsMkSL+Wj2+ta34phlgA=="; }; }; - "@node-red/runtime-1.2.6" = { + "@node-red/runtime-1.2.9" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.6"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.6.tgz"; - sha512 = "zfQGK4Hqssv5TV8S5WLZ77BHYmyylarZvEScVQpivhJHg6HeZL+MffqqtPIyTM1ulklPZvO6fPmq/f5T/CgAgw=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.9.tgz"; + sha512 = "wcSq7MNVbRLaahKWHV5diqyeCWviKtr6VNzAmtIB+wH+omfx+OWiJEimu9x/56l9iv3mc9ew4PwtOMG07QNiTQ=="; }; }; - "@node-red/util-1.2.6" = { + "@node-red/util-1.2.9" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.6"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.6.tgz"; - sha512 = "CYUCS8iqcaZFBf0vwtVPqqNXX0XY0ajFW69smtDItbxslyZL3A0qRMiTTv0qMPA1uvOCEw4wQRSIQV7j/nd0yw=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.9.tgz"; + sha512 = "a4JVRFaxkSpuVAHwwQ8yi+jwyhsflgZD7glGFlcPdfBXvcE4EiGxx1OFbNzI3JJ7pL+8sE0xxwfsZuY24IZahw=="; }; }; "@nodelib/fs.scandir-2.1.4" = { @@ -3802,40 +3703,40 @@ let sha512 = "oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="; }; }; - "@npmcli/git-2.0.4" = { + "@npmcli/git-2.0.6" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.4.tgz"; - sha512 = "OJZCmJ9DNn1cz9HPXXsPmUBnqaArot3CGYo63CyajHQk+g87rPXVOJByGsskQJhPsUUEXJcsZ2Q6bWd2jSwnBA=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.6.tgz"; + sha512 = "a1MnTfeRPBaKbFY07fd+6HugY1WAkKJzdiJvlRub/9o5xz2F/JtPacZZapx5zRJUQFIzSL677vmTSxEcDMrDbg=="; }; }; - "@npmcli/installed-package-contents-1.0.5" = { + "@npmcli/installed-package-contents-1.0.7" = { name = "_at_npmcli_slash_installed-package-contents"; packageName = "@npmcli/installed-package-contents"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.5.tgz"; - sha512 = "aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A=="; + url = "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz"; + sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; - "@npmcli/move-file-1.0.1" = { + "@npmcli/move-file-1.1.2" = { name = "_at_npmcli_slash_move-file"; packageName = "@npmcli/move-file"; - version = "1.0.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz"; - sha512 = "Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw=="; + url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"; + sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@npmcli/node-gyp-1.0.1" = { + "@npmcli/node-gyp-1.0.2" = { name = "_at_npmcli_slash_node-gyp"; packageName = "@npmcli/node-gyp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.1.tgz"; - sha512 = "pBqoKPWmuk9iaEcXlLBVRIA6I1kG9JiICU+sG0NuD6NAR461F+02elHJS4WkQxHW2W5rnsfvP/ClKwmsZ9RaaA=="; + url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz"; + sha512 = "yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="; }; }; "@npmcli/promise-spawn-1.3.2" = { @@ -3847,13 +3748,13 @@ let sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; }; }; - "@npmcli/run-script-1.8.1" = { + "@npmcli/run-script-1.8.3" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.8.1"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.1.tgz"; - sha512 = "G8c86g9cQHyRINosIcpovzv0BkXQc3urhL1ORf3KTe4TS4UBsg2O4Z2feca/W3pfzdHEJzc83ETBW4aKbb3SaA=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.3.tgz"; + sha512 = "ELPGWAVU/xyU+A+H3pEPj0QOvYwLTX71RArXcClFzeiyJ/b/McsZ+d0QxpznvfFtZzxGN/gz/1cvlqICR4/suQ=="; }; }; "@oclif/color-0.1.2" = { @@ -3919,13 +3820,13 @@ let sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA=="; }; }; - "@oclif/plugin-autocomplete-0.2.1" = { + "@oclif/plugin-autocomplete-0.3.0" = { name = "_at_oclif_slash_plugin-autocomplete"; packageName = "@oclif/plugin-autocomplete"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.2.1.tgz"; - sha512 = "EOcoh1x3auFg1a7NNVTT+hJ1PPih7Kg1it7WtG8oBgYKe+YD/bvHnX2QlXqi9S7H0XsQQMUb8hxbLP+XwQY/8Q=="; + url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.3.0.tgz"; + sha512 = "gCuIUCswvoU1BxDDvHSUGxW8rFagiacle8jHqE49+WnuniXD/N8NmJvnzmlNyc8qLE192CnKK+qYyAF+vaFQBg=="; }; }; "@oclif/plugin-help-1.2.11" = { @@ -3946,13 +3847,13 @@ let sha512 = "bGHUdo5e7DjPJ0vTeRBMIrfqTRDBfyR5w0MP41u0n3r7YG5p14lvMmiCXxi6WDaP2Hw5nqx3PnkAIntCKZZN7g=="; }; }; - "@oclif/plugin-help-3.2.1" = { + "@oclif/plugin-help-3.2.2" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.1.tgz"; - sha512 = "vq7rn16TrQmjX3Al/k1Z5iBZWZ3HE8fDXs52OmDJmmTqryPSNvURH9WCAsqr0PODYCSR17Hy1VTzS0x7vVVLEQ=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.2.tgz"; + sha512 = "SPZ8U8PBYK0n4srFjCLedk0jWU4QlxgEYLCXIBShJgOwPhTTQknkUlsEwaMIevvCU4iCQZhfMX+D8Pz5GZjFgA=="; }; }; "@oclif/plugin-not-found-1.2.4" = { @@ -3964,15 +3865,6 @@ let sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg=="; }; }; - "@oclif/plugin-plugins-1.9.4" = { - name = "_at_oclif_slash_plugin-plugins"; - packageName = "@oclif/plugin-plugins"; - version = "1.9.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.4.tgz"; - sha512 = "C5hEbX4zzTjzbym2RJUE4wxz2aL2ocb826HDs3suscsjMPA3mRHyu8/rWJW1Cgc2MeoIybNdrfyPU/zmpWkaWw=="; - }; - }; "@oclif/plugin-plugins-1.9.5" = { name = "_at_oclif_slash_plugin-plugins"; packageName = "@oclif/plugin-plugins"; @@ -4000,31 +3892,31 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@octokit/auth-token-2.4.4" = { + "@octokit/auth-token-2.4.5" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz"; - sha512 = "LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz"; + sha512 = "BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA=="; }; }; - "@octokit/endpoint-6.0.10" = { + "@octokit/endpoint-6.0.11" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.10"; + version = "6.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.10.tgz"; - sha512 = "9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz"; + sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; }; }; - "@octokit/openapi-types-2.0.1" = { + "@octokit/openapi-types-4.0.2" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "2.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.1.tgz"; - sha512 = "9AuC04PUnZrjoLiw3uPtwGh9FE4Q3rTqs51oNlQ0rkwgE8ftYsOC+lsrQyvCvWm85smBbSc0FNRKKumvGyb44Q=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-4.0.2.tgz"; + sha512 = "quqmeGTjcVks8YaatVGCpt7QpUTs2PK0D3mW5aEQqmFKOuIZ/CxwWrgnggPjqP3CNp6eALdQRgf0jUpcG8X1/Q=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4045,13 +3937,13 @@ let sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q=="; }; }; - "@octokit/plugin-request-log-1.0.2" = { + "@octokit/plugin-request-log-1.0.3" = { name = "_at_octokit_slash_plugin-request-log"; packageName = "@octokit/plugin-request-log"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz"; - sha512 = "oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg=="; + url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz"; + sha512 = "4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ=="; }; }; "@octokit/plugin-rest-endpoint-methods-2.4.0" = { @@ -4063,13 +3955,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.12" = { + "@octokit/request-5.4.14" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.12"; + version = "5.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.12.tgz"; - sha512 = "MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.14.tgz"; + sha512 = "VkmtacOIQp9daSnBmDI92xNIeLuSRDOIuplp/CJomkvzt7M18NXgG044Cx/LFKLgjKt9T2tZR6AtJayba9GTSA=="; }; }; "@octokit/request-error-1.2.1" = { @@ -4081,13 +3973,13 @@ let sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; }; }; - "@octokit/request-error-2.0.4" = { + "@octokit/request-error-2.0.5" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.4.tgz"; - sha512 = "LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz"; + sha512 = "T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg=="; }; }; "@octokit/rest-16.43.2" = { @@ -4108,13 +4000,22 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.1.2" = { + "@octokit/types-6.8.3" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.1.2"; + version = "6.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/types/-/types-6.8.3.tgz"; + sha512 = "ZNAy8z77ewKZ5LCX0KaUm4tWdgloWQ6FWJCh06qgahq/MH13sQefIPKSo0dBdPU3bcioltyZUcC0k8oHHfjvnQ=="; + }; + }; + "@open-policy-agent/opa-wasm-1.2.0" = { + name = "_at_open-policy-agent_slash_opa-wasm"; + packageName = "@open-policy-agent/opa-wasm"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.1.2.tgz"; - sha512 = "LPCpcLbcky7fWfHCTuc7tMiSHFpFlrThJqVdaHgowBTMS0ijlZFfonQC/C1PrZOjD4xRCYgBqH9yttEATGE/nw=="; + url = "https://registry.npmjs.org/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz"; + sha512 = "CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ=="; }; }; "@opencensus/core-0.0.8" = { @@ -4144,364 +4045,364 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@opentelemetry/api-0.11.0" = { + "@opentelemetry/api-0.12.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.11.0.tgz"; - sha512 = "K+1ADLMxduhsXoZ0GRfi9Pw162FvzBQLDQlHru1lg86rpIU+4XqdJkSGo6y3Kg+GmOWq1HNHOA/ydw/rzHQkRg=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.12.0.tgz"; + sha512 = "Dn4vU5GlaBrIWzLpsM6xbJwKHdlpwBQ4Bd+cL9ofJP3hKT8jBXpBpribmyaqAzrajzzl2Yt8uTa9rFVLfjDAvw=="; }; }; - "@opentelemetry/context-base-0.11.0" = { + "@opentelemetry/context-base-0.12.0" = { name = "_at_opentelemetry_slash_context-base"; packageName = "@opentelemetry/context-base"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.11.0.tgz"; - sha512 = "ESRk+572bftles7CVlugAj5Azrz61VO0MO0TS2pE9MLVL/zGmWuUBQryART6/nsrFqo+v9HPt37GPNcECTZR1w=="; + url = "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.12.0.tgz"; + sha512 = "UXwSsXo3F3yZ1dIBOG9ID8v2r9e+bqLWoizCtTb8rXtwF+N5TM7hzzvQz72o3nBU+zrI/D5e+OqAYK8ZgDd3DA=="; }; }; - "@opentelemetry/core-0.11.0" = { + "@opentelemetry/core-0.12.0" = { name = "_at_opentelemetry_slash_core"; packageName = "@opentelemetry/core"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/core/-/core-0.11.0.tgz"; - sha512 = "ZEKjBXeDGBqzouz0uJmrbEKNExEsQOhsZ3tJDCLcz5dUNoVw642oIn2LYWdQK2YdIfZbEmltiF65/csGsaBtFA=="; + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-0.12.0.tgz"; + sha512 = "oLZIkmTNWTJXzo1eA4dGu/S7wOVtylsgnEsCmhSJGhrJVDXm1eW/aGuNs3DVBeuxp0ZvQLAul3/PThsC3YrnzA=="; }; }; - "@opentelemetry/resources-0.11.0" = { + "@opentelemetry/resources-0.12.0" = { name = "_at_opentelemetry_slash_resources"; packageName = "@opentelemetry/resources"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.11.0.tgz"; - sha512 = "o7DwV1TcezqBtS5YW2AWBcn01nVpPptIbTr966PLlVBcS//w8LkjeOShiSZxQ0lmV4b2en0FiSouSDoXk/5qIQ=="; + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.12.0.tgz"; + sha512 = "8cYvIKB68cyupc7D6SWzkLtt13mbjgxMahL4JKCM6hWPyiGSJlPFEAey4XFXI5LLpPZRYTPHLVoLqI/xwCFZZA=="; }; }; - "@opentelemetry/semantic-conventions-0.11.0" = { + "@opentelemetry/semantic-conventions-0.12.0" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.11.0.tgz"; - sha512 = "xsthnI/J+Cx0YVDGgUzvrH0ZTtfNtl866M454NarYwDrc0JvC24sYw+XS5PJyk2KDzAHtb0vlrumUc1OAut/Fw=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.12.0.tgz"; + sha512 = "BuCcDW0uLNYYTns0/LwXkJ8lp8aDm7kpS+WunEmPAPRSCe6ciOYRvzn5reqJfX93rf+6A3U2SgrBnCTH+0qoQQ=="; }; }; - "@opentelemetry/tracing-0.11.0" = { + "@opentelemetry/tracing-0.12.0" = { name = "_at_opentelemetry_slash_tracing"; packageName = "@opentelemetry/tracing"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.11.0.tgz"; - sha512 = "QweFmxzl32BcyzwdWCNjVXZT1WeENNS/RWETq/ohqu+fAsTcMyGcr6cOq/yDdFmtBy+bm5WVVdeByEjNS+c4/w=="; + url = "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.12.0.tgz"; + sha512 = "2TUGhTGkhgnxTciHCNAILPSeyXageJewRqfP9wOrx65sKd/jgvNYoY8nYf4EVWVMirDOxKDsmYgUkjdQrwb2dg=="; }; }; - "@ot-builder/bin-composite-types-0.10.37" = { + "@ot-builder/bin-composite-types-1.0.1" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.37.tgz"; - sha512 = "TJ4mDLP0sHES4HjUry9fJTEHGb8bC51nF0OqBDR+lNCt3OHi5VVtE1Ph8QqxoglfTypLfTyXRcP8kXC+vV0Q/g=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.1.tgz"; + sha512 = "OwX0d7IN7LhgeWiPPftMTcGYVisMPWXuvuLQHdc7gO+1Sg/7+XbMwXbdYI1PvJwqNlqKPE5+yVesjgVtt1RRwQ=="; }; }; - "@ot-builder/bin-util-0.10.37" = { + "@ot-builder/bin-util-1.0.1" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.37.tgz"; - sha512 = "RR93ek6moT25cNC3eCc9QsGWxj3vOlTfryNybDTUVFEwhXi2EWXJ+cOvjKPOxplNY17YxzxffhqXX0qdX/Y6JQ=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.1.tgz"; + sha512 = "LN6iR+Y/gmRkRoxW6VV5U1SIDRu9zQ5ZshePQukp1+gdJQJBrhmCrreL4XEEOQ/3AC67yuj6pAPi70jagqKxyA=="; }; }; - "@ot-builder/cli-help-shower-0.10.37" = { + "@ot-builder/cli-help-shower-1.0.1" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.37.tgz"; - sha512 = "nkSDmkUROYEVAkZqd60p0WYvWAIDyv2EVN0Bon7X8fxk4Kg92ApD6yzvRUY6WrZKIV+AAM37UUodURgLG3c/Vg=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.1.tgz"; + sha512 = "oCsKX1ecjd1L8uOmU1z0YziizRoOWN4NOhnDU+sLGtPYPnM9bOzKprfY6W99NFkTYu27N19glwFUPM/s0F+nNA=="; }; }; - "@ot-builder/cli-proc-0.10.37" = { + "@ot-builder/cli-proc-1.0.1" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.37.tgz"; - sha512 = "5X+DBnVQrByPwGz8UlVnsldpxIKgwbZG3RndI75y2HZc/rZ5fgaAuTyjVhqxrIpLeNBv3InnTybu3QBbAouiuQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.1.tgz"; + sha512 = "lR90Mb/Wmm2GZH0tBIGjfZhh/VxQl5YiwXVjQIo7UM5iFviHf44lYqVkn0vyE9D1IT5E/tA1OzDrjpIBG7WBKQ=="; }; }; - "@ot-builder/cli-shared-0.10.37" = { + "@ot-builder/cli-shared-1.0.1" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.37.tgz"; - sha512 = "tiRMqvsiQ+TlP+00kMC93AW1ti9ip6kTGstjzXkDhYD9nulyyGUO6Kwx27M0DS4hFcMQXeUDd65JAOaDN5XVcQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.1.tgz"; + sha512 = "I9Zd7gRiZdD+MFr13A9zH2CRvEkjZX91OfkDiAxpDM9ncKlnlZpbbIVp3nh0VCbUAad9lrdc+xI+MMwOEPKhIA=="; }; }; - "@ot-builder/common-impl-0.10.37" = { + "@ot-builder/common-impl-1.0.1" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.37.tgz"; - sha512 = "oEl8l7313MfTRoouKGaPw5oDO8W8vq7EbS6Zg7GIh7yX5cjdXfvjS8pb9Nn2MUPcBJZ7nCGWO4mCYMSNT9Llug=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.1.tgz"; + sha512 = "v0r2tPYO8MTmx6Eo6cPGCXYZe2ScX4zA9xAfqvXn//h0sr4K11k3F6ELLDY64zKASOhITcWgznU3Prt3ubpkjg=="; }; }; - "@ot-builder/errors-0.10.37" = { + "@ot-builder/errors-1.0.1" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.37.tgz"; - sha512 = "1dQK50SBwEP2QWV5NBZAYTIqvIOXGQTFS4LVAUYBhhXYgBkbh58g8Cyhd7MDqf/VlCohuhZ/VxHZDjFsZse0Kg=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.1.tgz"; + sha512 = "66pRCyZq/uESMHTb6Wz3FYwUr6YYnuJ+sJMGyfvOCCvwZzlUYiZZ9r0lPjh/lvZ3j1UYFG6OvpIgUeBCqean9w=="; }; }; - "@ot-builder/io-bin-cff-0.10.37" = { + "@ot-builder/io-bin-cff-1.0.1" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.37.tgz"; - sha512 = "Cyhw7PddXzzRwflhBNX2ta+kRmfCGhS8v+XtTOmS/WX/bPwJRJInf4DGYB+NmhCfK51dmNxA9SJEf/lHsVoSrw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.1.tgz"; + sha512 = "rEuNFXtyU0/a2xpqTHajIZ8YgEkVdB7XImODrs308zlkHdaWL6akOUgBNr866qj6kVWEdfnXkcF0ZCaRJYrCzA=="; }; }; - "@ot-builder/io-bin-encoding-0.10.37" = { + "@ot-builder/io-bin-encoding-1.0.1" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.37.tgz"; - sha512 = "N2N0aJMz/pyt/TEgo0d9mlJQuOEcYf63p6ZPxCgnaiweb8QRFQa71WoWqlHLrZYKQRg8TU1xdRrrLzn6MpV/KA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.1.tgz"; + sha512 = "50IRjuNn2vJny5QXFcEp7EccfHEVZ8TTp4TdA6w6pyNtqxyUSHukrqJTpnO30jitNS+NRSqdoI9EHDgZh2Z5IQ=="; }; }; - "@ot-builder/io-bin-ext-private-0.10.37" = { + "@ot-builder/io-bin-ext-private-1.0.1" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.37.tgz"; - sha512 = "WO/omCDnkA+4M6OTSATzSfDRCpHQPkbm2l8HjVEvCj9lENEGDlB10qVUfHhS9OJRGyQ1zC2Sgz1uCP7fUPmpPQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.1.tgz"; + sha512 = "+vWNtsB9YDoM6bYcADfQEw5g9BIM1qbNlYDtntas/3BcEkjtMC2hUmHfkjPYJCaLpJSROUTqH9n+3Ih+OLgvRw=="; }; }; - "@ot-builder/io-bin-font-0.10.37" = { + "@ot-builder/io-bin-font-1.0.1" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.37.tgz"; - sha512 = "fN5UpZ1YnAiU9qLTH/bhzNnL7dTPdDNoDKbcfoEYcBF0HxvbGM7nOqgOe95HP20uUGO9z6p6A7jdkcCIgM/+JA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.1.tgz"; + sha512 = "GQ605nx70kUD3Mu+4RZ7+GyO5Yp6zGG4+Lrw6Fpmyd7aCTchCeYkHAIAuIUtzkTo/xKTg+MDQqHUK1a9V9hQpw=="; }; }; - "@ot-builder/io-bin-glyph-store-0.10.37" = { + "@ot-builder/io-bin-glyph-store-1.0.1" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.37.tgz"; - sha512 = "g2GvPbzcNSSUcs/TmjpaLfCgDUDOkeO5/BwZsUyF8vesHdZXzCLIuZ34Hla18kDFNEujNY5lTYOblin9MLsuCw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.1.tgz"; + sha512 = "O51k7dReVjls62SfpIh+bNv053dxqRq+fbHBwU2mXo/klKk+T7NIQvaWqZpomUFlY3nrNv9AOAlAHZzjkHyIeA=="; }; }; - "@ot-builder/io-bin-layout-0.10.37" = { + "@ot-builder/io-bin-layout-1.0.1" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.37.tgz"; - sha512 = "8uEvHSC5X1bxBBNEKVz+/5yedVStOSFndAHI86pCcEim8538Ib/jZTTcwSlBs4cg4r4QDJ8EekkOt0TFjvY0qA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.1.tgz"; + sha512 = "dfdqHp77r5jixq0E/7v/PyrMWVKVtZPCEAa7QonPIfFxoG5a/nq9hzuXSLldg8GxuUXzEqV3waXB9sSo7KpOCg=="; }; }; - "@ot-builder/io-bin-metadata-0.10.37" = { + "@ot-builder/io-bin-metadata-1.0.1" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.37.tgz"; - sha512 = "hvb+b11sYjHhRQBBCEo0Ijwk62v9S+HMCydL4EHzWxWBtEXL6ELyqG3JeWDWbwFnQ1R/gHVjHOHacaW/8NsPYw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.1.tgz"; + sha512 = "c5DMb048oMO3WKkeszVif5OVN1ZCEGexBjPBS06zIeRB3F0X+/ZjCjbtx6WWXRvF9DkZDrDMAFDmG3dAhtPvdA=="; }; }; - "@ot-builder/io-bin-metric-0.10.37" = { + "@ot-builder/io-bin-metric-1.0.1" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.37.tgz"; - sha512 = "AL38lT4RPUTJ8I/gDu0zuW6F5drcIzhoDN1hPsmMwsQLApx+1Ea/7gJipWfU4ppE+R9dpULrHOyH3EdCH59owA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.1.tgz"; + sha512 = "vRodhi6NOZ3J91XtnhNRC/i4FyUhV4xFA3kavsJvuRa6kmubSmkqoH1xYGgIxvRxi3pRdfojGI9+a/usZ5DikA=="; }; }; - "@ot-builder/io-bin-name-0.10.37" = { + "@ot-builder/io-bin-name-1.0.1" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.37.tgz"; - sha512 = "KBgTi4FdMdo/CJoPEL3HU1910GS42Lfw03BEwn/AXmv8mZy4q4DkhSI5jFH9xf2g9d67Rm9Ms4IR01OtZIdasg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.1.tgz"; + sha512 = "GnOPDSjIFG2uR2tbEondXqEt2ArISyTn7yXJbYM3AG4hdY52xn/mFcEvidgHEYLDDOkxuxoNTBDnbeCg3LxEyA=="; }; }; - "@ot-builder/io-bin-sfnt-0.10.37" = { + "@ot-builder/io-bin-sfnt-1.0.1" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.37.tgz"; - sha512 = "HzYvTaydmgxTRr7o5sichmc0j4TJcFbZfhf3kU8fE2KUdagi+Ia9jms3YWz+AVFaxkd6vp7xAKSgoaYggXWtcQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.1.tgz"; + sha512 = "5TjEG3bEthvgn/LlQT/c2wSiPUeY+7jmfPr6+7G839avl/31FwxYIbhCjrjWbg/ceuo8NNRxvmi7H+m1HwjcBg=="; }; }; - "@ot-builder/io-bin-ttf-0.10.37" = { + "@ot-builder/io-bin-ttf-1.0.1" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.37.tgz"; - sha512 = "nLILmjrsN3J9HqVQP8AqfTSNdaIJaB7V/k5Csu+lFS6Qeozkpm5C43WFb+pjTo9rO+3ZUyQKtN0dBez6Mu5zfA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.1.tgz"; + sha512 = "nYRGtMLRDZdrSkCxp6sDjFeSeOEsCDTMFWBZrNSeRKINSvDmXpVJQCKLqx+TBZBykNb9Cf7+iCuNG5YfNUiEGg=="; }; }; - "@ot-builder/ot-0.10.37" = { + "@ot-builder/ot-1.0.1" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.37.tgz"; - sha512 = "H2OhGBya1uhb3LNbDn1uYhD7VH+RxVIc//DjPB9TTjRAxepzJhtDQA+xHr44Pfh+/gMhzOg6IZaE6w2hKCOi+A=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.1.tgz"; + sha512 = "l+nQjrTWO6De0OkX1ETC+7Pr8gArJL5L+2vhYdktiqe0tAC/odmu/dVINMenqOufC+DVzJLHhCyFNT/HrukGCA=="; }; }; - "@ot-builder/ot-encoding-0.10.37" = { + "@ot-builder/ot-encoding-1.0.1" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.37.tgz"; - sha512 = "xuSnN3LD3v6ovkHLeZebM8z4PYZkpW6tVrl2HqRaujIjuR0LpBSWQcLwqI1B8xUwfvpdPrmRABXGTDQEfH7XbA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.1.tgz"; + sha512 = "eY1L/Waa9J7OAu5xaggvied4qKnJobpfELVcrDTdsR85F7JJQMdV2P1o9oRS0tzf6nHMfhkCihV5IlLqLxS1eQ=="; }; }; - "@ot-builder/ot-ext-private-0.10.37" = { + "@ot-builder/ot-ext-private-1.0.1" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.37.tgz"; - sha512 = "dZk0SedGSAvmmHuY+kwqICz0ptrX0rvWVitp5nF/0kXS1sUr5x2xXrGIFm6/ZatyYek5tdGIMy6OjUyfv2lEew=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.1.tgz"; + sha512 = "VTagNcyvtC9EmfVHDAni78dYX97k+Hd1/ruDRSPAJhttLA5xiLWah9xAuPeQtBcglFx7375N8qA9f6CQgFBrBA=="; }; }; - "@ot-builder/ot-glyphs-0.10.37" = { + "@ot-builder/ot-glyphs-1.0.1" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.37.tgz"; - sha512 = "EGO3Ok6xOZLrpViokybKkCD5fyV/TOOdzD2WD5hNC9OUT3uSWUCVp8O5CN1xbJUC47Xsbx8L3WTKPLMDVfyurQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.1.tgz"; + sha512 = "FZfcl61XFO393QOBZK8hzRAdavVHW5tUKEzkZzlnDWJEhlZNUTqycn+nJWc5rwfMtQnnJ4UQ1DdJDUTaDZ2VHQ=="; }; }; - "@ot-builder/ot-layout-0.10.37" = { + "@ot-builder/ot-layout-1.0.1" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.37.tgz"; - sha512 = "sK0ERPlrujMfd/1yqxX5In5AZRbV/vqR0gCyZavd2iOWA5IrPS0jeUcF6TmpnWqSt8IvKL/syPHm2VEmEBEGtQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.1.tgz"; + sha512 = "1Kes3RWBnP+k6bCtQAASquh4zDHvJI7BcD+vS0FyerwvniarxGxw4CELmLN87xGrQBybmez/aftqXnRmhsjrRQ=="; }; }; - "@ot-builder/ot-metadata-0.10.37" = { + "@ot-builder/ot-metadata-1.0.1" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.37.tgz"; - sha512 = "KO+MhJXSHCVMRE0sVoqI/W91/SYC5JUM1yc09OvlHdb5RlCYk8RWDr/1G2VKIQifrbMMXpzeVVwAVOjKxOlH2w=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.1.tgz"; + sha512 = "YO6WGvXyhvSCmsGdkK/L37YzoMpFn6A8YoDgMJk4R0MPjoJuVta4srDv41RvOLVr9oDiYtiPFRw8BjkdEWrMbg=="; }; }; - "@ot-builder/ot-name-0.10.37" = { + "@ot-builder/ot-name-1.0.1" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.37.tgz"; - sha512 = "LIXAd02w3PIUaepM5Esct+Z1iUu/Lq/kxd3WNUL0OTmauZF2oh0qdK3dQHLtFBHOMHoWIXUKjOPDLw/YP1dUwA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.1.tgz"; + sha512 = "6L4SAwLALNOjifhX47HvXPkGKcX1HfpeGnzFtMDtgUi3muiYrKb3YJffV8vk8V1EQhiVTWJ1j7441SS6cY2m8g=="; }; }; - "@ot-builder/ot-sfnt-0.10.37" = { + "@ot-builder/ot-sfnt-1.0.1" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.37.tgz"; - sha512 = "VICXFcp8yzi6zkd4nwLrYh7p3Yx86KMqDRV39ODtM1g/2r887beIfBOONE1ll4Dy6FMXbtvWY1+OEcMPEjD+LA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.1.tgz"; + sha512 = "jmojZ36QbcDUIXX+UPYlKtkxklKSlV35Cpa4P4vWVAISqocmX3fFIQ+Xz7Ub1XeLnkcIf86ruOrDyoSytF5NHg=="; }; }; - "@ot-builder/ot-standard-glyph-namer-0.10.37" = { + "@ot-builder/ot-standard-glyph-namer-1.0.1" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.37.tgz"; - sha512 = "I1FsVaBOHMSPA6lPFo6SWwAYLmp+q1QNKYQtcRJmgW5G5lljIjCTptvpDzyXqgujgFvGUDz7UWPNzlRq/HwLNw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.1.tgz"; + sha512 = "yKgPw8neJZr/wa/mFWtPbi4sKTkfyYCo+Q0SONkjJLNchuI6i/w3ijX3EDf8R9/m4j65JhHKQ8wltKBnRgHlCQ=="; }; }; - "@ot-builder/prelude-0.10.37" = { + "@ot-builder/prelude-1.0.1" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.37.tgz"; - sha512 = "rUMCp2j3or0dSYr2hDkmNRexg9A24zzRRQWNHh5KF+6x4Crj5Sg41gx+sx+MohQqs8mu8CM3CZOV1b66P7ixPA=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.1.tgz"; + sha512 = "ocaoVx+QeYm5aYjzy+gD67cK1j/JGArqTjGXmo/ndjsBCvS9Ni9QpN4UEjoN2oz8rzr0sK4RhX9fJ7ufQ27gPA=="; }; }; - "@ot-builder/primitive-0.10.37" = { + "@ot-builder/primitive-1.0.1" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.37.tgz"; - sha512 = "GdYr1DUgWRUASpK9C85jklb/iHpdzgPmHs1fxud61QktqXJ21Wo1jvr5W0TaHsK3tGyeDjfSbEohMQhFKgZZOA=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.1.tgz"; + sha512 = "mRSNfNNf7qUmZJ23UJVK6VnITRKgGQC5X1I1DFlIve/YfTVe6SbH0AbBBcS4OsC/gXskLkywXX6rZChjSWDmTg=="; }; }; - "@ot-builder/rectify-0.10.37" = { + "@ot-builder/rectify-1.0.1" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.37.tgz"; - sha512 = "0gv45ARwPgBSWnpl7mmk+lTtIlTO0XBtoCBT8BbkXzXH4YxkB70fEsAX47GEhSpWzWWg9QgTrVUCBFXVj4i67A=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.1.tgz"; + sha512 = "IBA/v+6ksxUADQEpk1Nbc0jRwXhZD2CNPz8xmtPPqnRAE3b8JpxIjmu6zhn1pRx0E0AvtPdMfAilhNis7IzY9g=="; }; }; - "@ot-builder/stat-glyphs-0.10.37" = { + "@ot-builder/stat-glyphs-1.0.1" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.37.tgz"; - sha512 = "JTQQtR8CWclhAdJyKAvWH3O99wuaJFJKyAr+BRcXL5wJ6D68V9AQ8zY+weaIL7m1FZIOp5kf4nc4RmRodtCcNw=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.1.tgz"; + sha512 = "YgsglcyhfAHNpbPXdPoZD4DhqbaHzAhtocJ/cblaOQr+uE7LD66890is1kJ4mrKUYV4Ei0uLZDyw9ngixZGteg=="; }; }; - "@ot-builder/trace-0.10.37" = { + "@ot-builder/trace-1.0.1" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.37.tgz"; - sha512 = "phedlApvTXseNHId9T0Ab+6luHoATwkwk0l/JFEhVFIbMdvAcHwgAB/oxumsySlTscYuV/7dgGqCyYeeYicfjw=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.1.tgz"; + sha512 = "UZ7Fi+A+LEnkjagFeCiPlzFKSrBtY04l/B2iXqlC4gyfmwOzKGe+A8B0kVfjheePhteUm4808Yx3e419o2EepQ=="; }; }; - "@ot-builder/var-store-0.10.37" = { + "@ot-builder/var-store-1.0.1" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.37.tgz"; - sha512 = "yAEZBdo+X0m3WnFNLXFW2pkmhDx8EEvqxqR0A95KxZC1M6gtLdYesQGz5x1qnTn6cAvxOOhyclWsk3XcSJpvKw=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.1.tgz"; + sha512 = "IcoJ7U+Z+wjbFSL2qLuU0tIW9G/NR6sWI0r1bKgnBr0hE2Si4dj/D+GYjIVkRscfvI3x/5/XL2sWayuh2Pjvdg=="; }; }; - "@ot-builder/variance-0.10.37" = { + "@ot-builder/variance-1.0.1" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.37.tgz"; - sha512 = "I+ZvuTZ82Itr1/KwTkDyMrhx30rgmimMxYX6dOIvjrrheTJSPR3iKR7tFKszCuJSgx6GTITeikeyi6tH4/krGQ=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.1.tgz"; + sha512 = "cJ4eL1xyvJnPlEcrnKkZeqIw6NbPGAP2RFyEclBU2U4Freu2ZH1R8WqATbekdQqlOnwoZ1vgV8mH8EpNI3N8Uw=="; }; }; "@parcel/fs-1.11.0" = { @@ -4576,13 +4477,13 @@ let sha512 = "CY/a6Nw72vrlp/FPx38l4jfEHp4gNEbo8i+WlSJ2cnWO6VE6CKmnC1zb4yQLvdP8f3EuzzoOBZVq6aGN20M82Q=="; }; }; - "@pm2/js-api-0.6.1" = { + "@pm2/js-api-0.6.7" = { name = "_at_pm2_slash_js-api"; packageName = "@pm2/js-api"; - version = "0.6.1"; + version = "0.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.1.tgz"; - sha512 = "LImZWHEzcpIrLZ7kt4z3Gllkoz+CChHk2waDretOWeinSItyTMrNpzcXcZd2QikP/57qPolLfHGFipHJmOKkwQ=="; + url = "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.7.tgz"; + sha512 = "jiJUhbdsK+5C4zhPZNnyA3wRI01dEc6a2GhcQ9qI38DyIk+S+C8iC3fGjcjUbt/viLYKPjlAaE+hcT2/JMQPXw=="; }; }; "@pm2/pm2-version-check-1.0.3" = { @@ -4711,15 +4612,6 @@ let sha512 = "UFnkg5RTq3s2X15fSkrWY9+5BKOFjihNSnJjTV2H5PtTUFbd55qnxxPw8CxSfK0bXb1IrSvCESprk2LEpqr5cg=="; }; }; - "@react-native-community/cli-platform-android-4.13.0" = { - name = "_at_react-native-community_slash_cli-platform-android"; - packageName = "@react-native-community/cli-platform-android"; - version = "4.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-4.13.0.tgz"; - sha512 = "3i8sX8GklEytUZwPnojuoFbCjIRzMugCdzDIdZ9UNmi/OhD4/8mLGO0dgXfT4sMWjZwu3qjy45sFfk2zOAgHbA=="; - }; - }; "@react-native-community/cli-platform-ios-4.13.0" = { name = "_at_react-native-community_slash_cli-platform-ios"; packageName = "@react-native-community/cli-platform-ios"; @@ -4756,31 +4648,22 @@ let sha512 = "rmuSC2JFFl4DkPDdGVrmffT9KcbG2AB5jvhxPIrOc1dO9mHRMUUftQY35KZlvWqqSSqVn+AM+J9dhiTo1ZqR8A=="; }; }; - "@rollup/plugin-babel-5.2.2" = { + "@rollup/plugin-babel-5.2.3" = { name = "_at_rollup_slash_plugin-babel"; packageName = "@rollup/plugin-babel"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.2.tgz"; - sha512 = "MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA=="; - }; - }; - "@rollup/plugin-commonjs-15.1.0" = { - name = "_at_rollup_slash_plugin-commonjs"; - packageName = "@rollup/plugin-commonjs"; - version = "15.1.0"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz"; - sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ=="; + url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.3.tgz"; + sha512 = "DOMc7nx6y5xFi86AotrFssQqCen6CxYn+zts5KSI879d4n1hggSb4TH3mjVgG17Vc3lZziWWfcXzrEmVdzPMdw=="; }; }; - "@rollup/plugin-commonjs-17.0.0" = { + "@rollup/plugin-commonjs-17.1.0" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; - version = "17.0.0"; + version = "17.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.0.0.tgz"; - sha512 = "/omBIJG1nHQc+bgkYDuLpb/V08QyutP9amOrJRUSlYJZP+b/68gM//D8sxJe3Yry2QnYIr3QjR3x4AlxJEN3GA=="; + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz"; + sha512 = "PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew=="; }; }; "@rollup/plugin-inject-4.0.2" = { @@ -4801,22 +4684,13 @@ let sha512 = "yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw=="; }; }; - "@rollup/plugin-node-resolve-11.0.1" = { - name = "_at_rollup_slash_plugin-node-resolve"; - packageName = "@rollup/plugin-node-resolve"; - version = "11.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.1.tgz"; - sha512 = "ltlsj/4Bhwwhb+Nb5xCz/6vieuEj2/BAkkqVIKmZwC7pIdl8srmgmglE4S0jFlZa32K4qvdQ6NHdmpRKD/LwoQ=="; - }; - }; - "@rollup/plugin-node-resolve-9.0.0" = { + "@rollup/plugin-node-resolve-11.1.1" = { name = "_at_rollup_slash_plugin-node-resolve"; packageName = "@rollup/plugin-node-resolve"; - version = "9.0.0"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz"; - sha512 = "gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg=="; + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.1.1.tgz"; + sha512 = "zlBXR4eRS+2m79TsUZWhsd0slrHUYdRx4JF+aVQm+MI0wsKdlpC2vlDVjmlGvtZY1vsefOT9w3JxvmWSBei+Lg=="; }; }; "@rollup/pluginutils-3.1.0" = { @@ -4837,6 +4711,15 @@ let sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q=="; }; }; + "@sammacbeth/random-access-idb-mutable-file-0.1.1" = { + name = "_at_sammacbeth_slash_random-access-idb-mutable-file"; + packageName = "@sammacbeth/random-access-idb-mutable-file"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sammacbeth/random-access-idb-mutable-file/-/random-access-idb-mutable-file-0.1.1.tgz"; + sha512 = "jHnpuu2qtFgwCmhgrpCCk3/hU3XqXTqhidh4XmcTijkVsGwh1c2T0+r2hkHs1PRfsxeimx8qDAotphpRoYB2eg=="; + }; + }; "@samverschueren/stream-to-observable-0.3.1" = { name = "_at_samverschueren_slash_stream-to-observable"; packageName = "@samverschueren/stream-to-observable"; @@ -4846,13 +4729,22 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.0.5" = { + "@scarf/scarf-1.1.0" = { + name = "_at_scarf_slash_scarf"; + packageName = "@scarf/scarf"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.1.0.tgz"; + sha512 = "b2iE8kjjzzUo2WZ0xuE2N77kfnTds7ClrDxcz3Atz7h2XrNVoAPUoT75i7CY0st5x++70V91Y+c6RpBX9MX7Jg=="; + }; + }; + "@schematics/angular-11.2.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.0.5"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.5.tgz"; - sha512 = "7p2wweoJYhim8YUy3ih1SrPGqRsa6+aEFbYgo9v4zt7b3tOva8SvkbC2alayK74fclzQ7umqa6xAwvWhy8ORvg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.0.tgz"; + sha512 = "PtbyZ7TEEEae9Y5siSZYigWyk8iOSjZ10ThA7tRxm8gdcLjGimyyKr5TyjufIAvrXIYnBXNLgPkZG6s5CQIEyw=="; }; }; "@schematics/schematics-0.1100.3" = { @@ -4864,13 +4756,13 @@ let sha512 = "tzjKnjD90FQ4LgRN9ALT2qCqgJYZrAKoy1embFJRuGKA8vv1hTG4JonVDqQEUoNwTc9r/Ok2Z1eenAI9TSUd1A=="; }; }; - "@schematics/update-0.1100.5" = { + "@schematics/update-0.1102.0" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1100.5"; + version = "0.1102.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.5.tgz"; - sha512 = "BYtKKuiWsrlc4FMW3bRyl4tm6lWNMTi8oql/mtkSgH7V5eMmaLDJtM+zDl+qyC/KHPxbHTfoHDapfv1tITSWjA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.0.tgz"; + sha512 = "2hFt/2iPe6LqQvzYj4HvQ8us0e0lBU75rSK2yY6VfiZWR/qo7yk99YKI7JWFTLvLsNbhNnSG/9opXJHqqUoc3g=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4900,13 +4792,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.4.3" = { + "@serverless/components-3.6.2" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.4.3"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.4.3.tgz"; - sha512 = "buKvUPDeS54bUG9c56bmX5WcL3hBCHASKamHpUGmSa1ArSem8BE76LzPjiNcreOJGSFf9VGMgpsW1d1WKy2fAA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.6.2.tgz"; + sha512 = "JT8+t3J90WF/ZjizTbIUbmwzLJFAybP6S2T8TK9TtHl1imeeIIu69LcFAth7fFYdPn6LrACSEMZMXJ2+QlLM6w=="; }; }; "@serverless/core-1.1.2" = { @@ -4918,13 +4810,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.4.1" = { + "@serverless/enterprise-plugin-4.4.3" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.4.1"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.1.tgz"; - sha512 = "MTjpIwpCA1gmldGuEozHNKIlce8BXMilvH2K0nm5vJ45PAUwK1bL9moaLwDadaTEw9B1jKbboa5/wpzJwwFdxA=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.3.tgz"; + sha512 = "2HKtgzv4c9yr9dyecbTJlSnYWaIJL4TQJ4YtVORzeBAm812r8PDK1XS9X8tvLlk2+DF2gu+Tb/Umnxl2rqhqZg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -4936,22 +4828,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-3.1.4" = { + "@serverless/platform-client-3.11.0" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "3.1.4"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.1.4.tgz"; - sha512 = "oc65L9Dl1Xe+T5qv/fkmjYREtPzrQMdje0fC5ntvsfR3luxvSfQIinHYKbt30Qpyy2sJCBPG4IPEip7b3y0WwA=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.11.0.tgz"; + sha512 = "fC4Q6mjARGdkPrBzEdsiZIgC4To74P7ro9qbtjhre1K9O0tJvvFB7/TuF3F7Xdry4fSPG6RuqdEDEXYA4FwkZw=="; }; }; - "@serverless/platform-client-china-2.0.9" = { + "@serverless/platform-client-china-2.1.4" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.0.9"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.9.tgz"; - sha512 = "qec3a5lVaMH0nccgjVgvcEF8M+M95BXZbbYDGypVHEieJQxrKqj057+VVKsiHBeHYXzr4B3v6pIyQHst40vpIw=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.4.tgz"; + sha512 = "jX+MoKgX7wkdg2lGUlUhbQNZLZkONs5jZa8edT+nDC8s9B1C5u5NO4mMuAy0ZigBQcfw/VVv2KvB06ntuw/QBA=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -4981,22 +4873,22 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-2.2.0" = { + "@serverless/utils-3.1.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "2.2.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-2.2.0.tgz"; - sha512 = "0TqmLwH9r2GAewvz9mhZ+TSyQBoE9ANuB4nNhn6lJvVUgzlzji3aqeFbAuDt+Z60ZkaIDNipU/J5Vf2Lo/QTQQ=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-3.1.0.tgz"; + sha512 = "HhmnTtfGt4gKCNGHg0q9pioltChh+dWbdA7y1aP7vNqjwpZ/pUDAqJf/M3GFozTnhlFpwCY9Ik1tOpDkgP3oiA=="; }; }; - "@serverless/utils-china-1.0.12" = { + "@serverless/utils-china-1.0.14" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.12.tgz"; - sha512 = "PuVap97QTf3Fi5+ez3ZUewGPFHTpf3dwZ+c6YWEoaf+1u7cgXzYFuWx8Ypi+4ghbL93/bf+blqdm+7CQi+CMRg=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.14.tgz"; + sha512 = "7ku9ePjb+bneFV1Akmz0t8pU8hhHfPJsBjG/Kf6IjyGAQrEjN/PcY2QUDm0emdCNyCsuido1wp0DWMGiwuhC8Q=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -5062,6 +4954,15 @@ let sha512 = "QSdIQ5keUFAZ3KLbfbsntW39ox0Ym8183RqTwBq/ZEFoN3NQAtGV+qWaNdzKpIDHgj9J2CQ2iNDRVU11Zyr7MQ=="; }; }; + "@skorfmann/terraform-cloud-1.7.1" = { + name = "_at_skorfmann_slash_terraform-cloud"; + packageName = "@skorfmann/terraform-cloud"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.7.1.tgz"; + sha512 = "uwcalR9R5/9M+UcOeKR+XgCyIlipl5dxiAryuWT8D4erW6sPnTE/B97G6F3VzzrZfcaPmljX5NVG8Dkl79ki6A=="; + }; + }; "@slack/client-3.16.0" = { name = "_at_slack_slash_client"; packageName = "@slack/client"; @@ -5125,6 +5026,15 @@ let sha512 = "+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw=="; }; }; + "@snyk/dep-graph-1.23.1" = { + name = "_at_snyk_slash_dep-graph"; + packageName = "@snyk/dep-graph"; + version = "1.23.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.23.1.tgz"; + sha512 = "bSlTRVJP0PHtvoilhE463AMt0fhsf9PxCEqJ28VHCVSe5QFzIlgGdljtytV+2DheadGwu27BgLGqPDGMdTBHRQ=="; + }; + }; "@snyk/docker-registry-v2-client-1.13.9" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; @@ -5152,13 +5062,13 @@ let sha512 = "uO1b6UtT6QGz7F5ZgNdOSyMXBvykUhOcuHBRc//xUnBWsyJwdlAFp/d646zIeaBCe87Fcn5hXuWUGjj+N8rBzA=="; }; }; - "@snyk/java-call-graph-builder-1.18.0" = { + "@snyk/java-call-graph-builder-1.19.0" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.18.0.tgz"; - sha512 = "6Mt+Rs2N4HdHICCjxWRwtGXUrSktCsSGnn7HlL6wi+4JXjPWa+rDCzaF6furqRR3aphZAclgved0haFwwmqBxQ=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.0.tgz"; + sha512 = "in26UkFVEWvGyHmSmVUebvgyubANJB7rfrkE3PKjHDA80NwSLZDSNWOOC2lF2B+4ob4STWjQdMbv+bMqXl5Yew=="; }; }; "@snyk/rpm-parser-2.2.1" = { @@ -5323,130 +5233,139 @@ let sha512 = "AmyMQndtxMsM59eDeA0gGiw8T2LzNvDhx/xl+ygFXXrsw+yb/mit73ndHkiHKcRA1EpNHTyD1PN9ATxghzplfg=="; }; }; - "@textlint/ast-node-types-4.3.5" = { + "@textlint/ast-node-types-4.4.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "4.3.5"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.3.5.tgz"; - sha512 = "syl8VE34DQDTV7+IADP1jYtGsxTC9MmCKLmpJX90G6nNv9CzgAZIukd7WMiJFZpFgcDAlibEaCKlJRxjfEmmPA=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.4.1.tgz"; + sha512 = "2QBwlqi2SU83vTHibfdTxGiLdIqR0btNyMGfVl0bwA6FI85HnSYoGFLrdCnq2V0nxpbhuvwzcm2Ja81w0VkMGA=="; }; }; - "@textlint/ast-tester-2.2.5" = { + "@textlint/ast-tester-2.3.2" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "2.2.5"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.2.5.tgz"; - sha512 = "kKolF3xDI0G1sjM2HJE1EZAf407026b/wHC0FAdo9/FAipUTtAATKDnvjYeN++W1b5TxtIWRF5SbHppK7eRXGQ=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.3.2.tgz"; + sha512 = "4e1kyqsHks5POcQmuh7ITVrU/dbYyRUfQarQbeVRPP271n2HnlgnoYyZ10yV2Sb/Ksw+lQf7DPSnwNewXdCWww=="; }; }; - "@textlint/ast-traverse-2.2.6" = { + "@textlint/ast-traverse-2.3.2" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "2.2.6"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.2.6.tgz"; - sha512 = "cpBF4UsbQ95oFU8gaGrkYar1H75ORvfRWN78dXneyinJFG1KBajXN9lLYhXhg+Z1Rn/9Ifw+SCjLZKnFmnwM0g=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.3.2.tgz"; + sha512 = "Dt1s/6x0XWhUNFH2rAa9gL6ODtq232BZuBHuHiOg+SrVwzl+VjOfa3fMQ0LoYixGSyDtwqAlksWcC0KyLz0eSw=="; }; }; - "@textlint/feature-flag-3.2.5" = { + "@textlint/feature-flag-3.3.2" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "3.2.5"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.2.5.tgz"; - sha512 = "OePponYtxPGjNf6GBqioRaOr1m8LJZQLCj49LgoGZnolm9hmKq3QP1jEKGbzxsHCADL7YHoKZ6zxKGkicmsxPA=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.3.2.tgz"; + sha512 = "7ErQ/UF0IBAd+PkQNBD7yYCDqL2o6leErMDENSWAgUHWLy5TcHr3Orn7qswtBMW5gIyXW9lh+EpllwLJ5qv35w=="; }; }; - "@textlint/fixer-formatter-3.2.6" = { + "@textlint/fixer-formatter-3.3.2" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.2.6"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.2.6.tgz"; - sha512 = "xVVEHcpUeBBFI7Ug4y/tGTRLf6XX9lsg/iLvk6cjWJhxnFsVOkSFJRrZFetIJnAKnhQmCAv/i+ybgnTHhas7pw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.3.2.tgz"; + sha512 = "aTEyH/rHSzxRLrluSjNhDnMSgIYK60J5AAgprKJCkb9h3dDRuNoiJ+BXh5FXVSSm1tGF0d8pu+Ph8OFBgQOchQ=="; }; }; - "@textlint/kernel-3.3.7" = { + "@textlint/kernel-3.4.2" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.3.7"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.3.7.tgz"; - sha512 = "zLk78gCwiQIl0ElkzT8DVMOLJ5PCDWZnuRaYk7YkwmGpjJSoJcGSCqiRGhmmc4d7CCZ+AcoM0DQUSyrFzJjyMA=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.4.2.tgz"; + sha512 = "PpxAtvLGI9ewn+Dbt4j0KMfmMM39/AY3cikmZffu59nyTdIymXMeVMEVkpVZTEUk5OlL27RAON9FF+2u+0fshg=="; }; }; - "@textlint/linter-formatter-3.2.6" = { + "@textlint/linter-formatter-3.3.2" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.2.6"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.2.6.tgz"; - sha512 = "39R2PAKRDqq8p6jQj3u9ERUzrrhK33BnHK622oegaXzPeaBLjN2brBXsxnBpNJFPUW2L9BDmJcBd92E/ajLTGg=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.3.2.tgz"; + sha512 = "MRa8D1/x6pWycKTwb1QLjtY7GyjgcsYRfV0Gu0Aze5szCa3UDwZSewHycpcAGlIqr8AkqPRfyXi653M47eJ0rA=="; }; }; - "@textlint/markdown-to-ast-6.2.6" = { + "@textlint/markdown-to-ast-6.3.2" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.2.6"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.2.6.tgz"; - sha512 = "TjZTMGYla9Nznegy0r23EEzNMfWva0oksj+48aqMlbQ+UvBA5vdEC0VzCO3l0Z137RgEJ+glInbvEilo2zcjZg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.3.2.tgz"; + sha512 = "uwndF3PRJ48wTVAEDSy0IAEVJg/scxpdZ1r+QKeGuFfdtaGSrtcgROI6qiVU1g/WNyNfQw+DAA7F8HfM+pmleg=="; }; }; - "@textlint/module-interop-1.1.5" = { + "@textlint/module-interop-1.2.2" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "1.1.5"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.1.5.tgz"; - sha512 = "YXz4qV6thEuwNfamHFhRsebZM7FWe1x3fD7XAqPxE8J+HLQea3Y0i52hU/rTQvt85omYq+37g3YtqjX60mYjog=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.2.2.tgz"; + sha512 = "B8HPS129lOqzEpRcafYl/OJ2TDxfBw1jGfEhebzwt3kGoMd5pQVih+hUIOl+SfAmLWqCDEniaKn0gw1s+hjSXA=="; }; }; - "@textlint/text-to-ast-3.2.5" = { + "@textlint/source-code-fixer-3.4.2" = { + name = "_at_textlint_slash_source-code-fixer"; + packageName = "@textlint/source-code-fixer"; + version = "3.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-3.4.2.tgz"; + sha512 = "mSGQNO8is21KcHgDh4S8Cx88r7uU+7xpzHLuEuzhgEZfgwz3+tnpk22TrEjNYe1V1+aseU9iCQegVQQr1wroKQ=="; + }; + }; + "@textlint/text-to-ast-3.3.2" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "3.2.5"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.2.5.tgz"; - sha512 = "1B43L9tVr2b6Qm37KsdI8dbutL8b5AN95PFGzPpxaJbShz8TjVUFQ5bxPrnKGc7wV5MFpazf+/UVjZx6JtUbMA=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.3.2.tgz"; + sha512 = "+DKAP62ho21KID8IcKy1kP6K+kUZk+Z0MwvS9u2l39J0cK+vX523KI+sA6AXxEhOMDA8zhdIsBf3onGvrAtyhA=="; }; }; - "@textlint/textlint-plugin-markdown-5.2.7" = { + "@textlint/textlint-plugin-markdown-5.3.2" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.2.7"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.2.7.tgz"; - sha512 = "GKx79nbsLwvDdyv98wnX2BSF83MKTM5j09OFJp2+wi2qrWO3U0+7YMILfdHDqyPfUk+osuy65BAFeq5jlXPomQ=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.3.2.tgz"; + sha512 = "6Ph7ESKR48tEz5Pnog3PpvF84LU3jkADvr4iBkkVz9vLQt3KbqGnmk8EV94Y0hLEX+UrZKWmH3cJfh6O1Zy/eA=="; }; }; - "@textlint/textlint-plugin-text-4.2.7" = { + "@textlint/textlint-plugin-text-4.3.2" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.2.7"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.2.7.tgz"; - sha512 = "uMoASP8kIJrMqMJCXePvKSh0tOEuiQS9vFjH+kq2kS8/+Po6Wwgma9IdJsLWuSI8H4ufcvbozREuY+DceQAp/w=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.3.2.tgz"; + sha512 = "xnjad0bXaM6ZtgffuFKogHYkzXymUK3VTLP5MGA00kLitADlNUtwXQk82TebkXFcSPRhePU9+2XFipXNQDsg7g=="; }; }; - "@textlint/types-1.4.6" = { + "@textlint/types-1.5.2" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.4.6"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.4.6.tgz"; - sha512 = "hoKPvIzNf+vI0goRk90HfsVUbXkAp4BfpvRxh51TGqVG27dlYrQJZkYheuUNUAwyj0Id09qzVwXno/xQPMYPcg=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.5.2.tgz"; + sha512 = "IdS0h2MCzdY+wjM0+qvl8IW/IxhmVFAVrGu5TmIBpJkihIV7WMa3ITFXIVb0oqwnePUmyLBRIVsCtC66E3QbfQ=="; }; }; - "@textlint/utils-1.1.5" = { + "@textlint/utils-1.2.2" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "1.1.5"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.1.5.tgz"; - sha512 = "wv1m6yyaQpt1QrGKIUYwMoL5LLhDhXk05+pXg3i0+8PC8X95jNin10fSkxRMyXOsEqB6481GR3XgQ8Ia7DO1tg=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.2.2.tgz"; + sha512 = "7Mqcl9G9YYrPBv5d/tZ2NlWC66hTUpQEQxZEHDMTdF3gPmQUSNRNGjqUR9mhw00Wy8Wo6i3LUWuxwMT6heHNBQ=="; }; }; "@tokenizer/token-0.1.1" = { @@ -5485,6 +5404,15 @@ let sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; }; }; + "@types/archiver-5.1.0" = { + name = "_at_types_slash_archiver"; + packageName = "@types/archiver"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/archiver/-/archiver-5.1.0.tgz"; + sha512 = "baFOhanb/hxmcOd1Uey2TfFg43kTSmM6py1Eo7Rjbv/ivcl7PXLhY0QgXGf50Hx/eskGCFqPfhs/7IZLb15C5g=="; + }; + }; "@types/babel-types-7.0.9" = { name = "_at_types_slash_babel-types"; packageName = "@types/babel-types"; @@ -5728,13 +5656,13 @@ let sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A=="; }; }; - "@types/engine.io-3.1.4" = { + "@types/engine.io-3.1.5" = { name = "_at_types_slash_engine.io"; packageName = "@types/engine.io"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.4.tgz"; - sha512 = "98rXVukLD6/ozrQ2O80NAlWDGA4INg+tqsEReWJldqyi2fulC9V7Use/n28SWgROXKm6003ycWV4gZHoF8GA6w=="; + url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.5.tgz"; + sha512 = "DLVpLEGTEZGBXOYoYoagHSxXkDHONc0fZouF2ayw7Q18aRu1Afwci+1CFKvPpouCUOVWP+dmCaAWpQjswe7kpg=="; }; }; "@types/eslint-7.2.6" = { @@ -5782,6 +5710,15 @@ let sha512 = "jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g=="; }; }; + "@types/estree-0.0.46" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.46"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz"; + sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="; + }; + }; "@types/events-3.0.0" = { name = "_at_types_slash_events"; packageName = "@types/events"; @@ -5809,13 +5746,13 @@ let sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; }; }; - "@types/express-serve-static-core-4.17.17" = { + "@types/express-serve-static-core-4.17.18" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.17"; + version = "4.17.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.17.tgz"; - sha512 = "YYlVaCni5dnHc+bLZfY908IG1+x5xuibKZMGv8srKkvtul3wUuanYvpIj9GXXoWkQbaAdR+kgX46IETKUALWNQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz"; + sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA=="; }; }; "@types/fancy-log-1.3.0" = { @@ -5881,13 +5818,13 @@ let sha512 = "AaXSrIF99SjjtPVNmCmYb388HML+PKEJb/xmj4SbL2ZO0hHuETZZzyDIKfOqaEoAHZEuX4sC+FRFrHYJoIby6A=="; }; }; - "@types/graceful-fs-4.1.4" = { + "@types/graceful-fs-4.1.5" = { name = "_at_types_slash_graceful-fs"; packageName = "@types/graceful-fs"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.4.tgz"; - sha512 = "mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg=="; + url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"; + sha512 = "anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw=="; }; }; "@types/graphlib-2.1.7" = { @@ -5971,13 +5908,13 @@ let sha512 = "2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA=="; }; }; - "@types/http-proxy-1.17.4" = { + "@types/http-proxy-1.17.5" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz"; - sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz"; + sha512 = "GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q=="; }; }; "@types/inquirer-6.5.0" = { @@ -6034,6 +5971,15 @@ let sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; }; }; + "@types/js-yaml-3.12.6" = { + name = "_at_types_slash_js-yaml"; + packageName = "@types/js-yaml"; + version = "3.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.6.tgz"; + sha512 = "cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ=="; + }; + }; "@types/jscodeshift-0.7.2" = { name = "_at_types_slash_jscodeshift"; packageName = "@types/jscodeshift"; @@ -6043,13 +5989,13 @@ let sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; }; }; - "@types/json-schema-7.0.6" = { + "@types/json-schema-7.0.7" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.6"; + version = "7.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; }; }; "@types/json5-0.0.29" = { @@ -6088,13 +6034,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.11.6" = { + "@types/koa-2.11.7" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.11.6"; + version = "2.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.6.tgz"; - sha512 = "BhyrMj06eQkk04C97fovEDQMpLpd2IxCB4ecitaXwOKGq78Wi2tooaDOWOFGajPk8IkQOAtMppApgSVkYe1F/A=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.7.tgz"; + sha512 = "1iXJZZWCePoMe9LGSIPWsu5k5RI4ooXijW78c+nljMn3YbUts8PXoEESu1OeFmrazLPl1l97vTxzwvmH32TWVQ=="; }; }; "@types/koa-compose-3.2.5" = { @@ -6115,13 +6061,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.167" = { + "@types/lodash-4.14.168" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.167"; + version = "4.14.168"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.167.tgz"; - sha512 = "w7tQPjARrvdeBkX/Rwg95S592JwxqOjmms3zWQ0XZgSyxSLdzWaYH3vErBhdVS/lRBX7F8aBYcYJYTr5TMGOzw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz"; + sha512 = "oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q=="; }; }; "@types/long-4.0.1" = { @@ -6151,13 +6097,13 @@ let sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw=="; }; }; - "@types/mime-2.0.3" = { + "@types/mime-1.3.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.3"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz"; - sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; + sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; "@types/minimatch-3.0.3" = { @@ -6259,13 +6205,13 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.50" = { + "@types/node-10.17.51" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.50"; + version = "10.17.51"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.50.tgz"; - sha512 = "vwX+/ija9xKc/z9VqMCdbf4WYcMTGsI0I/L/6shIF3qXURxZOhPQlPRHtjTpiNhAwn0paMJzlOQqw6mAGEQnTA=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.51.tgz"; + sha512 = "KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg=="; }; }; "@types/node-12.12.70" = { @@ -6277,22 +6223,13 @@ let sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ=="; }; }; - "@types/node-12.19.12" = { + "@types/node-13.13.41" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.19.12"; + version = "13.13.41"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.19.12.tgz"; - sha512 = "UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw=="; - }; - }; - "@types/node-13.13.39" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "13.13.39"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.39.tgz"; - sha512 = "wct+WgRTTkBm2R3vbrFOqyZM5w0g+D8KnhstG9463CJBVC3UVZHMToge7iMBR1vDl/I+NWFHUeK9X+JcF0rWKw=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.41.tgz"; + sha512 = "qLT9IvHiXJfdrje9VmsLzun7cQ65obsBTmtU3EOnCSLFOoSHx1hpiRHoBnpdbyFqnzqdUUIv81JcEJQCB8un9g=="; }; }; "@types/node-14.11.1" = { @@ -6304,13 +6241,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.20" = { + "@types/node-14.14.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.20"; + version = "14.14.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz"; - sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.26.tgz"; + sha512 = "skWxepWOs+VArEBWd2S/VR3wUavioIIx9/HzW+UJiIjtwa6+kNXdsOeq7FfxDXf56hIcL0ieo2brwMgBJ1+lhw=="; }; }; "@types/node-6.14.13" = { @@ -6349,6 +6286,15 @@ let sha512 = "o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw=="; }; }; + "@types/node-fetch-2.5.8" = { + name = "_at_types_slash_node-fetch"; + packageName = "@types/node-fetch"; + version = "2.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.8.tgz"; + sha512 = "fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw=="; + }; + }; "@types/normalize-package-data-2.4.0" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; @@ -6385,13 +6331,22 @@ let sha512 = "wqTKZmqkqXd1YiVRBT2poRrMIojwEi2bKTAAjUX6nEbzr98jc3cfR/7o7ZtubhH5xT7YJ6LRdRr1GZOgs8OUjg=="; }; }; - "@types/pg-types-1.11.5" = { + "@types/pg-types-2.2.0" = { name = "_at_types_slash_pg-types"; packageName = "@types/pg-types"; - version = "1.11.5"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-2.2.0.tgz"; + sha512 = "a+fLdul8OczRvPWPf8eTb6wPhxzyWQwRGhNN0ugtOtk6yFOG53i2LwXaA0d2D6bsJlWxi6eCuGZLGoCcdOlWZA=="; + }; + }; + "@types/pug-2.0.4" = { + name = "_at_types_slash_pug"; + packageName = "@types/pug"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-1.11.5.tgz"; - sha512 = "L8ogeT6vDzT1vxlW3KITTCt+BVXXVkLXfZ/XNm6UqbcJgxf+KPO7yjWx7dQQE8RW07KopL10x2gNMs41+IkMGQ=="; + url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.4.tgz"; + sha1 = "8772fcd0418e3cd2cc171555d73007415051f4b2"; }; }; "@types/q-1.5.4" = { @@ -6493,6 +6448,15 @@ let sha512 = "8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q=="; }; }; + "@types/sass-1.16.0" = { + name = "_at_types_slash_sass"; + packageName = "@types/sass"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/sass/-/sass-1.16.0.tgz"; + sha512 = "2XZovu4NwcqmtZtsBR5XYLw18T8cBCnU2USFHTnYLLHz9fkhnoEMoDsqShJIOFsFhn5aJHjweiUUdTrDGujegA=="; + }; + }; "@types/semver-5.5.0" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; @@ -6502,13 +6466,13 @@ let sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ=="; }; }; - "@types/serve-static-1.13.8" = { + "@types/serve-static-1.13.9" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.8"; + version = "1.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz"; - sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz"; + sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; }; }; "@types/sizzle-2.3.2" = { @@ -6556,6 +6520,15 @@ let sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA=="; }; }; + "@types/stream-buffers-3.0.3" = { + name = "_at_types_slash_stream-buffers"; + packageName = "@types/stream-buffers"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.3.tgz"; + sha512 = "NeFeX7YfFZDYsCfbuaOmFQ0OjSmHreKBpp7MQ4alWQBHeh2USLsj7qyMyn9t82kjqIX516CR/5SRHnARduRtbQ=="; + }; + }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -6610,13 +6583,13 @@ let sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uglify-js-3.11.1" = { + "@types/uglify-js-3.12.0" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.11.1"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz"; - sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.12.0.tgz"; + sha512 = "sYAF+CF9XZ5cvEBkI7RtrG9g2GtMBkviTnBxYYyq+8BWvO4QtXfwwR6a2LFwCi4evMKZfpv6U43ViYvv17Wz3Q=="; }; }; "@types/unist-2.0.3" = { @@ -6664,13 +6637,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.52.0" = { + "@types/vscode-1.53.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.52.0"; + version = "1.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.52.0.tgz"; - sha512 = "Kt3bvWzAvvF/WH9YEcrCICDp0Z7aHhJGhLJ1BxeyNP6yRjonWqWnAIh35/pXAjswAnWOABrYlF7SwXR9+1nnLA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.53.0.tgz"; + sha512 = "XjFWbSPOM0EKIT2XhhYm3D3cx3nn3lshMUcWNy1eqefk+oqRuBq8unVb6BYIZqXy9lQZyeUl7eaBCOZWv+LcXQ=="; }; }; "@types/webpack-4.41.25" = { @@ -6682,6 +6655,15 @@ let sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ=="; }; }; + "@types/webpack-4.41.26" = { + name = "_at_types_slash_webpack"; + packageName = "@types/webpack"; + version = "4.41.26"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz"; + sha512 = "7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA=="; + }; + }; "@types/webpack-sources-2.1.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; @@ -6718,13 +6700,13 @@ let sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ=="; }; }; - "@types/yargs-15.0.12" = { + "@types/yargs-15.0.13" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.12"; + version = "15.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.12.tgz"; - sha512 = "f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz"; + sha512 = "kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ=="; }; }; "@types/yargs-parser-20.2.0" = { @@ -6763,13 +6745,13 @@ let sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="; }; }; - "@typescript-eslint/eslint-plugin-4.12.0" = { + "@typescript-eslint/eslint-plugin-4.15.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.12.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz"; - sha512 = "wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.0.tgz"; + sha512 = "DJgdGZW+8CFUTz5C/dnn4ONcUm2h2T0itWD85Ob5/V27Ndie8hUoX5HKyGssvR8sUMkAIlUc/AMK67Lqa3kBIQ=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -6781,13 +6763,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.12.0" = { + "@typescript-eslint/experimental-utils-4.15.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.12.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz"; - sha512 = "MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.0.tgz"; + sha512 = "V4vaDWvxA2zgesg4KPgEGiomWEBpJXvY4ZX34Y3qxK8LUm5I87L+qGIOTd9tHZOARXNRt9pLbblSKiYBlGMawg=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -6799,22 +6781,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.12.0" = { + "@typescript-eslint/parser-4.15.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.12.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.12.0.tgz"; - sha512 = "9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.15.0.tgz"; + sha512 = "L6Dtbq8Bc7g2aZwnIBETpmUa9XDKCMzKVwAArnGp5Mn7PRNFjf3mUzq8UeBjL3K8t311hvevnyqXAMSmxO8Gpg=="; }; }; - "@typescript-eslint/scope-manager-4.12.0" = { + "@typescript-eslint/scope-manager-4.15.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.12.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz"; - sha512 = "QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.15.0.tgz"; + sha512 = "CSNBZnCC2jEA/a+pR9Ljh8Y+5TY5qgbPz7ICEk9WCpSEgT6Pi7H2RIjxfrrbUXvotd6ta+i27sssKEH8Azm75g=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -6826,13 +6808,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.12.0" = { + "@typescript-eslint/types-4.15.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.12.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.12.0.tgz"; - sha512 = "N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.15.0.tgz"; + sha512 = "su4RHkJhS+iFwyqyXHcS8EGPlUVoC+XREfy5daivjLur9JP8GhvTmDipuRpcujtGC4M+GYhUOJCPDE3rC5NJrg=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -6853,13 +6835,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.12.0" = { + "@typescript-eslint/typescript-estree-4.15.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.12.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz"; - sha512 = "gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.0.tgz"; + sha512 = "jG6xTmcNbi6xzZq0SdWh7wQ9cMb2pqXaUp6bUZOMsIlu5aOlxGxgE/t6L/gPybybQGvdguajXGkZKSndZJpksA=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -6871,31 +6853,31 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.12.0" = { + "@typescript-eslint/visitor-keys-4.15.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.12.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz"; - sha512 = "hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.0.tgz"; + sha512 = "RnDtJwOwFucWFAMjG3ghCG/ikImFJFEg20DI7mn4pHEx3vC48lIAoyjhffvfHmErRDboUPC7p9Z2il4CLb7qxA=="; }; }; - "@uifabric/foundation-7.9.20" = { + "@uifabric/foundation-7.9.24" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.20"; + version = "7.9.24"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.20.tgz"; - sha512 = "AcOClWfs+rNK0XyPLKTK2Nqeom7zOESOfL3Tbwl5VuDlSrlGW9yNywuuo6gJSOyXCJQO5dJFVdGExmB0EM4vkw=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.24.tgz"; + sha512 = "f9W6x6gqczgkayA89TsiGzdze2A8RJXc/GbANYvBad3zeyDlQahepMrlgRMOXcTiwZIiltTje+7ADtvD/o176Q=="; }; }; - "@uifabric/icons-7.5.17" = { + "@uifabric/icons-7.5.21" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.17"; + version = "7.5.21"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.17.tgz"; - sha512 = "2S1kse0gtseTuV2r59iWukLxxoOJ6GgP2Yhxt9oxzaP9QubpYdxCUepvJmfPQQvvy4GELdykDUWQ6/hbzliJyw=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.21.tgz"; + sha512 = "ZTqLpdCZeCChcMWCgEyWUke2wJxfi3SNdSjNFXWK90SsDWlafg3s/eDd7+n6oRi4pHlF6eBnc4oTLR6PFXt8kQ=="; }; }; "@uifabric/merge-styles-7.19.1" = { @@ -6907,13 +6889,13 @@ let sha512 = "yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A=="; }; }; - "@uifabric/react-hooks-7.13.9" = { + "@uifabric/react-hooks-7.13.11" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.13.9"; + version = "7.13.11"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.9.tgz"; - sha512 = "VtDg2b3ypYXX7MLp1STk1Fj6ZIeZktXnm0hu1Os/pGvq6xkuLRly5XP6ZSHitm8K7ZcMo48CcNL8smmiXprBQg=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.11.tgz"; + sha512 = "9qX4hiZ4MelUxOxx4IPl+vgn9/e43KkYTpYedl2QtUxFpDjsOVJ0jbG3Dkokyl+Kvw1gerYCT1SXL8UC4kG97w=="; }; }; "@uifabric/set-version-7.0.23" = { @@ -6925,22 +6907,22 @@ let sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.18" = { + "@uifabric/styling-7.18.0" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.18"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.18.tgz"; - sha512 = "jINFRMWfSIOZ4H29YNBHtwZU4f8JFprnyBX2E0Wq9rjqRzgcmdYbN2yn88gym6aC3houSDcYM0rdfG4ETjRQSA=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.18.0.tgz"; + sha512 = "PuCSr2PeVDLTtyqOjS67QBgN7rDYf044oRvMEkSCP57p9Du8rIAJio0LQjVNRKo+QlmfgFzmT3XjpS2LYkhFIg=="; }; }; - "@uifabric/utilities-7.33.2" = { + "@uifabric/utilities-7.33.4" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.33.2"; + version = "7.33.4"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.2.tgz"; - sha512 = "v2c3IUJdpru/hoGNOwIW549O5D4XBAc5sLpB7RREGI5ywoWuIJlNyYtBEGOwhAY62J2blj11qi86Ep+oZDM/Kw=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.4.tgz"; + sha512 = "FgEL2+GWOHMNMQqmI5Mko293W3c9PWIc/WrlU6jQ5AU83M1BQSxhS0LPNnRbahukiEFNkosCOOKzKCNdjzkCwA=="; }; }; "@ungap/from-entries-0.2.1" = { @@ -6961,13 +6943,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@unicode/unicode-13.0.0-1.0.2" = { + "@unicode/unicode-13.0.0-1.0.3" = { name = "_at_unicode_slash_unicode-13.0.0"; packageName = "@unicode/unicode-13.0.0"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.2.tgz"; - sha512 = "OKI6clBZqvMBlPKbH1tv3ChmkqRcyCfB6ulHqEX+9asjN5BVXs7tH7aOi+SExCNsmCVB8uJ1ZcvjuwaHsCtUeg=="; + url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.3.tgz"; + sha512 = "foNhrvnwzUpt6Od/L7hgkNwZkDjsGMPgPFdVcXSdcKKYNicNBySiypBwgLLMsdBLWS30aJ8eLjftifnGuNGN1g=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -6979,40 +6961,40 @@ let sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084"; }; }; - "@vue/cli-shared-utils-4.5.9" = { + "@vue/cli-shared-utils-4.5.11" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.9"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.9.tgz"; - sha512 = "anvsrv+rkQC+hgxaT2nQQxnSWSsIzyysZ36LO7qPjXvDRBvcvKLAAviFlUkYbZ+ntbV8puzJ3zw+gUhQw4SEVA=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.11.tgz"; + sha512 = "+aaQ+ThQG3+WMexfSWNl0y6f43edqVqRNbguE53F3TIH81I7saS5S750ayqXhZs2r6STJJyqorQnKtAWfHo29A=="; }; }; - "@vue/cli-ui-4.5.9" = { + "@vue/cli-ui-4.5.11" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.5.9"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.9.tgz"; - sha512 = "JXQk29CLp7eBdO6uCr2s60xBoKjXPzr9ckpCicFMIWFLQOR0+DqWQpS1DIqETbgOmTYQj1LX+v1rkLeA74Lo2A=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.11.tgz"; + sha512 = "hT9cukom8WkV+U3GL0yOFDvWXqG35vy5ddSLideUOK2Ylht0AW7P9DDfUls/cDCpQ172LfPnvKRO/8zADqSElg=="; }; }; - "@vue/cli-ui-addon-webpack-4.5.9" = { + "@vue/cli-ui-addon-webpack-4.5.11" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.5.9"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.9.tgz"; - sha512 = "fh79OvbqvZ2YQ7JI7DnDKeS3W72HoEMVS8m969g/kjrqkFM+Rt2cL81LBx3IgX5l/rZP999kof569vYsOyjVnA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.11.tgz"; + sha512 = "k7Iv8ZfoiFtbHNDlntIUee1fCbS5PkQT9ZuI+tMV7eP7fbQXPSRDefsEOb0lAnrZ953tli+AF+hh2XhP6ihZig=="; }; }; - "@vue/cli-ui-addon-widgets-4.5.9" = { + "@vue/cli-ui-addon-widgets-4.5.11" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.5.9"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.9.tgz"; - sha512 = "mFdUlfDGxoyreCQWO/SX4DvM/6epn37AimVGzLJLpSPJdWUerCnvxwzB6zL83SiYC6O6++cWEdzgz7EtKViFlA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.11.tgz"; + sha512 = "uUZIfWWfvFMAtfyzaJDtwRqN2vNzc2nnALEJliv2ccVRZHS8mwB/aLoaX0hL3h+RBJ8WV2PDiXmRFcESyDfKjA=="; }; }; "@vue/compiler-core-3.0.5" = { @@ -7087,6 +7069,15 @@ let sha512 = "gYsNoGkWejBxNO6SNRjOh/xKeZ0H0V+TFzaPzODfBjkAIb0aQgBuixC1brandC/CDJy1wYPwSoYrXpvul7m6yw=="; }; }; + "@webassemblyjs/ast-1.11.0" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz"; + sha512 = "kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg=="; + }; + }; "@webassemblyjs/ast-1.8.1" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -7105,13 +7096,13 @@ let sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="; }; }; - "@webassemblyjs/ast-1.9.1" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.9.1"; + "@webassemblyjs/floating-point-hex-parser-1.11.0" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.1.tgz"; - sha512 = "uMu1nCWn2Wxyy126LlGqRVlhdTOsO/bsBRI4dNq3+6SiSuRKRQX6ejjKgh82LoGAPSq72lDUiQ4FWVaf0PecYw=="; + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz"; + sha512 = "Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA=="; }; }; "@webassemblyjs/floating-point-hex-parser-1.8.1" = { @@ -7132,13 +7123,13 @@ let sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="; }; }; - "@webassemblyjs/floating-point-hex-parser-1.9.1" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.9.1"; + "@webassemblyjs/helper-api-error-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.1.tgz"; - sha512 = "5VEKu024RySmLKTTBl9q1eO/2K5jk9ZS+2HXDBLA9s9p5IjkaXxWiDb/+b7wSQp6FRdLaH1IVGIfOex58Na2pg=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz"; + sha512 = "baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w=="; }; }; "@webassemblyjs/helper-api-error-1.8.1" = { @@ -7159,13 +7150,13 @@ let sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; }; }; - "@webassemblyjs/helper-api-error-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.9.1"; + "@webassemblyjs/helper-buffer-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-buffer"; + packageName = "@webassemblyjs/helper-buffer"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.1.tgz"; - sha512 = "y1lGmfm38djrScwpeL37rRR9f1D6sM8RhMpvM7CYLzOlHVboouZokXK/G88BpzW0NQBSvCCOnW5BFhten4FPfA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz"; + sha512 = "u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA=="; }; }; "@webassemblyjs/helper-buffer-1.8.1" = { @@ -7186,13 +7177,13 @@ let sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; }; }; - "@webassemblyjs/helper-buffer-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-buffer"; - packageName = "@webassemblyjs/helper-buffer"; - version = "1.9.1"; + "@webassemblyjs/helper-code-frame-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.1.tgz"; - sha512 = "uS6VSgieHbk/m4GSkMU5cqe/5TekdCzQso4revCIEQ3vpGZgqSSExi4jWpTWwDpAHOIAb1Jfrs0gUB9AA4n71w=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.11.0.tgz"; + sha512 = "crKJ80NppRzmKB9863Xq5ufVT6he+V4A2PoBfeblFGeeCb6zig34mW97tNBzGLcuOfSsq4ncmI4QOtqQBg047g=="; }; }; "@webassemblyjs/helper-code-frame-1.8.1" = { @@ -7213,31 +7204,31 @@ let sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="; }; }; - "@webassemblyjs/helper-code-frame-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-code-frame"; - packageName = "@webassemblyjs/helper-code-frame"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.1.tgz"; - sha512 = "ZQ2ZT6Evk4DPIfD+92AraGYaFIqGm4U20e7FpXwl7WUo2Pn1mZ1v8VGH8i+Y++IQpxPbQo/UyG0Khs7eInskzA=="; - }; - }; - "@webassemblyjs/helper-compiler-1.9.1" = { + "@webassemblyjs/helper-compiler-1.11.0" = { name = "_at_webassemblyjs_slash_helper-compiler"; packageName = "@webassemblyjs/helper-compiler"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.9.1.tgz"; - sha512 = "Qad79JaN6Qgv+lWd3sLqt206o6WRne5AynNPuLQlTlvDh8P/QsqVzf6RAJnjn9snJczXxkdN3BhWg9jSgb1sUw=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.11.0.tgz"; + sha512 = "XEKiHYE951mCW3kjXXK3sHdJI+IOD8k/Vfzk55FeFRJbKxucXZEJ+H1dcDp9MK0wXLtaMSVU5RFXf7chrCjdAg=="; }; }; - "@webassemblyjs/helper-flatten-ast-1.9.1" = { + "@webassemblyjs/helper-flatten-ast-1.11.0" = { name = "_at_webassemblyjs_slash_helper-flatten-ast"; packageName = "@webassemblyjs/helper-flatten-ast"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.9.1.tgz"; - sha512 = "wb7ZvGAzfMdgPYAR5zQwu9R/M+kmJDYXKPCJ9vCMfUn3qMoa69Tn5J+Y9u+HzX7nt3TgPvJFcVZKWxCMIhuP7w=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.11.0.tgz"; + sha512 = "T5zOuVT4mOXuDu2elXT/0P+2hhsIj/SgUUIxGTmpak6j3XruH0hYOOcnT9ES+qQ4vN3eq63ivGnLaMmjMPcExA=="; + }; + }; + "@webassemblyjs/helper-fsm-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.11.0.tgz"; + sha512 = "H0vRFj05zA2J1SVi+VdNbMwi7m0yZQhLqq7vkjYk44ilLzk0zEXaBNofKH5rQcchQUP2gdqoxLLHA9EcUdW9nw=="; }; }; "@webassemblyjs/helper-fsm-1.8.1" = { @@ -7258,15 +7249,6 @@ let sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="; }; }; - "@webassemblyjs/helper-fsm-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-fsm"; - packageName = "@webassemblyjs/helper-fsm"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.1.tgz"; - sha512 = "J32HGpveEqqcKFS0YbgicB0zAlpfIxJa5MjxDxhu3i5ltPcVfY5EPvKQ1suRguFPehxiUs+/hfkwPEXom/l0lw=="; - }; - }; "@webassemblyjs/helper-module-context-1.8.1" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; @@ -7285,13 +7267,22 @@ let sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="; }; }; - "@webassemblyjs/helper-module-context-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-module-context"; - packageName = "@webassemblyjs/helper-module-context"; - version = "1.9.1"; + "@webassemblyjs/helper-numbers-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-numbers"; + packageName = "@webassemblyjs/helper-numbers"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.1.tgz"; - sha512 = "IEH2cMmEQKt7fqelLWB5e/cMdZXf2rST1JIrzWmf4XBt3QTxGdnnLvV4DYoN8pJjOx0VYXsWg+yF16MmJtolZg=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz"; + sha512 = "DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ=="; + }; + }; + "@webassemblyjs/helper-wasm-bytecode-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz"; + sha512 = "MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA=="; }; }; "@webassemblyjs/helper-wasm-bytecode-1.8.1" = { @@ -7312,13 +7303,13 @@ let sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; }; }; - "@webassemblyjs/helper-wasm-bytecode-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.9.1"; + "@webassemblyjs/helper-wasm-section-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-section"; + packageName = "@webassemblyjs/helper-wasm-section"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.1.tgz"; - sha512 = "i2rGTBqFUcSXxyjt2K4vm/3kkHwyzG6o427iCjcIKjOqpWH8SEem+xe82jUk1iydJO250/CvE5o7hzNAMZf0dQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz"; + sha512 = "3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew=="; }; }; "@webassemblyjs/helper-wasm-section-1.8.1" = { @@ -7339,13 +7330,13 @@ let sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; }; }; - "@webassemblyjs/helper-wasm-section-1.9.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-section"; - packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.9.1"; + "@webassemblyjs/ieee754-1.11.0" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.1.tgz"; - sha512 = "FetqzjtXZr2d57IECK+aId3D0IcGweeM0CbAnJHkYJkcRTHP+YcMb7Wmc0j21h5UWBpwYGb9dSkK/93SRCTrGg=="; + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz"; + sha512 = "KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA=="; }; }; "@webassemblyjs/ieee754-1.8.1" = { @@ -7366,13 +7357,13 @@ let sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="; }; }; - "@webassemblyjs/ieee754-1.9.1" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.9.1"; + "@webassemblyjs/leb128-1.11.0" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.1.tgz"; - sha512 = "EvTG9M78zP1MmkBpUjGQHZc26DzPGZSLIPxYHCjQsBMo60Qy2W34qf8z0exRDtxBbRIoiKa5dFyWer/7r1aaSQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz"; + sha512 = "aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g=="; }; }; "@webassemblyjs/leb128-1.8.1" = { @@ -7393,13 +7384,13 @@ let sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="; }; }; - "@webassemblyjs/leb128-1.9.1" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.9.1"; + "@webassemblyjs/utf8-1.11.0" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.1.tgz"; - sha512 = "Oc04ub0vFfLnF+2/+ki3AE+anmW4sv9uNBqb+79fgTaPv6xJsOT0dhphNfL3FrME84CbX/D1T9XT8tjFo0IIiw=="; + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz"; + sha512 = "A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw=="; }; }; "@webassemblyjs/utf8-1.8.1" = { @@ -7420,22 +7411,22 @@ let sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="; }; }; - "@webassemblyjs/utf8-1.9.1" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.9.1"; + "@webassemblyjs/validation-1.11.0" = { + name = "_at_webassemblyjs_slash_validation"; + packageName = "@webassemblyjs/validation"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.1.tgz"; - sha512 = "llkYtppagjCodFjo0alWOUhAkfOiQPQDIc5oA6C9sFAXz7vC9QhZf/f8ijQIX+A9ToM3c9Pq85X0EX7nx9gVhg=="; + url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.11.0.tgz"; + sha512 = "0doaNEdjsurs3hUahxqoo3AJKvz+QnsIlkDnmd6nNmlFge3ixCrA7B8Xm6vmNoBPWWZgQ0VhvHV8Qs4768q1pw=="; }; }; - "@webassemblyjs/validation-1.9.1" = { - name = "_at_webassemblyjs_slash_validation"; - packageName = "@webassemblyjs/validation"; - version = "1.9.1"; + "@webassemblyjs/wasm-edit-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-edit"; + packageName = "@webassemblyjs/wasm-edit"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.9.1.tgz"; - sha512 = "a/Vh1fKuvuqff0KqA9TYATTyk/FihoVcc5vp4qhXHfKjS4J9BIW548gh5YZ81ZB39yg5TKiApRy8zMRa82Ij/A=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz"; + sha512 = "JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ=="; }; }; "@webassemblyjs/wasm-edit-1.9.0" = { @@ -7447,13 +7438,13 @@ let sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; }; }; - "@webassemblyjs/wasm-edit-1.9.1" = { - name = "_at_webassemblyjs_slash_wasm-edit"; - packageName = "@webassemblyjs/wasm-edit"; - version = "1.9.1"; + "@webassemblyjs/wasm-gen-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-gen"; + packageName = "@webassemblyjs/wasm-gen"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.1.tgz"; - sha512 = "S2IaD6+x9B2Xi8BCT0eGsrXXd8UxAh2LVJpg1ZMtHXnrDcsTtIX2bDjHi40Hio6Lc62dWHmKdvksI+MClCYbbw=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz"; + sha512 = "BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ=="; }; }; "@webassemblyjs/wasm-gen-1.8.1" = { @@ -7474,13 +7465,13 @@ let sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; }; }; - "@webassemblyjs/wasm-gen-1.9.1" = { - name = "_at_webassemblyjs_slash_wasm-gen"; - packageName = "@webassemblyjs/wasm-gen"; - version = "1.9.1"; + "@webassemblyjs/wasm-opt-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-opt"; + packageName = "@webassemblyjs/wasm-opt"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.1.tgz"; - sha512 = "bqWI0S4lBQsEN5FTZ35vYzfKUJvtjNnBobB1agCALH30xNk1LToZ7Z8eiaR/Z5iVECTlBndoRQV3F6mbEqE/fg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz"; + sha512 = "tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg=="; }; }; "@webassemblyjs/wasm-opt-1.9.0" = { @@ -7492,13 +7483,13 @@ let sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; }; }; - "@webassemblyjs/wasm-opt-1.9.1" = { - name = "_at_webassemblyjs_slash_wasm-opt"; - packageName = "@webassemblyjs/wasm-opt"; - version = "1.9.1"; + "@webassemblyjs/wasm-parser-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.1.tgz"; - sha512 = "gSf7I7YWVXZ5c6XqTEqkZjVs8K1kc1k57vsB6KBQscSagDNbAdxt6MwuJoMjsE1yWY1tsuL+pga268A6u+Fdkg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz"; + sha512 = "6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw=="; }; }; "@webassemblyjs/wasm-parser-1.8.1" = { @@ -7519,13 +7510,13 @@ let sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="; }; }; - "@webassemblyjs/wasm-parser-1.9.1" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.9.1"; + "@webassemblyjs/wast-parser-1.11.0" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.1.tgz"; - sha512 = "ImM4N2T1MEIond0MyE3rXvStVxEmivQrDKf/ggfh5pP6EHu3lL/YTAoSrR7shrbKNPpeKpGesW1LIK/L4kqduw=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.11.0.tgz"; + sha512 = "HKFbg+HvjITWuOOWehS2EUdNZ4fsfWislwDTrxuUL6FpzrjtsASd2c4hmqNSW6c7sv5iBx1puUWwNtVqLXxFqw=="; }; }; "@webassemblyjs/wast-parser-1.8.1" = { @@ -7546,13 +7537,13 @@ let sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="; }; }; - "@webassemblyjs/wast-parser-1.9.1" = { - name = "_at_webassemblyjs_slash_wast-parser"; - packageName = "@webassemblyjs/wast-parser"; - version = "1.9.1"; + "@webassemblyjs/wast-printer-1.11.0" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.1.tgz"; - sha512 = "2xVxejXSvj3ls/o2TR/zI6p28qsGupjHhnHL6URULQRcXmryn3w7G83jQMcT7PHqUfyle65fZtWLukfdLdE7qw=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz"; + sha512 = "Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ=="; }; }; "@webassemblyjs/wast-printer-1.8.1" = { @@ -7573,31 +7564,31 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; - "@webassemblyjs/wast-printer-1.9.1" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.9.1"; + "@webpack-cli/configtest-1.0.1" = { + name = "_at_webpack-cli_slash_configtest"; + packageName = "@webpack-cli/configtest"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.1.tgz"; - sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.1.tgz"; + sha512 = "B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ=="; }; }; - "@webpack-cli/info-1.2.1" = { + "@webpack-cli/info-1.2.2" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.1.tgz"; - sha512 = "fLnDML5HZ5AEKzHul8xLAksoKN2cibu6MgonkUj8R9V7bbeVRkd1XbGEGWrAUNYHbX1jcqCsDEpBviE5StPMzQ=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.2.tgz"; + sha512 = "5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ=="; }; }; - "@webpack-cli/serve-1.2.1" = { + "@webpack-cli/serve-1.3.0" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.2.1.tgz"; - sha512 = "Zj1z6AyS+vqV6Hfi7ngCjFGdHV5EwZNIHo6QfFTNe9PyW+zBU1zJ9BiOW1pmUEq950RC4+Dym6flyA/61/vhyw=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.0.tgz"; + sha512 = "k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw=="; }; }; "@wry/context-0.4.4" = { @@ -7771,6 +7762,15 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; + "abortcontroller-polyfill-1.7.1" = { + name = "abortcontroller-polyfill"; + packageName = "abortcontroller-polyfill"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.1.tgz"; + sha512 = "yml9NiDEH4M4p0G4AcPkg8AAa4mF3nfYF28VQxaokpO67j9H7gWgmsVWJ/f1Rn+PzsnDYvzJzWIQzCqDKRvWlA=="; + }; + }; "absolute-0.0.1" = { name = "absolute"; packageName = "absolute"; @@ -7780,15 +7780,6 @@ let sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; }; }; - "abstract-leveldown-0.12.4" = { - name = "abstract-leveldown"; - packageName = "abstract-leveldown"; - version = "0.12.4"; - src = fetchurl { - url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz"; - sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; - }; - }; "abstract-leveldown-6.0.3" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -7906,13 +7897,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.0.4" = { + "acorn-8.0.5" = { name = "acorn"; packageName = "acorn"; - version = "8.0.4"; + version = "8.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.0.4.tgz"; - sha512 = "XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.0.5.tgz"; + sha512 = "v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg=="; }; }; "acorn-globals-1.0.9" = { @@ -8086,6 +8077,15 @@ let sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="; }; }; + "adm-zip-0.5.2" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.2.tgz"; + sha512 = "lUI3ZSNsfQXNYNzGjt68MdxzCs0eW29lgL74y/Y2h4nARgHmH3poFWuK3LonvFbNHFt4dTb2X/QQ4c1ZUWWsJw=="; + }; + }; "adverb-where-0.0.9" = { name = "adverb-where"; packageName = "adverb-where"; @@ -8176,13 +8176,13 @@ let sha512 = "e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ=="; }; }; - "agentkeepalive-4.1.3" = { + "agentkeepalive-4.1.4" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.3.tgz"; - sha512 = "wn8fw19xKZwdGPO47jivonaHRTd+nGOMP1z11sgGeQzDy2xd5FG0R67dIMcKHDE2cJ5y+YXV30XVGUBPRSY7Hg=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz"; + sha512 = "+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ=="; }; }; "aggregate-error-3.1.0" = { @@ -8266,13 +8266,13 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; - "ajv-7.0.3" = { + "ajv-7.1.0" = { name = "ajv"; packageName = "ajv"; - version = "7.0.3"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz"; - sha512 = "R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-7.1.0.tgz"; + sha512 = "svS9uILze/cXbH0z2myCK2Brqprx/+JJYK5pHicT/GQiBfzzhUVAIT6MwqJg8y4xV/zoGsUeuPuwtoiKSGE15g=="; }; }; "ajv-errors-1.0.1" = { @@ -8383,13 +8383,13 @@ let sha1 = "a78f1c98995087ad36192a41298e4db49e3dfc45"; }; }; - "analytics-node-3.3.0" = { + "analytics-node-3.5.0" = { name = "analytics-node"; packageName = "analytics-node"; - version = "3.3.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/analytics-node/-/analytics-node-3.3.0.tgz"; - sha512 = "wxrsmibvZVysy5CfkLItYrYMGbNVXDBccWurz+hgLUg98pbijiS2/QQdRc0SjHWVEqByxReEJ2T2MGhgb4jk3A=="; + url = "https://registry.npmjs.org/analytics-node/-/analytics-node-3.5.0.tgz"; + sha512 = "XgQq6ejZHCehUSnZS4V7QJPLIP7S9OAWwQDYl4WTLtsRvc5fCxIwzK/yihzmIW51v9PnyBmrl9dMcqvwfOE8WA=="; }; }; "ansi-0.3.1" = { @@ -8518,15 +8518,6 @@ let sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA=="; }; }; - "ansi-fragments-0.2.1" = { - name = "ansi-fragments"; - packageName = "ansi-fragments"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-fragments/-/ansi-fragments-0.2.1.tgz"; - sha512 = "DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w=="; - }; - }; "ansi-gray-0.1.1" = { name = "ansi-gray"; packageName = "ansi-gray"; @@ -8662,13 +8653,13 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; - "ansi-styles-5.0.0" = { + "ansi-styles-5.1.0" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.0.0.tgz"; - sha512 = "6564t0m0fuQMnockqBv7wJxo9T5C2V9JpYXyNScfRDPVLusOQQhkpMGrFC17QbiolraQ1sMXX+Y5nJpjqozL4g=="; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.1.0.tgz"; + sha512 = "osxifZo3ar56+e8tdYreU6p8FZGciBHo5O0JoDAxMUqZuyNUb+yHEwYtJZ+Z32R459jEgtwVf1u8D7qYwU0l6w=="; }; }; "ansi-term-0.0.2" = { @@ -8797,13 +8788,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.32.0" = { + "apollo-2.32.1" = { name = "apollo"; packageName = "apollo"; - version = "2.32.0"; + version = "2.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.32.0.tgz"; - sha512 = "6Wmt9OUYUET3JSQvAS6qgNP+vomf3P5zANARXDhqJ59c0/hAsXhdAvGaFFba+JhRRvyIVBOmaOpB880aNZeadg=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.32.1.tgz"; + sha512 = "aSjGnxxm+ZZ6uYTuGrBqtQ4e3boG408K16CbB5Zm/QHCRNHpPUz7r9VRDfAJWMFE1mBdWi+r0dyY+7FUkKeRrw=="; }; }; "apollo-cache-1.3.5" = { @@ -8815,13 +8806,13 @@ let sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA=="; }; }; - "apollo-cache-control-0.11.5" = { + "apollo-cache-control-0.11.6" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.11.5"; + version = "0.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.5.tgz"; - sha512 = "jvarfQhwDRazpOsmkt5Pd7qGFrtbL70zMbUZGqDhJSYpfqI672f7bXXc7O3vtpbD3qnS3XTBvK2kspX/Bdo0IA=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.6.tgz"; + sha512 = "YZ+uuIG+fPy+mkpBS2qKF0v1qlzZ3PW6xZVaDukeK3ed3iAs4L/2YnkTqau3OmoF/VPzX2FmSkocX/OVd59YSw=="; }; }; "apollo-cache-inmemory-1.6.6" = { @@ -8842,58 +8833,58 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.39.0" = { + "apollo-codegen-core-0.39.1" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.39.0"; + version = "0.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.0.tgz"; - sha512 = "b+RD8jerDMih2vf73hodOQAx4UODy1l053/Mdr4uIBlDbaF6OA4Q8TbTbH4k7tDzyAoL2pjH5v8AtlU8viIKwg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.1.tgz"; + sha512 = "8Sb9CN+lYR2BMeg7p3A4wjsQW7oxDTnKbueUHV/fmZU+hg2GNLXqVTdyWE2UWDEOyDTNpQMyysGEUZZBsOmBrw=="; }; }; - "apollo-codegen-flow-0.37.0" = { + "apollo-codegen-flow-0.37.1" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.37.0"; + version = "0.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.0.tgz"; - sha512 = "VWB++9ObUQx+Y1JPdgrkdkjPichsgXhYfz5w5HSKvare7SlkxEZFOzSXi9/bUAC3gry3B/38do1srDHtXZ366g=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.1.tgz"; + sha512 = "XhGUzlBxi3IHCBbIsnfk0c41mz30Ky1SPSYtJzrMdtMAdUAfMEGBLXzlLqgp1iAbUegQ10zbp2kgzLG0hkeYhg=="; }; }; - "apollo-codegen-scala-0.38.0" = { + "apollo-codegen-scala-0.38.1" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.38.0"; + version = "0.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.0.tgz"; - sha512 = "oQAV65ZGaFGeNpxVVnZLh2kyBKfA6QzSeyosDp0HKxeXOGQ84dHJg1zGiN0oWXELBM2MqPtwWSGFYgnk3CNeHg=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.1.tgz"; + sha512 = "WvIX6Gm7KHnh6FJzq/XVRyHMNwwbQEnMfRXpR9zFtaUuzZHfg9RNawtsUGMSQCnNw1sm5YLGIJvNFUp1hUEqGA=="; }; }; - "apollo-codegen-swift-0.39.0" = { + "apollo-codegen-swift-0.39.1" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.39.0"; + version = "0.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.0.tgz"; - sha512 = "fFaR8g62jjYS6QFW354ONcMHJNesy5EtCvYKsR9Sb1eBoLTx/6NkeMiGO28PIIk7bEw7FKMrzQE2UVNSeZbMxQ=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.1.tgz"; + sha512 = "dKqDd2w2YAOkyDbDkJ5etXLdn8foNnm55r5rsIssIxCdtdR5qsusrPHQvywVjHw8ZHBy4o229dVoSzmrIUygKg=="; }; }; - "apollo-codegen-typescript-0.39.0" = { + "apollo-codegen-typescript-0.39.1" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.39.0"; + version = "0.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.0.tgz"; - sha512 = "/clemyhTd+s+b4HoMa72zjWir4QrDqjcN4tnSpQYXSsOFO4e4kWlxSj0zrtyYkcx/Gqod9UrPSSsx2CZHyB37A=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.1.tgz"; + sha512 = "cSnMrAqyK2AMZRxTsBrZZhemfv87AU0OS1/aM45WQRyQurkEjf8GmWMfp2IRkJo9m+jgdo74X5ct3KZOXbYMXg=="; }; }; - "apollo-datasource-0.7.2" = { + "apollo-datasource-0.7.3" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.2.tgz"; - sha512 = "ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.3.tgz"; + sha512 = "PE0ucdZYjHjUyXrFWRwT02yLcx2DACsZ0jm1Mp/0m/I9nZu/fEkvJxfsryXB6JndpmQO77gQHixf/xGCN976kA=="; }; }; "apollo-env-0.6.5" = { @@ -9013,22 +9004,22 @@ let sha512 = "WJTJxLM+MRHNUxt1RTl4zD0HrLdH44F2mDzMweBj1yHL0kSt8I1WwoiF/wiGVSpnG48LZrBegCaOJeuVbJTbtw=="; }; }; - "apollo-server-caching-0.5.2" = { + "apollo-server-caching-0.5.3" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz"; - sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ=="; + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.3.tgz"; + sha512 = "iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ=="; }; }; - "apollo-server-core-2.19.1" = { + "apollo-server-core-2.20.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.19.1"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.1.tgz"; - sha512 = "5EVmcY8Ij7Ywwu+Ze4VaUhZBcxl8t5ztcSatJrKMd4HYlEHyaNGBV2itfpyqAthxfdMbGKqlpeCHmTGSqDcNpA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.20.0.tgz"; + sha512 = "tteFTl6y9c3MtuhePOs9IbCccaKVXELttLvefMzd7EfR3CPgIfIbxpy2ZEcDys8NteYXoJ+4LiM8Eh9kLgkKmQ=="; }; }; "apollo-server-env-2.4.5" = { @@ -9040,6 +9031,15 @@ let sha512 = "nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA=="; }; }; + "apollo-server-env-3.0.0" = { + name = "apollo-server-env"; + packageName = "apollo-server-env"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.0.0.tgz"; + sha512 = "tPSN+VttnPsoQAl/SBVUpGbLA97MXG990XIwq6YUnJyAixrrsjW1xYG7RlaOqetxm80y5mBZKLrRDiiSsW/vog=="; + }; + }; "apollo-server-errors-2.4.2" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; @@ -9049,40 +9049,40 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.19.1" = { + "apollo-server-express-2.20.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.19.1"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.1.tgz"; - sha512 = "PJQmPtV3JD7RiV6cP7JcqAwVdUq6hWUtvDIoCOxPoeUWYf79nEF4WiYsPXVF0+meLLWKlL1fuSwEEt1CEHEG5w=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.20.0.tgz"; + sha512 = "Bf2c/1J/ScXmioWi+0HFIsZ1bt8zFlI2VV/7oUn+Dd/lUBHLVfMNKvEJNMwjRkIrI9b9+eqANDrO6lf2ruC52w=="; }; }; - "apollo-server-plugin-base-0.10.3" = { + "apollo-server-plugin-base-0.10.4" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.3.tgz"; - sha512 = "NCLOsk9Jsd8oLvefkQvROdMDQvnHnzbzz3MPCqEYjCOEv0YBM8T77D0wCwbcViDS2M5p0W6un2ub9s/vU71f7Q=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.4.tgz"; + sha512 = "HRhbyHgHFTLP0ImubQObYhSgpmVH4Rk1BinnceZmwudIVLKrqayIVOELdyext/QnSmmzg5W7vF3NLGBcVGMqDg=="; }; }; - "apollo-server-types-0.6.2" = { + "apollo-server-types-0.6.3" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.2.tgz"; - sha512 = "LgSKgAStiDzpUSLYwJoAmy0W8nkxx/ExMmgEPgEYVi6dKPkUmtu561J970PhGdYH+D79ke3g87D+plkUkgfnlQ=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.3.tgz"; + sha512 = "aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg=="; }; }; - "apollo-tracing-0.12.1" = { + "apollo-tracing-0.12.2" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.1.tgz"; - sha512 = "qdkUjW+pOaidGOSITypeYE288y28HkPmGNpUtyQSOeTxgqXHtQX3TDWiOJ2SmrLH08xdSwfvz9o5KrTq4PdISg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.2.tgz"; + sha512 = "SYN4o0C0wR1fyS3+P0FthyvsQVHFopdmN3IU64IaspR/RZScPxZ3Ae8uu++fTvkQflAkglnFM0aX6DkZERBp6w=="; }; }; "apollo-upload-client-11.0.0" = { @@ -9229,13 +9229,13 @@ let sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg=="; }; }; - "archiver-5.1.0" = { + "archiver-5.2.0" = { name = "archiver"; packageName = "archiver"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-5.1.0.tgz"; - sha512 = "iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA=="; + url = "https://registry.npmjs.org/archiver/-/archiver-5.2.0.tgz"; + sha512 = "QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ=="; }; }; "archiver-utils-2.1.0" = { @@ -10111,6 +10111,15 @@ let sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; }; + "async-append-only-log-3.0.3" = { + name = "async-append-only-log"; + packageName = "async-append-only-log"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.0.3.tgz"; + sha512 = "w6F/oWReK4qyNBnCFe/cfYZHXMs07BZjS0LmpHQ5JByK5yEVzvvWGdNMStFPVbQhVJnT1PdmP+/LwEzmoe33qA=="; + }; + }; "async-done-1.3.2" = { name = "async-done"; packageName = "async-done"; @@ -10174,13 +10183,13 @@ let sha512 = "zVWTmAnxxHaeB2B1te84oecI8zTDJ/8G49aVBblRX6be0oq6pAybNcUSxwfgVOmOjSCvN4aYZAqwtyNI8e1YGw=="; }; }; - "async-mutex-0.2.4" = { + "async-mutex-0.2.6" = { name = "async-mutex"; packageName = "async-mutex"; - version = "0.2.4"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.4.tgz"; - sha512 = "fcQKOXUKMQc57JlmjBCHtkKNrfGpHyR7vu18RfuLfeTAf4hK9PgOadPR5cDrBQ682zasrLUhJFe7EKAHJOduDg=="; + url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.6.tgz"; + sha512 = "Hs4R+4SPgamu6rSGW8C7cV9gaWUKEHykfzCCvIRuaVv636Ju10ZdeUbvb4TBEW0INuq2DHZqXbK4Nd3yG4RaRw=="; }; }; "async-retry-1.3.1" = { @@ -10309,6 +10318,15 @@ let sha512 = "Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="; }; }; + "atomically-universal-0.1.1" = { + name = "atomically-universal"; + packageName = "atomically-universal"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/atomically-universal/-/atomically-universal-0.1.1.tgz"; + sha512 = "0bqmz+wKlA9hIiH/C4R3K8dpsVV6mM/X76QZ70LMHW0XzCDXzxdWD5gfkmRXxTM5txlbYE/06iz0IziohUQVzw=="; + }; + }; "attach-ware-1.1.1" = { name = "attach-ware"; packageName = "attach-ware"; @@ -10399,13 +10417,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.821.0" = { + "aws-sdk-2.842.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.821.0"; + version = "2.842.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.821.0.tgz"; - sha512 = "UtUlURMzmns1Wq8uAdJcyKsm/nW7iRYgTQEONQIpud0xwtjpPPR1pBFB0RSNZuYnZxcWboo807+jxq+LjaBEKA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.842.0.tgz"; + sha512 = "9vjVDxsLzNI79JChUgEHDUpv2obkTe35F3oGFGViKsf4C7xlOexzKOCfTRNcgzh0MON6rVDFpYBtF2LlEyDGKg=="; }; }; "aws-sign2-0.6.0" = { @@ -10435,40 +10453,13 @@ let sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "axios-0.17.1" = { + "axios-0.21.1" = { name = "axios"; packageName = "axios"; - version = "0.17.1"; + version = "0.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz"; - sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"; - }; - }; - "axios-0.18.1" = { - name = "axios"; - packageName = "axios"; - version = "0.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz"; - sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g=="; - }; - }; - "axios-0.19.0" = { - name = "axios"; - packageName = "axios"; - version = "0.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz"; - sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ=="; - }; - }; - "axios-0.19.2" = { - name = "axios"; - packageName = "axios"; - version = "0.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; - sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"; + sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; }; }; "axios-retry-3.1.9" = { @@ -11155,15 +11146,6 @@ let sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "base64-js-1.3.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; - }; - }; "base64-js-1.5.1" = { name = "base64-js"; packageName = "base64-js"; @@ -11317,13 +11299,13 @@ let sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; }; }; - "bcrypto-5.3.0" = { + "bcrypto-5.4.0" = { name = "bcrypto"; packageName = "bcrypto"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypto/-/bcrypto-5.3.0.tgz"; - sha512 = "SP48cpoc4BkEPNOErdsZ1VjbtdXY/C0f5wAywWniLne/Fd/5oOBqLbC6ZavngLvk4oik76g4I7PO5KduJoqECQ=="; + url = "https://registry.npmjs.org/bcrypto/-/bcrypto-5.4.0.tgz"; + sha512 = "KDX2CR29o6ZoqpQndcCxFZAtYA1jDMnXU3jmCfzP44g++Cu7AHHtZN/JbrN/MXAg9SLvtQ8XISG+eVD9zH1+Jg=="; }; }; "bcurl-0.1.9" = { @@ -11371,13 +11353,13 @@ let sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "before-after-hook-2.1.0" = { + "before-after-hook-2.1.1" = { name = "before-after-hook"; packageName = "before-after-hook"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz"; - sha512 = "IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A=="; + url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.1.tgz"; + sha512 = "5ekuQOvO04MDj7kYZJaMab2S8SPjGJbotVNyv7QYFCOAwrGZs/YnoDNlh1U+m5hl7H2D/+n0taaAV/tfyd3KMA=="; }; }; "bencode-0.7.0" = { @@ -11587,13 +11569,13 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; - "binary-extensions-2.1.0" = { + "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; }; "binary-search-1.3.6" = { @@ -11605,6 +11587,15 @@ let sha512 = "nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA=="; }; }; + "binary-search-bounds-2.0.5" = { + name = "binary-search-bounds"; + packageName = "binary-search-bounds"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.5.tgz"; + sha512 = "H0ea4Fd3lS1+sTEB2TgcLoK21lLhwEJzlQv3IN47pJS976Gx4zoWe0ak3q+uYh60ppQxg9F16Ri4tS1sfD4+jA=="; + }; + }; "binaryextensions-2.3.0" = { name = "binaryextensions"; packageName = "binaryextensions"; @@ -11677,6 +11668,15 @@ let sha1 = "01fa8748785ca70955d5011217d1b3139969ca22"; }; }; + "bipf-1.4.0" = { + name = "bipf"; + packageName = "bipf"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bipf/-/bipf-1.4.0.tgz"; + sha512 = "8b2T/OWIRI73kcPXhI+jqK+0QyxRlZ6HIzQBK8tRxIZ2NO0dBxJ4T9eeX6XsYEHy2cqM69n+rOZyVjhvRUGRig=="; + }; + }; "bitcoin-core-2.3.0" = { name = "bitcoin-core"; packageName = "bitcoin-core"; @@ -11776,13 +11776,13 @@ let sha512 = "tSh9HdQgwyEAfo1jzoGEis6o/zs4CcdRTchG93XVl5jct+DCAN90M5MVUV76k2vJ9Xg3GAzLB5NLsY/vnVTh6w=="; }; }; - "bittorrent-protocol-3.2.0" = { + "bittorrent-protocol-3.3.1" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.2.0.tgz"; - sha512 = "8xgCgK8xUg7MXZBxhqJapZy9hexHwN2TCD+b8m4yWg56/ZFfdkULxhxQkzuhpXyUfvKIKxeRzGmLT43li7FDKg=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.3.1.tgz"; + sha512 = "DJy0/jjqJD62PPJY79duCccmPMihp3KPowlmd7BLEU8FTtnDsYjso6BAx+pWwCKOeDORdc9RiJ7L72x3taCh6g=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -11794,22 +11794,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.15.0" = { + "bittorrent-tracker-9.16.1" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.15.0"; + version = "9.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.15.0.tgz"; - sha512 = "5LhLQeGxdVFumJTbveJS16Rc+Vzh/nbC6o80UMj6ZRvSkiVkk+4L782OMYI0VG1JTfUxiRFP4f+CZBFyuclLBg=="; - }; - }; - "bl-0.8.2" = { - name = "bl"; - packageName = "bl"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; - sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.16.1.tgz"; + sha512 = "JjegXwpWK8xRTHd5sqKTVqPhlhzAqJrR37gSiciTa1UkSSM6SWKVUDq7ZiGS3d8FhqonDSuPLQ9wUOC2q2jeIA=="; }; }; "bl-1.2.3" = { @@ -11830,13 +11821,22 @@ let sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; }; }; - "bl-4.0.3" = { + "bl-4.0.4" = { name = "bl"; packageName = "bl"; - version = "4.0.3"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.0.4.tgz"; + sha512 = "7tdr4EpSd7jJ6tuQ21vu2ke8w7pNEstzj1O8wwq6sNNzO3UDi5MA8Gny/gquCj7r2C6fHudg8tKRGyjRgmvNxQ=="; + }; + }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz"; - sha512 = "fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="; + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; "blake2b-2.1.3" = { @@ -11884,13 +11884,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.8.20" = { + "blessed-contrib-4.8.21" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.8.20"; + version = "4.8.21"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.20.tgz"; - sha512 = "jLLXR9pjjm/T2jY0Q8OCCpuDquWiMULkPyT8YNaiLUR0j1MchTQK/Q7SiuD63jn9ekn9BrohwP1Kom/FylmeHQ=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.21.tgz"; + sha512 = "zdQMO3UyfhdG0S+Zqn7YexI6BHlnO26qxBKc9jzgyZdIoq7nELiGM/V89CvrTPblZGQr3eMUqCy7pxlKm3vCYA=="; }; }; "blgr-0.1.8" = { @@ -11938,13 +11938,13 @@ let sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; - "block-stream2-2.0.0" = { + "block-stream2-2.1.0" = { name = "block-stream2"; packageName = "block-stream2"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/block-stream2/-/block-stream2-2.0.0.tgz"; - sha512 = "1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g=="; + url = "https://registry.npmjs.org/block-stream2/-/block-stream2-2.1.0.tgz"; + sha512 = "suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg=="; }; }; "blru-0.1.6" = { @@ -12073,13 +12073,22 @@ let sha1 = "e16661697452d436bf9886238cc791b08d66a61a"; }; }; - "bns-0.13.0" = { + "bns-0.14.0" = { name = "bns"; packageName = "bns"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/bns/-/bns-0.13.0.tgz"; - sha512 = "2aRg/m7+fvXsf+CpR30f0iXTgAFdf2UdhreZNhxbgMpVTo83rnlGhb6QuMznGIiqDxj6akDnONVg50M8wADoIw=="; + url = "https://registry.npmjs.org/bns/-/bns-0.14.0.tgz"; + sha512 = "lqxDpj9gX7OtihwAzMhlMk0w38ObZu+aRSF9fzG/wUfF6RfocFSFDGHA+KVbLNXudiTStzhWVGc8cJmcL4IHYw=="; + }; + }; + "bodec-0.1.0" = { + name = "bodec"; + packageName = "bodec"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bodec/-/bodec-0.1.0.tgz"; + sha1 = "bc851555430f23c9f7650a75ef64c6a94c3418cc"; }; }; "body-0.1.0" = { @@ -12190,13 +12199,13 @@ let sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; }; }; - "bower-1.8.8" = { + "bower-1.8.12" = { name = "bower"; packageName = "bower"; - version = "1.8.8"; + version = "1.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz"; - sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz"; + sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q=="; }; }; "bower-endpoint-parser-0.2.1" = { @@ -12262,6 +12271,15 @@ let sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ=="; }; }; + "boxen-5.0.0" = { + name = "boxen"; + packageName = "boxen"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-5.0.0.tgz"; + sha512 = "5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA=="; + }; + }; "bplist-creator-0.0.6" = { name = "bplist-creator"; packageName = "bplist-creator"; @@ -12379,6 +12397,15 @@ let sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; + "browser-hrtime-1.1.8" = { + name = "browser-hrtime"; + packageName = "browser-hrtime"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-hrtime/-/browser-hrtime-1.1.8.tgz"; + sha512 = "kzXheikaJsBtzUBlyVtPIY5r0soQePzjwVwT4IlDpU2RvfB5Py52gpU98M77rgqMCheoSSZvrcrdj3t6cZ3suA=="; + }; + }; "browser-launcher2-0.4.6" = { name = "browser-launcher2"; packageName = "browser-launcher2"; @@ -12478,15 +12505,6 @@ let sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; - "browserify-fs-1.0.0" = { - name = "browserify-fs"; - packageName = "browserify-fs"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-fs/-/browserify-fs-1.0.0.tgz"; - sha1 = "f075aa8a729d4d1716d066620e386fcc1311a96f"; - }; - }; "browserify-incremental-3.1.1" = { name = "browserify-incremental"; packageName = "browserify-incremental"; @@ -12559,13 +12577,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.16.0" = { + "browserslist-4.16.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.0"; + version = "4.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz"; - sha512 = "/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz"; + sha512 = "vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw=="; }; }; "brq-0.1.8" = { @@ -12703,6 +12721,15 @@ let sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; }; }; + "buffer-5.1.0" = { + name = "buffer"; + packageName = "buffer"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; + sha512 = "YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw=="; + }; + }; "buffer-5.2.1" = { name = "buffer"; packageName = "buffer"; @@ -12919,15 +12946,6 @@ let sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg=="; }; }; - "bufferstreams-2.0.1" = { - name = "bufferstreams"; - packageName = "bufferstreams"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-2.0.1.tgz"; - sha512 = "ZswyIoBfFb3cVDsnZLLj2IDJ/0ppYdil/v2EGlZXvoefO689FokEmFEldhN5dV7R2QBxFneqTJOMIpfqhj+n0g=="; - }; - }; "bufferutil-1.3.0" = { name = "bufferutil"; packageName = "bufferutil"; @@ -13045,6 +13063,15 @@ let sha512 = "LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg=="; }; }; + "bunyan-1.8.15" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.15"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz"; + sha512 = "0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig=="; + }; + }; "bunyan-syslog-udp-0.2.0" = { name = "bunyan-syslog-udp"; packageName = "bunyan-syslog-udp"; @@ -13279,13 +13306,13 @@ let sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw=="; }; }; - "call-bind-1.0.0" = { + "call-bind-1.0.2" = { name = "call-bind"; packageName = "call-bind"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz"; - sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; "call-me-maybe-1.0.1" = { @@ -13513,13 +13540,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001173" = { + "caniuse-lite-1.0.30001185" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001173"; + version = "1.0.30001185"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz"; - sha512 = "R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz"; + sha512 = "Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg=="; }; }; "canvas-2.6.1" = { @@ -13639,22 +13666,22 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.5" = { + "cdk8s-1.0.0-beta.8" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.5"; + version = "1.0.0-beta.8"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.5.tgz"; - sha512 = "E4l89rGnMI+OCdVojw0vV9xjkNgk9qMswkWc10hZLwwozhnx3ITMVgyjlRiZnCBIKMnKYY8ZhyMgEGgSVpR5fw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.8.tgz"; + sha512 = "99jNfGUIVic0hZCWXTU1yQLJ5ww06O7egXkgjltlHS0Fom9MY4bzFpqlVTNlmKguEO5eK3OEjjkoek4qVpEbpw=="; }; }; - "cdktf-0.0.19" = { + "cdktf-0.1.0" = { name = "cdktf"; packageName = "cdktf"; - version = "0.0.19"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.0.19.tgz"; - sha512 = "fBOl+yqMdMNRGNvLwAxOpE38PxHJG5Tdi/3J/Ag+KJwaDEXa/v5+ogwPxNtZ0dUdvZq2ovti9zbhdIPr59BvYQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.1.0.tgz"; + sha512 = "6PKMz7dkou3qrHD+rnj7fa8U+XujkRUVHsWcVaH7faCxBCIGSxUz0TFb8KeY//o0MHg285Agt1NTCgFIpJ7Clg=="; }; }; "center-align-0.1.3" = { @@ -13666,13 +13693,13 @@ let sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; }; }; - "chai-4.2.0" = { + "chai-4.3.0" = { name = "chai"; packageName = "chai"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"; - sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw=="; + url = "https://registry.npmjs.org/chai/-/chai-4.3.0.tgz"; + sha512 = "/BFd2J30EcOwmdOgXvVsmM48l0Br0nmZPlO0uOW4XKh6kpsUumRXBgPV+IlaqFaqr9cYbeoZAM1Npx0i4A+aiA=="; }; }; "chai-as-promised-7.1.1" = { @@ -14017,13 +14044,13 @@ let sha512 = "0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA=="; }; }; - "chloride-2.4.0" = { + "chloride-2.4.1" = { name = "chloride"; packageName = "chloride"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/chloride/-/chloride-2.4.0.tgz"; - sha512 = "Fgz7EaWswRjRBeft6pCkg8STSQTQT/5GrRZlbtlx5hkhFi/X1RSIhSustfe2GsbySVZF2DuxsWri8GDFJ/SkvQ=="; + url = "https://registry.npmjs.org/chloride/-/chloride-2.4.1.tgz"; + sha512 = "ZiID87W2o2llvuF4C7Fvt9GJisazSdMsSkjAq4WaMed9zn77nlkcy08ZfrPtOGAXyaxTDj0VjnuyD97EdJLz3g=="; }; }; "chloride-test-1.2.4" = { @@ -14080,6 +14107,15 @@ let sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; }; }; + "chokidar-3.5.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; + sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; + }; + }; "chownr-0.0.2" = { name = "chownr"; packageName = "chownr"; @@ -14206,13 +14242,13 @@ let sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; }; }; - "chunk-store-stream-4.1.1" = { + "chunk-store-stream-4.2.0" = { name = "chunk-store-stream"; packageName = "chunk-store-stream"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.1.1.tgz"; - sha512 = "2nVS+VLMCHNW+S1Y3bOlCtUL4ABPA4zeAcP8E/m15AAc+8fw1elEKIhs/Wg5EZNSfqIk24kUd9rvewmGNPehGQ=="; + url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.2.0.tgz"; + sha512 = "90iueoPoqT2isnmy1fyqwzgFy5FokuaxQuijOQG1VgC/6DaXRfeYN0da8iWENkzqElWhqLxo8pWc7pH9dmxlcA=="; }; }; "ci-info-1.6.0" = { @@ -14341,6 +14377,15 @@ let sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; + "clean-css-5.0.1" = { + name = "clean-css"; + packageName = "clean-css"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.0.1.tgz"; + sha512 = "F1zAGOowUCg8yxT0O4UR+nmbMauf3YwbiUS60CPxpzJU7ulpamGzQomFrJSK4w/HqHtMmQKSHJUNue+dQQYQdg=="; + }; + }; "clean-deep-3.4.0" = { name = "clean-deep"; packageName = "clean-deep"; @@ -14485,13 +14530,13 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cli-progress-3.8.2" = { + "cli-progress-3.9.0" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.2.tgz"; - sha512 = "qRwBxLldMSfxB+YGFgNRaj5vyyHe1yMpVeDL79c+7puGujdKJHQHydgqXDcrkvQgJ5U/d3lpf6vffSoVVUftVQ=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.9.0.tgz"; + sha512 = "g7rLWfhAo/7pF+a/STFH/xPyosaL1zgADhI0OM83hl3c7S43iGvJWEAV2QuDOnQ8i6EMBj/u4+NTd0d5L+4JfA=="; }; }; "cli-spinner-0.2.10" = { @@ -14773,15 +14818,6 @@ let sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; }; }; - "clone-0.1.19" = { - name = "clone"; - packageName = "clone"; - version = "0.1.19"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"; - sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85"; - }; - }; "clone-0.1.5" = { name = "clone"; packageName = "clone"; @@ -15070,13 +15106,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.16.0" = { + "codemaker-1.20.1" = { name = "codemaker"; packageName = "codemaker"; - version = "1.16.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.16.0.tgz"; - sha512 = "kC53r6ACRGYcSAKeOcbcUhWZYWynIuBIQ50oLOYUygShjrqF0NO303eSvOzT0Qxaz2TQWI2deUwJBMm3s8HoZg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.20.1.tgz"; + sha512 = "AhDdoC0jhSw8VhbHBH2WN8CDp8PZKnO0YMAlZXG9BRLJnu4ztOQkYuB8BWipNydRHS3Zj1LQX4lPtTQkJN4vWg=="; }; }; "codepage-1.4.0" = { @@ -15592,6 +15628,15 @@ let sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; }; }; + "commander-7.0.0" = { + name = "commander"; + packageName = "commander"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz"; + sha512 = "ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -16015,13 +16060,13 @@ let sha1 = "7890482bf5c71af6c5ca192be3136aed74428aad"; }; }; - "consola-2.15.0" = { + "consola-2.15.3" = { name = "consola"; packageName = "consola"; - version = "2.15.0"; + version = "2.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/consola/-/consola-2.15.0.tgz"; - sha512 = "vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ=="; + url = "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz"; + sha512 = "9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw=="; }; }; "console-browserify-1.1.0" = { @@ -16096,13 +16141,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.2.94" = { + "constructs-3.3.18" = { + name = "constructs"; + packageName = "constructs"; + version = "3.3.18"; + src = fetchurl { + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.18.tgz"; + sha512 = "aoFeZLctXI17AYApAc9Ilg/kTY3m7e29VbxeGnNiKvrsj9+UyC1setKozYPxtxr1dVC0UTUrOEYdP1rIAVGffQ=="; + }; + }; + "constructs-3.3.5" = { name = "constructs"; packageName = "constructs"; - version = "3.2.94"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.2.94.tgz"; - sha512 = "yK4FKT+hONiC0ebCM0Ln3xuLPF4WPyZSQ8Sl/ZOTTFUI+/csBBxGy7TkY2ZVTbOi7MCHUatZgW2ANsYRaaxoOQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.5.tgz"; + sha512 = "qicg+YQ/8ftntU+PtvB+faUmGMCPMJyQ+Vo1Y7z2QdlDVRW1YJ5XVS4Skk4WlOfaJ9r/dvlSinB9+Vaw3Yb2Ww=="; }; }; "consume-http-header-1.0.0" = { @@ -16457,13 +16511,13 @@ let sha512 = "8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow=="; }; }; - "copy-anything-2.0.1" = { + "copy-anything-2.0.3" = { name = "copy-anything"; packageName = "copy-anything"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz"; - sha512 = "lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g=="; + url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz"; + sha512 = "GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ=="; }; }; "copy-concurrently-1.0.5" = { @@ -16538,13 +16592,13 @@ let sha512 = "WxZRTnt5RHxSAB9urnHFUtVBcIe1YjR4sfwHLsxakNoKkFhcie3HrV5QmNBgRQ5DkxmanRN3VSx4OrPVsNmAaQ=="; }; }; - "cordova-fetch-3.0.0" = { + "cordova-fetch-3.0.1" = { name = "cordova-fetch"; packageName = "cordova-fetch"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.0.tgz"; - sha512 = "N6mB/1GD8BNclxnfO85E4/s46nEJjIxYeJYHRGi6MjofhigJ3NlGwTCslbTcq8IOYEh0RdoA0mS4W2jA5UcWeQ=="; + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.1.tgz"; + sha512 = "bxXk6H3FtGXpCtlO+XyXM4pa72azQomdurNeHbZai9eYBzA5vjyPnsgxsYcylLUc1wQFeR+XWQVfgJitx6ghEw=="; }; }; "cordova-lib-10.0.0" = { @@ -16583,22 +16637,22 @@ let sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; }; }; - "core-js-3.8.2" = { + "core-js-3.8.3" = { name = "core-js"; packageName = "core-js"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.8.2.tgz"; - sha512 = "FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz"; + sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q=="; }; }; - "core-js-compat-3.8.2" = { + "core-js-compat-3.8.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.2.tgz"; - sha512 = "LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz"; + sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog=="; }; }; "core-util-is-1.0.2" = { @@ -16610,13 +16664,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "core_d-2.0.0" = { + "core_d-3.0.0" = { name = "core_d"; packageName = "core_d"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/core_d/-/core_d-2.0.0.tgz"; - sha512 = "oIb3QJj/ayYNbg2WYTYM1h3d8XvKF/RBUFhNeVVOfXDskeQC43fypCwnvdGqgTK7rbJ/a8tvxeErCr8vJhJ4vA=="; + url = "https://registry.npmjs.org/core_d/-/core_d-3.0.0.tgz"; + sha512 = "6DM/spZ6j+Yha93TMdK+uz/ws82eDcYefPv2dKZBlMT5mFoJNG+zNPaqSpb5xFvrZh90KFXdSuau1Z+Jql2Tsg=="; }; }; "cors-2.8.5" = { @@ -16718,6 +16772,15 @@ let sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; }; }; + "cpu-percentage-1.0.3" = { + name = "cpu-percentage"; + packageName = "cpu-percentage"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cpu-percentage/-/cpu-percentage-1.0.3.tgz"; + sha1 = "868fd9092f439d1ef95f4a85e5fa4b9f07efc95c"; + }; + }; "cpy-8.1.1" = { name = "cpy"; packageName = "cpy"; @@ -16763,13 +16826,13 @@ let sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; }; }; - "crc32-stream-4.0.1" = { + "crc32-stream-4.0.2" = { name = "crc32-stream"; packageName = "crc32-stream"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.1.tgz"; - sha512 = "FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw=="; + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz"; + sha512 = "DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w=="; }; }; "create-ecdh-4.0.4" = { @@ -16817,13 +16880,13 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; - "create-torrent-4.4.2" = { + "create-torrent-4.5.0" = { name = "create-torrent"; packageName = "create-torrent"; - version = "4.4.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.4.2.tgz"; - sha512 = "FRxgYty6AF00xrYKMtpQ14ZJlst+i7mmUhcN4do7TTjktEntqAzfriaOIV6xk27t9GLTtraFnaTxsGgnyFA2eA=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.5.0.tgz"; + sha512 = "RvhI3/mMbvSGb+NbV2V1nax64fc47rRYXY8WJV47t4RfzM+P2p2zpAOYyBjKqz+CkBUexS9Mvgga4Rx53m+tyA=="; }; }; "cron-1.7.2" = { @@ -17438,6 +17501,15 @@ let sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }; }; + "culvert-0.1.2" = { + name = "culvert"; + packageName = "culvert"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/culvert/-/culvert-0.1.2.tgz"; + sha1 = "9502f5f0154a2d5a22a023e79f71cc936fa6ef6f"; + }; + }; "currently-unhandled-0.4.1" = { name = "currently-unhandled"; packageName = "currently-unhandled"; @@ -17546,13 +17618,13 @@ let sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="; }; }; - "d3-array-2.9.1" = { + "d3-array-2.11.0" = { name = "d3-array"; packageName = "d3-array"; - version = "2.9.1"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz"; - sha512 = "Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-2.11.0.tgz"; + sha512 = "26clcwmHQEdsLv34oNKq5Ia9tQ26Y/4HqS3dQzF42QBUqymZJ+9PORcN1G52bt37NsL2ABoX4lvyYZc+A9Y0zw=="; }; }; "d3-axis-1.0.12" = { @@ -18275,13 +18347,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.10.1" = { + "dayjs-1.10.4" = { name = "dayjs"; packageName = "dayjs"; - version = "1.10.1"; + version = "1.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.1.tgz"; - sha512 = "2xg7JrHQeLBQFkvTumLoy62x1siyeocc98QwjtURgvRqOPYmAkMUdmSjrOA+MlmL6QMQn5MUhDf6rNZNuPc1LQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz"; + sha512 = "RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw=="; }; }; "dayjs-1.8.36" = { @@ -18428,15 +18500,6 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "debug-4.2.0" = { - name = "debug"; - packageName = "debug"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; - }; - }; "debug-4.3.1" = { name = "debug"; packageName = "debug"; @@ -18509,6 +18572,15 @@ let sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; }; }; + "decamelize-5.0.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-5.0.0.tgz"; + sha512 = "U75DcT5hrio3KNtvdULAWnLiAPbFUC4191ldxMmj4FA/mRuBnmDwU0boNfPyFRhnan+Jm+haLeSn3P0afcBn4w=="; + }; + }; "decamelize-keys-1.1.0" = { name = "decamelize-keys"; packageName = "decamelize-keys"; @@ -18644,6 +18716,15 @@ let sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; }; }; + "dedent-js-1.0.1" = { + name = "dedent-js"; + packageName = "dedent-js"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dedent-js/-/dedent-js-1.0.1.tgz"; + sha1 = "bee5fb7c9e727d85dffa24590d10ec1ab1255305"; + }; + }; "deep-eql-3.0.1" = { name = "deep-eql"; packageName = "deep-eql"; @@ -18770,15 +18851,6 @@ let sha512 = "8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ=="; }; }; - "deepmerge-1.5.2" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; - sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; - }; - }; "deepmerge-2.1.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -18896,15 +18968,6 @@ let sha512 = "8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A=="; }; }; - "deferred-leveldown-0.2.0" = { - name = "deferred-leveldown"; - packageName = "deferred-leveldown"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz"; - sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; - }; - }; "deferred-leveldown-5.3.0" = { name = "deferred-leveldown"; packageName = "deferred-leveldown"; @@ -19022,13 +19085,13 @@ let sha512 = "WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag=="; }; }; - "delay-4.4.0" = { + "delay-4.4.1" = { name = "delay"; packageName = "delay"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/delay/-/delay-4.4.0.tgz"; - sha512 = "txgOrJu3OdtOfTiEOT2e76dJVfG/1dz2NZ4F0Pyt4UGZJryssMRp5vdM5wQoLwSOBNdrJv3F9PAhp/heqd7vrA=="; + url = "https://registry.npmjs.org/delay/-/delay-4.4.1.tgz"; + sha512 = "aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ=="; }; }; "delay-async-1.2.0" = { @@ -19076,15 +19139,6 @@ let sha1 = "3a36287f5034e699e7577901052c2e6c94251631"; }; }; - "denque-1.4.1" = { - name = "denque"; - packageName = "denque"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz"; - sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="; - }; - }; "denque-1.5.0" = { name = "denque"; packageName = "denque"; @@ -19472,6 +19526,15 @@ let sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; + "diff-5.0.0" = { + name = "diff"; + packageName = "diff"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"; + sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; + }; + }; "diff-match-patch-1.0.5" = { name = "diff-match-patch"; packageName = "diff-match-patch"; @@ -19760,15 +19823,6 @@ let sha512 = "cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg=="; }; }; - "dockerfile-ast-0.0.30" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.0.30"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.30.tgz"; - sha512 = "QOeP5NjbjoSLtnMz6jzBLsrKtywLEVPoCOAwA54cQpulyKb1gBnZ63tr6Amq8oVDvu5PXa3aifBVw+wcoCGHKg=="; - }; - }; "dockerfile-ast-0.1.0" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -19778,22 +19832,22 @@ let sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ=="; }; }; - "dockerfile-language-service-0.1.1" = { + "dockerfile-language-service-0.2.0" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.1.1.tgz"; - sha512 = "Lw4QlxJoy9F1559wxX+0xe5iSNK95Fbzx/YhdmAzfwgbPvdPzvFouIuuMyMPj/Q5JyFH1QAr7VeagOe24w0cqg=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.2.0.tgz"; + sha512 = "Y1JYIDF8F78kNDwyoQoeAPzptJRubIaMJ5q4mATmeDViGVV+mY4m6BjHqw5XtlkHEftljgqMNDvbUORUDIzTHg=="; }; }; - "dockerfile-utils-0.1.1" = { + "dockerfile-utils-0.2.0" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.1.1.tgz"; - sha512 = "ddAA8PCAcT4pBQ1AFRnPjetJ31/7BqNKLHQkZebNE0hBAiOr8SzrnIWvJUcBDHrVbASCVl1Ye37hbaTsUmYHsw=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.2.0.tgz"; + sha512 = "B8tEGwLd3w0dWALshXS0gkAwDYdqFKAKm9zIyp/nCFkx8+BOhbz5CiAFlVU+WRvv6kd6AP/YtYVOzSL54MJlmQ=="; }; }; "doctrine-2.1.0" = { @@ -20498,13 +20552,22 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.634" = { + "ejs-3.1.6" = { + name = "ejs"; + packageName = "ejs"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz"; + sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; + }; + }; + "electron-to-chromium-1.3.663" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.634"; + version = "1.3.663"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.634.tgz"; - sha512 = "QPrWNYeE/A0xRvl/QP3E0nkaEvYUvH3gM04ZWYtIa6QlSpEetRlRI1xvQ7hiMIySHHEV+mwDSX8Kj4YZY6ZQAw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.663.tgz"; + sha512 = "xkVkzHj6k3oRRGlmdgUCCLSLhtFYHDCTH7SeK+LJdJjnsLcrdbpr8EYmfMQhez3V/KPO5UScSpzQ0feYX6Qoyw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -20562,13 +20625,13 @@ let sha512 = "4Kp3AA94jC085IJox+qnvrZ3PudqTi4gQNvIoTZfJJ9IqkRuCoqP60vCVYlIg00c5aYusi5Wjh2bf0cHYt+6gQ=="; }; }; - "elliptic-6.5.3" = { + "elliptic-6.5.4" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz"; - sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"; + sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; }; }; "email-validator-2.0.4" = { @@ -20586,7 +20649,7 @@ let version = "1.0.1"; src = fetchurl { name = "emitter-1.0.1.tar.gz"; - url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; + url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; @@ -20599,6 +20662,15 @@ let sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ=="; }; }; + "emmet-2.3.0" = { + name = "emmet"; + packageName = "emmet"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emmet/-/emmet-2.3.0.tgz"; + sha512 = "/9jfXVKjODNt1QBpMkfUp2SlyYNfi0CcWLpiYCQmwnsLmME/To3lScw+Ip4V7Pasp0O0uYUU0Um0M9ewSIfx3g=="; + }; + }; "emoji-named-characters-1.0.2" = { name = "emoji-named-characters"; packageName = "emoji-named-characters"; @@ -20752,15 +20824,6 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "end-of-stream-1.4.1" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; - }; - }; "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -20842,6 +20905,15 @@ let sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA=="; }; }; + "engine.io-4.1.1" = { + name = "engine.io"; + packageName = "engine.io"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.1.tgz"; + sha512 = "t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w=="; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -20905,22 +20977,22 @@ let sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; }; }; - "enhanced-resolve-4.3.0" = { + "enhanced-resolve-4.5.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "4.3.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; - sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; + sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.4.1" = { + "enhanced-resolve-5.7.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.4.1"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.4.1.tgz"; - sha512 = "4GbyIMzYktTFoRSmkbgZ1LU+RXwf4AQ8Z+rSuuh1dC8plp0PPeaWvx6+G4hh4KnUJ48VoxKbNyA1QQQIUpXjYA=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz"; + sha512 = "6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw=="; }; }; "enquirer-2.3.6" = { @@ -20986,6 +21058,15 @@ let sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; + "entities-2.2.0" = { + name = "entities"; + packageName = "entities"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + }; "entity-decode-2.0.2" = { name = "entity-decode"; packageName = "entity-decode"; @@ -21004,13 +21085,13 @@ let sha512 = "AOiNZ3lmxrtva3r/roqaYDF+1PX2V+ouUzuGqJf7KNxyyYkuU+CsfFbbUeibQPdixxjI/lP6eDtvtkX1/wymJw=="; }; }; - "env-editor-0.4.1" = { + "env-editor-0.4.2" = { name = "env-editor"; packageName = "env-editor"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/env-editor/-/env-editor-0.4.1.tgz"; - sha512 = "suh+Vm00GnPQgXpmONTkcUT9LgBSL6sJrRnJxbykT0j+ONjzmIS+1U3ne467ArdZN/42/npp+GnhtwkLQ+vUjw=="; + url = "https://registry.npmjs.org/env-editor/-/env-editor-0.4.2.tgz"; + sha512 = "ObFo8v4rQJAE59M69QzwloxPZtd33TpYEIjtKD1rrFDcM1Gd7IkDxEBU+HriziN6HSHQnBJi8Dmy+JWkav5HKA=="; }; }; "env-paths-1.0.0" = { @@ -21058,6 +21139,15 @@ let sha512 = "46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA=="; }; }; + "envinfo-7.7.4" = { + name = "envinfo"; + packageName = "envinfo"; + version = "7.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.7.4.tgz"; + sha512 = "TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ=="; + }; + }; "eol-0.9.1" = { name = "eol"; packageName = "eol"; @@ -21166,22 +21256,31 @@ let sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g=="; }; }; - "es-abstract-1.18.0-next.1" = { + "es-abstract-1.18.0-next.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.18.0-next.1"; + version = "1.18.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; - sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz"; + sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw=="; }; }; - "es-get-iterator-1.1.1" = { + "es-get-iterator-1.1.2" = { name = "es-get-iterator"; packageName = "es-get-iterator"; - version = "1.1.1"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz"; + sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ=="; + }; + }; + "es-module-lexer-0.3.26" = { + name = "es-module-lexer"; + packageName = "es-module-lexer"; + version = "0.3.26"; src = fetchurl { - url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.1.tgz"; - sha512 = "qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw=="; + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.3.26.tgz"; + sha512 = "Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA=="; }; }; "es-to-primitive-1.2.1" = { @@ -21328,6 +21427,15 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; + "esbuild-0.8.44" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.8.44"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.44.tgz"; + sha512 = "m9yyBZMgWuAB7e7tA2g9L4PovoLa5Xb73+Yg9uBBR2w3Fe4P9/nxqj/HLrw1k/rjdjF1eX1kNJRytboqOtRCCQ=="; + }; + }; "esc-exit-2.0.2" = { name = "esc-exit"; packageName = "esc-exit"; @@ -21526,13 +21634,13 @@ let sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA=="; }; }; - "eslint-7.17.0" = { + "eslint-7.19.0" = { name = "eslint"; packageName = "eslint"; - version = "7.17.0"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz"; - sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.19.0.tgz"; + sha512 = "CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg=="; }; }; "eslint-plugin-no-unsanitized-3.1.4" = { @@ -21562,13 +21670,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.4.1" = { + "eslint-plugin-vue-7.5.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.4.1"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz"; - sha512 = "W/xPNHYIkGJphLUM2UIYYGKbRw3BcDoMIPY9lu1TTa2YLiZoxurddfnmOP+UOVywxb5vi438ejzwvKdZqydtIw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.5.0.tgz"; + sha512 = "QnMMTcyV8PLxBz7QQNAwISSEs6LYk2LJvGlxalXvpCtfKnqo7qcY0aZTIxPe8QOnHd7WCwiMZLOJzg6A03T0Gw=="; }; }; "eslint-scope-3.7.3" = { @@ -21760,13 +21868,13 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "esquery-1.3.1" = { + "esquery-1.4.0" = { name = "esquery"; packageName = "esquery"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; - sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; }; "esrecurse-4.3.0" = { @@ -22399,13 +22507,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.58" = { + "expo-pwa-0.0.64" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.58"; + version = "0.0.64"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.58.tgz"; - sha512 = "dbPKRQyr5vtpa8/fmBoRzNs1SYkTWosXvcJJhIfGVGvb8ZMPduruydczM+lavBjZmufdlOL4e8CWNXcr4NRz9g=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.64.tgz"; + sha512 = "pMZ1UP5ionvJYw5ny602Av8KKhLHiv3W0rWUTOU2LZpPe4GQn+saHJMh1dSNDBo9gQ/QZM3x//pFqnI8tFqE9A=="; }; }; "express-2.5.11" = { @@ -22498,13 +22606,13 @@ let sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; }; }; - "express-openapi-7.2.0" = { + "express-openapi-7.3.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.2.0.tgz"; - sha512 = "Zlz1qA5DA5vRj8UrWFNH5cA1js5g0VB5yRIR1cuxPGAclsU8q7Y6Dvx/BhQ10/OGYd8qwFk4mFvDYahSEQe7gw=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.3.0.tgz"; + sha512 = "SENL0+eC1P2NMXAZJr/xGTGlWw62pUbD49EkRKrVdCZO4M3dNLEfvPsdkDhvJvzL8YiFjrQ2C3hF77/RhVgC4w=="; }; }; "express-session-1.17.1" = { @@ -22534,6 +22642,15 @@ let sha1 = "f5fc2f9fa9e9a8578634f10e86ba5a4346b96f4f"; }; }; + "express-ws-2.0.0" = { + name = "express-ws"; + packageName = "express-ws"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-ws/-/express-ws-2.0.0.tgz"; + sha1 = "96d13fa41c8de8fa5dcbfa2dacace6f594272888"; + }; + }; "ext-1.4.0" = { name = "ext"; packageName = "ext"; @@ -22876,6 +22993,15 @@ let sha512 = "4WKW0AL5+WEqO0zWavAfYGY1qwLsBgE//DN4TTcVEN2UlINgkv9b3vm2iHicoenWKSX9mKWmGOsU/iI5IST7pQ=="; }; }; + "fast-equals-2.0.0" = { + name = "fast-equals"; + packageName = "fast-equals"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-equals/-/fast-equals-2.0.0.tgz"; + sha512 = "u6RBd8cSiLLxAiC04wVsLV6GBFDOXcTCgWkd3wEoFXgidPSoAJENqC9m7Jb2vewSvjBIfXV6icKeh3GTKfIaXA=="; + }; + }; "fast-glob-2.2.7" = { name = "fast-glob"; packageName = "fast-glob"; @@ -22885,13 +23011,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.4" = { + "fast-glob-3.2.5" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; - sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; + sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; }; }; "fast-json-parse-1.0.3" = { @@ -23011,6 +23137,15 @@ let sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; }; }; + "fastintcompression-0.0.4" = { + name = "fastintcompression"; + packageName = "fastintcompression"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fastintcompression/-/fastintcompression-0.0.4.tgz"; + sha512 = "sRtejNHcWjJl0Fr+gsbybbgOKKj0sQYvv7rA787EbeFu1fMpmzjHuBW8fLBImSZeqDuR++TZU2n60mRrpAUR9g=="; + }; + }; "fastparse-1.1.2" = { name = "fastparse"; packageName = "fastparse"; @@ -23020,13 +23155,13 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; - "fastq-1.10.0" = { + "fastq-1.10.1" = { name = "fastq"; packageName = "fastq"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz"; - sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz"; + sha512 = "AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA=="; }; }; "fault-1.0.4" = { @@ -23038,14 +23173,13 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; - "faunadb-git+https://github.com/fauna/faunadb-js.git#triage/bearer-to-basic" = { + "faunadb-4.0.3" = { name = "faunadb"; packageName = "faunadb"; - version = "4.0.0"; - src = fetchgit { - url = "https://github.com/fauna/faunadb-js.git"; - rev = "135256ed60a8043201085f18ed6fd2032cc9dd88"; - sha256 = "0c7dae0478258a6cc72621ea148471492616b8b03e79cf975aee9fdc3bd480a0"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/faunadb/-/faunadb-4.0.3.tgz"; + sha512 = "pfXX3pwyQQfsx+wO4u8m16gQyDPJRbpjMGk5fCzq0tCT/3mPyCVlc5zTorSdBWWmLFuResP9idFrWdqo+q2IEA=="; }; }; "faye-websocket-0.10.0" = { @@ -23084,13 +23218,13 @@ let sha1 = "10e85da38bfea7fc599341c296ee1d77266ee640"; }; }; - "fd-lock-1.1.1" = { + "fd-lock-1.2.0" = { name = "fd-lock"; packageName = "fd-lock"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fd-lock/-/fd-lock-1.1.1.tgz"; - sha512 = "Ng+IXbq6LPMDvvVb0Vr325NjqhPwqlLIvmf43ii7t3WQvo2sHU6V6jQY1cclflxPaPfvNUAuD5VdPuIO1sp50g=="; + url = "https://registry.npmjs.org/fd-lock/-/fd-lock-1.2.0.tgz"; + sha512 = "Lk/pKH2DldLpG4Yh/sOOY84k5VqNzxHPffGwf1+yYI+/qMXzTPp9KJMX+Wh6n4xqGSA1Mu7JPmaDArfJGw2O/A=="; }; }; "fd-read-stream-1.1.0" = { @@ -23345,13 +23479,13 @@ let sha512 = "hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="; }; }; - "filelist-1.0.1" = { + "filelist-1.0.2" = { name = "filelist"; packageName = "filelist"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz"; - sha512 = "8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ=="; + url = "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz"; + sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; }; }; "filename-regex-2.0.1" = { @@ -23453,6 +23587,15 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; + "filter-obj-1.1.0" = { + name = "filter-obj"; + packageName = "filter-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; + sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b"; + }; + }; "filter-obj-2.0.1" = { name = "filter-obj"; packageName = "filter-obj"; @@ -23786,13 +23929,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.1.0" = { + "flatted-3.1.1" = { name = "flatted"; packageName = "flatted"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz"; - sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; + sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; }; }; "flatten-0.0.1" = { @@ -23822,13 +23965,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.141.0" = { + "flow-parser-0.144.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.141.0"; + version = "0.144.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.141.0.tgz"; - sha512 = "WKdBiR9sDfkgEyPGhIgldUrVM08D57CgHLgd0FOXbhcVYXNfw+eHSApQ8SdcdQQoqrOvhlcVRB8lsn9bD5GQOw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.144.0.tgz"; + sha512 = "si2lCamPs0N1QcTiQY8p9RxvVsVGbx4rpkX6dcfUQ2OOvEg6Cya7LItlPqcx54Gtakdx1St6TseQlV8nafYW5g=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -23930,13 +24073,13 @@ let sha512 = "uPTT5I26ePMc6Xhjebu1aiaHAd7P3EqyE9SZB6B9ZIvXtMXhFYNk7iO1yzh1ZXp3aYzdYmrI9k8mSz9urZ9gNQ=="; }; }; - "flumeview-reduce-1.3.17" = { + "flumeview-reduce-1.4.0" = { name = "flumeview-reduce"; packageName = "flumeview-reduce"; - version = "1.3.17"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.17.tgz"; - sha512 = "Li09TntlRpN51GtFKllIh5nDdBcyDazvi5a/yvbdUCS9xAFb8OA6H6uu32W9gG+4GyvfUi9AsOyN8RQ8OcREQA=="; + url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.4.0.tgz"; + sha512 = "ShCMtY5YZl3icnUAWTfwzRXSGN1AUo4Isj1wTRLpMMNgM9p1T0gc6N+r1ajampf1GO19SkqrgZHdPPOaEitvhg=="; }; }; "flush-write-stream-1.1.1" = { @@ -23993,22 +24136,13 @@ let sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; }; }; - "follow-redirects-1.13.1" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz"; - sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="; - }; - }; - "follow-redirects-1.5.10" = { + "follow-redirects-1.13.2" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.5.10"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; - sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz"; + sha512 = "6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="; }; }; "font-awesome-filetypes-2.1.0" = { @@ -24254,13 +24388,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.9.3" = { + "fp-ts-2.9.5" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.9.3"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.3.tgz"; - sha512 = "NjzcHYgigcbPQ6yJ52zwgsVDwKz3vwy9sjbxyzcvfXQm+j1BGeOPRuzLKEwsLyE4Xut6gG1FXJtsU9/gUB7tXg=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.5.tgz"; + sha512 = "MiHrA5teO6t8zKArE3DdMPT/Db6v2GUt5yfWnhBTrrsVfeCJUUnV6sgFvjGNBKDmEMqVwRFkEePL7wPwqrLKKA=="; }; }; "fragment-cache-0.2.1" = { @@ -24371,13 +24505,13 @@ let sha512 = "KhjJmZAs2eqfhCb6PdPx4RcZtheGTz86tpTC5JTvqBn/xda+Nb+0C7dCyjOSN7T76H6a56LvH0SVXQMchLXDRw=="; }; }; - "fs-chunk-store-2.0.2" = { + "fs-chunk-store-2.0.3" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-2.0.2.tgz"; - sha512 = "4nSngo6KyoGguscb5sTxjcxOvtRiMxuQl4vFK9SnYYMjmy08Nm095ACoM3lxj1KmCuxO4JMnuo4EebMWHlagjQ=="; + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-2.0.3.tgz"; + sha512 = "qQi93nHX3880gtoQPt1hKQcuYBNVfCbMk8OVRDqR0cJ0riheELW25ry9yl7pII8E9gOAONTGKBD5N/zGHFSVQg=="; }; }; "fs-constants-1.0.0" = { @@ -24506,6 +24640,15 @@ let sha512 = "h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ=="; }; }; + "fs-extra-9.1.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; + }; + }; "fs-minipass-1.2.7" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -24632,13 +24775,13 @@ let sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA=="; }; }; - "fsevents-2.3.1" = { + "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz"; - sha512 = "YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; }; "fstream-0.1.31" = { @@ -24713,13 +24856,13 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "fuse.js-6.4.5" = { + "fuse.js-6.4.6" = { name = "fuse.js"; packageName = "fuse.js"; - version = "6.4.5"; + version = "6.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.5.tgz"; - sha512 = "AIHjOhexWVqs/jWqun6jTUfdXB3Bm1uShoirHvTZImD2kHEQZ1zOmoDEqIPs8N1LnnwXJeG0T+r9ilEeJzlaoA=="; + url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.6.tgz"; + sha512 = "/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw=="; }; }; "fuzzy-0.1.3" = { @@ -24749,15 +24892,6 @@ let sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; }; }; - "fwd-stream-1.0.4" = { - name = "fwd-stream"; - packageName = "fwd-stream"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fwd-stream/-/fwd-stream-1.0.4.tgz"; - sha1 = "ed281cabed46feecf921ee32dc4c50b372ac7cfa"; - }; - }; "fx-runner-1.0.13" = { name = "fx-runner"; packageName = "fx-runner"; @@ -24893,15 +25027,6 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; - "geoip-country-4.0.49" = { - name = "geoip-country"; - packageName = "geoip-country"; - version = "4.0.49"; - src = fetchurl { - url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.49.tgz"; - sha512 = "oeiRP6aiDBplorW2tl0Rm2k6iNlqrLI9Smn9lk4yBUSsMOqeUHqI7gXBKP59iMZqWq2emclX1IfJL665FX7btQ=="; - }; - }; "get-amd-module-type-3.0.0" = { name = "get-amd-module-type"; packageName = "get-amd-module-type"; @@ -24956,13 +25081,13 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; - "get-intrinsic-1.0.2" = { + "get-intrinsic-1.1.1" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz"; - sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -25244,6 +25369,15 @@ let sha512 = "PdNkH2snpXsKIzho6OWMZKEl+KZG6Zm+1ghQIDi0tEq1sz/S1tDjvNuYrX2ZpomalHAB89OUQim8O6vN+jesNQ=="; }; }; + "git-node-fs-1.0.0" = { + name = "git-node-fs"; + packageName = "git-node-fs"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-node-fs/-/git-node-fs-1.0.0.tgz"; + sha1 = "49b215e242ebe43aa4c7561bbba499521752080f"; + }; + }; "git-packidx-parser-1.0.0" = { name = "git-packidx-parser"; packageName = "git-packidx-parser"; @@ -25316,6 +25450,15 @@ let sha512 = "tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA=="; }; }; + "git-sha1-0.1.2" = { + name = "git-sha1"; + packageName = "git-sha1"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/git-sha1/-/git-sha1-0.1.2.tgz"; + sha1 = "599ac192b71875825e13a445f3a6e05118c2f745"; + }; + }; "git-spawned-stream-1.0.1" = { name = "git-spawned-stream"; packageName = "git-spawned-stream"; @@ -25343,22 +25486,22 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.4.0" = { + "git-url-parse-11.4.3" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.4.0"; + version = "11.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.0.tgz"; - sha512 = "KlIa5jvMYLjXMQXkqpFzobsyD/V2K5DRHl5OAf+6oDFPlPLxrGDVQlIdI63c4/Kt6kai4kALENSALlzTGST3GQ=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.3.tgz"; + sha512 = "LZTTk0nqJnKN48YRtOpR8H5SEfp1oM2tls90NuZmBxN95PnCvmuXGzqQ4QmVirBgKx2KPYfPGteX3/raWjKenQ=="; }; }; - "git-url-parse-11.4.3" = { + "git-url-parse-11.4.4" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.4.3"; + version = "11.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.3.tgz"; - sha512 = "LZTTk0nqJnKN48YRtOpR8H5SEfp1oM2tls90NuZmBxN95PnCvmuXGzqQ4QmVirBgKx2KPYfPGteX3/raWjKenQ=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.4.tgz"; + sha512 = "Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw=="; }; }; "gitconfiglocal-1.0.0" = { @@ -25631,13 +25774,22 @@ let sha512 = "MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ=="; }; }; + "global-dirs-3.0.0" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz"; + sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; + }; + }; "global-https://github.com/component/global/archive/v2.0.1.tar.gz" = { name = "global"; packageName = "global"; version = "2.0.1"; src = fetchurl { name = "global-2.0.1.tar.gz"; - url = https://codeload.github.com/component/global/tar.gz/v2.0.1; + url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; }; }; @@ -25776,6 +25928,15 @@ let sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; }; }; + "globby-11.0.2" = { + name = "globby"; + packageName = "globby"; + version = "11.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; + sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -25884,13 +26045,13 @@ let sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50"; }; }; - "google-auth-library-6.1.3" = { + "google-auth-library-6.1.6" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "6.1.3"; + version = "6.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.3.tgz"; - sha512 = "m9mwvY3GWbr7ZYEbl61isWmk+fvTmOt0YNUfPOUY2VH8K5pZlAIWJjxEi0PqR3OjMretyiQLI6GURMrPSwHQ2g=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.6.tgz"; + sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -25902,13 +26063,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.9.2" = { + "google-gax-2.10.2" = { name = "google-gax"; packageName = "google-gax"; - version = "2.9.2"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.9.2.tgz"; - sha512 = "Pve4osEzNKpBZqFXMfGKBbKCtgnHpUe5IQMh5Ou+Xtg8nLcba94L3gF0xgM5phMdGRRqJn0SMjcuEVmOYu7EBg=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.10.2.tgz"; + sha512 = "adECud3d5jsk24SvPkKQG3Kw1szpy4We0OqKfsdBHKWlSWhdY4hVQEOG7iBBp469Zm327fzz7NZz8BMLOYZJHg=="; }; }; "google-p12-pem-3.0.3" = { @@ -25920,13 +26081,13 @@ let sha512 = "wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA=="; }; }; - "goosig-0.9.0" = { + "goosig-0.10.0" = { name = "goosig"; packageName = "goosig"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/goosig/-/goosig-0.9.0.tgz"; - sha512 = "RaCpYN0eStJQszrudhwf42hd8j/Nod6iRiUU81cnHjI0f3s4vhmVkvpPE7QktF/EUA9tkoG2hrYYr9NJXvgefg=="; + url = "https://registry.npmjs.org/goosig/-/goosig-0.10.0.tgz"; + sha512 = "+BVVLfxmawAmGVjjJpXzu5LNcFIOfgXgP7kWEyc3qu/xn9RMqbPbNfYDdHBZKfZkDMIO7Q4vD790iNYQAXhoFA=="; }; }; "gossip-query-2.0.2" = { @@ -26064,13 +26225,13 @@ let sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.6" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; }; }; "graceful-readlink-1.0.1" = { @@ -26145,13 +26306,13 @@ let sha512 = "GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w=="; }; }; - "graphql-15.4.0" = { + "graphql-15.5.0" = { name = "graphql"; packageName = "graphql"; - version = "15.4.0"; + version = "15.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-15.4.0.tgz"; - sha512 = "EB3zgGchcabbsU9cFe1j+yxdzKQKAbGUWRb13DsrsMN1yyfmmIq+2+L5MqVWcDCE4V89R5AyUOi7sMOGxdsYtA=="; + url = "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz"; + sha512 = "OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA=="; }; }; "graphql-anywhere-4.2.7" = { @@ -26172,22 +26333,22 @@ let sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g=="; }; }; - "graphql-extensions-0.12.7" = { + "graphql-extensions-0.12.8" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.12.7"; + version = "0.12.8"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.7.tgz"; - sha512 = "yc9qOmEmWVZNkux9m0eCiHdtYSwNZRHkFhgfKfDn4u/gpsJolft1iyMUADnG/eytiRW0CGZFBpZjHkJhpginuQ=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.8.tgz"; + sha512 = "xjsSaB6yKt9jarFNNdivl2VOx52WySYhxPgf8Y16g6GKZyAzBoIFiwyGw5PJDlOSUa6cpmzn6o7z8fVMbSAbkg=="; }; }; - "graphql-subscriptions-1.1.0" = { + "graphql-subscriptions-1.2.0" = { name = "graphql-subscriptions"; packageName = "graphql-subscriptions"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.1.0.tgz"; - sha512 = "6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA=="; + url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.2.0.tgz"; + sha512 = "uXvp729fztqwa7HFUFaAqKwNMwwOfsvu4HwOu7/35Cd44bNrMPCn97mNGN0ybuuZE36CPXBTaW/4U/xyOS4D9w=="; }; }; "graphql-tag-2.11.0" = { @@ -26199,6 +26360,15 @@ let sha512 = "VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA=="; }; }; + "graphql-tag-2.12.0" = { + name = "graphql-tag"; + packageName = "graphql-tag"; + version = "2.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.0.tgz"; + sha512 = "iK040pFYpQpHfqF5UJOlYu2XEw6wx56aiyKJP1zqhxabGssqfbTIqz6U++cBwx/Izad0JNq6IsWvrL+p6d1GOA=="; + }; + }; "graphql-tools-3.0.0" = { name = "graphql-tools"; packageName = "graphql-tools"; @@ -26244,13 +26414,13 @@ let sha512 = "U2OiDI5VxYmzRKw0Z2dmfk0zkqMRaecH9Smh1U277gVgVe9Qn+18xqf4skwr4YJszGIh7iQDZ57+5ygOK9sM/Q=="; }; }; - "graphql-ws-3.1.0" = { + "graphql-ws-4.1.0" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "3.1.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-3.1.0.tgz"; - sha512 = "zbex3FSiFz0iRgfkzDNWpOY/sYWoX+iZ5XUhakaDwOh99HSuk8rPt5suuxdXUVzEg5TGQ9rwzNaz/+mTPtS0yg=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.1.0.tgz"; + sha512 = "DxJP1y2YzCqVLy7DrQN0iuR2l48vMOBWukX2d/J9aN2o5x9un5psIIq/2UFRh91UGARmfvPH86y1p4qbC1dITg=="; }; }; "gray-matter-2.1.1" = { @@ -26316,13 +26486,13 @@ let sha512 = "cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ=="; }; }; - "gtoken-5.1.0" = { + "gtoken-5.2.1" = { name = "gtoken"; packageName = "gtoken"; - version = "5.1.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/gtoken/-/gtoken-5.1.0.tgz"; - sha512 = "4d8N6Lk8TEAHl9vVoRVMh9BNOKWVgl2DdNtr3428O75r3QFrF/a5MMu851VmK0AA8+iSvbwRv69k5XnMLURGhg=="; + url = "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz"; + sha512 = "OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw=="; }; }; "gulp-4.0.2" = { @@ -27099,13 +27269,13 @@ let sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653"; }; }; - "highlight.js-10.5.0" = { + "highlight.js-10.6.0" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.5.0"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.5.0.tgz"; - sha512 = "xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.6.0.tgz"; + sha512 = "8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ=="; }; }; "highlight.js-8.2.0" = { @@ -27243,13 +27413,13 @@ let sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; }; }; - "hosted-git-info-3.0.7" = { + "hosted-git-info-3.0.8" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz"; - sha512 = "fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz"; + sha512 = "aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw=="; }; }; "hot-shots-6.8.7" = { @@ -27964,15 +28134,6 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; - "iconv-lite-0.5.2" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz"; - sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; - }; - }; "iconv-lite-0.6.2" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -28009,15 +28170,6 @@ let sha512 = "snvtAQRforYUI+C2+45L2LBJy/0/uQUffxv8/uwiS98fSUoXHVrFPClgzWZWxT0drwkLHJRm9inZcYzTR42GLA=="; }; }; - "idb-wrapper-1.7.2" = { - name = "idb-wrapper"; - packageName = "idb-wrapper"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/idb-wrapper/-/idb-wrapper-1.7.2.tgz"; - sha512 = "zfNREywMuf0NzDo9mVsL0yegjsirJxHpKHvWcyRozIqQy89g0a3U+oBPOCN4cc0oCiOuYgZHimzaW/R46G1Mpg=="; - }; - }; "idx-2.4.0" = { name = "idx"; packageName = "idx"; @@ -28207,15 +28359,6 @@ let sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; }; - "import-fresh-3.2.1" = { - name = "import-fresh"; - packageName = "import-fresh"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; - sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; - }; - }; "import-fresh-3.3.0" = { name = "import-fresh"; packageName = "import-fresh"; @@ -28450,15 +28593,6 @@ let sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; }; }; - "ini-1.3.6" = { - name = "ini"; - packageName = "ini"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.6.tgz"; - sha512 = "IZUoxEjNjubzrmvzZU4lKP7OnYmX72XRl3sqkfJhBKweKi5rnGi5+IUdlj/H1M+Ip5JQ1WzaDMOBRY90Ajc5jg=="; - }; - }; "ini-1.3.7" = { name = "ini"; packageName = "ini"; @@ -28819,13 +28953,22 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.2" = { + "internal-slot-1.0.3" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.2.tgz"; - sha512 = "2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + }; + }; + "internmap-1.0.0" = { + name = "internmap"; + packageName = "internmap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/internmap/-/internmap-1.0.0.tgz"; + sha512 = "SdoDWwNOTE2n4JWUsLn4KXZGuZPjPF9yyOGc8bnfWnBQh7BD/l80rzSznKc/r4Y0aQ7z3RTk9X+tV4tHBpu+dA=="; }; }; "interpret-1.1.0" = { @@ -28945,15 +29088,6 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; - "ip-address-6.4.0" = { - name = "ip-address"; - packageName = "ip-address"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ip-address/-/ip-address-6.4.0.tgz"; - sha512 = "c5uxc2WUTuRBVHT/6r4m7HIr/DfV0bF6DvLH3iZGSK8wp8iMwwZSgIq2do0asFf8q9ECug0SE+6+1ACMe4sorA=="; - }; - }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -28963,13 +29097,13 @@ let sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; }; }; - "ip-regex-4.2.0" = { + "ip-regex-4.3.0" = { name = "ip-regex"; packageName = "ip-regex"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.2.0.tgz"; - sha512 = "n5cDDeTWWRwK1EBoWwRti+8nP4NbytBBY0pldmnIkq6Z55KNFmWofh4rl9dPZpj+U/nVq7gweR3ylrvMt4YZ5A=="; + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz"; + sha512 = "B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q=="; }; }; "ip-set-1.0.2" = { @@ -29053,15 +29187,6 @@ let sha1 = "2ca9b033651111855412f16be5d77c62a458a766"; }; }; - "is-0.2.7" = { - name = "is"; - packageName = "is"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is/-/is-0.2.7.tgz"; - sha1 = "3b34a2c48f359972f35042849193ae7264b63562"; - }; - }; "is-3.3.0" = { name = "is"; packageName = "is"; @@ -29251,13 +29376,13 @@ let sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; - "is-callable-1.2.2" = { + "is-callable-1.2.3" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz"; - sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; + sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; }; }; "is-canonical-base64-1.1.1" = { @@ -29629,6 +29754,15 @@ let sha512 = "wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g=="; }; }; + "is-installed-globally-0.4.0" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; + sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; + }; + }; "is-interactive-1.0.0" = { name = "is-interactive"; packageName = "is-interactive"; @@ -29827,15 +29961,6 @@ let sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; }; - "is-object-0.1.2" = { - name = "is-object"; - packageName = "is-object"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz"; - sha1 = "00efbc08816c33cfc4ac8251d132e10dc65098d7"; - }; - }; "is-object-1.0.2" = { name = "is-object"; packageName = "is-object"; @@ -30043,13 +30168,13 @@ let sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; }; }; - "is-regex-1.1.1" = { + "is-regex-1.1.2" = { name = "is-regex"; packageName = "is-regex"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz"; - sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz"; + sha512 = "axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg=="; }; }; "is-regexp-1.0.0" = { @@ -30493,15 +30618,6 @@ let sha512 = "ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg=="; }; }; - "isbuffer-0.0.0" = { - name = "isbuffer"; - packageName = "isbuffer"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isbuffer/-/isbuffer-0.0.0.tgz"; - sha1 = "38c146d9df528b8bf9b0701c3d43cf12df3fc39b"; - }; - }; "isemail-3.2.0" = { name = "isemail"; packageName = "isemail"; @@ -30853,15 +30969,6 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jetifier-1.6.6" = { - name = "jetifier"; - packageName = "jetifier"; - version = "1.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jetifier/-/jetifier-1.6.6.tgz"; - sha512 = "JNAkmPeB/GS2tCRqUzRPsTOHpGDah7xP18vGJfIjZC+W2sxEHbxgJxetIjIqhjQ3yYbYNEELkM/spKLtwoOSUQ=="; - }; - }; "jetpack-id-1.0.0" = { name = "jetpack-id"; packageName = "jetpack-id"; @@ -30880,6 +30987,15 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; + "jitdb-2.0.7" = { + name = "jitdb"; + packageName = "jitdb"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/jitdb/-/jitdb-2.0.7.tgz"; + sha512 = "Ymkv6cQg6NUPXu6890NY4/xWgn08+YYz4gy9VMerzgC1jx5L38ggzfz6m2ylm0COoHE4Ni5QlxO43+lJoTGPuw=="; + }; + }; "jju-1.4.0" = { name = "jju"; packageName = "jju"; @@ -30952,13 +31068,13 @@ let sha512 = "Apz3AqpJhToFlo70mwnlbVyqhJRagzhNKKp84ZMeTqe/Ay9oIno8unm7eFepdlR8m8wz/9JXJQxUjK/3Ku/cpg=="; }; }; - "jpeg-js-0.4.2" = { + "jpeg-js-0.4.3" = { name = "jpeg-js"; packageName = "jpeg-js"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.2.tgz"; - sha512 = "+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw=="; + url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz"; + sha512 = "ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q=="; }; }; "jpeg-turbo-0.4.0" = { @@ -30988,13 +31104,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.20.1" = { + "jquery.terminal-2.21.0" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.20.1"; + version = "2.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.1.tgz"; - sha512 = "XDXH/psm0BquAmQEwomn1g9lYBGS/P6laRgWC/gADi6eJjEBWeyuiP9F5nzoEVhEa2VDnEYbvfm/MBA5DcrvdA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.21.0.tgz"; + sha512 = "Cd2uediwjcWaKbag/+WtF25coudkPLnH7RSg8oKH80BsUiPi/3aQIVBTKVB7Gw3viGwN6VV3G3TsuvKBqPrKTg=="; }; }; "js-base64-2.6.4" = { @@ -31006,13 +31122,22 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; - "js-beautify-1.13.0" = { + "js-beautify-1.13.5" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.13.0"; + version = "1.13.5"; + src = fetchurl { + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.5.tgz"; + sha512 = "MsXlH6Z/BiRYSkSRW3clNDqDjSpiSNOiG8xYVUBXt4k0LnGvDhlTGOlHX1VFtAdoLmtwjxMG5qiWKy/g+Ipv5w=="; + }; + }; + "js-git-0.7.8" = { + name = "js-git"; + packageName = "js-git"; + version = "0.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz"; - sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA=="; + url = "https://registry.npmjs.org/js-git/-/js-git-0.7.8.tgz"; + sha1 = "52fa655ab61877d6f1079efc6534b554f31e5444"; }; }; "js-message-1.0.7" = { @@ -31249,49 +31374,58 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "jsii-1.16.0" = { + "jsesc-3.0.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz"; + sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; + }; + }; + "jsii-1.20.1" = { name = "jsii"; packageName = "jsii"; - version = "1.16.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.16.0.tgz"; - sha512 = "8cgroyD6LOlFUlXUMAmjtUhzgyF3oQpVVpIdDzqcn2dNgs7iDnZN/Wo27MfZj8usbIBLLK3DYv7DSf+0/H0yWA=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.20.1.tgz"; + sha512 = "e4LS9u4QhhsqDN/JlK7JHDhYXhg3fiw+nq1xU5EeAtHQJvmM7CXTXhgDT9FjtnkWbnnjCOd0hgLcE8yIIZ8Lkw=="; }; }; - "jsii-pacmak-1.16.0" = { + "jsii-pacmak-1.20.1" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.16.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.16.0.tgz"; - sha512 = "fjNiW8CliOO/GTzbhdA3kJGBvG1PDh2suQKfsUdh2sD0HSRmQPSpVydSmK0pfav7PD6OOfXsWvWI6WlKzNY0pg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.20.1.tgz"; + sha512 = "mNViMzB+wqDKowjmcOMa4qLmkhZ4GAs2wOjNiHcWTN9ZtdyjG5BoRgJrKChlRYQfjRuE+EmqiHpZyH8IzPo8SQ=="; }; }; - "jsii-reflect-1.16.0" = { + "jsii-reflect-1.20.1" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.16.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.16.0.tgz"; - sha512 = "1zxZwni5S9WUQrNJJA+fVVkd1s54u6fdxjuiHpkZUvxkcPUnsuurL8KWImMEvbdz5ykGHEmnjMOOiyRh/XEc2Q=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.20.1.tgz"; + sha512 = "TkimkYu25H6YtfKRz7D/ZXbquXbhylS60TxgSPZC85iItCpZMwTlbIdvnpBKasx8e7MtJO6xYoAHEYHRhs8djQ=="; }; }; - "jsii-rosetta-1.16.0" = { + "jsii-rosetta-1.20.1" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.16.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.16.0.tgz"; - sha512 = "1FFGV+JmwyljCNjc9bkW40MIQXvPgNxq+V3zx8/0+FM51S/0O5EvTa/413LX8fzB8sWH0G42NqFa+8k3k9s2hw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.20.1.tgz"; + sha512 = "3F01+B8zahWD4GhTMWPzlaGhuGvdPdYyIdhIe1bkHCYJuL1ttcf+ulCxVeF4qkBAxB2+/cfHBvEMHfSMoYCISA=="; }; }; - "jsii-srcmak-0.1.180" = { + "jsii-srcmak-0.1.222" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.180"; + version = "0.1.222"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.180.tgz"; - sha512 = "U9CmoEM6A7ZhIT66N8r9flPKUsNnkCu5iWkzH9k6sdNwbiEC5KT4MdJUfJ42L1AbX1BXwhmQtFyj7QvKdGI44g=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.222.tgz"; + sha512 = "OLeezlo5ag/GoW+7YmiYVfE8zItDmV+rFcovlfYQCjCnksg6nX/e0t1mXOeLmCSetUNnu0DNrzwuqiO4hhgODQ=="; }; }; "json-bigint-0.2.3" = { @@ -31573,13 +31707,13 @@ let sha512 = "W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ=="; }; }; - "json2jsii-0.1.172" = { + "json2jsii-0.1.188" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.172"; + version = "0.1.188"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.172.tgz"; - sha512 = "X78nchCnnN0M3x6byBMhR9X5fz5BETDxFmAE149WUpMn0Dh6Dg3c7H9FbQkRV1MVaqC0sLJHGIeO++hfgYpa7w=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.188.tgz"; + sha512 = "XeUcBQl0rngTFmiSIx0XNW+g0QgAJcqwsUYzvGcDPPSvPngIGmJ/X6d0UH/nDmSVyEilYyKnVP7iYh3y9by9fA=="; }; }; "json3-3.2.6" = { @@ -31618,6 +31752,15 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; + "json5-2.2.0" = { + name = "json5"; + packageName = "json5"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; + }; + }; "json5-relaxed-0.5.4" = { name = "json5-relaxed"; packageName = "json5-relaxed"; @@ -31870,13 +32013,13 @@ let sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; }; }; - "jszip-3.5.0" = { + "jszip-3.6.0" = { name = "jszip"; packageName = "jszip"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz"; - sha512 = "WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz"; + sha512 = "jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ=="; }; }; "junk-3.1.0" = { @@ -31996,13 +32139,13 @@ let sha512 = "YvDpmY3waI999h1zZoW1rJ04fZrgZ+5PAlVmvwDHT6YO/Q1AOhdel07xsKy9eAvJjQ9xZV1wz3rXKqEfaWvlcQ=="; }; }; - "k-bucket-5.0.0" = { + "k-bucket-5.1.0" = { name = "k-bucket"; packageName = "k-bucket"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-5.0.0.tgz"; - sha512 = "r/q+wV/Kde62/tk+rqyttEJn6h0jR7x+incdMVSYTqK73zVxVrzJa70kJL49cIKen8XjIgUZKSvk8ktnrQbK4w=="; + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-5.1.0.tgz"; + sha512 = "Fac7iINEovXIWU20GPnOMLUbjctiS+cnmyjC4zAUgvs3XPf1vo9akfCHkigftSic/jiKqKl+KA3a/vFcJbHyCg=="; }; }; "k-rpc-3.7.0" = { @@ -32204,13 +32347,13 @@ let sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; }; }; - "khroma-1.1.1" = { + "khroma-1.2.0" = { name = "khroma"; packageName = "khroma"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/khroma/-/khroma-1.1.1.tgz"; - sha512 = "p7SYAiFisFFmLHHCqYBNwmfTrVIlWjUq+Pw81lDvnpaXOj2sR/xszTG4873AeaEO1kYQ50Z1c9CIrtQa6bdNdA=="; + url = "https://registry.npmjs.org/khroma/-/khroma-1.2.0.tgz"; + sha512 = "DlKk5y243dujy8fOH02aRnnewLfiHJV0s8aXaVrCohgBf3s7fEAn6gc6LLQ21agODlFZS8ufrn+juu70uCA9Tw=="; }; }; "killable-1.0.1" = { @@ -32312,13 +32455,13 @@ let sha512 = "wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q=="; }; }; - "known-css-properties-0.20.0" = { + "known-css-properties-0.21.0" = { name = "known-css-properties"; packageName = "known-css-properties"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.20.0.tgz"; - sha512 = "URvsjaA9ypfreqJ2/ylDr5MUERhJZ+DhguoWRr2xgS5C7aGCalXo+ewL+GixgKBfhT2vuL02nbIgNGqVWgTOYw=="; + url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz"; + sha512 = "sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw=="; }; }; "known-css-properties-0.5.0" = { @@ -32627,15 +32770,6 @@ let sha512 = "psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw=="; }; }; - "level-blobs-0.1.7" = { - name = "level-blobs"; - packageName = "level-blobs"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/level-blobs/-/level-blobs-0.1.7.tgz"; - sha1 = "9ab9b97bb99f1edbf9f78a3433e21ed56386bdaf"; - }; - }; "level-codec-6.2.0" = { name = "level-codec"; packageName = "level-codec"; @@ -32672,42 +32806,6 @@ let sha512 = "UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw=="; }; }; - "level-filesystem-1.2.0" = { - name = "level-filesystem"; - packageName = "level-filesystem"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-filesystem/-/level-filesystem-1.2.0.tgz"; - sha1 = "a00aca9919c4a4dfafdca6a8108d225aadff63b3"; - }; - }; - "level-fix-range-1.0.2" = { - name = "level-fix-range"; - packageName = "level-fix-range"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/level-fix-range/-/level-fix-range-1.0.2.tgz"; - sha1 = "bf15b915ae36d8470c821e883ddf79cd16420828"; - }; - }; - "level-fix-range-2.0.0" = { - name = "level-fix-range"; - packageName = "level-fix-range"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-fix-range/-/level-fix-range-2.0.0.tgz"; - sha1 = "c417d62159442151a19d9a2367868f1724c2d548"; - }; - }; - "level-hooks-4.5.0" = { - name = "level-hooks"; - packageName = "level-hooks"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-hooks/-/level-hooks-4.5.0.tgz"; - sha1 = "1b9ae61922930f3305d1a61fc4d83c8102c0dd93"; - }; - }; "level-iterator-stream-4.0.2" = { name = "level-iterator-stream"; packageName = "level-iterator-stream"; @@ -32717,15 +32815,6 @@ let sha512 = "ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q=="; }; }; - "level-js-2.2.4" = { - name = "level-js"; - packageName = "level-js"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/level-js/-/level-js-2.2.4.tgz"; - sha1 = "bc055f4180635d4489b561c9486fa370e8c11697"; - }; - }; "level-js-4.0.2" = { name = "level-js"; packageName = "level-js"; @@ -32753,15 +32842,6 @@ let sha512 = "HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ=="; }; }; - "level-peek-1.0.6" = { - name = "level-peek"; - packageName = "level-peek"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/level-peek/-/level-peek-1.0.6.tgz"; - sha1 = "bec51c72a82ee464d336434c7c876c3fcbcce77f"; - }; - }; "level-post-1.0.7" = { name = "level-post"; packageName = "level-post"; @@ -32771,15 +32851,6 @@ let sha512 = "PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew=="; }; }; - "level-sublevel-5.2.3" = { - name = "level-sublevel"; - packageName = "level-sublevel"; - version = "5.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-5.2.3.tgz"; - sha1 = "744c12c72d2e72be78dde3b9b5cd84d62191413a"; - }; - }; "level-supports-1.0.1" = { name = "level-supports"; packageName = "level-supports"; @@ -32798,15 +32869,6 @@ let sha512 = "iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ=="; }; }; - "levelup-0.18.6" = { - name = "levelup"; - packageName = "levelup"; - version = "0.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz"; - sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb"; - }; - }; "levelup-4.4.0" = { name = "levelup"; packageName = "levelup"; @@ -32888,22 +32950,22 @@ let sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; }; }; - "libsodium-0.7.8" = { + "libsodium-0.7.9" = { name = "libsodium"; packageName = "libsodium"; - version = "0.7.8"; + version = "0.7.9"; src = fetchurl { - url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.8.tgz"; - sha512 = "/Qc+APf0jbeWSaeEruH0L1/tbbT+sbf884ZL0/zV/0JXaDPBzYkKbyb/wmxMHgAHzm3t6gqe7bOOXAVwfqVikQ=="; + url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.9.tgz"; + sha512 = "gfeADtR4D/CM0oRUviKBViMGXZDgnFdMKMzHsvBdqLBHd9ySi6EtYnmuhHVDDYgYpAO8eU8hEY+F8vIUAPh08A=="; }; }; - "libsodium-wrappers-0.7.8" = { + "libsodium-wrappers-0.7.9" = { name = "libsodium-wrappers"; packageName = "libsodium-wrappers"; - version = "0.7.8"; + version = "0.7.9"; src = fetchurl { - url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.8.tgz"; - sha512 = "PDhPWXBqd/SaqAFUBgH2Ux7b3VEEJgyD6BQB+VdNFJb9PbExGr/T/myc/MBoSvl8qLzfm0W0IVByOQS5L1MrCg=="; + url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz"; + sha512 = "9HaAeBGk1nKTRFRHkt7nzxqCvnkWTjn1pdjKgcUnZxj0FyOP4CnhgFhMdrFfgNsukijBGyBLpP2m2uKT1vuWhQ=="; }; }; "lie-3.3.0" = { @@ -33140,13 +33202,13 @@ let sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; }; }; - "loader-runner-4.1.0" = { + "loader-runner-4.2.0" = { name = "loader-runner"; packageName = "loader-runner"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.1.0.tgz"; - sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA=="; + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz"; + sha512 = "92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="; }; }; "loader-utils-1.4.0" = { @@ -33221,15 +33283,6 @@ let sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; }; - "lock-0.1.4" = { - name = "lock"; - packageName = "lock"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lock/-/lock-0.1.4.tgz"; - sha1 = "fec7deaef17e7c3a0a55e1da042803e25d91745d"; - }; - }; "locks-0.2.2" = { name = "locks"; packageName = "locks"; @@ -33284,15 +33337,6 @@ let sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; }; }; - "lodash-4.17.15" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.15"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; - }; - }; "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; @@ -33743,6 +33787,15 @@ let sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; + "lodash.constant-3.0.0" = { + name = "lodash.constant"; + packageName = "lodash.constant"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.constant/-/lodash.constant-3.0.0.tgz"; + sha1 = "bfe05cce7e515b3128925d6362138420bd624910"; + }; + }; "lodash.debounce-4.0.8" = { name = "lodash.debounce"; packageName = "lodash.debounce"; @@ -33815,15 +33868,6 @@ let sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; - "lodash.find-4.6.0" = { - name = "lodash.find"; - packageName = "lodash.find"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz"; - sha1 = "cb0704d47ab71789ffa0de8b97dd926fb88b13b1"; - }; - }; "lodash.findkey-4.6.0" = { name = "lodash.findkey"; packageName = "lodash.findkey"; @@ -33923,6 +33967,15 @@ let sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; }; }; + "lodash.has-4.5.2" = { + name = "lodash.has"; + packageName = "lodash.has"; + version = "4.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz"; + sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; + }; + }; "lodash.identity-2.4.1" = { name = "lodash.identity"; packageName = "lodash.identity"; @@ -34166,6 +34219,15 @@ let sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; }; }; + "lodash.keys-4.2.0" = { + name = "lodash.keys"; + packageName = "lodash.keys"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"; + sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"; + }; + }; "lodash.map-4.6.0" = { name = "lodash.map"; packageName = "lodash.map"; @@ -34175,15 +34237,6 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; - "lodash.max-4.0.1" = { - name = "lodash.max"; - packageName = "lodash.max"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.max/-/lodash.max-4.0.1.tgz"; - sha1 = "8735566c618b35a9f760520b487ae79658af136a"; - }; - }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -34328,6 +34381,15 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; + "lodash.size-4.2.0" = { + name = "lodash.size"; + packageName = "lodash.size"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.size/-/lodash.size-4.2.0.tgz"; + sha1 = "71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86"; + }; + }; "lodash.snakecase-4.1.1" = { name = "lodash.snakecase"; packageName = "lodash.snakecase"; @@ -34481,6 +34543,15 @@ let sha1 = "abf514436b3cb705001627978cbcf30b1280eea4"; }; }; + "lodash.values-4.3.0" = { + name = "lodash.values"; + packageName = "lodash.values"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz"; + sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"; + }; + }; "lodash.xorby-4.7.0" = { name = "lodash.xorby"; packageName = "lodash.xorby"; @@ -34598,15 +34669,6 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "logfmt-1.3.2" = { - name = "logfmt"; - packageName = "logfmt"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/logfmt/-/logfmt-1.3.2.tgz"; - sha512 = "U0lelcaGWEfEITZQXs8y5HrJp2xa0BJ+KDfkkLJRmuKbQIEVGNv145FbaNekY4ZYHJSBBx8NLJitaPtRqLEkxQ=="; - }; - }; "logform-2.2.0" = { name = "logform"; packageName = "logform"; @@ -34616,15 +34678,6 @@ let sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; - "logkitty-0.7.1" = { - name = "logkitty"; - packageName = "logkitty"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/logkitty/-/logkitty-0.7.1.tgz"; - sha512 = "/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ=="; - }; - }; "loglevel-1.7.1" = { name = "loglevel"; packageName = "loglevel"; @@ -35147,13 +35200,13 @@ let sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; }; }; - "make-fetch-happen-8.0.12" = { + "make-fetch-happen-8.0.14" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "8.0.12"; + version = "8.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.12.tgz"; - sha512 = "cBD7yM72ltWEV+xlLlbimnh5qHwr+thAb/cZLiaZhicVVPVN63BikBvL5OR68+8+z2fvBOgck628vGJ2ulgF6g=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz"; + sha512 = "EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ=="; }; }; "make-iterator-1.0.1" = { @@ -35543,13 +35596,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.2.7" = { + "marked-1.2.9" = { name = "marked"; packageName = "marked"; - version = "1.2.7"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz"; - sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.9.tgz"; + sha512 = "H8lIX2SvyitGX+TRdtS06m1jHMijKN/XjfH6Ooii9fvxMlh8QdqBfBDkGUpMWH2kQNrtixjzYUa3SH8ROTgRRw=="; }; }; "marked-terminal-3.3.0" = { @@ -35795,22 +35848,22 @@ let sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; }; }; - "mdast-util-from-markdown-0.8.4" = { + "mdast-util-from-markdown-0.8.5" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz"; - sha512 = "jj891B5pV2r63n2kBTFh8cRI2uR9LQHsXG1zSDqfhXkIlDzrTcIlbB5+5aaYEkl8vOPIOPLf8VT7Ere1wWTMdw=="; + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz"; + sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; }; }; - "mdast-util-to-markdown-0.6.2" = { + "mdast-util-to-markdown-0.6.5" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; - version = "0.6.2"; + version = "0.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.2.tgz"; - sha512 = "iRczns6WMvu0hUw02LXsPDJshBIwtUPbvHBWo19IQeU0YqmzlA8Pd30U8V7uiI0VPkxzS7A/NXBXH6u+HS87Zg=="; + url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz"; + sha512 = "XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ=="; }; }; "mdast-util-to-nlcst-4.0.1" = { @@ -35957,6 +36010,15 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; + "mem-8.0.0" = { + name = "mem"; + packageName = "mem"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-8.0.0.tgz"; + sha512 = "qrcJOe6uD+EW8Wrci1Vdiua/15Xw3n/QnaNXE7varnB6InxSk7nu3/i5jfy3S6kWxr8WYJ6R1o0afMUtvorTsA=="; + }; + }; "mem-fs-1.2.0" = { name = "mem-fs"; packageName = "mem-fs"; @@ -36011,13 +36073,13 @@ let sha1 = "9d7028a6f266deb733510bb7dbba5f51878c561e"; }; }; - "memoizee-0.4.14" = { + "memoizee-0.4.15" = { name = "memoizee"; packageName = "memoizee"; - version = "0.4.14"; + version = "0.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz"; - sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg=="; + url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz"; + sha512 = "UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ=="; }; }; "memory-cache-0.2.0" = { @@ -36029,13 +36091,13 @@ let sha1 = "7890b01d52c00c8ebc9d533e1f8eb17e3034871a"; }; }; - "memory-chunk-store-1.3.0" = { + "memory-chunk-store-1.3.2" = { name = "memory-chunk-store"; packageName = "memory-chunk-store"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.0.tgz"; - sha512 = "6LsOpHKKhxYrLhHmOJdBCUtSO7op5rUs1pag0fhjHo0QiXRyna0bwYf4EmQuL7InUeF2J7dUMPr6VMogRyf9NA=="; + url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.2.tgz"; + sha512 = "EBcbwpdQlzT5aNV0FTT+RAfh1cGEssjiCcRGcTk57mKsnZlRMOtH4Cfk/AqQnkz8xP2dUF+/lgpmErSGwwE1FA=="; }; }; "memory-fs-0.3.0" = { @@ -36155,13 +36217,22 @@ let sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; }; }; - "meow-8.1.0" = { + "meow-8.1.2" = { name = "meow"; packageName = "meow"; - version = "8.1.0"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-8.1.0.tgz"; - sha512 = "fNWkgM1UVMey2kf24yLiccxLihc5W+6zVus3/N0b+VfnJgxV99E9u04X6NAiKdg6ED7DAQBX5sy36NM0QJZkWA=="; + url = "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz"; + sha512 = "r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q=="; + }; + }; + "meow-9.0.0" = { + name = "meow"; + packageName = "meow"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz"; + sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ=="; }; }; "merge-1.2.1" = { @@ -36236,13 +36307,13 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; - "mermaid-8.8.4" = { + "mermaid-8.9.0" = { name = "mermaid"; packageName = "mermaid"; - version = "8.8.4"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.8.4.tgz"; - sha512 = "YPn35uEAIrOcsDPjCiKNXXBdO1Aoazsv2zTZjG4+oXa7+tTVUb5sI81NqaTYa47RnoH9Vl4waLlEEJfB8KM9VA=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.9.0.tgz"; + sha512 = "J582tyE1vkdNu4BGgfwXnFo4Mu6jpuc4uK96mIenavaak9kr4T5gaMmYCo/7edwq/vTBkx/soZ5LcJo5WXZ1BQ=="; }; }; "mersenne-0.0.4" = { @@ -36380,6 +36451,15 @@ let sha512 = "COjNutiFgnDHXZEIM/jYuZPwq2h8zMUeScf6Sh6so98a+REqdlpaNS7Cb2ffGfK5I+xfgoA3Rx49NGuNJTJq3w=="; }; }; + "micro-memoize-4.0.9" = { + name = "micro-memoize"; + packageName = "micro-memoize"; + version = "4.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/micro-memoize/-/micro-memoize-4.0.9.tgz"; + sha512 = "Z2uZi/IUMGQDCXASdujXRqrXXEwSY0XffUrAOllhqzQI3wpUyZbiZTiE2JuYC0HSG2G7DbCS5jZmsEKEGZuemg=="; + }; + }; "microbuffer-1.0.0" = { name = "microbuffer"; packageName = "microbuffer"; @@ -36407,13 +36487,13 @@ let sha512 = "jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g=="; }; }; - "micromark-2.11.2" = { + "micromark-2.11.4" = { name = "micromark"; packageName = "micromark"; - version = "2.11.2"; + version = "2.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromark/-/micromark-2.11.2.tgz"; - sha512 = "IXuP76p2uj8uMg4FQc1cRE7lPCLsfAXuEfdjtdO55VRiFO1asrCSQ5g43NmPqFtRwzEnEhafRVzn2jg0UiKArQ=="; + url = "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz"; + sha512 = "+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA=="; }; }; "micromatch-2.3.11" = { @@ -36515,22 +36595,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-2.4.6" = { + "mime-2.4.7" = { name = "mime"; packageName = "mime"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz"; - sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; + url = "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz"; + sha512 = "dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA=="; }; }; - "mime-2.4.7" = { + "mime-2.5.0" = { name = "mime"; packageName = "mime"; - version = "2.4.7"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz"; - sha512 = "dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA=="; + url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz"; + sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag=="; }; }; "mime-db-1.33.0" = { @@ -36839,13 +36919,13 @@ let sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; }; }; - "minipass-fetch-1.3.2" = { + "minipass-fetch-1.3.3" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.2.tgz"; - sha512 = "/i4fX1ss+Dtwyk++OsAI6SEV+eE1dvI6W+0hORdjfruQ7VD5uYTetJIHcEMjWiEiszWjn2aAtP1CB/Q4KfeoYA=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.3.tgz"; + sha512 = "akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ=="; }; }; "minipass-flush-1.0.5" = { @@ -37046,31 +37126,31 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-6.0.4" = { + "mobx-6.1.6" = { name = "mobx"; packageName = "mobx"; - version = "6.0.4"; + version = "6.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.0.4.tgz"; - sha512 = "wT2QJT9tW19VSHo9x7RPKU3z/I2Ps6wUS8Kb1OO+kzmg7UY3n4AkcaYG6jq95Lp1R9ohjC/NGYuT2PtuvBjhFg=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.1.6.tgz"; + sha512 = "3by0Avodad/3cdPAuJuj8jWXhe1YByHKaEkonD9yOdcMoMuot2jrjlSXmQPhR1bJpNHfSsOx122tM9Pv3IzFWA=="; }; }; - "mobx-react-7.0.5" = { + "mobx-react-7.1.0" = { name = "mobx-react"; packageName = "mobx-react"; - version = "7.0.5"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.0.5.tgz"; - sha512 = "WmHl3Ni30ujVcOOnllmGmyccsbfFCKtAwpkIwncwxhgLcvXcE0Wa9lGJIhoqQdTJzGr0AJqGzMVAdwNc3Fj2DQ=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.1.0.tgz"; + sha512 = "DxvA6VXmnZ+N9f/UTtolWtdRnAAQY2iHWTSPLktfpj8NKlXUe4dabBAjuXrBcZUM8GjLWnxD1ZEjssXq1M0RAw=="; }; }; - "mobx-react-lite-3.1.6" = { + "mobx-react-lite-3.2.0" = { name = "mobx-react-lite"; packageName = "mobx-react-lite"; - version = "3.1.6"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.1.6.tgz"; - sha512 = "MM3x9BLt5nC7iE/ILA5n2+hfrplEKYbFjqROEuGkzBdZP/KD+Z44+2gseczRrTG0xFuiPWfEzgT68+6/zqOiEw=="; + url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.2.0.tgz"; + sha512 = "q5+UHIqYCOpBoFm/PElDuOhbcatvTllgRp3M1s+Hp5j0Z6XNgDbgqxawJ0ZAUEyKM8X1zs70PCuhAIzX1f4Q/g=="; }; }; "mocha-2.5.3" = { @@ -37091,13 +37171,13 @@ let sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; }; }; - "mocha-8.2.1" = { + "mocha-8.3.0" = { name = "mocha"; packageName = "mocha"; - version = "8.2.1"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; - sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz"; + sha512 = "TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q=="; }; }; "mock-require-3.0.3" = { @@ -37163,6 +37243,15 @@ let sha512 = "7PZH8QFJ51cIVtDv7wfUREBd3gL59JB0v/ARA3RI9zkSRa9LyGjS1Bdldii2J1/NQXRQ/3OOVOSdnZrCcVaZlw=="; }; }; + "moize-6.0.0" = { + name = "moize"; + packageName = "moize"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moize/-/moize-6.0.0.tgz"; + sha512 = "/GXPWgxfgQAeM2S7IPh29MDbhK9ZF1YjzP6QRcJ1QcYrqehe6eFpAQZ88Xk/s4dy/wYhMY5axT1vaaWC+lllZA=="; + }; + }; "mold-source-map-0.4.0" = { name = "mold-source-map"; packageName = "mold-source-map"; @@ -37217,6 +37306,15 @@ let sha512 = "Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA=="; }; }; + "moment-timezone-0.5.33" = { + name = "moment-timezone"; + packageName = "moment-timezone"; + version = "0.5.33"; + src = fetchurl { + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz"; + sha512 = "PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w=="; + }; + }; "monotonic-timestamp-0.0.9" = { name = "monotonic-timestamp"; packageName = "monotonic-timestamp"; @@ -37289,13 +37387,13 @@ let sha512 = "2/PRtGGiqPc/VEhbm7xAQ+gbb7yzHjjMAv6MpAifr5pCpbh3fQUdj93uNgwPiTppAGu8HFKe3PeU+OdRyAxStA=="; }; }; - "mp4-stream-3.1.0" = { + "mp4-stream-3.1.2" = { name = "mp4-stream"; packageName = "mp4-stream"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.0.tgz"; - sha512 = "ZQQjf0VEiqPucwRvmT3e0pfZfMSE3nc5ngGUiN1+2VMxCtrInrlAjZ2K6jpNmxSZ/roiQne/ovYJYTeOvZDXPw=="; + url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.2.tgz"; + sha512 = "AviUjTA6aER9DFVFPNYd4KrEKfhw2Pi8OKBY46r39ORmyX8qfaYx6XBIUGFCl67gX4+Giv2FLF+Gh6P3g81xrQ=="; }; }; "mpath-0.5.2" = { @@ -37325,6 +37423,15 @@ let sha512 = "GzgeeCirQpB59FyhHvf8BLiIYgxctPSxuSyaF2vWnkt7paX7jtuQ8Gpl+DkHCxZmYuv7GQE6zcUAegpafd0MqQ=="; }; }; + "mri-1.1.6" = { + name = "mri"; + packageName = "mri"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mri/-/mri-1.1.6.tgz"; + sha512 = "oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ=="; + }; + }; "mrmr-0.1.10" = { name = "mrmr"; packageName = "mrmr"; @@ -37586,13 +37693,13 @@ let sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ=="; }; }; - "multistream-4.0.1" = { + "multistream-4.1.0" = { name = "multistream"; packageName = "multistream"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multistream/-/multistream-4.0.1.tgz"; - sha512 = "LNPIR/LD0JUw2beGlSv4sgTSnGbZp16d/PG2rnIrYjkeCaepNmBTobuiaNQATCPiYgn+BBuQTm70UlvwRfLZ3Q=="; + url = "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz"; + sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw=="; }; }; "munin-plugin-0.0.9" = { @@ -37613,15 +37720,6 @@ let sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; }; }; - "mustache-4.0.1" = { - name = "mustache"; - packageName = "mustache"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz"; - sha512 = "yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA=="; - }; - }; "mustache-4.1.0" = { name = "mustache"; packageName = "mustache"; @@ -37874,15 +37972,6 @@ let sha512 = "s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="; }; }; - "nanoid-3.1.12" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; - sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; - }; - }; "nanoid-3.1.20" = { name = "nanoid"; packageName = "nanoid"; @@ -37964,15 +38053,6 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "native-request-1.0.8" = { - name = "native-request"; - packageName = "native-request"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz"; - sha512 = "vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag=="; - }; - }; "native-url-0.2.6" = { name = "native-url"; packageName = "native-url"; @@ -38189,13 +38269,13 @@ let sha512 = "o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA=="; }; }; - "needle-2.5.2" = { + "needle-2.6.0" = { name = "needle"; packageName = "needle"; - version = "2.5.2"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz"; - sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ=="; + url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz"; + sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg=="; }; }; "negotiator-0.3.0" = { @@ -38262,6 +38342,15 @@ let sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; }; }; + "nested-error-stacks-2.0.1" = { + name = "nested-error-stacks"; + packageName = "nested-error-stacks"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz"; + sha512 = "SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A=="; + }; + }; "nested-error-stacks-2.1.0" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -38271,22 +38360,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-4.9.0" = { + "netlify-6.1.7" = { name = "netlify"; packageName = "netlify"; - version = "4.9.0"; + version = "6.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-4.9.0.tgz"; - sha512 = "x+VqJ+yop05OUpeaT4fhz/NAvJQFjtNhW1s+/i6oP/EZS6/+B0u+qCANF8uP9u3UJcmWvlJmrRoDhj62Xvtwug=="; - }; - }; - "netlify-6.0.9" = { - name = "netlify"; - packageName = "netlify"; - version = "6.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-6.0.9.tgz"; - sha512 = "izoELW+kE5ClHX85f5EExRo42H3hXESwSr69EJdCuDQlTP3JR09xQgZcWL5t7FNdkfBj7Kdhf62tk02TN4+YzA=="; + url = "https://registry.npmjs.org/netlify/-/netlify-6.1.7.tgz"; + sha512 = "6eSG7gtjOKNDUMjk/s35auWJJ4o03j+iy6eY4L3Fe2p0FoSm6x5wGk0ZCnD9o0QCleXubSJIPe6MCYa/fwdpqg=="; }; }; "netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = { @@ -38298,13 +38378,13 @@ let sha512 = "5Rvi17CKgPpZTazEV2wkSj4IbS2zJpoKuytaYCyvemV/CMVeZUUPRwNPWm7+NjxObqJHgzUyi2FmWql8HfWhGA=="; }; }; - "netlify-redirect-parser-2.5.0" = { + "netlify-redirect-parser-3.0.3" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "2.5.0"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-2.5.0.tgz"; - sha512 = "pF8BiOr3Pa4kQLLiOu53I0d30EIUDM0DYqYvCQmKD96cMX2qLh/QsxT0Zh18IrL5a0IWQ236/o76lTe0yEEw6w=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.3.tgz"; + sha512 = "Enafs4wGjLXry4SREr0Rhc6A3k7hLhlJA/+M/jYzoDza9aK+xTV6Y0rHmWFW1ffUe2fN8kyrtxW++Fdipxffbw=="; }; }; "netlify-redirector-0.2.1" = { @@ -38713,15 +38793,6 @@ let sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; }; }; - "node-gyp-4.0.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz"; - sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA=="; - }; - }; "node-gyp-5.1.1" = { name = "node-gyp"; packageName = "node-gyp"; @@ -38812,31 +38883,22 @@ let sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; }; }; - "node-notifier-6.0.0" = { - name = "node-notifier"; - packageName = "node-notifier"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-6.0.0.tgz"; - sha512 = "SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw=="; - }; - }; - "node-notifier-8.0.0" = { + "node-notifier-8.0.1" = { name = "node-notifier"; packageName = "node-notifier"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz"; - sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz"; + sha512 = "BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA=="; }; }; - "node-notifier-8.0.1" = { + "node-notifier-9.0.0" = { name = "node-notifier"; packageName = "node-notifier"; - version = "8.0.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz"; - sha512 = "BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.0.tgz"; + sha512 = "SkwNwGnMMlSPrcoeH4CSo9XyWe72acAHEJGDdPdB+CyBVHsIYaTQ4U/1wk3URsyzC75xZLg2vzU2YaALlqDF1Q=="; }; }; "node-persist-2.1.0" = { @@ -38911,13 +38973,13 @@ let sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d"; }; }; - "node-red-admin-0.2.6" = { + "node-red-admin-0.2.7" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.6.tgz"; - sha512 = "s3TlPwl9VbhsCTg9w2nUCdyBwqyRGqnaohy9iPJPmHPnvT+YudVt9VCoJVol5lPlWbDC9QlBQMyHQDdXIxoLkw=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.7.tgz"; + sha512 = "bsFbC7KFfGY37+SuYfmM9Er00cM92anqp6xCj8x7Y+4qZHOXnLi9XDFoWtvvsC1uQyaMqas1ALCfqcOxLlWngw=="; }; }; "node-red-node-rbe-0.2.9" = { @@ -38938,13 +39000,13 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.69" = { + "node-releases-1.1.70" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.69"; + version = "1.1.70"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz"; - sha512 = "DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz"; + sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw=="; }; }; "node-source-walk-4.2.0" = { @@ -39253,13 +39315,13 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; - "npm-api-1.0.0" = { + "npm-api-1.0.1" = { name = "npm-api"; packageName = "npm-api"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.0.tgz"; - sha512 = "gtJhIhGq07g9H5sIAB9TZzTySW8MYtcYqg+e+J+5q1GmDsDLLVfyvVBL1VklzjtRsElph11GUtLBS191RDOJxQ=="; + url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.1.tgz"; + sha512 = "4sITrrzEbPcr0aNV28QyOmgn6C9yKiF8k92jn4buYAK8wmA5xo1qL3II5/gT1r7wxbXBflSduZ2K3FbtOrtGkA=="; }; }; "npm-bundled-1.1.1" = { @@ -39424,24 +39486,6 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.7" = { - name = "npm-registry-fetch"; - packageName = "npm-registry-fetch"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz"; - sha512 = "cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ=="; - }; - }; - "npm-registry-fetch-8.1.5" = { - name = "npm-registry-fetch"; - packageName = "npm-registry-fetch"; - version = "8.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.5.tgz"; - sha512 = "yZPNoJK9clx1jhSXU54kU6Aj1SV2p7mXUs1W/6OjQvek3wb1RrjDCrt4iY1+VX9eBQvvSGEpzNmYkRUaTL8rqg=="; - }; - }; "npm-registry-fetch-9.0.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -39631,13 +39675,13 @@ let sha512 = "e5G6bbq3Nrfxm+SDPR5AiZ6n2smVUmhLA1OgI2/Bl8e2ywfWsKw/yuqrwiXXiNHb1wdM/GyPMX6QjCGJODlaaA=="; }; }; - "oas-resolver-2.5.3" = { + "oas-resolver-2.5.4" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.3.tgz"; - sha512 = "y4gP5tabqP3YcNVHNAEJAlcqZ40Y9lxemzmXvt54evbrvuGiK5dEhuE33Rf+191TOwzlxMoIgbwMYeuOM7BwjA=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.4.tgz"; + sha512 = "1vIj5Wkjmi+kZj5sFamt95LkuXoalmoKUohtaUQoCQZjLfPFaY8uZ7nw6IZaWuE6eLON2b6xrXhxD4hiTdYl0g=="; }; }; "oas-schema-walker-1.1.5" = { @@ -39658,13 +39702,13 @@ let sha512 = "bIt8erTyclF7bkaySTtQ9sppqyVc+mAlPi7vPzCLVHJsL9nrivQjc/jHLX/o+eGbxHd6a6YBwuY/Vxa6wGsiuw=="; }; }; - "oas-validator-5.0.4" = { + "oas-validator-5.0.5" = { name = "oas-validator"; packageName = "oas-validator"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.4.tgz"; - sha512 = "/v+5BbPXl7JuKf1bYhEGIfbJZR7zBf5QJNM2RAe1e0bsABsp35nAfeptZq0hb+9RMecGSFxmzhuvlOT0/KioiQ=="; + url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.5.tgz"; + sha512 = "d10yy6xlhRTh6np44k2U0gm5M66pioYTllH8J1ZTj+WSY3cpTvU+Dt51iWOT85HJqyGHo0RZKXF3u/NGQWDFgg=="; }; }; "oauth-0.9.15" = { @@ -39682,7 +39726,7 @@ let version = "0.9.15"; src = fetchurl { name = "oauth-0.9.15.tar.gz"; - url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; + url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"; sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; @@ -39830,15 +39874,6 @@ let sha512 = "1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg=="; }; }; - "object-keys-0.2.0" = { - name = "object-keys"; - packageName = "object-keys"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz"; - sha1 = "cddec02998b091be42bf1035ae32e49f1cb6ea67"; - }; - }; "object-keys-0.4.0" = { name = "object-keys"; packageName = "object-keys"; @@ -40037,22 +40072,13 @@ let sha1 = "cb236106341536f0dac4815e06708221cad7fb5e"; }; }; - "obz-1.0.2" = { + "obz-1.0.3" = { name = "obz"; packageName = "obz"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/obz/-/obz-1.0.2.tgz"; - sha512 = "c+EtVwT2IpXz5we2mR40aPLJ1s0eNOsxYeaYbaHhmsY6kWKo3IRkpwpBU5ck0aHfqfKUUEiKabC6rzsrG/hSHw=="; - }; - }; - "octal-1.0.0" = { - name = "octal"; - packageName = "octal"; - version = "1.0.0"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz"; - sha1 = "63e7162a68efbeb9e213588d58e989d1e5c4530b"; + url = "https://registry.npmjs.org/obz/-/obz-1.0.3.tgz"; + sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="; }; }; "octokit-pagination-methods-1.1.0" = { @@ -40064,13 +40090,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.155.3" = { + "office-ui-fabric-react-7.160.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.155.3"; + version = "7.160.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.155.3.tgz"; - sha512 = "MOGOEviHa5P580rANl9+vS4QTDt6SeyVlfhGLqZpSgA7VZ4JDCIU/mFyNbl5KG39wfg5JiKic+Lz8rXUrExQfw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.160.0.tgz"; + sha512 = "HMEqVKCjCmWckgnwNZtOZfSffrkfoAiUlqyi5Ypzs/QJsnUaclwhPPo8mwfWGEDInsrLgfT6OQvehWqWBfusJg=="; }; }; "omggif-1.0.10" = { @@ -40244,13 +40270,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.16.0" = { + "oo-ascii-tree-1.20.1" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.16.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.16.0.tgz"; - sha512 = "xIuc4hP3NKOhPaPJN1zkTXiGNpNe4vOaS0CUwyCuVv1kBzBhliZ71siaGXpHIL45CBmX6qGAjEiHt7ZS1nQWaA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.20.1.tgz"; + sha512 = "imKW5pdztAEqtl5pmNTM9Rva53XOcuY91YL9jTuwFGJpBGqT6pnyxXJOFdwc5TRaQr9+GdpWTpByGRvgNPbdvQ=="; }; }; "opal-runtime-1.0.11" = { @@ -40307,6 +40333,24 @@ let sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw=="; }; }; + "open-7.3.1" = { + name = "open"; + packageName = "open"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.3.1.tgz"; + sha512 = "f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A=="; + }; + }; + "open-7.4.0" = { + name = "open"; + packageName = "open"; + version = "7.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.4.0.tgz"; + sha512 = "PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA=="; + }; + }; "openapi-default-setter-2.1.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; @@ -40316,13 +40360,13 @@ let sha512 = "2ZNlX1B/J9Q/bsM/vZKh8alC0Pn04KtDGbMN30qLRu3GkaOJH3dDMKxqJzCpYj8BOAa8G3BEsQq6kqWzkEsM7A=="; }; }; - "openapi-default-setter-7.0.1" = { + "openapi-default-setter-7.2.3" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; - version = "7.0.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.0.1.tgz"; - sha512 = "O9jhaZPEEJzI1HSG3Yw5rOIC0EpZ9PjRJgtksXKuSMyEoxUDnl7zQ27LuFRR1ykSMVhMt8vHMrQBQIwLW8S0yQ=="; + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.2.3.tgz"; + sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw=="; }; }; "openapi-framework-0.26.0" = { @@ -40334,13 +40378,13 @@ let sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; }; }; - "openapi-framework-7.2.0" = { + "openapi-framework-7.3.0" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.2.0.tgz"; - sha512 = "rC4U+SIBVxoTujSIrk84PMquBwkNJfhYC7KTTDUUc7yfIyMVKRat5TOuMDyc49Ovsv+7bdkx1stf7d0N9LbtLg=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.3.0.tgz"; + sha512 = "I0KDyH9LNYNfMUGK+nmM+0S+E1hiqKAikEIogGaVmKcJSenHaZyfbjuw1BdotBuQyCKSpcYg5yUZOyLwHVlytg=="; }; }; "openapi-jsonschema-parameters-1.2.0" = { @@ -40352,13 +40396,13 @@ let sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ=="; }; }; - "openapi-jsonschema-parameters-7.0.2" = { + "openapi-jsonschema-parameters-7.2.3" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "7.0.2"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.0.2.tgz"; - sha512 = "hCC8wsWu9qU/pWCUClAYmUyXRhAeXSZUCRV7NVlj/8+3fWrtTBwk8GKI2dRa5Up0yZ3pstGi3Ewzzuixbmh8sw=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.2.3.tgz"; + sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ=="; }; }; "openapi-request-coercer-2.4.0" = { @@ -40370,13 +40414,13 @@ let sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ=="; }; }; - "openapi-request-coercer-7.1.0" = { + "openapi-request-coercer-7.2.3" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "7.1.0"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.1.0.tgz"; - sha512 = "6nvSgvOvLYMkUBu3NbHQU6Lcol1WxDr0DsOe3oYHb2tZhokrNEuOF20QYPV+CGZYyEzc0f+Hdas774n5B0euLg=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.2.3.tgz"; + sha512 = "w+CcKjQ/UWgtA5lgrCh7t/D2FGaKyQRXgMk8aWuT/y2a/pvdZbXdmdABWdafXB6iVlBr9CKXYHJUDlBcoKH2yQ=="; }; }; "openapi-request-validator-4.2.0" = { @@ -40388,13 +40432,13 @@ let sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; }; }; - "openapi-request-validator-7.2.0" = { + "openapi-request-validator-7.3.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.2.0.tgz"; - sha512 = "LgXvKco6XR5SKr8QBaM6v0++QXY5MP2yvvKv0Ckutef3css9MAyIcokDsBj6DYYzNnjmFxPx4ntuY7CZTC2ZFA=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.3.0.tgz"; + sha512 = "Apyo0eiR1ya63vWxjAKuPBkqr953133o5BgBxXS0gFSfvbK9tmXCPwYOhvafPknkoJGaCKy5psRuBRWjUuVNSg=="; }; }; "openapi-response-validator-4.0.0" = { @@ -40406,13 +40450,13 @@ let sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg=="; }; }; - "openapi-response-validator-7.0.1" = { + "openapi-response-validator-7.2.3" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "7.0.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.0.1.tgz"; - sha512 = "Fxr9YdQ6s7/SIvvM888iWnc1GUn/fFxTaMFqHkUv0/eNCYoBfOwAKj9aptaRfL+BJXlsVdXWCJd3GWkwn8sIJA=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.2.3.tgz"; + sha512 = "j9OvLWO/6sWiR4fwdbzPbZuuj02abk+kt8Zd2aXS4mS8K7/sl7QiJGI/VmQpvq9CTlNG67eEKyqgmBzI1ovu/g=="; }; }; "openapi-sampler-1.0.0-beta.18" = { @@ -40433,13 +40477,13 @@ let sha512 = "KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA=="; }; }; - "openapi-schema-validator-7.0.1" = { + "openapi-schema-validator-7.2.3" = { name = "openapi-schema-validator"; packageName = "openapi-schema-validator"; - version = "7.0.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.0.1.tgz"; - sha512 = "P/dmF14xWbyaFVcoS1Fs2tUP4AhJO+eEnZV+jbApeo3569/Z2fiki6Mb6Rs7cfi0ewNnV4L4HiYH+HPZaKWnjQ=="; + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.2.3.tgz"; + sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA=="; }; }; "openapi-security-handler-2.0.4" = { @@ -40451,13 +40495,13 @@ let sha512 = "blz/UftEqYQLAByuEVITePUI9hV5Rd91CEK8yrsKDUaf3zk6cmIMafJ2qvagHqjXRRtL7fOqvsSKIeFrai+HfQ=="; }; }; - "openapi-security-handler-7.0.1" = { + "openapi-security-handler-7.2.3" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; - version = "7.0.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.0.1.tgz"; - sha512 = "fiRJE2Z5F0tY9QBssBX9g8Txtr0oj1BOU0nOZ6QHHXQdCYxebszGgcXD63uy0UJQwzwVOMs/AlCnKNVS/yMSEg=="; + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.2.3.tgz"; + sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg=="; }; }; "openapi-to-graphql-2.2.5" = { @@ -40496,6 +40540,15 @@ let sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A=="; }; }; + "openapi-types-7.2.3" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "7.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.2.3.tgz"; + sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; + }; + }; "openapi3-ts-1.4.0" = { name = "openapi3-ts"; packageName = "openapi3-ts"; @@ -40766,6 +40819,15 @@ let sha512 = "+wG2v8TUU8EgzPHun1k/n45pXquQ9fHnbXVetl9rRgO6kjZszGGbraF3XPTIdgeA+s1lbRjSEftAnyT0w8ZMvQ=="; }; }; + "ora-5.3.0" = { + name = "ora"; + packageName = "ora"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz"; + sha512 = "zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -40901,22 +40963,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-0.10.37" = { + "ot-builder-1.0.1" = { name = "ot-builder"; packageName = "ot-builder"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.37.tgz"; - sha512 = "9V9v49oxGZUDosB63AlR1k6J5nAMJKUaRflYbwYy8o2/u9YMyujfAfqwDqAoWz12Q2Xdc9GllVA8TpPTw03acQ=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.1.tgz"; + sha512 = "tx0ZlR8KGohvVketGtOmd5nClqvdoWPxMwugihnkzSu2z75b1uAgEfiJ2gvZLix+re20trKq/HooYv+iQ+kmjA=="; }; }; - "otb-ttc-bundle-0.10.37" = { + "otb-ttc-bundle-1.0.1" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.37.tgz"; - sha512 = "y3ziaqX+obzc9NMeXFvVz9+q2Hf9Nhu03lNbY/Iz1AjhfBHi7kMF9giW7ljmCTfdEg26crfOCBi2RbAUA2+3+g=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.1.tgz"; + sha512 = "dkdU3V3jqOLOSABpKYzl1mocygPZUhv6DjJSip5Hp2L7PVsDKv1xS+TNf+SQSBlPYPXLzP6cwvbDvwsqeeCEBw=="; }; }; "ow-0.21.0" = { @@ -41459,31 +41521,22 @@ let sha512 = "LUL4NK7sz01jdSUdCu3z1LyphCiFdQaFouaEDsAWmJpzS0lbeNfvZoX4bi1Tm1ilzheK5VAoD96QskDCZQr+jA=="; }; }; - "pacote-11.1.0" = { - name = "pacote"; - packageName = "pacote"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.0.tgz"; - sha512 = "JcMmHiK6h6rcncj2HLayiyJZg28iJXJafXcmEGw2NjKH3WE8ZgSwyMZs7+f+aliPD57PDhB31IEgUtLXp0YZxA=="; - }; - }; - "pacote-11.1.13" = { + "pacote-11.2.4" = { name = "pacote"; packageName = "pacote"; - version = "11.1.13"; + version = "11.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.13.tgz"; - sha512 = "oJ7Bg7p3izrIMhZPHCCHmMHQl+xb+pKBXL5ZYeM2oCZrw6sBRSx7f8l7F+95V2qA0BP3c1cNaaBmUNkbo6Hn9w=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.2.4.tgz"; + sha512 = "GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ=="; }; }; - "pacote-9.5.12" = { + "pacote-11.2.6" = { name = "pacote"; packageName = "pacote"; - version = "9.5.12"; + version = "11.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz"; - sha512 = "BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.2.6.tgz"; + sha512 = "xCl++Hb3aBC7LaWMimbO4xUqZVsEbKDVc6KKDIIyAeBYrmMwY1yJC2nES/lsGd8sdQLUosgBxQyuVNncZ2Ru0w=="; }; }; "pad-0.0.5" = { @@ -41504,13 +41557,13 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "paged-request-2.0.1" = { + "paged-request-2.0.2" = { name = "paged-request"; packageName = "paged-request"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.1.tgz"; - sha512 = "C0bB/PFk9rQskD1YEiz7uuchzqKDQGgdsEHN1ahify0UUWzgmMK4NDG9fhlQg2waogmNFwEvEeHfMRvJySpdVw=="; + url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.2.tgz"; + sha512 = "NWrGqneZImDdcMU/7vMcAOo1bIi5h/pmpJqe7/jdsy85BA/s5MSaU/KlpxwW/IVPmIwBcq2uKPrBWWhEWhtxag=="; }; }; "pako-0.2.9" = { @@ -41765,13 +41818,13 @@ let sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ=="; }; }; - "parse-json-5.1.0" = { + "parse-json-5.2.0" = { name = "parse-json"; packageName = "parse-json"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz"; - sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; }; "parse-latin-4.3.0" = { @@ -41819,13 +41872,13 @@ let sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; - "parse-path-4.0.2" = { + "parse-path-4.0.3" = { name = "parse-path"; packageName = "parse-path"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.2.tgz"; - sha512 = "HSqVz6iuXSiL8C1ku5Gl1Z5cwDd9Wo0q8CoffdAghP6bz8pJa1tcMC+m4N+z6VAS8QdksnIGq1TB6EgR4vPR6w=="; + url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.3.tgz"; + sha512 = "9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA=="; }; }; "parse-png-2.1.0" = { @@ -41882,13 +41935,13 @@ let sha512 = "to8zT7+o6bVTyP35r2QgG1svuFGMFO1mE6ri1oWHgL9tlgnOtfjmfHmA3mOuP9HTIU/8OiZw0NG5zbyqVLxhvA=="; }; }; - "parse-torrent-9.1.0" = { + "parse-torrent-9.1.3" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "9.1.0"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.0.tgz"; - sha512 = "TVht2kv44bTHEd55KgmfEHyDh5djIBZMhaD6uFWnxLhJWUXy8lrIOsjPSs4Tfzs9PTGIgGM0k+UG6CFphHgOZQ=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.3.tgz"; + sha512 = "/Yr951CvJM8S6TjMaqrsmMxeQEAjDeCX+MZ3hGXXc7DG2wqzp/rzOsHtDzIVqN6NsFRCqy6wYLF/W7Sgvq7bXw=="; }; }; "parse-torrent-file-2.1.4" = { @@ -42197,13 +42250,13 @@ let sha512 = "nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA=="; }; }; - "patel-0.33.1" = { + "patel-0.34.0" = { name = "patel"; packageName = "patel"; - version = "0.33.1"; + version = "0.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz"; - sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg=="; + url = "https://registry.npmjs.org/patel/-/patel-0.34.0.tgz"; + sha512 = "3EvIzxbIFknpPa9QL2LYW+B35qFwER3Dn674KSC9Hc7DIuLJ7YMUJOR4dvCMPmpj/lB4fDvfr/VYV7FKKLEpFA=="; }; }; "path-browserify-0.0.1" = { @@ -42413,13 +42466,13 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; - "pathval-1.1.0" = { + "pathval-1.1.1" = { name = "pathval"; packageName = "pathval"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; - sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; + url = "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz"; + sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; }; }; "patrisika-0.22.2" = { @@ -42467,13 +42520,13 @@ let sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg=="; }; }; - "peek-readable-3.1.1" = { + "peek-readable-3.1.3" = { name = "peek-readable"; packageName = "peek-readable"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.1.tgz"; - sha512 = "QHJag0oYYPVkx6rVPEgCLEUMo6VRYbV3GUrqy00lxXJBEIw9LhPCP5MQI6mEfahJO9KYUP8W8qD8kC0V9RyZFQ=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz"; + sha512 = "mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg=="; }; }; "peek-stream-1.1.3" = { @@ -43142,13 +43195,22 @@ let sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg=="; }; }; - "polished-3.6.7" = { + "polished-3.7.0" = { name = "polished"; packageName = "polished"; - version = "3.6.7"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/polished/-/polished-3.7.0.tgz"; + sha512 = "1tnvQ2wsxfR/DyPE2Xu9sRbnLAwXAarCWiZJ8Hfirw59bTigqjbzEWSAmzYizT6ocQW995V8n7RP48jq50DjJA=="; + }; + }; + "polyraf-1.1.0" = { + name = "polyraf"; + packageName = "polyraf"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.6.7.tgz"; - sha512 = "b4OViUOihwV0icb9PHmWbR+vPqaSzSAEbgLskvb7ANPATVXGiYv/TQFHQo65S53WU9i5EQ1I03YDOJW7K0bmYg=="; + url = "https://registry.npmjs.org/polyraf/-/polyraf-1.1.0.tgz"; + sha512 = "wKRyhZQE6AC70nJyMCWbwd/dX4S6UsFz+58qAF8HTpCn6C7pvr63FiH4vR9vT6VrhZrJKuT7A81ea/lIslS0bA=="; }; }; "poor-mans-t-sql-formatter-1.6.10" = { @@ -43341,13 +43403,13 @@ let sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; }; }; - "postcss-load-config-3.0.0" = { + "postcss-load-config-3.0.1" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.0.0.tgz"; - sha512 = "lErrN8imuEF1cSiHBV8MiR7HeuzlDpCGNtaMyYHlOBuJHHOGw6S4xOMZp8BbXPr7AGQp14L6PZDlIOpfFJ6f7w=="; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.0.1.tgz"; + sha512 = "/pDHe30UYZUD11IeG8GWx9lNtu1ToyTsZHnyy45B4Mrwr/Kb6NgYl7k753+05CJNKnjbwh4975amoPJ+TEjHNQ=="; }; }; "postcss-media-query-parser-0.2.3" = { @@ -43998,6 +44060,15 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; + "prettier-plugin-svelte-2.1.4" = { + name = "prettier-plugin-svelte"; + packageName = "prettier-plugin-svelte"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.1.4.tgz"; + sha512 = "fQfcIyl04VNWI3+JeseT+gLljs2bJJifbKmrTe8yMnTCdv0unfM1jnY2p4etzCfOj6skC1FPFaqBayYk3+7ZZg=="; + }; + }; "prettier-stylelint-0.4.2" = { name = "prettier-stylelint"; packageName = "prettier-stylelint"; @@ -44097,6 +44168,15 @@ let sha512 = "4gaK1skD2gwscCfkswYQRmddUb2GJZtzDGRjHWadVHtK/DIKFufa12MvES6/xu1tVbUYeia5bmLcwJtZJQUqnw=="; }; }; + "pretty-quick-3.1.0" = { + name = "pretty-quick"; + packageName = "pretty-quick"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.0.tgz"; + sha512 = "DtxIxksaUWCgPFN7E1ZZk4+Aav3CCuRdhrDSFZENb404sYMtuo9Zka823F+Mgeyt8Zt3bUiCjFzzWYE9LYqkmQ=="; + }; + }; "pretty-time-1.1.0" = { name = "pretty-time"; packageName = "pretty-time"; @@ -44187,31 +44267,22 @@ let sha512 = "abAuk3ZDyQvPLY6MygtwaDTUBIZ0C5wMMuX1jXa0svazV+keTwn7cPobRv4WYA9ctsDUztm/9CYu4y2TPL08xw=="; }; }; - "probe-image-size-3.2.0" = { - name = "probe-image-size"; - packageName = "probe-image-size"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-3.2.0.tgz"; - sha512 = "LE7mIvfDoEeOgIH9TbMNv5txJh+K0/UVandiXHk+Hm4VKqNV5qxoeDzdW3QiMIlqXsIEm3K+SzeAedT6fZKjtQ=="; - }; - }; - "probe-image-size-4.0.0" = { + "probe-image-size-5.0.0" = { name = "probe-image-size"; packageName = "probe-image-size"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-4.0.0.tgz"; - sha512 = "nm7RvWUxps+2+jZKNLkd04mNapXNariS6G5WIEVzvAqjx7EUuKcY1Dp3e6oUK7GLwzJ+3gbSbPLFAASHFQrPcQ=="; + url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-5.0.0.tgz"; + sha512 = "V6uBYw5eBc5UVIE7MUZD6Nxg0RYuGDWLDenEn0B1WC6PcTvn1xdQ6HLDDuznefsiExC6rNrCz7mFRBo0f3Xekg=="; }; }; - "probe-image-size-5.0.0" = { + "probe-image-size-6.0.0" = { name = "probe-image-size"; packageName = "probe-image-size"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-5.0.0.tgz"; - sha512 = "V6uBYw5eBc5UVIE7MUZD6Nxg0RYuGDWLDenEn0B1WC6PcTvn1xdQ6HLDDuznefsiExC6rNrCz7mFRBo0f3Xekg=="; + url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-6.0.0.tgz"; + sha512 = "99PZ5+RU4gqiTfK5ZDMDkZtn6eL4WlKfFyVJV7lFQvH3iGmQ85DqMTOdxorERO26LHkevR2qsxnHp0x/2UDJPA=="; }; }; "process-0.10.1" = { @@ -44385,6 +44456,15 @@ let sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; }; }; + "promise-retry-2.0.1" = { + name = "promise-retry"; + packageName = "promise-retry"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; + }; + }; "promise.prototype.finally-3.1.2" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; @@ -44403,6 +44483,15 @@ let sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; }; }; + "promisify-4loc-1.0.0" = { + name = "promisify-4loc"; + packageName = "promisify-4loc"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promisify-4loc/-/promisify-4loc-1.0.0.tgz"; + sha512 = "u/XtndUyqqDXAuhFEgFgkpjHG8IizREoj80j5dL4t41eE9yH0gzFPyOD21/VnikdPJtRziuqf6ryTu1HoTjyog=="; + }; + }; "promisify-child-process-4.1.1" = { name = "promisify-child-process"; packageName = "promisify-child-process"; @@ -44583,13 +44672,13 @@ let sha512 = "WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw=="; }; }; - "proxy-agent-4.0.0" = { + "proxy-agent-4.0.1" = { name = "proxy-agent"; packageName = "proxy-agent"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.0.tgz"; - sha512 = "8P0Y2SkwvKjiGU1IkEfYuTteioMIDFxPL4/j49zzt5Mz3pG1KO+mIrDG1qH0PQUHTTczjwGcYl+EzfXiFj5vUQ=="; + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz"; + sha512 = "ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA=="; }; }; "proxy-from-env-1.1.0" = { @@ -44610,15 +44699,6 @@ let sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56"; }; }; - "prr-0.0.0" = { - name = "prr"; - packageName = "prr"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; - sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; - }; - }; "prr-1.0.1" = { name = "prr"; packageName = "prr"; @@ -44826,6 +44906,24 @@ let sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843"; }; }; + "pull-async-1.0.0" = { + name = "pull-async"; + packageName = "pull-async"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-async/-/pull-async-1.0.0.tgz"; + sha1 = "146b36e3e043d7a666b59a14165fdd3bef3cf44c"; + }; + }; + "pull-awaitable-1.0.0" = { + name = "pull-awaitable"; + packageName = "pull-awaitable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-awaitable/-/pull-awaitable-1.0.0.tgz"; + sha512 = "tfufzU9wMd1rM38tcgunaKMUNGXMj1Qms1ygEw+ZerkMmLAwilEtMsyzrDSLhNlnfhSzHXovOarieSNrTD1ovQ=="; + }; + }; "pull-block-filter-1.0.0" = { name = "pull-block-filter"; packageName = "pull-block-filter"; @@ -45249,6 +45347,15 @@ let sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew=="; }; }; + "pull-thenable-1.0.0" = { + name = "pull-thenable"; + packageName = "pull-thenable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-thenable/-/pull-thenable-1.0.0.tgz"; + sha512 = "gio2Yanuj5lcN8X+VXtx6F2iWxnhxfaHSKaSJHUzJMNNboEz48/+udzZFDaya8kAwj3DbuFFt1pbb8m1tIS6PQ=="; + }; + }; "pull-through-1.0.18" = { name = "pull-through"; packageName = "pull-through"; @@ -45429,6 +45536,15 @@ let sha512 = "wCDN1KkAWOMXsiV0XxH/CggHqOYeXvyn00t9Zjp5RKsLZ2rzg/lLJIMAVxYLyh79T168W3fBYcG5TRRJAlQr6g=="; }; }; + "push-stream-11.0.0" = { + name = "push-stream"; + packageName = "push-stream"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/push-stream/-/push-stream-11.0.0.tgz"; + sha512 = "rDVD2f3wOztI/59/fukGLwZkUOC55674hncsSwgKF/yLlkkL594AoWTlkF6SGF0x8O5o1j92ObXk8Cxc1llhYg=="; + }; + }; "push-stream-to-pull-stream-1.0.3" = { name = "push-stream-to-pull-stream"; packageName = "push-stream-to-pull-stream"; @@ -45609,13 +45725,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.4" = { + "qs-6.9.6" = { name = "qs"; packageName = "qs"; - version = "6.9.4"; + version = "6.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz"; - sha512 = "A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; }; }; "query-string-1.0.1" = { @@ -45645,13 +45761,13 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; - "query-string-6.13.8" = { + "query-string-6.14.0" = { name = "query-string"; packageName = "query-string"; - version = "6.13.8"; + version = "6.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-6.13.8.tgz"; - sha512 = "jxJzQI2edQPE/NPUOusNjO/ZOGqr1o2OBa/3M00fU76FsLXDVbJDv/p7ng5OdQyorKrkRz1oqfwmbe5MAMePQg=="; + url = "https://registry.npmjs.org/query-string/-/query-string-6.14.0.tgz"; + sha512 = "In3o+lUxlgejoVJgwEdYtdxrmlL0cQWJXj0+kkI7RWVo7hg5AhFtybeKlC9Dpgbr8eOC4ydpEh8017WwyfzqVQ=="; }; }; "querystring-0.2.0" = { @@ -45735,6 +45851,15 @@ let sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; }; }; + "quicktask-1.0.1" = { + name = "quicktask"; + packageName = "quicktask"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quicktask/-/quicktask-1.0.1.tgz"; + sha512 = "+jhR01aSsi6Iw9wbYumKusRK72QK1ub2oE0kOnRyMkMdD/rXMMGW/TVl5edjcLjuuIKP1ezkr+xQzUMD5/4JHw=="; + }; + }; "quicktask-1.1.0" = { name = "quicktask"; packageName = "quicktask"; @@ -45825,22 +45950,58 @@ let sha512 = "maAX1cnBkzIZ89O4tSQUOF098xjGMC8N+9vuY/WfHwg87THw6odD2Br35donlj5e6KnB1SB0QBHhTQhhDHuTPQ=="; }; }; - "random-access-file-2.1.4" = { + "random-access-chrome-file-1.1.4" = { + name = "random-access-chrome-file"; + packageName = "random-access-chrome-file"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-chrome-file/-/random-access-chrome-file-1.1.4.tgz"; + sha512 = "xZW1BT26g+gl8AF1kC/oXX97jCMVoLIbf6yx4eVMwLgOddGhhkJygimnfERSEmhUKiGs3DTymNao6wf/P23Nkg=="; + }; + }; + "random-access-file-2.1.5" = { name = "random-access-file"; packageName = "random-access-file"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.4.tgz"; - sha512 = "WAcBP5iLhg1pbjZA40WyMenjK7c5gJUY6Pi5HJ3fLJCeVFNSZv3juf20yFMKxBdvcX5GKbX/HZSfFzlLBdGTdQ=="; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.5.tgz"; + sha512 = "lqmUGgF9X+LD0XSeWSHcs7U2nSLYp+RQvkDDqKWoxW8jcd13tZ00G6PHV32OZqDIHmS9ewoEUEa6jcvyB7UCvg=="; }; }; - "random-access-memory-3.1.1" = { + "random-access-idb-1.2.1" = { + name = "random-access-idb"; + packageName = "random-access-idb"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-idb/-/random-access-idb-1.2.1.tgz"; + sha512 = "5rZRPhjgfR222n+dmZtRYhu0CF9dDEwxaS+UgeWursIWPmNirR6BajzOB4wG5I7WAeYZea9HCqYKk/Tin3s9cA=="; + }; + }; + "random-access-idb-mutable-file-0.3.0" = { + name = "random-access-idb-mutable-file"; + packageName = "random-access-idb-mutable-file"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-idb-mutable-file/-/random-access-idb-mutable-file-0.3.0.tgz"; + sha512 = "CdVAoFNNDn5uAgYOJ8J3ICSaFzaMOa95XnYcX+taj4jirJuRASiTyQSOGR+Z0K8ZkBGuj0A8ivyeRAWuxRCgQA=="; + }; + }; + "random-access-memory-3.1.2" = { name = "random-access-memory"; packageName = "random-access-memory"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.1.tgz"; - sha512 = "Qy1MliJDozZ1A6Hx3UbEnm8PPCfkiG/8CArbnhrxXMx1YRJPWipgPTB9qyhn4Z7WlLvCEqPb6Bd98OayyVuwrA=="; + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.2.tgz"; + sha512 = "wIfh4OZ9T+FRNf6rbXLvEb4FfSxyZpvGnC5kC7Xi39SyPkRYfeJyR9Xwa13iLbNyoNKNIkTFUE4g9lXFb1ZflA=="; + }; + }; + "random-access-storage-1.3.0" = { + name = "random-access-storage"; + packageName = "random-access-storage"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.3.0.tgz"; + sha512 = "pdS9Mcb9TB7oICypPRALlheaSuszuAKmLVEPKJMuYor7R/zDuHh5ALuQoS+ox31XRwQUL+tDwWH2GPdyspwelA=="; }; }; "random-access-storage-1.4.1" = { @@ -45852,6 +46013,15 @@ let sha512 = "DbCc2TIzOxPaHF6KCbr8zLtiYOJQQQCBHUVNHV/SckUQobCBB2YkDtbLdxGnPwPNpJfEyMWxDAm36A2xkbxxtw=="; }; }; + "random-access-web-2.0.3" = { + name = "random-access-web"; + packageName = "random-access-web"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-web/-/random-access-web-2.0.3.tgz"; + sha512 = "nN3AAgl4/lTOYMk5Qm44SzFsglOmaG2d0Kh0603umh35+rk9QXYLFf0nFJ0GOv9INBsP9iT1lub24r8PjyCtvA=="; + }; + }; "random-bytes-1.0.0" = { name = "random-bytes"; packageName = "random-bytes"; @@ -46032,6 +46202,15 @@ let sha512 = "bwfUSB37TWkHfP+PPjb/x8BUjChFmmBK44JMfVnU7paisWqZl/o5k7ttCH+EQLnrbn2Aq8Fo1LAsyUiz+WF4CQ=="; }; }; + "rc-config-loader-4.0.0" = { + name = "rc-config-loader"; + packageName = "rc-config-loader"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.0.0.tgz"; + sha512 = "//LRTblJEcqbmmro1GCmZ39qZXD+JqzuD8Y5/IZU3Dhp3A1Yr0Xn68ks8MQ6qKfKvYCWDveUmRDKDA40c+sCXw=="; + }; + }; "re-emitter-1.1.4" = { name = "re-emitter"; packageName = "re-emitter"; @@ -46068,13 +46247,13 @@ let sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; }; }; - "react-dev-utils-11.0.1" = { + "react-dev-utils-11.0.2" = { name = "react-dev-utils"; packageName = "react-dev-utils"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.1.tgz"; - sha512 = "rlgpCupaW6qQqvu0hvv2FDv40QG427fjghV56XyPcP5aKtOAPzNAhQ7bHqk1YdS2vpW1W7aSV3JobedxuPlBAA=="; + url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.2.tgz"; + sha512 = "xG7GlMoYkrgc2M1kDCHKRywXMDbFnjOB+/VzpytQyYBusEzR8NlGTMmUbvN86k94yyKu5XReHB8eZC2JZrNchQ=="; }; }; "react-devtools-core-4.10.1" = { @@ -46095,13 +46274,13 @@ let sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; }; }; - "react-error-overlay-6.0.8" = { + "react-error-overlay-6.0.9" = { name = "react-error-overlay"; packageName = "react-error-overlay"; - version = "6.0.8"; + version = "6.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.8.tgz"; - sha512 = "HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw=="; + url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz"; + sha512 = "nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="; }; }; "react-is-16.13.1" = { @@ -46140,13 +46319,13 @@ let sha512 = "X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="; }; }; - "react-tabs-3.1.2" = { + "react-tabs-3.2.0" = { name = "react-tabs"; packageName = "react-tabs"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-tabs/-/react-tabs-3.1.2.tgz"; - sha512 = "OKS1l7QzSNcn+L2uFsxyGFHdXp9YsPGf/YOURWcImp7xLN36n0Wz+/j9HwlwGtlXCZexwshScR5BrcFbw/3P9Q=="; + url = "https://registry.npmjs.org/react-tabs/-/react-tabs-3.2.0.tgz"; + sha512 = "q7oNapNRoYTQq8gDhApXwdBheuuN5qQ4YvUaQUAkb6OSSttJulBAvxJ0FS6W5uojvMxbbIZKu1f2I+GXISoLjw=="; }; }; "read-1.0.7" = { @@ -46239,13 +46418,22 @@ let sha512 = "D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA=="; }; }; - "read-package-json-fast-1.2.1" = { + "read-package-json-fast-1.2.2" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.1.tgz"; - sha512 = "OFbpwnHcv74Oa5YN5WvbOBfLw6yPmPcwvyJJw/tj9cWFBF7juQUDLDSZiOjEcgzfweWeeROOmbPpNN1qm4hcRg=="; + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz"; + sha512 = "39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ=="; + }; + }; + "read-package-json-fast-2.0.1" = { + name = "read-package-json-fast"; + packageName = "read-package-json-fast"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.1.tgz"; + sha512 = "bp6z0tdgLy9KzdfENDIw/53HWAolOVoQTRWXv7PUiqAo3YvvoUVeLr7RWPWq+mu7KUOu9kiT4DvxhUgNUBsvug=="; }; }; "read-package-tree-5.3.1" = { @@ -46635,13 +46823,13 @@ let sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; }; - "redis-commands-1.6.0" = { + "redis-commands-1.7.0" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz"; - sha512 = "2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ=="; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz"; + sha512 = "nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="; }; }; "redis-parser-2.6.0" = { @@ -46653,13 +46841,13 @@ let sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; }; }; - "redoc-2.0.0-rc.48" = { + "redoc-2.0.0-rc.49" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.48"; + version = "2.0.0-rc.49"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.48.tgz"; - sha512 = "shArJWhNG2gQ0XKxW8WcfG8peNOtxbZ86CqxgrR9P7MnE5ESAo559CH/PSlezePeVLpcC0C9tcimOfSN5MaAvA=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.49.tgz"; + sha512 = "mCdO0kHnnmwieCq56R5LDJ5eIEhLCoq/le1m0AlMFkIkxMJWZfmq9y3QYq6Fe4Uec73kZgG7gN3qYSGBMHtgQQ=="; }; }; "reduce-component-1.0.1" = { @@ -46689,13 +46877,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "reftools-1.1.7" = { + "reftools-1.1.8" = { name = "reftools"; packageName = "reftools"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/reftools/-/reftools-1.1.7.tgz"; - sha512 = "I+KZFkQvZjMZqVWxRezTC/kQ2kLhGRZ7C+4ARbgmb5WJbvFUlbrZ/6qlz6mb+cGcPNYib+xqL8kZlxCsSZ7Hew=="; + url = "https://registry.npmjs.org/reftools/-/reftools-1.1.8.tgz"; + sha512 = "Yvz9NH8uFHzD/AXX82Li1GdAP6FzDBxEZw+njerNBBQv/XHihqsWAjNfXtaq4QD2l4TEZVnp4UbktdYSegAM3g=="; }; }; "regenerate-1.4.2" = { @@ -46770,13 +46958,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.3.0" = { + "regexp.prototype.flags-1.3.1" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; + sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA=="; }; }; "regexpp-1.1.0" = { @@ -46869,13 +47057,13 @@ let sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; }; - "regjsparser-0.6.4" = { + "regjsparser-0.6.7" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.6.4"; + version = "0.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz"; - sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz"; + sha512 = "ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ=="; }; }; "rehype-parse-7.0.1" = { @@ -47454,6 +47642,15 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; + "requireg-0.2.2" = { + name = "requireg"; + packageName = "requireg"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/requireg/-/requireg-0.2.2.tgz"; + sha512 = "nYzyjnFcPNGR3lx9lwPPPnuQxv6JWEZd2Ci0u9opN7N5zUEPIhY/GbL3vMGOr2UXwEg9WwSyV9X9Y/kLFgPsOg=="; + }; + }; "requirejs-2.3.6" = { name = "requirejs"; packageName = "requirejs"; @@ -47499,31 +47696,40 @@ let sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; - "resolve-1.18.1" = { + "resolve-1.19.0" = { name = "resolve"; packageName = "resolve"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz"; - sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; + sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; }; }; - "resolve-1.19.0" = { + "resolve-1.20.0" = { name = "resolve"; packageName = "resolve"; - version = "1.19.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; - sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; }; }; - "resolve-2.0.0-next.2" = { + "resolve-1.7.1" = { name = "resolve"; packageName = "resolve"; - version = "2.0.0-next.2"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.2.tgz"; - sha512 = "oHC2H45OCkhIeS45uW5zCsSinW+hgWwRtfobOhmkXiO4Q6e6fpZpBuBkZxAqTfoC1O6VIclqK6RjyeGVaxEYtA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz"; + sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; + }; + }; + "resolve-2.0.0-next.3" = { + name = "resolve"; + packageName = "resolve"; + version = "2.0.0-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz"; + sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; }; }; "resolve-alpn-1.0.0" = { @@ -47859,13 +48065,13 @@ let sha1 = "eeeb88342fadbe8027c0f36ada921a13e6f96206"; }; }; - "rfdc-1.1.4" = { + "rfdc-1.2.0" = { name = "rfdc"; packageName = "rfdc"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz"; - sha512 = "5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug=="; + url = "https://registry.npmjs.org/rfdc/-/rfdc-1.2.0.tgz"; + sha512 = "ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA=="; }; }; "rgb-regex-1.0.1" = { @@ -48012,13 +48218,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.36.0" = { + "rollup-2.38.5" = { name = "rollup"; packageName = "rollup"; - version = "2.36.0"; + version = "2.38.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz"; - sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.38.5.tgz"; + sha512 = "VoWt8DysFGDVRGWuHTqZzT02J0ASgjVq/hPs9QcBOGMd7B+jfTr/iqMVEyOi901rE3xq+Deq66GzIT1yt7sGwQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -48048,13 +48254,22 @@ let sha512 = "jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q=="; }; }; - "rollup-plugin-node-builtins-2.1.2" = { - name = "rollup-plugin-node-builtins"; - packageName = "rollup-plugin-node-builtins"; - version = "2.1.2"; + "rollup-plugin-inject-3.0.2" = { + name = "rollup-plugin-inject"; + packageName = "rollup-plugin-inject"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-node-builtins/-/rollup-plugin-node-builtins-2.1.2.tgz"; - sha1 = "24a1fed4a43257b6b64371d8abc6ce1ab14597e9"; + url = "https://registry.npmjs.org/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz"; + sha512 = "ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w=="; + }; + }; + "rollup-plugin-node-polyfills-0.2.1" = { + name = "rollup-plugin-node-polyfills"; + packageName = "rollup-plugin-node-polyfills"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz"; + sha512 = "4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA=="; }; }; "rollup-plugin-node-resolve-5.2.0" = { @@ -48138,13 +48353,13 @@ let sha1 = "44e00858ebebc0133d58e40b2cd8a1fbb04203f5"; }; }; - "rss-parser-3.10.0" = { + "rss-parser-3.11.0" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.10.0.tgz"; - sha512 = "TC6FNvEmdFeaW6r/60MSJT7cp4d95X4M9As+mvNtxRx7YXHxpV95syMnWZthZSeD1BRN7SEKdq6c3nxMLQRopw=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.11.0.tgz"; + sha512 = "oTLoYW+bNqNwkz8OpGinBU9s3As0sdczQjETIZFgyAdi7AopyhoVFGPIyFMYXXEY8hayKzD5CH+4CtmiPtJ89g=="; }; }; "rss-parser-3.7.1" = { @@ -48210,22 +48425,22 @@ let sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; - "run-parallel-1.1.10" = { + "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.10"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; - sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; }; - "run-parallel-limit-1.0.6" = { + "run-parallel-limit-1.1.0" = { name = "run-parallel-limit"; packageName = "run-parallel-limit"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.6.tgz"; - sha512 = "yFFs4Q2kECi5mWXyyZj3UlAZ5OFq5E07opABC+EmhZdjEkrxXaUwFqOaaNF4tbayMnBxrsbujpeCYTVjGufZGQ=="; + url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.1.0.tgz"; + sha512 = "jJA7irRNM91jaKc3Hcl1npHsFLOXOoTkPCUL1JEa1R82O2miplXXRaGdjW/KM/98YQWDhJLiSs793CnXfblJUw=="; }; }; "run-queue-1.0.3" = { @@ -48480,13 +48695,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.32.0" = { + "sass-1.32.7" = { name = "sass"; packageName = "sass"; - version = "1.32.0"; + version = "1.32.7"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.0.tgz"; - sha512 = "fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.7.tgz"; + sha512 = "C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A=="; }; }; "sax-0.5.8" = { @@ -48813,15 +49028,6 @@ let sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; - "semver-6.1.1" = { - name = "semver"; - packageName = "semver"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz"; - sha512 = "rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ=="; - }; - }; "semver-6.3.0" = { name = "semver"; packageName = "semver"; @@ -48840,15 +49046,6 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.1.3" = { - name = "semver"; - packageName = "semver"; - version = "7.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; - sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA=="; - }; - }; "semver-7.2.3" = { name = "semver"; packageName = "semver"; @@ -49605,13 +49802,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.31.0" = { + "simple-git-2.34.2" = { name = "simple-git"; packageName = "simple-git"; - version = "2.31.0"; + version = "2.34.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.31.0.tgz"; - sha512 = "/+rmE7dYZMbRAfEmn8EUIOwlM2G7UdzpkC60KF86YAfXGnmGtsPrKsym0hKvLBdFLLW019C+aZld1+6iIVy5xA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.34.2.tgz"; + sha512 = "/EX4FtcpAj5L/Bs5zgaBGYDrnkrKflFVNppNLH9VXpIjZBLHx5cZ6/mOYJCoKXKlLRuk3iTvzrIsHo7v42zWHg=="; }; }; "simple-markdown-0.4.4" = { @@ -49686,13 +49883,13 @@ let sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; - "simple-websocket-8.1.1" = { + "simple-websocket-9.1.0" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "8.1.1"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.1.1.tgz"; - sha512 = "06I3cwOD5Q3LdVd6qfyDGp1U9eau9x9qniSL3b/aDgM5bsJX4nZfCuii2UCFcTfrDq0jCXF4NQ/38qeC8CJZTg=="; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-9.1.0.tgz"; + sha512 = "8MJPnjRN6A8UCp1I+H/dSFyjwJhp6wta4hsVRhjf8w9qBHRzxYt14RaOcjvQnhD1N4yKOddEjflwMnQM4VtXjQ=="; }; }; "simplediff-0.1.1" = { @@ -50019,13 +50216,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.13.1" = { + "snyk-docker-plugin-4.16.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.13.1"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.13.1.tgz"; - sha512 = "KS2G2cBdwKhyRta85uv3q/xUmFSC9lVCu8MUxgm7IDNn8ImjmCIkSp5SsI0qu5jYXJhZZnX6jjj5gzI0QP0WXw=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.16.0.tgz"; + sha512 = "bsKvWJ2ic5vzCcpjRWDTMumfXNuyIiQfsDcpNb/Hhev3UhKu6vb3KXaS6kPg360r5o/KxY7xOjW1L9VjZ0zZeA=="; }; }; "snyk-go-parser-1.4.1" = { @@ -50046,22 +50243,13 @@ let sha512 = "7REUy5U6h2wCPIg9060V5bh24gichRHfuqWC22xrp/n+dVolQXvG5RN/PqdJiPsCj7Y9voyWLbYai+Tmk3o82Q=="; }; }; - "snyk-gradle-plugin-3.11.0" = { + "snyk-gradle-plugin-3.12.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.11.0"; + version = "3.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.11.0.tgz"; - sha512 = "OXf1A+kcif+vslm/nsel3bDYWsGwum2PsZLETM28nG4JOgqBLYLWvCHPgH9r2aa0MKTq0nBpimvFkzDm/+2qQQ=="; - }; - }; - "snyk-module-1.9.1" = { - name = "snyk-module"; - packageName = "snyk-module"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.9.1.tgz"; - sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.3.tgz"; + sha512 = "1LdlB/tDGqeeh5xgJYmv2Rw9eeYsbZ9VX9MS+u6V/DwdzbiXZvFeqexdCqwVOKwBtYUeQfg/QXm5AAd0hQwxCA=="; }; }; "snyk-module-2.1.0" = { @@ -50082,13 +50270,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.25.0" = { + "snyk-mvn-plugin-2.25.1" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.25.0"; + version = "2.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.0.tgz"; - sha512 = "2NDWrMWi9K32i9CdWUy2Pce8D9myR0dxPDJJpamVt/DD3fDxH4ia701i2HdDgOjMq8PI6yIgI+vRaAW3X2GrbA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.1.tgz"; + sha512 = "buhFh7iDxIxTiQy1D+bLm2aYlqHqMoQxaeLTtMw939rU4TqIrvFiTDYZo0kq8PfvCWU5yvxLHlbR5V4goObv7w=="; }; }; "snyk-nodejs-lockfile-parser-1.30.1" = { @@ -50100,13 +50288,13 @@ let sha512 = "QyhE4pmy7GI7fQrVmZ+qrQB8GGSbxN7OoYueS4BEP9nDxIyH4dJAz8dME5zOUeUxh3frcgBWoWgZoSzE4VOYpg=="; }; }; - "snyk-nuget-plugin-1.19.4" = { + "snyk-nuget-plugin-1.20.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.19.4"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.19.4.tgz"; - sha512 = "6BvLJc7gpNdfPJSnvpmTL4BrbaOVbXh/9q1FNMs5OVp8NbnZ3l97iM+bpQXWTJHOa3BJBZz7iEg+3suH4AWoWw=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.20.0.tgz"; + sha512 = "hKN1saA8lyVp4lVi/qfieKmFuTxKoUMxYt6omo7JY0MmeXbHXwGcCo5c+JSHsHdn0uKIQPOKKGnTE1yg3VvzuQ=="; }; }; "snyk-paket-parser-1.6.0" = { @@ -50127,13 +50315,13 @@ let sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA=="; }; }; - "snyk-poetry-lockfile-parser-1.1.1" = { + "snyk-poetry-lockfile-parser-1.1.5" = { name = "snyk-poetry-lockfile-parser"; packageName = "snyk-poetry-lockfile-parser"; - version = "1.1.1"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.1.tgz"; - sha512 = "G3LX27V2KUsKObwVN4vDDjrYr5BERad9pXHAf+SST5+vZsdPUUZjd1ZUIrHgCv7IQhwq+7mZrtqedY5x7+LIGA=="; + url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.5.tgz"; + sha512 = "HR5XjWyueRZc0mWlcXD+OidyDnZ83tgAqJN+n7DGxqTv1z00eogkTxsW2DwNvXevF7ItoBaN80t14oicNQ8GlA=="; }; }; "snyk-policy-1.14.1" = { @@ -50145,13 +50333,13 @@ let sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g=="; }; }; - "snyk-python-plugin-1.19.1" = { + "snyk-python-plugin-1.19.4" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.1"; + version = "1.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.1.tgz"; - sha512 = "JoOUHnA76L3pekCblSuE9jQ9CuA5jt+GqXpsLQbEIZ0FQQTBa+0F7vfolg3Q7+s1it4ZdtgSbSWrlxCngIJt8g=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.4.tgz"; + sha512 = "d1c/QKb3Il3xF1HY0IYoqQ+16+i0Ex5ai+J4KqOMbcKFvNcfkiOSPpCsrgSNJtBa50srbRleUrILdorALxaV2w=="; }; }; "snyk-resolve-1.0.1" = { @@ -50163,13 +50351,13 @@ let sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw=="; }; }; - "snyk-resolve-deps-4.4.0" = { + "snyk-resolve-deps-4.7.2" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; - version = "4.4.0"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.4.0.tgz"; - sha512 = "aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ=="; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz"; + sha512 = "Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg=="; }; }; "snyk-sbt-plugin-2.11.0" = { @@ -50217,13 +50405,13 @@ let sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; }; }; - "socket.io-2.4.0" = { + "socket.io-2.4.1" = { name = "socket.io"; packageName = "socket.io"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz"; - sha512 = "9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.1.tgz"; + sha512 = "Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w=="; }; }; "socket.io-3.0.5" = { @@ -50235,6 +50423,15 @@ let sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; }; }; + "socket.io-3.1.1" = { + name = "socket.io"; + packageName = "socket.io"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz"; + sha512 = "7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA=="; + }; + }; "socket.io-adapter-0.2.0" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; @@ -50262,6 +50459,15 @@ let sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ=="; }; }; + "socket.io-adapter-2.1.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz"; + sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg=="; + }; + }; "socket.io-client-1.0.6" = { name = "socket.io-client"; packageName = "socket.io-client"; @@ -50307,13 +50513,13 @@ let sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; }; }; - "socket.io-parser-3.3.1" = { + "socket.io-parser-3.3.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.1.tgz"; - sha512 = "1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz"; + sha512 = "FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg=="; }; }; "socket.io-parser-3.4.1" = { @@ -50325,13 +50531,13 @@ let sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="; }; }; - "socket.io-parser-4.0.3" = { + "socket.io-parser-4.0.4" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz"; - sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz"; + sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g=="; }; }; "sockjs-0.3.20" = { @@ -50487,13 +50693,13 @@ let sha512 = "mbkiyA2clyfwAyOFIzMvsV6ny2KrKEIhFVASJxWfsmgfUEymgLIS2MLHHcGIQMkrcKhPErRaMR5Dzv0EEn+BWg=="; }; }; - "sodium-native-3.2.0" = { + "sodium-native-3.2.1" = { name = "sodium-native"; packageName = "sodium-native"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-3.2.0.tgz"; - sha512 = "8aq/vQSegLwsRch8Sb/Bpf9aAqlNe5dp0+NVhb9UjHv42zDZ0D5zX3wBRUbXK9Ejum9uZE6DUgT4vVLlUFRBWg=="; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-3.2.1.tgz"; + sha512 = "EgDZ/Z7PxL2kCasKk7wnRkV8W9kvwuIlHuHXAxkQm3FF0MgVsjyLBXGjSRGhjE6u7rhSpk3KaMfFM23bfMysIQ=="; }; }; "sodium-universal-2.0.0" = { @@ -50505,13 +50711,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-1.3.0" = { + "sonic-boom-1.3.2" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.3.0.tgz"; - sha512 = "4nX6OYvOYr6R76xfQKi6cZpTO3YSWe/vd+QdIfoH0lBy0MnPkeAbb2rRWgmgADkXUeCKPwO1FZAKlAVWAadELw=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.3.2.tgz"; + sha512 = "/B4tAuK2+hIlR94GhhWU1mJHWk5lt0CEuBvG0kvk1qIAzQc4iB1TieMio8DCZxY+Y7tsuzOxSUDOGmaUm3vXMg=="; }; }; "sorcery-0.10.0" = { @@ -50694,13 +50900,13 @@ let sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; - "source-map-url-0.4.0" = { + "source-map-url-0.4.1" = { name = "source-map-url"; packageName = "source-map-url"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"; + sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="; }; }; "sourcemap-codec-1.4.8" = { @@ -50820,13 +51026,13 @@ let sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; }; }; - "spdx-license-list-6.3.0" = { + "spdx-license-list-6.4.0" = { name = "spdx-license-list"; packageName = "spdx-license-list"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.3.0.tgz"; - sha512 = "Qz8ru5VVK5T4cFOBrshIzggzrQ15fVBcpjpZLCVz2j9KNnpslGbw8w1r06v2vi6YP6bnUSY5CXsFCfUypLZ2GA=="; + url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.4.0.tgz"; + sha512 = "4BxgJ1IZxTJuX1YxMGu2cRYK46Bk9zJNTK2/R0wNZR0cm+6SVl26/uG7FQmQtxoJQX1uZ0EpTi2L7zvMLboaBA=="; }; }; "spdy-1.32.5" = { @@ -51081,6 +51287,15 @@ let sha512 = "rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw=="; }; }; + "sqlite3-5.0.1" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.1.tgz"; + sha512 = "kh2lTIcYNfmVcvhVJihsYuPj9U0xzBbh6bmqILO2hkryWSC9RRhzYmkIDtJkJ+d8Kg4wZRJ0T1reyHUEspICfg=="; + }; + }; "sqlstring-2.3.1" = { name = "sqlstring"; packageName = "sqlstring"; @@ -51171,6 +51386,15 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; + "ssb-db2-1.11.2" = { + name = "ssb-db2"; + packageName = "ssb-db2"; + version = "1.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.11.2.tgz"; + sha512 = "nwo7Ope08o6yVSbSH3F0YbU/X8rLw79b+s+++X07Aheg9GBaZOgTUp8DgF9ZDywkqqUPSG7agyX+o/icmYCe/g=="; + }; + }; "ssb-ebt-5.6.7" = { name = "ssb-ebt"; packageName = "ssb-ebt"; @@ -51180,13 +51404,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.3.0" = { + "ssb-friends-4.4.3" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.3.0"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.3.0.tgz"; - sha512 = "5NgtiuYM8M2g8crzQF2nCpenM70zhsb6PNeL6B0iXalAl/IN2wwEWSUhU8++2gTh9dZ7icZJ8nC/kCzIoUdmgA=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.3.tgz"; + sha512 = "9LY+XH05epjsJD7MPyuz1OHnErfNI4DJbAqMgees3DtEOfb2wYjeTzfsR3xUnayCgHJQ0p3SVmUhQVyKAy0xkg=="; }; }; "ssb-git-0.5.0" = { @@ -51243,6 +51467,15 @@ let sha512 = "FPeyYU/3LpxcagnbmVWE+Q/qzg6keqeOBPbD7sEH9UKixUASeufPKiORDgh8nVX7J9Z+0vUaHt/WG999kGjvVQ=="; }; }; + "ssb-keys-8.0.2" = { + name = "ssb-keys"; + packageName = "ssb-keys"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-8.0.2.tgz"; + sha512 = "u2U9t5YLbFShKQzr+ayMx9cYNvUJzDeOScodMwfP5zM3+/1AStvc5W91knZGllGwsmGjNC57KW+whRun+H/dBQ=="; + }; + }; "ssb-links-3.0.10" = { name = "ssb-links"; packageName = "ssb-links"; @@ -51396,6 +51629,15 @@ let sha512 = "r/34OHn5wDkVUu0UNdKdPjmd3cPDmgknA5nK+gXBZj9ugSDwmdDsfEUavGtA7hlO+He1pC4EXtBa14dqgTqJCg=="; }; }; + "ssb-sort-1.1.3" = { + name = "ssb-sort"; + packageName = "ssb-sort"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-sort/-/ssb-sort-1.1.3.tgz"; + sha512 = "oPsF8lGgcHcIb4F1GddV3CbZTJZ0OzxI9fHXH0Zc7ZjqjFlYdqMDxFSuvqJnmtDydJcswyGANiziP1ghd69jOw=="; + }; + }; "ssb-unix-socket-1.0.0" = { name = "ssb-unix-socket"; packageName = "ssb-unix-socket"; @@ -51531,13 +51773,13 @@ let sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="; }; }; - "ssri-8.0.0" = { + "ssri-8.0.1" = { name = "ssri"; packageName = "ssri"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz"; - sha512 = "aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA=="; + url = "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"; + sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; }; }; "stable-0.1.8" = { @@ -51828,6 +52070,15 @@ let sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; + "stream-buffers-3.0.2" = { + name = "stream-buffers"; + packageName = "stream-buffers"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz"; + sha512 = "DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ=="; + }; + }; "stream-chain-2.2.4" = { name = "stream-chain"; packageName = "stream-chain"; @@ -52125,13 +52376,13 @@ let sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b"; }; }; - "string-kit-0.11.8" = { + "string-kit-0.11.10" = { name = "string-kit"; packageName = "string-kit"; - version = "0.11.8"; + version = "0.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.8.tgz"; - sha512 = "lJyXXoptFpgOXL9cWZXtf45jxdbP5qYtaGZsmtFm4CZy9q6wwzvRzQcJiFeLx8I/0RpzBao9WCOGpbyfW2CMWA=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.10.tgz"; + sha512 = "ATVmIpMrqxPFNiNQTnmEeXzt3743O6DubJWh2MiAQV1ifKd4PcCjBcybCdb0ENnPO1T6asORK9nOpygn1BATag=="; }; }; "string-length-1.0.1" = { @@ -52170,15 +52421,6 @@ let sha1 = "3aaad855b3e9735c5e412dfe72198ccf99c7f48e"; }; }; - "string-range-1.2.2" = { - name = "string-range"; - packageName = "string-range"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz"; - sha1 = "a893ed347e72299bc83befbbf2a692a8d239d5dd"; - }; - }; "string-similarity-2.0.0" = { name = "string-similarity"; packageName = "string-similarity"; @@ -52683,13 +52925,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.0.6" = { + "strtok3-6.0.8" = { name = "strtok3"; packageName = "strtok3"; - version = "6.0.6"; + version = "6.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.6.tgz"; - sha512 = "fVxvAEKDwHFfbQO1yKxKBPfkWZyBr0Zf20UQ/mblbkAQe5h0Xdd2jDb3Mh7yRZd7LSItJ9JWgQWelpEmVoBe2g=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz"; + sha512 = "QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw=="; }; }; "structured-source-3.0.2" = { @@ -52737,13 +52979,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylelint-13.8.0" = { + "stylelint-13.10.0" = { name = "stylelint"; packageName = "stylelint"; - version = "13.8.0"; + version = "13.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz"; - sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.10.0.tgz"; + sha512 = "eDuLrL0wzPKbl5/TbNGZcbw0lTIGbDEr5W6lCODvb1gAg0ncbgCRt7oU0C2VFDvbrcY0A3MFZOwltwTRmc0XCw=="; }; }; "stylelint-8.4.0" = { @@ -52782,13 +53024,13 @@ let sha512 = "vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg=="; }; }; - "stylus-supremacy-2.14.5" = { + "stylus-supremacy-2.15.0" = { name = "stylus-supremacy"; packageName = "stylus-supremacy"; - version = "2.14.5"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus-supremacy/-/stylus-supremacy-2.14.5.tgz"; - sha512 = "JZjCn4GxPhghgAZ7cdYOKjbo9LIU42BcksNCeLgWQa2FtjyEz44mKKnaXVgUYw+AQIm+x/MblV+VJ04Yk5DSqw=="; + url = "https://registry.npmjs.org/stylus-supremacy/-/stylus-supremacy-2.15.0.tgz"; + sha512 = "XXfA33wxC8xQ0rW9WpA0MOuLOLuzmVsDUmdI1qyKiafJmg1+oqn/efMbtTxUKDgk13DGqNqUgCPhkS16g5T7Qw=="; }; }; "subarg-1.0.0" = { @@ -52998,6 +53240,15 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; + "supports-color-8.1.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; + }; + }; "supports-hyperlinks-1.0.1" = { name = "supports-hyperlinks"; packageName = "supports-hyperlinks"; @@ -53016,6 +53267,33 @@ let sha512 = "zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA=="; }; }; + "svelte-3.32.3" = { + name = "svelte"; + packageName = "svelte"; + version = "3.32.3"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte/-/svelte-3.32.3.tgz"; + sha512 = "5etu/wDwtewhnYO/631KKTjSmFrKohFLWNm1sWErVHXqGZ8eJLqrW0qivDSyYTcN8GbUqsR4LkIhftNFsjNehg=="; + }; + }; + "svelte-preprocess-4.6.8" = { + name = "svelte-preprocess"; + packageName = "svelte-preprocess"; + version = "4.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.6.8.tgz"; + sha512 = "yrT+vuHPoGnNx5Oxa6gMqWV5ZhLgA4isfhUOBwv9iVqZAro9/Nyy8XF5sahAglfMmnCxJkDZSwg7CdAwGpVxhw=="; + }; + }; + "svelte2tsx-0.1.169" = { + name = "svelte2tsx"; + packageName = "svelte2tsx"; + version = "0.1.169"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.169.tgz"; + sha512 = "E4AM2WGMdsYWe8z3BQXbvKQ9dWrOPDrO9xx5V7e+5MHFhyof1a5ZupY6LprJlwQYmWm0Vj9HUGkm8fdVFCfnhA=="; + }; + }; "sver-compat-1.5.0" = { name = "sver-compat"; packageName = "sver-compat"; @@ -53142,13 +53420,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.38.0" = { + "swagger-ui-dist-3.43.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.38.0"; + version = "3.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.38.0.tgz"; - sha512 = "sselV8VY6f1BBauY9Sdmwz0jVaWTnGuHQWei7BaTpiUrLcoEUdmmK5bKefLXiwq+dx//es2S8mOvUS+tcXDsKg=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.43.0.tgz"; + sha512 = "PtE+g23bNbYv8qqAVoPBqNQth8hU5Sl5ZsQ7gHXlO5jlCt31dVTiKI9ArHIT1b23ZzUYTnKsFgPYYFoiWyNCAw=="; }; }; "swagger2openapi-6.2.3" = { @@ -53160,13 +53438,13 @@ let sha512 = "cUUktzLpK69UwpMbcTzjMw2ns9RZChfxh56AHv6+hTx3StPOX2foZjPgds3HlJcINbxosYYBn/D3cG8nwcCWwQ=="; }; }; - "swagger2openapi-7.0.4" = { + "swagger2openapi-7.0.5" = { name = "swagger2openapi"; packageName = "swagger2openapi"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.4.tgz"; - sha512 = "MGzJU44XSXHKxvtx/NbBnP3z5s1KzN5xhqIBERoZEKfRiZ56lNUo5TGOv0dJ8n7JGeheCeU0CydfvbSOh+DaXg=="; + url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.5.tgz"; + sha512 = "Hzxse+VTX0u8xBgYJ665EjO6BfvW2PN9Yv+yIjBDm6ga9jl83+4CEdCCpznH+ILr5MS8bIIXB+XcQUM3u25w4g=="; }; }; "sway-1.0.0" = { @@ -53268,13 +53546,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.34.2" = { + "systeminformation-4.34.9" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.34.2"; + version = "4.34.9"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.2.tgz"; - sha512 = "1LynQMla38gIjzyupKBnBLIo4B0TQf3vdhs2bjKPtN02EymuSWpoAM1KX/6+gtFLVmn91MfllE3wSVGQcVTHDw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.9.tgz"; + sha512 = "jvc4DlJeXazsen2riPDR97GSaHNCmoL+mgfB8IXxmpNpNd7kv5MfkuihXEmF1/prBFtqzUA2lxnt1qp4maOMQA=="; }; }; "table-3.8.3" = { @@ -53377,13 +53655,13 @@ let sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; }; }; - "tail-2.1.1" = { + "tail-2.2.0" = { name = "tail"; packageName = "tail"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tail/-/tail-2.1.1.tgz"; - sha512 = "TBGFzKYD5Af/ts7DBypAQNmPQlt5Uq0bqcf4eRwnfvQcLnSTqruA8h3ps7CKIEPcwX7z9YnP3B6bBHLWYN7+ag=="; + url = "https://registry.npmjs.org/tail/-/tail-2.2.0.tgz"; + sha512 = "QqUMtWlnzArTvGyjVnAE5fAiXEm2Psvk/BlE7vWx2/dIEWMsAhcNPz7iW6WTiSM8h1fjtCkRMsaWBS1j6rpGBg=="; }; }; "taketalk-1.0.0" = { @@ -53485,6 +53763,15 @@ let sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg=="; }; }; + "tar-6.1.0" = { + name = "tar"; + packageName = "tar"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"; + sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; + }; + }; "tar-fs-1.16.3" = { name = "tar-fs"; packageName = "tar-fs"; @@ -53728,13 +54015,13 @@ let sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; - "terminal-kit-1.44.3" = { + "terminal-kit-1.47.0" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.44.3"; + version = "1.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.44.3.tgz"; - sha512 = "G7V7l2pqJqa5llfn/ORDgKlUMGG27n1nxuxwWmZ4/1hCURz+yldKrknirIeu/kyK5M3UdtgPJ0wGAAXw+0aVfw=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.47.0.tgz"; + sha512 = "wyfslVEOJrB2kmZyUEkTKtd4jlNTVR9G1ogkrs7a1VMk55t83+m8sMDJTNuEqfwYXvWbRyGD8pyhv9vyl9xc5w=="; }; }; "terminal-link-2.1.1" = { @@ -53800,13 +54087,13 @@ let sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; }; }; - "terser-webpack-plugin-5.0.3" = { + "terser-webpack-plugin-5.1.1" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.0.3"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.3.tgz"; - sha512 = "zFdGk8Lh9ZJGPxxPE6jwysOlATWB8GMW8HcfGULWA/nPal+3VdATflQvSBSLQJRCmYZnfFJl6vkRTiwJGNgPiQ=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz"; + sha512 = "5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q=="; }; }; "test-exclude-6.0.0" = { @@ -54592,13 +54879,13 @@ let sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"; }; }; - "token-types-2.0.0" = { + "token-types-2.1.1" = { name = "token-types"; packageName = "token-types"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-2.0.0.tgz"; - sha512 = "WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw=="; + url = "https://registry.npmjs.org/token-types/-/token-types-2.1.1.tgz"; + sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; "toml-2.3.6" = { @@ -54628,6 +54915,15 @@ let sha512 = "2Ulkc8T7mXJ2l0W476YC/A209PR38Nw8PuaCNtk9uI3t1zzFdGQeWYGQvmj2PZkVvRC/Yoi4xQKMRnWc/N29tQ=="; }; }; + "too-hot-1.0.0" = { + name = "too-hot"; + packageName = "too-hot"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/too-hot/-/too-hot-1.0.0.tgz"; + sha512 = "RqtHvVffaf+ORMlpFjEWh3czDy6Q5wFfdGq9JXVBXu2L8/ssjDTnong8f1+I2xWGlKslXUkHU7m1HBj6MyoLqw=="; + }; + }; "too-wordy-0.1.6" = { name = "too-wordy"; packageName = "too-wordy"; @@ -54637,13 +54933,13 @@ let sha512 = "MV5F74YF9+UYsvwXGXTh+5YP3EqH/ivwWfyFE2/YHWQQxm9jDPmkIC23nkN133Ye4nO3HTXmiMcfGqJ5xRPfOA=="; }; }; - "too-wordy-0.2.2" = { + "too-wordy-0.3.1" = { name = "too-wordy"; packageName = "too-wordy"; - version = "0.2.2"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/too-wordy/-/too-wordy-0.2.2.tgz"; - sha512 = "ePZfjs1ajL4b8jT4MeVId+9Ci5hJCzAtNIEXIHyFYmKmQuX+eHC/RNv6tuLMUhrGrhJ+sYWW/lBF/LKILHGZEA=="; + url = "https://registry.npmjs.org/too-wordy/-/too-wordy-0.3.1.tgz"; + sha512 = "qfKDd/kxLEmbOqdtWnp/Gw1EEvW5ONZB3HehzkHNKFIx3bUrfda6qdOzxJ74vkaIaJbZyRFkBHkbY078fjAd5A=="; }; }; "topo-2.0.2" = { @@ -55150,6 +55446,15 @@ let sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="; }; }; + "tslib-2.1.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; + sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; + }; + }; "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; @@ -55186,31 +55491,13 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; - "tsutils-3.18.0" = { + "tsutils-3.20.0" = { name = "tsutils"; packageName = "tsutils"; - version = "3.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.18.0.tgz"; - sha512 = "D9Tu8nE3E7D1Bsf/V29oMHceMf+gnVO+pDguk/A5YRo1cLpkiQ48ZnbbS57pvvHeY+OIeNQx1vf4ASPlEtRpcA=="; - }; - }; - "ttf2woff-2.0.2" = { - name = "ttf2woff"; - packageName = "ttf2woff"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.2.tgz"; - sha512 = "X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA=="; - }; - }; - "ttf2woff2-3.0.0" = { - name = "ttf2woff2"; - packageName = "ttf2woff2"; - version = "3.0.0"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-3.0.0.tgz"; - sha512 = "5/Web6B0lF/STNAQ0d5vAlRRquuWsNj8wOmKQ9ql9Bsgbx8MsLnNzaBG9vBcSE4s4Ry1QOr/MyUrDUIVgVPEfw=="; + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.20.0.tgz"; + sha512 = "RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg=="; }; }; "ttl-1.3.1" = { @@ -55303,6 +55590,15 @@ let sha512 = "pqZ6WrHFGnxXC9q2xJ3Qa7EoLAwrojgFRajWZjxTKwbz9vnNnyi8lLjiD5h86UTPOcMlEyHjm6NMhjEDdlc25A=="; }; }; + "turndown-7.0.0" = { + name = "turndown"; + packageName = "turndown"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/turndown/-/turndown-7.0.0.tgz"; + sha512 = "G1FfxfR0mUNMeGjszLYl3kxtopC4O9DRRiMlMDDVHvU1jaBkGFg4qxIyjIk2aiKLHyDyZvZyu4qBO2guuYBy3Q=="; + }; + }; "tv4-1.3.0" = { name = "tv4"; packageName = "tv4"; @@ -55384,13 +55680,13 @@ let sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; - "type-2.1.0" = { + "type-2.2.0" = { name = "type"; packageName = "type"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz"; - sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="; + url = "https://registry.npmjs.org/type/-/type-2.2.0.tgz"; + sha512 = "M/u37b4oSGlusaU8ZB96BfFPWQ8MbsZYXB+kXGMiDj6IKinkcNaQvmirBuWj8mAXqP6LYn1rQvbTYum3yPhaOA=="; }; }; "type-check-0.3.2" = { @@ -55564,22 +55860,31 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "typedarray-to-buffer-1.0.4" = { + "typedarray-to-buffer-3.1.5" = { name = "typedarray-to-buffer"; packageName = "typedarray-to-buffer"; - version = "1.0.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-1.0.4.tgz"; - sha1 = "9bb8ba0e841fb3f4cf1fe7c245e9f3fa8a5fe99c"; + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typedarray-to-buffer-3.1.5" = { + "typedarray-to-buffer-4.0.0" = { name = "typedarray-to-buffer"; packageName = "typedarray-to-buffer"; - version = "3.1.5"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-4.0.0.tgz"; + sha512 = "6dOYeZfS3O9RtRD1caom0sMxgK59b27+IwoNy8RDPsmslSGOyU+mpTamlaIW7aNKi90ZQZ9DFaZL3YRoiSCULQ=="; + }; + }; + "typedfastbitset-0.2.1" = { + name = "typedfastbitset"; + packageName = "typedfastbitset"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typedfastbitset/-/typedfastbitset-0.2.1.tgz"; + sha512 = "B2B+wo5gC7VRAqcFEiUCjS6CJ1vmeYZ7uzY3Jsu6UNStHiF+W0vkhZAmQaj5m9sC2KVrpyHGRzGuhz3M6+n/8A=="; }; }; "typeforce-1.18.0" = { @@ -55618,13 +55923,13 @@ let sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; }; }; - "typescript-3.9.7" = { + "typescript-3.9.9" = { name = "typescript"; packageName = "typescript"; - version = "3.9.7"; + version = "3.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz"; - sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz"; + sha512 = "kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w=="; }; }; "typescript-4.0.3" = { @@ -55645,13 +55950,13 @@ let sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="; }; }; - "typescript-4.1.3" = { + "typescript-4.1.5" = { name = "typescript"; packageName = "typescript"; - version = "4.1.3"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; - sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz"; + sha512 = "6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -55699,13 +56004,13 @@ let sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; }; }; - "typo-geom-0.11.0" = { + "typo-geom-0.11.1" = { name = "typo-geom"; packageName = "typo-geom"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.0.tgz"; - sha512 = "0f7MjfJdUOYCLfUpVegTIukkWd1nkvN6CX6oXF8hcx9Hu04qhQfTC+gOffH8bhSjsSiLhIy7aRuzgIAj4UdyyQ=="; + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.1.tgz"; + sha512 = "DqAx/eGYLJprgRHEV2cMQBzRJo2N9UdBJ2eN54OeZ9chHbq+9U059lLY2DUxeGMff5rtTyG966CuL9aO4csxbQ=="; }; }; "ua-parser-js-0.7.21" = { @@ -55717,13 +56022,13 @@ let sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="; }; }; - "ua-parser-js-0.7.22" = { + "ua-parser-js-0.7.23" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.22"; + version = "0.7.23"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz"; - sha512 = "YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.23.tgz"; + sha512 = "m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA=="; }; }; "uc.micro-1.0.6" = { @@ -55744,22 +56049,22 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.11.6" = { + "uglify-js-3.12.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.6"; + version = "3.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz"; - sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; + sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; }; }; - "uglify-js-3.12.4" = { + "uglify-js-3.12.7" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.4"; + version = "3.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; - sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.7.tgz"; + sha512 = "SIZhkoh+U/wjW+BHGhVwE9nt8tWJspncloBcFapkpGRwNPqcH8pzX36BXe3TPBjzHWPMUZotpCigak/udWNr1Q=="; }; }; "uglify-js-3.4.10" = { @@ -56167,13 +56472,13 @@ let sha512 = "vLUezxCnjzz+ya4pYouRQVMT8k82Rk4fIj406UidRnSFJdGXFaQyQklAnalsQHJrLqAlaYPkXPUa1upfVSHGCA=="; }; }; - "unified-message-control-3.0.2" = { + "unified-message-control-3.0.3" = { name = "unified-message-control"; packageName = "unified-message-control"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.2.tgz"; - sha512 = "lhF8fKjDo2cIPx1re5X1QinqUonl+AN6F0XfEaab8w/hjqX7FZAhzu4P8g6pmYp09ld+HSWFwdRJj+Y8xD0q7Q=="; + url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.3.tgz"; + sha512 = "oY5z2n8ugjpNHXOmcgrw0pQeJzavHS0VjPBP21tOcm7rc2C+5Q+kW9j5+gqtf8vfW/8sabbsK5+P+9QPwwEHDA=="; }; }; "union-0.5.0" = { @@ -56770,13 +57075,13 @@ let sha512 = "8tqsiVrMv7aZsKNSjqA6DdBLKJpZG1hRpkj1RbOJu1PgyP69OX+EInAnP1EK/ShX5YdPFgwWdk19oquZ0HTM8g=="; }; }; - "update-notifier-5.0.1" = { + "update-notifier-5.1.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-5.0.1.tgz"; - sha512 = "BuVpRdlwxeIOvmc32AGYvO1KVdPlsmqSh8KDDBxS6kDE5VR7R8OMP1d8MdhaVBvxl4H3551k9akXr0Y1iIB2Wg=="; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz"; + sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; }; }; "upnp-device-client-1.0.2" = { @@ -56842,13 +57147,13 @@ let sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; }; }; - "uri-js-4.4.0" = { + "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; - sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; "urijs-1.19.5" = { @@ -56869,13 +57174,13 @@ let sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; - "urkel-0.6.3" = { + "urkel-0.7.0" = { name = "urkel"; packageName = "urkel"; - version = "0.6.3"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/urkel/-/urkel-0.6.3.tgz"; - sha512 = "aY/u3cpCRRwa3XjUGG8DcLcQJSNmQ0+qXDeT0igDytKhrK+yiusZ7mYdPRzmtbQ2CPozHhwsmVxCVBkPBp9jDQ=="; + url = "https://registry.npmjs.org/urkel/-/urkel-0.7.0.tgz"; + sha512 = "7Z3Gor4DkKKi0Ehp6H9xehWXqyL12+PA4JM41dcVc1LWks4zI4PGWv6DWgxaLCC+otpEuGdq3Vh5ayD/Mvzfbg=="; }; }; "url-0.10.3" = { @@ -57104,6 +57409,15 @@ let sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d"; }; }; + "utf8-3.0.0" = { + name = "utf8"; + packageName = "utf8"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz"; + sha512 = "E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="; + }; + }; "utf8-byte-length-1.0.4" = { name = "utf8-byte-length"; packageName = "utf8-byte-length"; @@ -57212,6 +57526,15 @@ let sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; }; }; + "util.promisify-1.1.1" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz"; + sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw=="; + }; + }; "utila-0.4.0" = { name = "utila"; packageName = "utila"; @@ -57266,13 +57589,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.2.2" = { + "utp-native-2.3.0" = { name = "utp-native"; packageName = "utp-native"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.2.2.tgz"; - sha512 = "xwn5neM3aKgRCNYaiENRf2pwPa2G79O7r+OCZJDiy92x2q58Ez9hFUPeAW0IQcv0Ii5l1ytDIFWWyaiYVOtlng=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.3.0.tgz"; + sha512 = "5dV711teCP21FIRndcq44ETDPL00TnRVmEnINu3jxyg0tq//ptxOyq7oNO6TcMmuFfeFZRSYOqDmTUl8MmPauQ=="; }; }; "uuid-2.0.3" = { @@ -57329,15 +57652,6 @@ let sha512 = "fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="; }; }; - "uuid-8.3.1" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz"; - sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg=="; - }; - }; "uuid-8.3.2" = { name = "uuid"; packageName = "uuid"; @@ -57446,24 +57760,6 @@ let sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; }; - "validator-10.5.0" = { - name = "validator"; - packageName = "validator"; - version = "10.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.5.0.tgz"; - sha512 = "6OOi+eV2mOxCFLq0f2cJDrdB6lrtLXEUxabhNRGjgOLT/l3SSll9J49Cl+LIloUqkWWTPraK/mucEQ3dc2jStQ=="; - }; - }; - "validator-11.0.0" = { - name = "validator"; - packageName = "validator"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-11.0.0.tgz"; - sha512 = "+wnGLYqaKV2++nUv60uGzUJyJQwYVOin6pn1tgEiFCeCQO60yeu3Og9/yPccbBX574kxIcEJicogkzx6s6eyag=="; - }; - }; "validator-5.7.0" = { name = "validator"; packageName = "validator"; @@ -57599,13 +57895,13 @@ let sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; }; }; - "vega-5.17.3" = { + "vega-5.19.1" = { name = "vega"; packageName = "vega"; - version = "5.17.3"; + version = "5.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.17.3.tgz"; - sha512 = "c8N2pNg9MMmC6shNpoxVw3aVp2XPFOgmWNX5BEOAdCaGHRnSgzNy44+gYdGRaIe6+ljTzZg99Mf+OLO50IP42A=="; + url = "https://registry.npmjs.org/vega/-/vega-5.19.1.tgz"; + sha512 = "UE6/c9q9kzuz4HULFuU9HscBASoZa+zcXqGKdbQP545Nwmhd078QpcH+wZsq9lYfiTxmFtzLK/a0OH0zhkghvA=="; }; }; "vega-canvas-1.2.6" = { @@ -57689,13 +57985,13 @@ let sha512 = "oTAeub3KWm6nKhXoYCx1q9G3K43R6/pDMXvqDlTSUtjoY7b/Gixm8iLcir5S9bPjvH40n4AcbZsPmNfL/Up77A=="; }; }; - "vega-functions-5.10.0" = { + "vega-functions-5.12.0" = { name = "vega-functions"; packageName = "vega-functions"; - version = "5.10.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.10.0.tgz"; - sha512 = "1l28OxUwOj8FEvRU62Oz2hiTuDECrvx1DPU1qLebBKhlgaKbcCk3XyHrn1kUzhMKpXq+SFv5VPxchZP47ASSvQ=="; + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.12.0.tgz"; + sha512 = "3hljmGs+gR7TbO/yYuvAP9P5laKISf1GKk4yRHLNdM61fWgKm8pI3f6LY2Hvq9cHQFTiJ3/5/Bx2p1SX5R4quQ=="; }; }; "vega-geo-4.3.8" = { @@ -57734,13 +58030,13 @@ let sha512 = "e5enQECdau7rJob0NFB5pGumh3RaaSWWm90+boxMy3ay2b4Ki/3XIvo+C4F1Lx04qSxvQF7tO2LJcklRm6nqRA=="; }; }; - "vega-parser-6.1.2" = { + "vega-parser-6.1.3" = { name = "vega-parser"; packageName = "vega-parser"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.2.tgz"; - sha512 = "aGyZrNzPrBruEb/WhemKDuDjQsIkMDGIgnSJci0b+9ZVxjyAzMl7UfGbiYorPiJlnIercjUJbMoFD6fCIf4gqQ=="; + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.3.tgz"; + sha512 = "8oiVhhW26GQ4GZBvolId8FVFvhn3s1KGgPlD7Z+4P2wkV+xe5Nqu0TEJ20F/cn3b88fd0Vj48X3BH3dlSeKNFg=="; }; }; "vega-projection-1.4.5" = { @@ -57779,22 +58075,22 @@ let sha512 = "yE0to0prA9E5PBJ/XP77TO0BMkzyUVyt7TH5PAwj+CZT7PMsMO6ozihelRhoIiVcP0Ae/ByCEQBUQkzN5zJ0ZA=="; }; }; - "vega-scenegraph-4.9.2" = { + "vega-scenegraph-4.9.3" = { name = "vega-scenegraph"; packageName = "vega-scenegraph"; - version = "4.9.2"; + version = "4.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.2.tgz"; - sha512 = "epm1CxcB8AucXQlSDeFnmzy0FCj+HV2k9R6ch2lfLRln5lPLEfgJWgFcFhVf5jyheY0FSeHH52Q5zQn1vYI1Ow=="; + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.3.tgz"; + sha512 = "lBvqLbXqrqRCTGJmSgzZC/tLR/o+TXfakbdhDzNdpgTavTaQ65S/67Gpj5hPpi77DvsfZUIY9lCEeO37aJhy0Q=="; }; }; - "vega-selections-5.1.5" = { + "vega-selections-5.3.0" = { name = "vega-selections"; packageName = "vega-selections"; - version = "5.1.5"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.5.tgz"; - sha512 = "oRSsfkqYqA5xfEJqDpgnSDd+w0k6p6SGYisMD6rGXMxuPl0x0Uy6RvDr4nbEtB+dpWdoWEvgrsZVS6axyDNWvQ=="; + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.3.0.tgz"; + sha512 = "vC4NPsuN+IffruFXfH0L3i2A51RgG4PqpLv85TvrEAIYnSkyKDE4bf+wVraR3aPdnLLkc3+tYuMi6le5FmThIA=="; }; }; "vega-statistics-1.7.9" = { @@ -58157,13 +58453,13 @@ let sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; }; }; - "vizion-0.2.13" = { + "vizion-2.2.1" = { name = "vizion"; packageName = "vizion"; - version = "0.2.13"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vizion/-/vizion-0.2.13.tgz"; - sha1 = "1314cdee2b34116f9f5b1248536f95dbfcd6ef5f"; + url = "https://registry.npmjs.org/vizion/-/vizion-2.2.1.tgz"; + sha512 = "sfAcO2yeSU0CSPFI/DmZp3FsFE9T+8913nv1xWBOyzODv13fwkn6Vl7HqxGpkr9F608M+8SuFId3s+BlZqfXww=="; }; }; "vlc-command-1.2.0" = { @@ -58229,13 +58525,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.83.0" = { + "vsce-1.85.0" = { name = "vsce"; packageName = "vsce"; - version = "1.83.0"; + version = "1.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.83.0.tgz"; - sha512 = "gyF/xtCOFcKO+EvC0FQu5jPECHz2XKMWcw62gqwJJ22lVvlj58t49sWe1IGl9S5NpxCek+QMm6V9i/cDwGWs/Q=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.85.0.tgz"; + sha512 = "YVFwjXWvHRwk75mm3iL4Wr3auCdbBPTv2amtLf97ccqH0hkt0ZVBddu7iOs4HSEbSr9xiiaZwQHUsqMm6Ks0ag=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -58256,22 +58552,31 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; - "vscode-debugadapter-testsupport-1.43.0" = { + "vscode-css-languageservice-5.0.0" = { + name = "vscode-css-languageservice"; + packageName = "vscode-css-languageservice"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.0.0.tgz"; + sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; + }; + }; + "vscode-debugadapter-testsupport-1.44.0" = { name = "vscode-debugadapter-testsupport"; packageName = "vscode-debugadapter-testsupport"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.43.0.tgz"; - sha512 = "dxTu7xgNDipoIKf7H2mrVBhp9Vxx2czrnn1N7eIvmg3CYOLPOq3AGrzHoCwMOZNJX1rVttdYZet1f0bEjrDyjg=="; + url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.44.0.tgz"; + sha512 = "5sPAQ4/OFPBvZoyx2nPI91Zv7CCZ63CS9XrsCaR1t2awEY+hv+yjwryaWpV0AQX6lrYOCO/PehYvzmDsGLEy6A=="; }; }; - "vscode-debugprotocol-1.43.0" = { + "vscode-debugprotocol-1.44.0" = { name = "vscode-debugprotocol"; packageName = "vscode-debugprotocol"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.43.0.tgz"; - sha512 = "pnj+9wVS3yPYz/RXoYSN1tCv+D4139ueaY2WC7V6fUd9QZU8IE5s4r/lZUMJ9gAEGz2km/Iv4qcI7Fdlz5xS9w=="; + url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.44.0.tgz"; + sha512 = "qf+eBnrDyR2MpP08y1JfzJnFZGHdkk86+SRGRp0XepDGNA6n/Nann5XhtAzdGX/yaZokjTAINK313S2yYhHoPQ=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -58283,6 +58588,15 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; + "vscode-emmet-helper-2.1.2" = { + name = "vscode-emmet-helper"; + packageName = "vscode-emmet-helper"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.2.tgz"; + sha512 = "Fy6UNawSgxE3Kuqi54vSXohf03iOIrp1A74ReAgzvGP9Yt7fUAvkqF6No2WAc34/w0oWAHAeqoBNqmKKWh6U5w=="; + }; + }; "vscode-html-languageservice-2.1.12" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; @@ -58292,6 +58606,15 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; + "vscode-html-languageservice-4.0.0" = { + name = "vscode-html-languageservice"; + packageName = "vscode-html-languageservice"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.0.0.tgz"; + sha512 = "UmC+GS0IqBeZnOAmdtQvaDzoH1c5/un+b7qALUziu/Y4SOPXso5dF+YkJeTqsde6YU2pLm78RtMDzl9BParwbw=="; + }; + }; "vscode-json-languageservice-3.11.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; @@ -58634,13 +58957,13 @@ let sha512 = "u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="; }; }; - "vscode-test-1.4.1" = { + "vscode-test-1.5.0" = { name = "vscode-test"; packageName = "vscode-test"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.4.1.tgz"; - sha512 = "Ls7+JyC06cUCuomlTYk4aNJI00Rri09hgtkNl3zfQ1bj6meXglpSPpuzJ/RPNetlUHFMm4eGs0Xr/H5pFPVwfQ=="; + url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.5.0.tgz"; + sha512 = "svwE/mhBBqrB77C1U7pkUKfUmxnkzg0dLGi1vEmitsleu88oNsqZEhG3ANZrL/Ia4m0CW0oYEKRw2EojpFxLlQ=="; }; }; "vscode-textbuffer-1.0.0" = { @@ -58769,13 +59092,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.3.0" = { + "vue-eslint-parser-7.4.1" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.3.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz"; - sha512 = "n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz"; + sha512 = "AFvhdxpFvliYq1xt/biNBslTHE/zbEvSnr1qfHA/KxRIpErmEDrQZlQnvEexednRHmLfDNOMuDYwZL5xkLzIXQ=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -58868,15 +59191,6 @@ let sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; }; }; - "watchpack-1.7.4" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz"; - sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg=="; - }; - }; "watchpack-1.7.5" = { name = "watchpack"; packageName = "watchpack"; @@ -58886,13 +59200,13 @@ let sha512 = "9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ=="; }; }; - "watchpack-2.1.0" = { + "watchpack-2.1.1" = { name = "watchpack"; packageName = "watchpack"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-2.1.0.tgz"; - sha512 = "UjgD1mqjkG99+3lgG36at4wPnUXNvis2v1utwTgQ43C22c4LD71LsYMExdWXh4HZ+RmW+B0t1Vrg2GpXAkTOQw=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz"; + sha512 = "Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw=="; }; }; "watchpack-chokidar2-2.0.1" = { @@ -58913,6 +59227,15 @@ let sha1 = "79331f666366b3b1c6ab02ceb04bad8dd2eebb0c"; }; }; + "wawoff2-1.0.2" = { + name = "wawoff2"; + packageName = "wawoff2"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wawoff2/-/wawoff2-1.0.2.tgz"; + sha512 = "qxuTwf5tAP/XojrRc6cmR0hGvqgD3XUxv2fzfzURKPDfE7AeHmtRuankVxdJ4DRdSKXaE5QlyJT49yBis2vb6Q=="; + }; + }; "wbuf-1.7.3" = { name = "wbuf"; packageName = "wbuf"; @@ -58967,13 +59290,13 @@ let sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; - "webassemblyjs-1.9.1" = { + "webassemblyjs-1.11.0" = { name = "webassemblyjs"; packageName = "webassemblyjs"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.9.1.tgz"; - sha512 = "x0YxqLnuk8PjeZf5NOkmdQ4FwIRa7NlX3WIRhbpzSaGCih6la55TaATY4BpS81lMyjZvpdfKAQlLVzvd5G57fg=="; + url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.11.0.tgz"; + sha512 = "zAwCqHShTm/OBhYzqXlumetrI5yAkMFbFjnv8qba4WtP+KZIchkAml6zPDZWnxQQH2rs9TTbcbXrMVQplleJQA=="; }; }; "webidl-conversions-2.0.1" = { @@ -59030,6 +59353,15 @@ let sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; }; }; + "webpack-4.46.0" = { + name = "webpack"; + packageName = "webpack"; + version = "4.46.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz"; + sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; + }; + }; "webpack-5.9.0" = { name = "webpack"; packageName = "webpack"; @@ -59102,13 +59434,13 @@ let sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; - "webpack-merge-4.2.2" = { + "webpack-merge-5.7.3" = { name = "webpack-merge"; packageName = "webpack-merge"; - version = "4.2.2"; + version = "5.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"; - sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz"; + sha512 = "6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA=="; }; }; "webpack-node-externals-2.5.2" = { @@ -59183,13 +59515,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.112.0" = { + "webtorrent-0.114.1" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.112.0"; + version = "0.114.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.112.0.tgz"; - sha512 = "3Fe4tzeXhZKI0KXGGkr9gyzlx7eKjfU9Se2VJhdE1AcpHppxApuechaWu/KS24amUv4j+xPXE7f3Lc4wF+7QSQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.114.1.tgz"; + sha512 = "RJqwy6cTG1kysvd3xX2CJIAMeC/3e5M/MPu4MuZKcBxa2I+D75nONoNjP0cLTnE+gVb0MFQSQU93ln/2/f6k6g=="; }; }; "well-known-symbols-2.0.0" = { @@ -59426,13 +59758,22 @@ let sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA=="; }; }; - "wikipeg-2.0.3" = { + "wikipeg-2.0.5" = { name = "wikipeg"; packageName = "wikipeg"; - version = "2.0.3"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.5.tgz"; + sha512 = "FMNznSW4Qjexmgqz23YLtXoS6+GKPnbkEsI14xdRxsWv8jQWJ94ffQZ4PpUSsZm7/XAjqrjFiUnbvOOxBhJY4g=="; + }; + }; + "wildcard-2.0.0" = { + name = "wildcard"; + packageName = "wildcard"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.3.tgz"; - sha512 = "VMVqiZRIFqb5rQYhRqvzPy5yFwJyCkjEdNAsSnq6ZxYH+7EN7/U+R3LrIx1Lf16pq+DZuWY3wrkq6YFhU8c0lg=="; + url = "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz"; + sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; }; }; "win-detect-browsers-1.0.2" = { @@ -59822,13 +60163,13 @@ let sha512 = "P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg=="; }; }; - "workerpool-6.0.2" = { + "workerpool-6.1.0" = { name = "workerpool"; packageName = "workerpool"; - version = "6.0.2"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz"; - sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz"; + sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; }; }; "wrap-ansi-2.1.0" = { @@ -60056,31 +60397,22 @@ let sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA=="; }; }; - "ws-7.3.1" = { - name = "ws"; - packageName = "ws"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz"; - sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="; - }; - }; - "ws-7.4.1" = { + "ws-7.4.2" = { name = "ws"; packageName = "ws"; - version = "7.4.1"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz"; - sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ=="; + url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz"; + sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="; }; }; - "ws-7.4.2" = { + "ws-7.4.3" = { name = "ws"; packageName = "ws"; - version = "7.4.2"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz"; - sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz"; + sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; }; }; "x-default-browser-0.3.1" = { @@ -60389,15 +60721,6 @@ let sha512 = "HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ=="; }; }; - "xmldoc-1.1.2" = { - name = "xmldoc"; - packageName = "xmldoc"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldoc/-/xmldoc-1.1.2.tgz"; - sha512 = "ruPC/fyPNck2BD1dpz0AZZyrEwMOrWTO5lDdIXS91rs3wtm4j+T8Rp2o+zoOYkkAxJTZRPOSnOGei1egoRmKMQ=="; - }; - }; "xmldom-0.1.19" = { name = "xmldom"; packageName = "xmldom"; @@ -60458,7 +60781,7 @@ let version = "1.5.0"; src = fetchurl { name = "xmlhttprequest-1.5.0.tar.gz"; - url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433; + url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433"; sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; }; }; @@ -60552,15 +60875,6 @@ let sha512 = "1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw=="; }; }; - "xtend-2.0.6" = { - name = "xtend"; - packageName = "xtend"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz"; - sha1 = "5ea657a6dba447069c2e59c58a1138cb0c5e6cee"; - }; - }; "xtend-2.1.2" = { name = "xtend"; packageName = "xtend"; @@ -60570,24 +60884,6 @@ let sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; }; }; - "xtend-2.2.0" = { - name = "xtend"; - packageName = "xtend"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-2.2.0.tgz"; - sha1 = "eef6b1f198c1c8deafad8b1765a04dad4a01c5a9"; - }; - }; - "xtend-3.0.0" = { - name = "xtend"; - packageName = "xtend"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"; - sha1 = "5cce7407baf642cba7becda568111c493f59665a"; - }; - }; "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; @@ -60696,13 +60992,13 @@ let sha512 = "26QP9JhfcrroDTeMv2OsY4eoI+NKb6tZwy1Uz0MBWi1uGmOw0/6aR9Oa3guOsC96U27GAqT6glRFMjCGqLro7A=="; }; }; - "yaml-language-server-parser-0.1.1" = { + "yaml-language-server-parser-0.1.2" = { name = "yaml-language-server-parser"; packageName = "yaml-language-server-parser"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.1.tgz"; - sha512 = "2PememGb1SrPqXAxXTpBD39rwYZap6CJVSvkfULNv9uwV3VHp1TfkgpsylBb+mpuuivH0JZ52lChXPvNa6yVxw=="; + url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.2.tgz"; + sha512 = "GQ2eRE5GcKBK8XVKBIcMyOfC8WMZmEs6gogtVc6knLKE6pG+e5L/lOMfBxZzAt2lqye5itMggQ9+6stXAVhMsw=="; }; }; "yaml-language-server-parser-0.1.3-fa8245c.0" = { @@ -61047,13 +61343,13 @@ let sha512 = "pLIhhU9z/G+kjOXmJ2bPFm3nejfbH+f1fjYRSOteEXDBrv1EoJE/e+kuHixSXfCYfTkxjYsvRaDX+1QykLCnpQ=="; }; }; - "yeoman-generator-4.12.0" = { + "yeoman-generator-4.13.0" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.12.0"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.12.0.tgz"; - sha512 = "lozwklVQHwUXMM1o8BgxEB8F5BB7vkHW4pjAo1Zt5sJ7FOlWhd6DJ4ZxJ2OK0w+gNYkY/ocPMkUV7DTz/uqEEg=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.13.0.tgz"; + sha512 = "f2/5N5IR3M2Ozm+QocvZQudlQITv2DwI6Mcxfy7R7gTTzaKgvUpgo/pQMJ+WQKm0KN0YMWCFOZpj0xFGxevc1w=="; }; }; "yn-3.1.1" = { @@ -61215,70 +61511,86 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.0.5"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.5.tgz"; - sha512 = "k4j/2z7qkuigJ1shH0McW1wW63clhrbrg98FK4/KWhU/sce5AgVjuHDQFycAclTwHesf7Vs6Gzt7zGlqUmeKIg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.0.tgz"; + sha512 = "waIR5Nqc2wcYXZh/Mgm+4Iyvu0nzKAhvmKiJjcJ+f2UuPRMLdNAInTvhdpfgKaNdmiArxNa6UntRIu+EavGc9Q=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1100.5" - sources."@angular-devkit/core-11.0.5" - sources."@angular-devkit/schematics-11.0.5" - sources."@schematics/angular-11.0.5" - sources."@schematics/update-0.1100.5" + sources."@angular-devkit/architect-0.1102.0" + sources."@angular-devkit/core-11.2.0" + sources."@angular-devkit/schematics-11.2.0" + sources."@npmcli/ci-detect-1.3.0" + (sources."@npmcli/git-2.0.6" // { + dependencies = [ + sources."promise-retry-2.0.1" + ]; + }) + sources."@npmcli/installed-package-contents-1.0.7" + sources."@npmcli/move-file-1.1.2" + sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/promise-spawn-1.3.2" + (sources."@npmcli/run-script-1.8.3" // { + dependencies = [ + sources."read-package-json-fast-2.0.1" + ]; + }) + sources."@schematics/angular-11.2.0" + sources."@schematics/update-0.1102.0" + sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" - sources."JSONStream-1.3.5" - sources."agent-base-4.3.0" - sources."agentkeepalive-3.5.2" + sources."abbrev-1.1.1" + sources."agent-base-6.0.2" + sources."agentkeepalive-4.1.4" + sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."balanced-match-1.0.0" + sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.7.2" + sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" + sources."buffer-5.7.1" sources."builtins-1.0.3" - (sources."cacache-12.0.4" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."rimraf-2.7.1" - sources."yallist-3.1.1" - ]; - }) + sources."cacache-15.0.5" sources."caseless-0.12.0" sources."chalk-4.1.0" sources."chardet-0.7.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" + sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.5.0" sources."cli-width-3.0.0" sources."clone-1.0.4" + sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) + sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."cyclist-1.0.1" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.1" sources."defaults-1.0.3" sources."delayed-stream-1.0.0" - sources."duplexify-3.7.1" + sources."delegates-1.0.0" + sources."depd-1.1.2" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" (sources."encoding-0.1.13" // { @@ -61286,231 +61598,173 @@ in sources."iconv-lite-0.6.2" ]; }) - sources."end-of-stream-1.4.4" - sources."err-code-1.1.2" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" + sources."env-paths-2.2.0" + sources."err-code-2.0.3" sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.2" sources."figures-3.2.0" - sources."flush-write-stream-1.1.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."from2-2.3.0" - sources."fs-minipass-1.2.7" - sources."fs-write-stream-atomic-1.0.10" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."genfun-5.0.0" - sources."get-stream-4.1.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."hosted-git-info-3.0.7" - sources."http-cache-semantics-3.8.1" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."has-unicode-2.0.1" + sources."hosted-git-info-3.0.8" + sources."http-cache-semantics-4.1.0" + sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" - (sources."https-proxy-agent-2.2.4" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) + sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" - sources."iferr-0.1.5" + sources."ieee754-1.2.1" sources."ignore-walk-3.0.3" sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.6" + sources."ini-2.0.0" sources."inquirer-7.3.3" sources."ip-1.1.5" sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" + sources."is-lambda-1.0.1" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonc-parser-2.3.1" + sources."jsonc-parser-3.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.20" sources."log-symbols-4.0.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" - (sources."make-fetch-happen-5.0.2" // { + (sources."make-fetch-happen-8.0.14" // { dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.1.1" + sources."promise-retry-2.0.1" ]; }) sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-1.2.5" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) - sources."minizlib-1.3.3" - sources."mississippi-3.0.0" - sources."mkdirp-0.5.5" - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) + sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.3.3" + sources."minipass-flush-1.0.5" + sources."minipass-json-stream-1.0.1" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."node-fetch-npm-2.0.4" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."hosted-git-info-2.8.8" - sources."semver-5.7.1" - ]; - }) + sources."node-gyp-7.1.2" + sources."nopt-5.0.0" sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.0" - sources."npm-packlist-1.4.8" + sources."npm-packlist-2.1.4" sources."npm-pick-manifest-6.1.0" - (sources."npm-registry-fetch-4.0.7" // { - dependencies = [ - sources."hosted-git-info-2.8.8" - sources."lru-cache-5.1.1" - sources."npm-package-arg-6.1.1" - sources."semver-5.7.1" - sources."yallist-3.1.1" - ]; - }) + sources."npm-registry-fetch-9.0.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.3.0" - sources."ora-5.1.0" - sources."os-homedir-1.0.2" + sources."open-7.4.0" + sources."ora-5.3.0" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - (sources."pacote-9.5.12" // { - dependencies = [ - sources."hosted-git-info-2.8.8" - sources."lru-cache-5.1.1" - sources."npm-package-arg-6.1.1" - sources."npm-pick-manifest-3.0.2" - sources."rimraf-2.7.1" - sources."semver-5.7.1" - sources."yallist-3.1.1" - ]; - }) - sources."parallel-transform-1.2.0" + sources."p-map-4.0.0" + sources."pacote-11.2.4" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" - sources."promise-retry-1.1.1" - sources."protoduck-5.0.1" - sources."psl-1.8.0" - sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { + (sources."promise-retry-1.1.1" // { dependencies = [ - sources."pump-2.0.1" + sources."err-code-1.1.2" + sources."retry-0.10.1" ]; }) + sources."psl-1.8.0" + sources."puka-1.0.1" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."read-package-json-fast-1.2.2" + sources."readable-stream-3.6.0" (sources."request-2.88.2" // { dependencies = [ sources."uuid-3.4.0" ]; }) - sources."resolve-1.18.1" + sources."resolve-1.19.0" sources."restore-cursor-3.1.0" - sources."retry-0.10.1" + sources."retry-0.12.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-queue-1.0.3" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.2" + sources."semver-7.3.4" (sources."semver-intersect-1.4.0" // { dependencies = [ sources."semver-5.7.1" ]; }) + sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" - sources."socks-2.3.3" - (sources."socks-proxy-agent-4.0.2" // { - dependencies = [ - sources."agent-base-4.2.1" - ]; - }) + sources."socks-2.5.1" + sources."socks-proxy-agent-5.0.0" sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" - sources."spdx-correct-3.1.1" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" - sources."ssri-6.0.1" - sources."stream-each-1.2.3" - sources."stream-shift-1.0.1" + sources."ssri-8.0.1" sources."string-width-4.2.0" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" - sources."symbol-observable-2.0.3" - (sources."tar-4.4.13" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) + sources."symbol-observable-3.0.0" + sources."tar-6.1.0" sources."through-2.3.8" - sources."through2-2.0.5" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.11.0" - sources."typedarray-0.0.6" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" (sources."universal-analytics-0.4.23" // { @@ -61518,23 +61772,28 @@ in sources."uuid-3.4.0" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" - sources."uuid-8.3.1" - sources."validate-npm-package-license-3.0.4" + sources."uuid-8.3.2" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."wcwidth-1.0.1" - sources."which-1.3.1" + sources."which-2.0.2" + (sources."wide-align-1.1.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."y18n-4.0.1" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { description = "CLI tool for Angular"; - homepage = https://github.com/angular/angular-cli; + homepage = "https://github.com/angular/angular-cli"; license = "MIT"; }; production = true; @@ -61571,7 +61830,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The command line interface for Antora."; - homepage = https://antora.org/; + homepage = "https://antora.org"; license = "MPL-2.0"; }; production = true; @@ -61608,7 +61867,7 @@ in sources."async-lock-1.2.8" sources."balanced-match-1.0.0" sources."base64-js-0.0.2" - sources."bl-4.0.3" + sources."bl-4.0.4" sources."bops-0.0.7" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -61627,7 +61886,7 @@ in sources."pump-3.0.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."clean-git-ref-2.0.1" @@ -61693,7 +61952,7 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" (sources."get-stream-4.1.0" // { dependencies = [ sources."pump-3.0.0" @@ -61718,7 +61977,7 @@ in sources."mimic-response-1.0.1" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" (sources."gulp-vinyl-zip-2.2.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -61857,7 +62116,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.7" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -61887,7 +62146,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The default site generator pipeline for producing and publishing static documentation sites with Antora."; - homepage = https://antora.org/; + homepage = "https://antora.org"; license = "MPL-2.0"; }; production = true; @@ -61897,17 +62156,17 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.13.3"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.13.3.tgz"; - sha512 = "N6eUF/1JBENunuXcpt0d2t5fRLuZndobKMxKTMyqguEH3Fy9cRhEopirxbXskEDCf7Dh2jUdlL/b+4e3fpG7rw=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.14.0.tgz"; + sha512 = "j9xCEhsE+xkR6tYYONv+MSlv7/OIQHj9G2JYq5vOauC4RNRLYSmo5I94LKliqUZDrZb4HpByhcL/nUcNxu5fNw=="; }; dependencies = [ sources."abab-2.0.5" sources."acorn-6.4.2" sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" - sources."agent-base-5.1.1" + sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -61921,6 +62180,7 @@ in sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" + sources."browser-hrtime-1.1.8" sources."browser-process-hrtime-1.0.0" sources."caseless-0.12.0" sources."chalk-2.4.1" @@ -61956,13 +62216,13 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."getpass-0.1.7" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."html-encoding-sniffer-1.0.2" sources."http-signature-1.2.0" - sources."https-proxy-agent-4.0.0" + sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" sources."is-docker-2.1.1" @@ -62035,7 +62295,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" @@ -62053,7 +62313,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A secure and free password manager for all of your devices."; - homepage = https://bitwarden.com/; + homepage = "https://bitwarden.com"; license = "GPL-3.0"; }; production = true; @@ -62072,9 +62332,9 @@ in sources."@angular-devkit/core-11.0.3" sources."@angular-devkit/schematics-11.0.3" sources."@angular-devkit/schematics-cli-0.1100.3" - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -62084,10 +62344,12 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-7.2.6" // { + (sources."@nestjs/schematics-7.2.7" // { dependencies = [ - sources."@angular-devkit/core-11.0.5" - sources."@angular-devkit/schematics-11.0.5" + sources."@angular-devkit/core-11.1.0" + sources."@angular-devkit/schematics-11.1.0" + sources."chalk-4.1.0" + sources."ora-5.2.0" ]; }) sources."@schematics/schematics-0.1100.3" @@ -62095,13 +62357,13 @@ in sources."@types/eslint-7.2.6" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.45" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" - (sources."@types/uglify-js-3.11.1" // { + (sources."@types/uglify-js-3.12.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -62132,23 +62394,26 @@ in sources."@webassemblyjs/wast-printer-1.9.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.0.4" + sources."acorn-8.0.5" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."at-least-node-1.0.0" sources."balanced-match-1.0.0" - sources."binary-extensions-2.1.0" + sources."base64-js-1.5.1" + sources."binary-extensions-2.2.0" + sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.0" + sources."browserslist-4.16.3" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001185" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.4.3" @@ -62169,10 +62434,10 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.663" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-4.3.0" + sources."enhanced-resolve-4.5.0" sources."errno-0.1.8" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -62197,7 +62462,7 @@ in sources."chalk-4.1.0" ]; }) - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."fs-monkey-1.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" @@ -62206,21 +62471,20 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-flag-4.0.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."import-fresh-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."chalk-4.1.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" ]; }) sources."interpret-1.4.0" @@ -62241,13 +62505,9 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json5-1.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."jsonfile-6.1.0" sources."lines-and-columns-1.1.6" - sources."loader-runner-4.1.0" + sources."loader-runner-4.2.0" sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" @@ -62260,7 +62520,13 @@ in sources."macos-release-2.4.1" sources."magic-string-0.25.7" sources."memfs-3.2.0" - sources."memory-fs-0.5.0" + (sources."memory-fs-0.5.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."merge-stream-2.0.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" @@ -62270,7 +62536,7 @@ in sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -62278,9 +62544,7 @@ in sources."onetime-5.1.2" (sources."ora-5.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."chalk-4.1.0" - sources."strip-ansi-6.0.0" ]; }) sources."os-name-4.0.0" @@ -62289,7 +62553,7 @@ in sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -62303,16 +62567,16 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" - sources."readable-stream-2.3.7" + sources."readable-stream-3.6.0" sources."readdirp-3.5.0" sources."rechoir-0.6.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."rxjs-6.6.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."schema-utils-2.7.0" sources."semver-7.3.4" @@ -62329,9 +62593,14 @@ in ]; }) sources."sourcemap-codec-1.4.8" - sources."string-width-2.1.1" - sources."string_decoder-1.1.1" - sources."strip-ansi-4.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" @@ -62342,7 +62611,7 @@ in sources."commander-2.20.3" ]; }) - (sources."terser-webpack-plugin-5.0.3" // { + (sources."terser-webpack-plugin-5.1.1" // { dependencies = [ sources."p-limit-3.1.0" sources."schema-utils-3.0.0" @@ -62367,14 +62636,14 @@ in sources."tslib-1.14.1" sources."type-fest-0.11.0" sources."typescript-4.0.5" - sources."universalify-1.0.0" - sources."uri-js-4.4.0" + sources."universalify-2.0.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" - sources."watchpack-2.1.0" + sources."watchpack-2.1.1" sources."wcwidth-1.0.1" (sources."webpack-5.9.0" // { dependencies = [ - sources."enhanced-resolve-5.4.1" + sources."enhanced-resolve-5.7.0" sources."schema-utils-3.0.0" sources."tapable-2.2.0" ]; @@ -62405,17 +62674,21 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.5.9"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.9.tgz"; - sha512 = "R6fRau8+fqKI+94LrruKtJDaMQGVsJCNzrdefTJ+bn+ljtCS6j9H+XuU8zLa9+X0HBkX4VoBT7XjfwUAo1IIPA=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.11.tgz"; + sha512 = "w6B1+Fb0AHwAd8eE1q4/KrJph/kXo/cqQ0Lf5MnXCYt7SXdDPBGTdyFAumMaSPQESXgmdWgEo8EhnVEBNpXDIw=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.20.7" + (sources."@apollo/federation-0.20.7" // { + dependencies = [ + sources."apollo-server-env-2.4.5" + ]; + }) (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.50" + sources."@types/node-10.17.51" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -62424,127 +62697,135 @@ in sources."@apollographql/graphql-language-service-types-2.0.2" sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + (sources."@babel/core-7.12.16" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/generator-7.12.15" + sources."@babel/types-7.12.13" sources."semver-5.7.1" ]; }) - (sources."@babel/generator-7.12.10" // { + (sources."@babel/generator-7.12.11" // { + dependencies = [ + sources."@babel/types-7.12.13" + ]; + }) + (sources."@babel/helper-annotate-as-pure-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-annotate-as-pure-7.12.10" // { + (sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.5" // { + (sources."@babel/helper-compilation-targets-7.12.16" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - (sources."@babel/helper-define-map-7.10.5" // { + sources."@babel/helper-create-class-features-plugin-7.12.16" + sources."@babel/helper-create-regexp-features-plugin-7.12.16" + (sources."@babel/helper-explode-assignable-expression-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-explode-assignable-expression-7.12.1" // { + (sources."@babel/helper-function-name-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-function-name-7.12.11" // { + (sources."@babel/helper-get-function-arity-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-get-function-arity-7.12.10" // { + (sources."@babel/helper-hoist-variables-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/helper-hoist-variables-7.10.4" - (sources."@babel/helper-member-expression-to-functions-7.12.7" // { + (sources."@babel/helper-member-expression-to-functions-7.12.16" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-module-imports-7.12.5" // { + (sources."@babel/helper-module-imports-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-module-transforms-7.12.1" // { + (sources."@babel/helper-module-transforms-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-optimise-call-expression-7.12.10" // { + (sources."@babel/helper-optimise-call-expression-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/helper-plugin-utils-7.10.4" - (sources."@babel/helper-remap-async-to-generator-7.12.1" // { + sources."@babel/helper-plugin-utils-7.12.13" + (sources."@babel/helper-remap-async-to-generator-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-replace-supers-7.12.11" // { + (sources."@babel/helper-replace-supers-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-simple-access-7.12.1" // { + (sources."@babel/helper-simple-access-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-split-export-declaration-7.12.11" // { + (sources."@babel/helper-split-export-declaration-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - (sources."@babel/helpers-7.12.5" // { - dependencies = [ - sources."@babel/types-7.12.12" - ]; - }) - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/helper-validator-option-7.12.16" + (sources."@babel/helper-wrap-function-7.12.13" // { + dependencies = [ + sources."@babel/types-7.12.13" + ]; + }) + (sources."@babel/helpers-7.12.13" // { + dependencies = [ + sources."@babel/types-7.12.13" + ]; + }) + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.1" + sources."@babel/plugin-syntax-flow-7.12.13" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -62552,68 +62833,68 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-syntax-typescript-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.10" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-typescript-7.12.1" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.11" // { - dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-syntax-typescript-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-typescript-7.12.16" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + (sources."@babel/preset-env-7.12.16" // { + dependencies = [ + sources."@babel/types-7.12.13" sources."semver-5.7.1" ]; }) - sources."@babel/preset-flow-7.12.1" + sources."@babel/preset-flow-7.12.13" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.7" - (sources."@babel/register-7.12.10" // { + sources."@babel/preset-typescript-7.12.16" + (sources."@babel/register-7.12.13" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.12.5" - (sources."@babel/template-7.12.7" // { + sources."@babel/runtime-7.12.13" + (sources."@babel/template-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/traverse-7.12.12" // { + (sources."@babel/traverse-7.12.13" // { dependencies = [ - sources."@babel/generator-7.12.11" - sources."@babel/types-7.12.12" + sources."@babel/generator-7.12.15" + sources."@babel/types-7.12.13" ]; }) sources."@babel/types-7.10.4" @@ -62643,17 +62924,22 @@ in }) (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.1" + sources."@oclif/plugin-help-3.2.2" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" sources."lru-cache-6.0.0" sources."semver-7.3.4" - sources."yallist-4.0.0" + sources."supports-color-7.2.0" ]; }) (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."globby-11.0.1" + sources."globby-11.0.2" sources."is-wsl-2.2.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."@oclif/errors-1.3.4" // { @@ -62669,15 +62955,17 @@ in }) sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.5" - (sources."@oclif/plugin-autocomplete-0.2.1" // { + (sources."@oclif/plugin-autocomplete-0.3.0" // { dependencies = [ - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."fs-extra-9.1.0" + sources."has-flag-4.0.0" + sources."jsonfile-6.1.0" + sources."supports-color-7.2.0" + sources."universalify-2.0.0" ]; }) (sources."@oclif/plugin-help-2.2.3" // { @@ -62703,15 +62991,22 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."@oclif/plugin-plugins-1.9.4" // { + (sources."@oclif/plugin-plugins-1.9.5" // { dependencies = [ - sources."fs-extra-8.1.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."fs-extra-9.1.0" + sources."has-flag-4.0.0" + sources."jsonfile-6.1.0" sources."lru-cache-6.0.0" sources."npm-run-path-4.0.1" sources."path-key-3.1.1" sources."semver-7.3.4" - sources."tslib-2.0.3" - sources."yallist-4.0.0" + sources."supports-color-7.2.0" + sources."tslib-2.1.0" + sources."universalify-2.0.0" ]; }) (sources."@oclif/plugin-warn-if-update-available-1.7.0" // { @@ -62740,12 +63035,12 @@ in sources."@types/cors-2.8.8" sources."@types/ejs-2.7.0" sources."@types/express-4.17.7" - sources."@types/express-serve-static-core-4.17.17" + sources."@types/express-serve-static-core-4.17.18" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" (sources."@types/graphql-upload-8.0.4" // { dependencies = [ - sources."graphql-15.4.0" + sources."graphql-15.5.0" ]; }) sources."@types/http-assert-1.5.1" @@ -62759,12 +63054,12 @@ in ]; }) sources."@types/keygrip-1.0.2" - sources."@types/koa-2.11.6" + sources."@types/koa-2.11.7" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" - sources."@types/mime-2.0.3" + sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -62773,28 +63068,28 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" - sources."@types/serve-static-1.13.8" + sources."@types/serve-static-1.13.9" sources."@types/through-0.0.30" sources."@types/ws-7.4.0" sources."@types/zen-observable-0.8.2" - sources."@vue/cli-shared-utils-4.5.9" - (sources."@vue/cli-ui-4.5.9" // { + sources."@vue/cli-shared-utils-4.5.11" + (sources."@vue/cli-ui-4.5.11" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.5.9" - sources."@vue/cli-ui-addon-widgets-4.5.9" + sources."@vue/cli-ui-addon-webpack-4.5.11" + sources."@vue/cli-ui-addon-widgets-4.5.11" (sources."@vue/compiler-core-3.0.5" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" sources."source-map-0.6.1" ]; }) sources."@vue/compiler-dom-3.0.5" (sources."@vue/compiler-sfc-3.0.5" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" sources."source-map-0.6.1" ]; }) @@ -62846,28 +63141,29 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.32.0" // { + (sources."apollo-2.32.1" // { dependencies = [ + sources."graphql-tag-2.11.0" sources."mkdirp-1.0.4" sources."strip-ansi-5.2.0" ]; }) sources."apollo-cache-1.3.5" - sources."apollo-cache-control-0.11.5" + sources."apollo-cache-control-0.11.6" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.39.0" // { + (sources."apollo-codegen-core-0.39.1" // { dependencies = [ sources."recast-0.20.4" sources."source-map-0.6.1" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) - sources."apollo-codegen-flow-0.37.0" - sources."apollo-codegen-scala-0.38.0" - sources."apollo-codegen-swift-0.39.0" - sources."apollo-codegen-typescript-0.39.0" - sources."apollo-datasource-0.7.2" + sources."apollo-codegen-flow-0.37.1" + sources."apollo-codegen-scala-0.38.1" + sources."apollo-codegen-swift-0.39.1" + sources."apollo-codegen-typescript-0.39.1" + sources."apollo-datasource-0.7.3" sources."apollo-env-0.6.5" sources."apollo-graphql-0.6.0" sources."apollo-language-server-1.25.0" @@ -62880,18 +63176,23 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-reporting-protobuf-0.6.2" - sources."apollo-server-caching-0.5.2" - (sources."apollo-server-core-2.19.1" // { + (sources."apollo-server-caching-0.5.3" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) + (sources."apollo-server-core-2.20.0" // { dependencies = [ + sources."lru-cache-6.0.0" sources."uuid-8.3.2" ]; }) - sources."apollo-server-env-2.4.5" + sources."apollo-server-env-3.0.0" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.19.1" - sources."apollo-server-plugin-base-0.10.3" - sources."apollo-server-types-0.6.2" - sources."apollo-tracing-0.12.1" + sources."apollo-server-express-2.20.0" + sources."apollo-server-plugin-base-0.10.4" + sources."apollo-server-types-0.6.3" + sources."apollo-tracing-0.12.2" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { @@ -62918,7 +63219,7 @@ in sources."assign-symbols-1.0.0" (sources."ast-types-0.14.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."astral-regex-1.0.0" @@ -62982,7 +63283,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.0" + sources."browserslist-4.16.3" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -63000,24 +63301,26 @@ in sources."lowercase-keys-1.0.0" sources."normalize-url-2.0.1" sources."prepend-http-2.0.0" + sources."query-string-5.1.1" sources."sort-keys-2.0.0" + sources."strict-uri-encode-1.1.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001185" (sources."capital-case-1.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."capture-stack-trace-1.0.1" @@ -63027,7 +63330,7 @@ in sources."chalk-2.4.2" (sources."change-case-4.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."chardet-0.7.0" @@ -63066,7 +63369,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-progress-3.8.2" + sources."cli-progress-3.9.0" sources."cli-spinners-2.5.0" (sources."cli-truncate-0.2.1" // { dependencies = [ @@ -63093,9 +63396,8 @@ in sources."semver-7.3.4" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.1.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."type-fest-0.11.0" - sources."yallist-4.0.0" ]; }) sources."cli-width-3.0.0" @@ -63128,7 +63430,7 @@ in sources."consolidate-0.16.0" (sources."constant-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."content-disposition-0.5.3" // { @@ -63145,8 +63447,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.8.2" - (sources."core-js-compat-3.8.2" // { + sources."core-js-3.8.3" + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -63222,7 +63524,7 @@ in sources."dir-glob-3.0.1" (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."dot-prop-4.2.1" @@ -63242,17 +63544,17 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.663" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."entities-2.1.0" + sources."entities-2.2.0" sources."env-ci-3.2.2" - sources."envinfo-7.7.3" + sources."envinfo-7.7.4" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -63309,10 +63611,10 @@ in sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."fd-slicer-1.1.0" sources."figures-1.7.0" sources."file-type-8.1.0" @@ -63320,6 +63622,7 @@ in sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."fill-range-7.0.1" + sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" @@ -63334,7 +63637,8 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.141.0" + sources."flow-parser-0.144.0" + sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -63356,21 +63660,26 @@ in sources."generic-names-2.0.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."git-clone-0.1.0" sources."git-config-path-1.0.1" - sources."git-parse-1.0.4" + (sources."git-parse-1.0.4" // { + dependencies = [ + sources."es-abstract-1.17.7" + sources."util.promisify-1.0.1" + ]; + }) (sources."git-rev-sync-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.15" ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.4.0" + sources."git-url-parse-11.4.3" sources."glob-7.1.5" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" @@ -63378,7 +63687,6 @@ in dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.4" - sources."yallist-4.0.0" ]; }) sources."global-dirs-0.1.1" @@ -63425,16 +63733,16 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphql-14.7.0" (sources."graphql-anywhere-4.2.7" // { dependencies = [ sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.12.7" - sources."graphql-subscriptions-1.1.0" - sources."graphql-tag-2.11.0" + sources."graphql-extensions-0.12.8" + sources."graphql-subscriptions-1.2.0" + sources."graphql-tag-2.12.0" sources."graphql-tools-4.0.8" sources."graphql-type-json-0.3.2" sources."graphql-upload-8.1.0" @@ -63466,7 +63774,7 @@ in sources."hash.js-1.1.7" (sources."header-case-2.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."homedir-polyfill-1.0.3" @@ -63522,7 +63830,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-ci-1.2.1" sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" @@ -63548,7 +63856,7 @@ in sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-redirect-1.0.0" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-retry-allowed-1.2.0" sources."is-ssh-1.3.2" sources."is-stream-1.1.0" @@ -63597,7 +63905,7 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."keyv-3.0.0" @@ -63665,7 +63973,7 @@ in sources."lowdb-1.0.0" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."lowercase-keys-1.0.1" @@ -63733,19 +64041,23 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."node-dir-0.1.17" sources."node-fetch-2.6.1" sources."node-ipc-9.1.3" sources."node-modules-regexp-1.0.0" - (sources."node-notifier-6.0.0" // { + (sources."node-notifier-9.0.0" // { dependencies = [ sources."is-wsl-2.2.0" + sources."lru-cache-6.0.0" + sources."semver-7.3.4" + sources."uuid-8.3.2" + sources."which-2.0.2" ]; }) - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.7" @@ -63785,11 +64097,7 @@ in sources."object-treeify-1.1.31" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - (sources."object.getownpropertydescriptors-2.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -63818,25 +64126,29 @@ in }) (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."parse-git-config-2.0.3" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."parse-passwd-1.0.0" - sources."parse-path-4.0.2" + (sources."parse-path-4.0.3" // { + dependencies = [ + sources."qs-6.9.6" + ]; + }) sources."parse-url-5.0.2" sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."pascalcase-0.1.1" sources."password-prompt-1.1.2" (sources."path-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."path-dirname-1.0.2" @@ -63856,6 +64168,7 @@ in sources."execa-0.9.0" sources."get-stream-3.0.0" sources."lru-cache-4.1.5" + sources."yallist-2.1.2" ]; }) sources."pify-3.0.0" @@ -63898,7 +64211,8 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."query-string-5.1.1" + sources."query-string-6.14.0" + sources."queue-microtask-1.2.2" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ @@ -63956,7 +64270,7 @@ in sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.7" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -63967,7 +64281,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -63977,9 +64291,9 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."roarr-2.15.4" - sources."rss-parser-3.10.0" + sources."rss-parser-3.11.0" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" @@ -64009,7 +64323,7 @@ in }) (sources."sentence-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."serialize-error-7.0.1" // { @@ -64033,7 +64347,7 @@ in sources."slice-ansi-0.0.4" (sources."snake-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."snapdragon-0.8.2" // { @@ -64073,12 +64387,13 @@ in sources."source-map-0.6.1" ]; }) - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" + sources."split-on-first-1.1.0" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -64108,7 +64423,7 @@ in sources."statuses-1.5.0" sources."steno-0.4.4" sources."streamsearch-0.1.2" - sources."strict-uri-encode-1.1.0" + sources."strict-uri-encode-2.0.0" sources."string-hash-1.1.3" sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.3" @@ -64183,6 +64498,7 @@ in sources."execa-0.7.0" sources."get-stream-3.0.0" sources."lru-cache-4.1.5" + sources."yallist-2.1.2" ]; }) sources."through-2.3.8" @@ -64217,7 +64533,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.6.0" sources."type-is-1.6.18" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."unbzip2-stream-1.4.3" (sources."undefsafe-2.0.3" // { dependencies = [ @@ -64257,21 +64573,21 @@ in }) (sources."upper-case-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."upper-case-first-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + sources."util.promisify-1.1.1" sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -64329,7 +64645,7 @@ in sources."xss-1.0.8" sources."xtend-4.0.2" sources."y18n-4.0.1" - sources."yallist-2.1.2" + sources."yallist-4.0.0" (sources."yaml-front-matter-3.4.1" // { dependencies = [ sources."commander-1.0.0" @@ -64357,7 +64673,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for rapid Vue.js development"; - homepage = https://cli.vuejs.org/; + homepage = "https://cli.vuejs.org/"; license = "MIT"; }; production = true; @@ -64367,31 +64683,31 @@ in "@webassemblyjs/cli" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; packageName = "@webassemblyjs/cli"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.9.1.tgz"; - sha512 = "OMu4uSrLdv1bJRrV+zbl6DszJiYaSUwfeigoGMkZvVHzh686pmzka9Bbz85es9Az/dnantDDIokEPSx1FQYm4A=="; + url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.11.0.tgz"; + sha512 = "mQjMqOSOCu1lsA7cVvCKkK/IBED+qUtjrSuFhLBSEusHu5IqhzWFWnappMRpA424lNDMScsxry5jhbM+c9wyEg=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.9.1" - sources."@webassemblyjs/floating-point-hex-parser-1.9.1" - sources."@webassemblyjs/helper-api-error-1.9.1" - sources."@webassemblyjs/helper-code-frame-1.9.1" - sources."@webassemblyjs/helper-compiler-1.9.1" - sources."@webassemblyjs/helper-flatten-ast-1.9.1" - sources."@webassemblyjs/helper-fsm-1.9.1" - sources."@webassemblyjs/helper-module-context-1.9.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" - sources."@webassemblyjs/ieee754-1.9.1" - sources."@webassemblyjs/leb128-1.9.1" - sources."@webassemblyjs/utf8-1.9.1" - sources."@webassemblyjs/validation-1.9.1" - sources."@webassemblyjs/wasm-parser-1.9.1" - sources."@webassemblyjs/wast-parser-1.9.1" - sources."@webassemblyjs/wast-printer-1.9.1" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-code-frame-1.11.0" + sources."@webassemblyjs/helper-compiler-1.11.0" + sources."@webassemblyjs/helper-flatten-ast-1.11.0" + sources."@webassemblyjs/helper-fsm-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/validation-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" + sources."@webassemblyjs/wast-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."webassemblyjs-1.9.1" + sources."webassemblyjs-1.11.0" ]; buildInputs = globalBuildInputs; meta = { @@ -64406,31 +64722,31 @@ in "@webassemblyjs/repl" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_repl"; packageName = "@webassemblyjs/repl"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.9.1.tgz"; - sha512 = "190S+kS/qWfwt/c/QSpRmZpZV57WEL4Cbz2KZu+z5HAg+e53LXxC4XfpxHdsw+1Lo8Z4QB7nI+5xIr2mH+2ZjQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.11.0.tgz"; + sha512 = "U+f6IHDVPOdj1C22AMb8+xEq5OpEhXKcTl+YyMEqRtUdAt6CVkoeHdaPVv4iDfBaxR15nds8DRq+gHjCncrA3Q=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.9.1" - sources."@webassemblyjs/floating-point-hex-parser-1.9.1" - sources."@webassemblyjs/helper-api-error-1.9.1" - sources."@webassemblyjs/helper-code-frame-1.9.1" - sources."@webassemblyjs/helper-compiler-1.9.1" - sources."@webassemblyjs/helper-flatten-ast-1.9.1" - sources."@webassemblyjs/helper-fsm-1.9.1" - sources."@webassemblyjs/helper-module-context-1.9.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" - sources."@webassemblyjs/ieee754-1.9.1" - sources."@webassemblyjs/leb128-1.9.1" - sources."@webassemblyjs/utf8-1.9.1" - sources."@webassemblyjs/validation-1.9.1" - sources."@webassemblyjs/wasm-parser-1.9.1" - sources."@webassemblyjs/wast-parser-1.9.1" - sources."@webassemblyjs/wast-printer-1.9.1" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-code-frame-1.11.0" + sources."@webassemblyjs/helper-compiler-1.11.0" + sources."@webassemblyjs/helper-flatten-ast-1.11.0" + sources."@webassemblyjs/helper-fsm-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/validation-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" + sources."@webassemblyjs/wast-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."webassemblyjs-1.9.1" + sources."webassemblyjs-1.11.0" ]; buildInputs = globalBuildInputs; meta = { @@ -64482,32 +64798,28 @@ in "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wasm-text-gen"; packageName = "@webassemblyjs/wasm-text-gen"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.9.1.tgz"; - sha512 = "RzgRzhCQJ/DBak+Yoy2bo4W6dUdqiswX8PN7qXsIZpNLYMcOOkcaq2o5gkiT/Y2HM3Rt08GxnBBlanXTrryTKQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.11.0.tgz"; + sha512 = "Q1OfB3hpa4TtM6x5a2gJmZncpQYx0hFt4ohdgv4Ms67kcAVwL29QQ2NDbNqfKr15IzlNAhLGueCzxG6dMjdnbQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/generator-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/generator-7.12.15" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/types-7.12.12" - sources."@webassemblyjs/ast-1.9.1" - sources."@webassemblyjs/floating-point-hex-parser-1.9.1" - sources."@webassemblyjs/helper-api-error-1.9.1" - sources."@webassemblyjs/helper-code-frame-1.9.1" - sources."@webassemblyjs/helper-fsm-1.9.1" - sources."@webassemblyjs/helper-module-context-1.9.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" - sources."@webassemblyjs/ieee754-1.9.1" - sources."@webassemblyjs/leb128-1.9.1" - sources."@webassemblyjs/utf8-1.9.1" - sources."@webassemblyjs/wasm-parser-1.9.1" - sources."@webassemblyjs/wast-parser-1.9.1" - sources."@webassemblyjs/wast-printer-1.9.1" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/template-7.12.13" + sources."@babel/types-7.12.13" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."ansi-styles-3.2.1" @@ -64537,21 +64849,21 @@ in "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wast-refmt"; packageName = "@webassemblyjs/wast-refmt"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.9.1.tgz"; - sha512 = "+JfTZZV25LhdJspgw5xznFr/2QiFnHrKvb8CXmEV/s3PNFRpNDUlRPw0ZUZk2cwooZdiWNpC+WKfRPQb8tMx8w=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.11.0.tgz"; + sha512 = "UVjojl3i1wzn2odausLskcFh7VaZqbp5HJ5od9pdsLvUZ06cSUo35yJ9Yetoc+yNj/IfdfisJtOcTQmILQ+RqQ=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.9.1" - sources."@webassemblyjs/floating-point-hex-parser-1.9.1" - sources."@webassemblyjs/helper-api-error-1.9.1" - sources."@webassemblyjs/helper-code-frame-1.9.1" - sources."@webassemblyjs/helper-fsm-1.9.1" - sources."@webassemblyjs/helper-module-context-1.9.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" - sources."@webassemblyjs/wast-parser-1.9.1" - sources."@webassemblyjs/wast-printer-1.9.1" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-code-frame-1.11.0" + sources."@webassemblyjs/helper-fsm-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/wast-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/long-4.2.2" ]; buildInputs = globalBuildInputs; @@ -64573,33 +64885,33 @@ in sha512 = "bBFO/imgikyrGd6urHfiZDmceZzAMfWeAmt5Fd9du5B+rv6IIJsDZMrTcalKUhwL6NdM0mBwkFcLmQvjm8UMOw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + (sources."@babel/core-7.12.16" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.11" // { + (sources."@babel/generator-7.12.15" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -64617,7 +64929,7 @@ in sources."ejs-3.1.5" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" - sources."filelist-1.0.1" + sources."filelist-1.0.2" sources."fs-extra-5.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -64633,7 +64945,7 @@ in ]; }) sources."globals-11.12.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-color-0.1.7" sources."has-flag-3.0.0" @@ -64650,7 +64962,7 @@ in }) sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."jsonlint-1.6.3" sources."lodash-4.17.20" @@ -64669,7 +64981,7 @@ in sources."parse-passwd-1.0.0" sources."path-parse-1.0.6" sources."pkginfo-0.4.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."semver-5.7.1" @@ -64706,7 +65018,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -64724,7 +65036,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Creating Electron app packages"; - homepage = https://github.com/electron/asar; + homepage = "https://github.com/electron/asar"; license = "MIT"; }; production = true; @@ -64841,7 +65153,7 @@ in sources."turndown-4.0.2" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urijs-1.19.5" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -64874,15 +65186,15 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.8"; + version = "1.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz"; - sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz"; + sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q=="; }; buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; - homepage = http://bower.io/; + homepage = "http://bower.io"; license = "MIT"; }; production = true; @@ -64901,7 +65213,7 @@ in sources."argparse-1.0.4" sources."array-find-index-1.0.2" sources."balanced-match-1.0.0" - sources."bower-1.8.8" + sources."bower-1.8.12" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" @@ -64920,7 +65232,7 @@ in sources."find-up-1.1.2" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" ]; }) sources."fs.realpath-1.0.0" @@ -64941,17 +65253,17 @@ in sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" ]; }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" ]; }) sources."lodash-4.2.1" @@ -64974,7 +65286,7 @@ in sources."path-parse-1.0.6" (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" ]; }) sources."pify-2.3.0" @@ -64986,7 +65298,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.6" @@ -65015,7 +65327,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; - homepage = https://github.com/rvl/bower2nix; + homepage = "https://github.com/rvl/bower2nix"; license = "GPL-3.0"; }; production = true; @@ -65070,7 +65382,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.2" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" @@ -65100,12 +65412,12 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; }) - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" @@ -65114,7 +65426,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."has-1.0.3" sources."has-symbols-1.0.1" @@ -65134,12 +65446,12 @@ in sources."insert-module-globals-7.2.1" sources."is-arguments-1.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-generator-function-1.0.8" sources."is-negative-zero-2.0.1" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-symbol-1.0.3" sources."is-typed-array-1.1.4" sources."isarray-1.0.0" @@ -65191,7 +65503,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -65249,10 +65561,10 @@ in btc-rpc-explorer = nodeEnv.buildNodePackage { name = "btc-rpc-explorer"; packageName = "btc-rpc-explorer"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-2.1.0.tgz"; - sha512 = "dB+CI/FcZWmQPD5P1uMGnnCi6a/skTTFHWnPRYq5lfYPc9k6Cjz/nTIrZXhIHBcdxiwEiY10QX3UqYLQgF58dA=="; + url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-2.2.0.tgz"; + sha512 = "xaexMnw1gI6WYyEDMlIg2epSPuh0CcKfAqdHf8J7VATDYgQNcLaXCzM4TKTmkBjiA5f0rXypX5rVw0d8p+p1Vw=="; }; dependencies = [ sources."@types/babel-types-7.0.9" @@ -65318,8 +65630,9 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" - sources."bunyan-1.8.14" + sources."bunyan-1.8.15" sources."bytes-3.1.0" + sources."call-bind-1.0.2" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" sources."caseless-0.12.0" @@ -65381,7 +65694,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."electrum-client-git://github.com/janoside/electrum-client" - sources."elliptic-6.5.3" + sources."elliptic-6.5.4" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -65418,9 +65731,10 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" sources."glob-6.0.4" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -65456,7 +65770,7 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-typedarray-1.0.0" sources."isarray-2.0.5" sources."isstream-0.1.2" @@ -65585,7 +65899,7 @@ in sources."readable-stream-3.6.0" sources."redent-2.0.0" sources."redis-2.8.0" - sources."redis-commands-1.6.0" + sources."redis-commands-1.7.0" sources."redis-parser-2.6.0" sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" @@ -65596,7 +65910,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."right-align-0.1.3" sources."rimraf-2.4.5" sources."ripemd160-2.0.2" @@ -65670,7 +65984,7 @@ in sources."uglify-to-browserify-1.0.2" sources."uid-safe-2.1.5" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -65725,7 +66039,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.39" + sources."@types/node-13.13.41" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -65787,7 +66101,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-6.2.1" + sources."commander-7.0.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -65848,7 +66162,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."got-1.2.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -65981,7 +66295,8 @@ in sources."qap-3.3.1" sources."qs-6.5.2" sources."query-string-1.0.1" - sources."random-access-file-2.1.4" + sources."queue-microtask-1.2.2" + sources."random-access-file-2.1.5" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" @@ -66010,10 +66325,10 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."rimraf-2.7.1" sources."router-0.6.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."run-series-1.1.9" sources."rusha-0.8.13" sources."rx-2.5.3" @@ -66089,7 +66404,7 @@ in sources."ultron-1.1.1" sources."underscore-1.6.0" sources."uniq-1.0.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."utfx-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" @@ -66130,38 +66445,38 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.5"; + version = "1.0.0-beta.8"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.5.tgz"; - sha512 = "5jVubGjmRXlrXPDJIl2g2oWApFmN7V2EzonMWDd67TlaOwwS8Ypy4ej3VvwviXyZ7IO9zET4pDNFSInBQE+aJw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.8.tgz"; + sha512 = "3gtzVdy2/KcfUsXmbEuehe8O1L1EtjzEvfzBYcQtZ1VYJK+X95H2UXlDwI6ug+K8A/Fmnrh2TjtIq1Vakv0fcQ=="; }; dependencies = [ - sources."@jsii/spec-1.16.0" - sources."@types/node-10.17.50" + sources."@jsii/spec-1.20.1" + sources."@types/node-10.17.51" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."array-filter-1.0.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.2" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.5" + sources."cdk8s-1.0.0-beta.8" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.16.0" // { + (sources."codemaker-1.20.1" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" ]; }) sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.2.94" + sources."constructs-3.3.5" sources."date-format-3.0.0" sources."debug-4.3.2" - sources."decamelize-4.0.0" + sources."decamelize-5.0.0" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" sources."detect-indent-5.0.0" @@ -66169,8 +66484,8 @@ in sources."dot-case-3.0.4" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.17.7" - sources."es-get-iterator-1.1.1" + sources."es-abstract-1.18.0-next.2" + sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" @@ -66185,67 +66500,59 @@ in }) sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" - sources."graceful-fs-4.2.4" + sources."get-intrinsic-1.1.1" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-arguments-1.1.0" sources."is-bigint-1.0.1" sources."is-boolean-object-1.1.0" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-date-object-1.0.2" sources."is-fullwidth-code-point-3.0.0" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-object-1.0.4" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-set-2.0.2" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."is-typed-array-1.1.4" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.16.0" // { + (sources."jsii-1.20.1" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.16.0" // { + (sources."jsii-pacmak-1.20.1" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.16.0" // { + (sources."jsii-reflect-1.20.1" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.16.0" // { + (sources."jsii-rosetta-1.20.1" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.180" // { + (sources."jsii-srcmak-0.1.222" // { dependencies = [ - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.2.5" - sources."json2jsii-0.1.172" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."json2jsii-0.1.188" + sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" sources."log4js-6.3.0" @@ -66260,15 +66567,15 @@ in sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.16.0" + sources."oo-ascii-tree-1.20.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."rfdc-1.1.4" + sources."rfdc-1.2.0" sources."semver-7.3.4" (sources."semver-intersect-1.4.0" // { dependencies = [ @@ -66279,7 +66586,7 @@ in sources."side-channel-1.0.4" sources."snake-case-3.0.4" sources."sort-json-2.0.0" - sources."spdx-license-list-6.3.0" + sources."spdx-license-list-6.4.0" sources."sscaff-1.2.0" (sources."streamroller-2.2.4" // { dependencies = [ @@ -66291,17 +66598,13 @@ in sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" sources."strip-ansi-6.0.0" - sources."tslib-2.0.3" - sources."typescript-3.9.7" - sources."universalify-1.0.0" + sources."tslib-2.1.0" + sources."typescript-3.9.9" + sources."universalify-2.0.0" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - (sources."which-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."which-typed-array-1.1.4" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" sources."xmldom-0.4.0" @@ -66333,32 +66636,52 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.0.19"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.0.19.tgz"; - sha512 = "JH2DyIQyhpI8lwO4HANha/HiVV2MXVG63iK+PZbEZKJDEr3fVB0WSKvzrp66CarceLiuNy7Z5cIR+81Q6eMx+w=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.1.0.tgz"; + sha512 = "tlkYo1SbitrwfqcTK0S5ZsGasRaJtN5tRP3VxgIszJZggav7mpRGABjTkqY23GzG8UXIaUTvH4uBGshx+iqcOA=="; }; dependencies = [ - sources."@jsii/spec-1.16.0" - sources."@types/node-14.14.20" + sources."@jsii/spec-1.20.1" + sources."@skorfmann/terraform-cloud-1.7.1" + sources."@types/archiver-5.1.0" + sources."@types/glob-7.1.3" + sources."@types/minimatch-3.0.3" + sources."@types/node-14.14.26" sources."@types/readline-sync-1.4.3" + sources."@types/stream-buffers-3.0.3" sources."@types/uuid-8.3.0" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" + sources."archiver-5.2.0" + (sources."archiver-utils-2.1.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + ]; + }) sources."array-filter-1.0.0" sources."array-includes-3.1.2" sources."array.prototype.flatmap-1.2.4" sources."arrify-2.0.1" sources."astral-regex-2.0.0" + sources."async-3.2.0" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" sources."available-typed-arrays-1.0.2" - sources."call-bind-1.0.0" + sources."axios-0.21.1" + sources."balanced-match-1.0.0" + sources."base64-js-1.5.1" + sources."bl-4.1.0" + sources."brace-expansion-1.1.11" + sources."buffer-5.7.1" + sources."buffer-crc32-0.2.13" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" sources."case-1.6.3" - sources."cdktf-0.0.19" + sources."cdktf-0.1.0" sources."chalk-4.1.0" sources."ci-info-2.0.0" sources."cli-cursor-3.1.0" @@ -66375,35 +66698,57 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.2.94" + sources."compress-commons-4.0.2" + sources."concat-map-0.0.1" + sources."constructs-3.3.18" + sources."core-util-is-1.0.2" + sources."crc-32-1.2.0" + sources."crc32-stream-4.0.2" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-1.2.0" - sources."deep-equal-2.0.5" + (sources."deep-equal-2.0.5" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."define-properties-1.1.3" sources."detect-indent-5.0.0" sources."detect-newline-2.1.0" sources."doctrine-2.1.0" sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" sources."entities-2.0.3" - sources."es-abstract-1.18.0-next.1" - sources."es-get-iterator-1.1.1" + sources."es-abstract-1.18.0-next.2" + (sources."es-get-iterator-1.1.2" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" sources."eslint-plugin-react-7.22.0" sources."esutils-2.0.3" + sources."exit-on-epipe-1.0.1" sources."find-up-4.1.0" sources."flatted-2.0.2" + sources."follow-redirects-1.13.2" sources."foreach-2.0.5" + sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" + sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" - sources."graceful-fs-4.2.4" + sources."get-intrinsic-1.1.1" + sources."glob-7.1.6" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" + sources."ieee754-1.2.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" (sources."ink-2.7.1" // { dependencies = [ sources."chalk-3.0.0" @@ -66416,15 +66761,11 @@ in sources."chalk-3.0.0" ]; }) - (sources."internal-slot-1.0.2" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."internal-slot-1.0.3" sources."is-arguments-1.1.0" sources."is-bigint-1.0.1" sources."is-boolean-object-1.1.0" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-ci-2.0.0" sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" @@ -66433,7 +66774,7 @@ in sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-object-1.0.4" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-set-2.0.2" sources."is-string-1.0.5" sources."is-symbol-1.0.3" @@ -66441,75 +66782,65 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-wsl-2.2.0" - sources."isarray-2.0.5" + sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.16.0" // { + (sources."jsii-1.20.1" // { dependencies = [ - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.16.0" // { + (sources."jsii-pacmak-1.20.1" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.16.0" - sources."decamelize-4.0.0" - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."codemaker-1.20.1" + sources."decamelize-5.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.16.0" // { + (sources."jsii-reflect-1.20.1" // { dependencies = [ - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.16.0" // { + (sources."jsii-rosetta-1.20.1" // { dependencies = [ - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.180" // { + (sources."jsii-srcmak-0.1.222" // { dependencies = [ - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" ]; }) sources."jsonfile-4.0.0" sources."jsonschema-1.4.0" sources."jsx-ast-utils-3.2.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + ]; + }) sources."locate-path-5.0.0" + sources."lodash.defaults-4.2.0" + sources."lodash.difference-4.5.0" + sources."lodash.flatten-4.4.0" + sources."lodash.isplainobject-4.0.6" sources."lodash.throttle-4.1.1" + sources."lodash.union-4.6.0" (sources."log-update-3.4.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -66531,11 +66862,14 @@ in sources."log4js-6.3.0" sources."loose-envify-1.4.0" sources."lru-cache-6.0.0" + sources."map-obj-4.1.0" sources."mdurl-1.0.1" sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.1.2" sources."ncp-2.0.0" + sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-inspect-1.9.0" sources."object-is-1.1.4" @@ -66544,29 +66878,33 @@ in sources."object.entries-1.1.3" sources."object.fromentries-2.0.3" sources."object.values-1.1.2" + sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.16.0" - sources."open-7.3.0" + sources."oo-ascii-tree-1.20.1" + sources."open-7.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" + sources."printj-1.1.2" + sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" + sources."quick-lru-4.0.1" sources."react-16.14.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" + sources."readable-stream-3.6.0" + sources."readdir-glob-1.1.1" sources."readline-sync-1.4.10" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.1" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."restore-cursor-3.1.0" - sources."rfdc-1.1.4" + sources."rfdc-1.2.0" + sources."safe-buffer-5.1.2" sources."scheduler-0.18.0" sources."semver-7.3.4" (sources."semver-intersect-1.4.0" // { @@ -66579,8 +66917,9 @@ in sources."signal-exit-3.0.3" sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" - sources."spdx-license-list-6.3.0" + sources."spdx-license-list-6.4.0" sources."sscaff-1.2.0" + sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -66598,11 +66937,14 @@ in sources."string.prototype.repeat-0.2.0" sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" + sources."tar-stream-2.2.0" sources."type-fest-0.11.0" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."universalify-0.1.2" + sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" @@ -66610,6 +66952,7 @@ in sources."which-typed-array-1.1.4" sources."widest-line-3.1.0" sources."wrap-ansi-6.2.0" + sources."wrappy-1.0.2" sources."xmlbuilder-15.1.1" sources."xmldom-0.4.0" sources."y18n-5.0.5" @@ -66624,6 +66967,7 @@ in sources."yargs-parser-20.2.4" sources."yn-3.1.1" sources."yoga-layout-prebuilt-1.10.0" + sources."zip-stream-4.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -66638,16 +66982,16 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "4.3.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-4.3.0.tgz"; - sha512 = "8GHZfr+mG3zB/Lgqrr27qHBFsPSn0fyEI3f2rIZpxPxUbn2J6A8xyyeBRVTW8duDuXigN0s80vsXiXJOEFIO5Q=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.0.1.tgz"; + sha512 = "6Y+G8FmQu76rSWQjSBY5rVcdgatknjvzfEUU5xtx1uaYovClg7jap7ol3Xf3NP7vMd1fs38TtfhsyIS8Dq0Jvw=="; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."clean-css-4.2.3" - sources."commander-2.20.3" + sources."clean-css-5.0.1" + sources."commander-7.0.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.6" @@ -66698,6 +67042,7 @@ in sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" sources."fetch-everywhere-1.0.5" + sources."filter-obj-1.1.0" sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."has-flag-3.0.0" @@ -66720,7 +67065,7 @@ in sources."path-is-absolute-1.0.1" sources."prompt-1.1.0" sources."punycode-2.1.1" - sources."query-string-6.13.8" + sources."query-string-6.14.0" sources."read-1.0.7" sources."revalidator-0.1.8" sources."rimraf-2.7.1" @@ -66773,10 +67118,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.14.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.14.0.tgz"; - sha512 = "ccxtSRTqVIuIQrtS5SI0uevO2WC7cSA9dNtiZ/PveDKyxhqyQlfRs9n0bdOJdXteYt6BKUIiqFV8Q48Z71y89A=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.18.0.tgz"; + sha512 = "6ghwTYVdJ/XMcoLb690DPcxVM3t2bCDKTFPqMfkamBhKRJNFJDSjxQiP3Njn5f7g4rYvIuBQdZ8wteB4dr/4HA=="; }; buildInputs = globalBuildInputs; meta = { @@ -66814,10 +67159,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.4.1"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.4.1.tgz"; - sha512 = "dqzn4vqmEqIlzwpFxG6AnhXUwDSTMLsg2d4RDwHDhh1yioukSFR+turQxsq9fssuWeV208y54kb/AzmOIji9jA=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.4.5.tgz"; + sha512 = "+xt0bn1nG348Q2tERiL44a/20a+NeDJLtwh7Gnn5VjOQ64OYUGrbAbQphskdVZyLE5qRDTvyiLArN+IxDsmpQQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -66832,10 +67177,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.0.5"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.5.tgz"; - sha512 = "MwoSWGr8mco+/Bth/4zr0kNRuG9rXYgyAEI1mGOuRsMqy2G9LEr4azSP68V2EuIPzYVcYx6ZZk2o5e8b/ux0/w=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.2.1.tgz"; + sha512 = "UlT5D++GU9vWlK/bANGHDxtThdPOWWiVRg9Fsist2ytrg6pjNPSDT/f6US1J7aBCRCB9p2463e/G7JSUT4WTow=="; }; buildInputs = globalBuildInputs; meta = { @@ -66850,15 +67195,15 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.13.2"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.13.2.tgz"; - sha512 = "E//SHaQlzmh4nBUJsA6oSZWBVFkEWJ/kjL19jIBbIrY8KWCjxfCm6H8+WDNMUULHS2HQNlUEQzVHS/ftE10iGg=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.13.3.tgz"; + sha512 = "JxAJD3z10ziO8CxgTUlguZp8uy1r6fo0pP+L4GeXKv+q12BHIxWXoAZdd158vAP/YCh0Yw4zBrij57Fg4wtVdg=="; }; dependencies = [ sources."isexe-2.0.0" sources."node-fetch-2.6.1" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-uri-3.0.2" sources."which-2.0.2" @@ -66892,13 +67237,13 @@ in coc-html = nodeEnv.buildNodePackage { name = "coc-html"; packageName = "coc-html"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-html/-/coc-html-1.3.2.tgz"; - sha512 = "8upyERwR/7zZNDkATpKy1aIyflzwfsgercRsHm1OG/ECRG2FpUWYkHywHBDbWAdHsipbd2WoO0nr3Ct22JV4oA=="; + url = "https://registry.npmjs.org/coc-html/-/coc-html-1.4.1.tgz"; + sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.1.3" + sources."typescript-4.1.5" ]; buildInputs = globalBuildInputs; meta = { @@ -66966,10 +67311,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.3.2"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.2.tgz"; - sha512 = "4wSADhO6oE2lxyYJw1cZqz6eYTrJWI4wHLETSTwhkkpZrPCNJA7mSmuB6oowxt7kJRmDVAIZP2mFyLTXU0jU6w=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.4.tgz"; + sha512 = "IK3JYMiJALMMhUlFgl4HxW2dvJdmUr86Hve+ngVATLpT2vWHG5V3sXjuHq7c7RlE7+oWS2CNoxIPf8oiuZesPQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -66983,10 +67328,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.16"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.16.tgz"; - sha512 = "6m/LCFHcnFdbJoFnrkzj8OhBvcFl491eYG0247Gti/u2iQCVj2X8RRxdxcGbDh4tR5OEPZdQPcd6YMDbtphPSg=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.4.0.tgz"; + sha512 = "AKmM8/+BjncinB4MrS/e8hJ7MzvXL5GtAvusGZb3zsAj4tNO77oWiVzE8V09QEWAsorgHVgNv/OXr4EPJMZvpg=="; }; buildInputs = globalBuildInputs; meta = { @@ -67001,10 +67346,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.9.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.9.0.tgz"; - sha512 = "cTIR4IXs6CC06iDwylxzS0Sq4HhiWofTBqgedtbAckkaoJYOZdM+uMKKdkSO2nt93bHtE4MsEoQ91sxHgKqNfg=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.10.1.tgz"; + sha512 = "nYuGmxppC3+16kN7128HxrzDWAPGrC5KdP4XQQHoKeOAApLTphF9rH/gfWjUale+Roq8YDe0rEJBLc3DUdIebg=="; }; buildInputs = globalBuildInputs; meta = { @@ -67019,10 +67364,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.9"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.9.tgz"; - sha512 = "VCjIm+ytVrgqzAXMpweh3D8SfQg9oF0BVXSFeUIgsm3xU9BuZd1jU+CxtNNAIihxcJ1LUX1JGn1Sydu541hwzA=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.1.tgz"; + sha512 = "1chc5qluoxF39fNKSoLNrPWrWsBQc+zHkXmleOka2HLYDQHmqgYqWZiPgJ03IqOoR3uJcS8sgdrCLyVdqWBwrg=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.13" @@ -67040,7 +67385,7 @@ in sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" sources."bytes-3.1.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."chainsaw-0.1.0" sources."chownr-2.0.0" sources."clipboardy-2.3.0" @@ -67068,8 +67413,8 @@ in sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.13.1" - sources."fp-ts-2.9.3" + sources."follow-redirects-1.13.2" + sources."fp-ts-2.9.5" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -67080,10 +67425,10 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."http-proxy-agent-4.0.1" @@ -67093,10 +67438,10 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int64-buffer-0.1.10" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-wsl-2.2.0" @@ -67148,7 +67493,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."rfc-3986-1.0.1" - sources."rfdc-1.1.4" + sources."rfdc-1.2.0" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."semver-7.3.4" @@ -67167,9 +67512,9 @@ in sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-6.0.5" + sources."tar-6.1.0" sources."traverse-0.3.9" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."universalify-0.1.2" sources."unzipper-0.10.11" sources."util-deprecate-1.0.2" @@ -67199,10 +67544,10 @@ in coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; - version = "1.2.21"; + version = "1.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.21.tgz"; - sha512 = "QTrzPCgk+zNVSnDjCbm3cvzb6c6rIwYMowrGhVb4XGnc8ooMXDBSfMoPYUtVgEJ+Qcu3++93OWr+m2VOHwHxag=="; + url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.22.tgz"; + sha512 = "AskNxINhyImxvFhlt0tvFJUS/Z4sUehgKPdy1jxVa+vu4CU903cNR6Dot4phrRRfgSCH3NT8SrYBhg4YvsxlkA=="; }; buildInputs = globalBuildInputs; meta = { @@ -67223,13 +67568,13 @@ in sha512 = "3p4AwJnsjtLJM53wLsMtcVUzWPMnnYI6pkwQraHH6Tp7/ZuXwIVhjUvDgMcAvhmIkVePyvJF5xZHN4ghLLP02A=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."@typescript-eslint/experimental-utils-3.10.1" sources."@typescript-eslint/parser-3.10.1" sources."@typescript-eslint/types-3.10.1" @@ -67297,7 +67642,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001185" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -67354,7 +67699,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.8.2" + sources."core-js-3.8.3" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -67386,7 +67731,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" @@ -67394,7 +67739,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.663" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -67411,7 +67756,7 @@ in sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -67543,7 +67888,7 @@ in sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."got-6.7.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -67903,7 +68248,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.19.0" + sources."resolve-1.20.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -67970,7 +68315,7 @@ in sources."snapdragon-util-3.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -68083,10 +68428,10 @@ in sources."tsutils-2.29.0" ]; }) - sources."tsutils-3.18.0" + sources."tsutils-3.20.0" sources."type-check-0.3.2" sources."type-fest-0.8.1" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."unherit-1.1.3" sources."unified-6.2.0" sources."union-value-1.0.1" @@ -68111,7 +68456,7 @@ in }) sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."use-3.1.1" @@ -68235,10 +68580,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.26.0"; + version = "0.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.26.0.tgz"; - sha512 = "Wn0m/IImB9BryAUhH5WTSqrkWh2tamuMVyMzxUmH1EW71TJKOavfV2DAmSNYSkGCD/H9icUbMIiSwyMI9JVYOw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.32.0.tgz"; + sha512 = "AwUqoPFeetwDcCe6BpCRMsW+/VtPJ/I/wJA/3ycArSx2mYy+P2IBfBW62NERmw9RNopUbHQKjr6JBTXbl9T/uA=="; }; buildInputs = globalBuildInputs; meta = { @@ -68271,10 +68616,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.3.1.tgz"; - sha512 = "n11bVCYeDA0s1wYNAYsQdAHVv4C/k8QkvadSkzRWrNCP29fivGALp+wEYl8rtsqs0aeKY3FtPsI812581g6NPg=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.0.tgz"; + sha512 = "XjL23iRnKCxeh/qG6FN1SJQQRHLunlxs6UlJua35A42tjztC6ZZYwuE4W9W8oU53iqGrSYrIrkT1+WFznBr/0g=="; }; buildInputs = globalBuildInputs; meta = { @@ -68288,10 +68633,10 @@ in coc-solargraph = nodeEnv.buildNodePackage { name = "coc-solargraph"; packageName = "coc-solargraph"; - version = "1.1.8"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.8.tgz"; - sha512 = "j0/S9ycyP4cdFhTu3FGaY4t0ZSn1K5EFWi6A90nppQYPwrzSGo3tn5XDO44vaWsYhEUlQfQrXVwtFScKCdc1vg=="; + url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.0.tgz"; + sha512 = "0bvily8jnfmBx/WjNgZ/1TNVSV2BBSsaAflc4bhwtw1mN7XLAiXLpeK3Eps6qwOYMtTRngJFKxNXKoAM2bCY/A=="; }; buildInputs = globalBuildInputs; meta = { @@ -68311,29 +68656,29 @@ in sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/core-7.12.16" + sources."@babel/generator-7.12.15" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/parser-7.12.16" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -68344,7 +68689,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-7.0.3" + sources."ajv-7.1.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -68355,11 +68700,11 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.0" + sources."browserslist-4.16.3" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001185" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -68391,13 +68736,13 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.663" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -68407,14 +68752,14 @@ in sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."file-entry-cache-6.0.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -68424,13 +68769,13 @@ in sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hosted-git-info-3.0.7" + sources."hosted-git-info-3.0.8" sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" sources."ignore-5.1.8" @@ -68465,9 +68810,9 @@ in sources."jsesc-2.5.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."kind-of-6.0.3" - sources."known-css-properties-0.20.0" + sources."known-css-properties-0.21.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.20" @@ -68476,12 +68821,12 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.1.0" sources."mathml-tag-names-2.1.3" - sources."mdast-util-from-markdown-0.8.4" - sources."mdast-util-to-markdown-0.6.2" + sources."mdast-util-from-markdown-0.8.5" + sources."mdast-util-to-markdown-0.6.5" sources."mdast-util-to-string-2.0.0" - sources."meow-8.1.0" + sources."meow-9.0.0" sources."merge2-1.4.1" - sources."micromark-2.11.2" + sources."micromark-2.11.4" sources."micromatch-4.0.2" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -68492,7 +68837,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" (sources."normalize-package-data-3.0.0" // { dependencies = [ sources."semver-7.3.4" @@ -68507,7 +68852,7 @@ in sources."p-try-2.2.0" sources."parent-module-1.0.1" sources."parse-entities-2.0.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -68536,6 +68881,7 @@ in sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.1.0" sources."punycode-2.1.1" + sources."queue-microtask-1.2.2" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -68556,11 +68902,11 @@ in sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."signal-exit-3.0.3" @@ -68587,7 +68933,7 @@ in sources."strip-ansi-6.0.0" sources."strip-indent-3.0.0" sources."style-search-0.1.0" - sources."stylelint-13.8.0" + sources."stylelint-13.10.0" sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" @@ -68603,7 +68949,7 @@ in sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.0.4" sources."unist-util-stringify-position-2.0.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" @@ -68639,10 +68985,10 @@ in coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; - version = "1.2.3"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.2.3.tgz"; - sha512 = "1FVW4hj7eK8PAUS0fzeme/23iBBP9Q3nfoMVzpBGchJiziL2qOhXaFrU0QgliIhiRSMmLnagTx/lWuI8BuO96g=="; + url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.3.tgz"; + sha512 = "6CYtXKaEduGHLjiBdYRcWvl7gzvW92iGTxW7M3KVfn/tRFO+VF+3FuSX7Fg53ol4/USyNOTgXz3uyBjfsZOBXA=="; }; buildInputs = globalBuildInputs; meta = { @@ -68662,9 +69008,9 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.0" @@ -68694,14 +69040,14 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."semver-5.7.1" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" sources."tslib-1.14.1" sources."tslint-5.20.1" sources."tsutils-2.29.0" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -68750,13 +69096,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.6.tgz"; - sha512 = "Rij5moc30YSnhYkiSwilLYorbRkmYPn9uN5b4EMXrNo0wWGReFYRRCxq72BoDEIwbTE3MsuVb67irdMukJ95eA=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.7.tgz"; + sha512 = "NVBl6AEbEax6GQdBlBy/SelJ5TXCkrnLN/dDqgDWwhIPX6UBFhFTFCLcqcHbfMjLM/MDvP/t85w+OYBGe2gXxg=="; }; dependencies = [ - sources."typescript-4.1.3" + sources."typescript-4.1.5" ]; buildInputs = globalBuildInputs; meta = { @@ -68777,14 +69123,14 @@ in sha512 = "2SHFFjxkw2kl0hADDNUYX85OR/PbjqYPxFnpNp6G83SbeZBoJN8KDUl7TrIJ7BZ4UCiIilXnKQCHpxREiVPAEg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.2.2" + sources."@eslint/eslintrc-0.3.0" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -68818,8 +69164,8 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.17.0" - sources."eslint-plugin-vue-7.4.1" + sources."eslint-7.19.0" + sources."eslint-plugin-vue-7.5.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -68833,7 +69179,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -68850,7 +69196,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -68893,7 +69239,7 @@ in sources."punycode-2.1.1" sources."regexpp-3.1.0" sources."require-from-string-2.0.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.3.4" @@ -68913,7 +69259,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.0.3" + sources."ajv-7.1.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -68928,11 +69274,11 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."typescript-4.1.3" - sources."uri-js-4.4.0" + sources."typescript-4.1.5" + sources."uri-js-4.4.1" sources."v8-compile-cache-2.2.0" sources."vls-0.5.10" - (sources."vue-eslint-parser-7.3.0" // { + (sources."vue-eslint-parser-7.4.1" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -69095,7 +69441,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; + homepage = "http://coffeescript.org"; license = "MIT"; }; production = true; @@ -69105,15 +69451,15 @@ in coinmon = nodeEnv.buildNodePackage { name = "coinmon"; packageName = "coinmon"; - version = "0.0.24"; + version = "0.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.24.tgz"; - sha512 = "pb/zklwkyZrdxQB1zm6n46h+NrHPW+L0H8Q9ikp8v31AELgaZlU7c/0ArwF6sACdMDmurfGP2lOKsENnv7xN3g=="; + url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.27.tgz"; + sha512 = "aOxDy3oAUu5oKpjb+ZrQgOuT+yBPxbaOc4CMLD+c8uKyDbAodf/0Xee53xVihqeQtjvdCXszoAnMNtKid+/MrA=="; }; dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."axios-0.19.2" + sources."axios-0.21.1" sources."chalk-2.4.2" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" @@ -69122,14 +69468,12 @@ in sources."color-name-1.1.3" sources."colors-1.4.0" sources."commander-2.20.3" - sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.5.10" + sources."follow-redirects-1.13.2" sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" sources."log-symbols-2.2.0" sources."mimic-fn-1.2.0" - sources."ms-2.0.0" sources."object-assign-4.1.1" sources."onetime-2.0.1" sources."ora-1.4.0" @@ -69173,7 +69517,7 @@ in sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" sources."fn.name-1.1.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -69229,20 +69573,36 @@ in sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" + sources."@npmcli/ci-detect-1.3.0" + sources."@npmcli/git-2.0.6" + sources."@npmcli/installed-package-contents-1.0.7" + sources."@npmcli/move-file-1.1.2" + sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/promise-spawn-1.3.2" + sources."@npmcli/run-script-1.8.3" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@tootallnate/once-1.1.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" + sources."agent-base-6.0.2" + sources."agentkeepalive-4.1.4" + sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ansi-0.3.1" (sources."ansi-align-3.0.0" // { dependencies = [ + sources."ansi-regex-4.1.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" sources."array-find-index-1.0.2" sources."array-flatten-1.1.1" sources."array-union-2.1.0" @@ -69260,6 +69620,10 @@ in (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" + sources."debug-2.6.9" + sources."iconv-lite-0.4.24" + sources."ms-2.0.0" + sources."qs-6.7.0" ]; }) (sources."boxen-4.2.0" // { @@ -69276,6 +69640,7 @@ in sources."braces-3.0.2" sources."builtins-1.0.3" sources."bytes-3.0.0" + sources."cacache-15.0.5" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."lowercase-keys-2.0.0" @@ -69286,20 +69651,29 @@ in sources."caseless-0.12.0" sources."chalk-3.0.0" sources."chardet-0.7.0" + sources."chownr-2.0.0" sources."ci-info-2.0.0" + sources."clean-stack-2.2.0" sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."compressible-2.0.18" - sources."compression-1.7.4" + (sources."compression-1.7.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."concat-map-0.0.1" (sources."conf-1.4.0" // { dependencies = [ sources."dot-prop-4.2.1" + sources."env-paths-1.0.0" sources."is-obj-1.0.1" sources."make-dir-1.3.0" sources."pify-3.0.0" @@ -69307,6 +69681,7 @@ in ]; }) sources."configstore-5.0.1" + sources."console-control-strings-1.1.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."cookie-0.4.0" @@ -69314,7 +69689,7 @@ in sources."cordova-app-hello-world-5.0.0" sources."cordova-common-4.0.2" sources."cordova-create-3.0.0" - (sources."cordova-fetch-3.0.0" // { + (sources."cordova-fetch-3.0.1" // { dependencies = [ sources."pify-5.0.0" ]; @@ -69330,12 +69705,13 @@ in sources."crypto-random-string-2.0.0" sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" - sources."debug-2.6.9" + sources."debug-4.3.2" sources."decompress-response-3.3.0" sources."dedent-0.7.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" (sources."dep-graph-1.1.0" // { dependencies = [ sources."underscore-1.2.1" @@ -69354,69 +69730,92 @@ in sources."elementtree-0.1.7" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."endent-1.4.1" - sources."env-paths-1.0.0" + sources."env-paths-2.2.0" + sources."err-code-2.0.3" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-4.1.0" - sources."express-4.17.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.7.0" + ]; + }) sources."extend-3.0.2" (sources."external-editor-3.1.0" // { dependencies = [ + sources."iconv-lite-0.4.24" sources."tmp-0.0.33" ]; }) sources."extsprintf-1.4.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."figures-2.0.0" sources."fill-range-7.0.1" - sources."finalhandler-1.1.2" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."find-up-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fs-extra-9.0.1" + sources."fs-extra-9.1.0" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."gauge-2.7.4" sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."global-dirs-2.1.0" - sources."globby-11.0.1" + sources."globby-11.0.2" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.7" + sources."hosted-git-info-3.0.8" sources."http-cache-semantics-4.1.0" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" ]; }) + sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" + sources."https-proxy-agent-5.0.0" sources."human-signals-1.1.1" - sources."iconv-lite-0.4.24" + sources."humanize-ms-1.2.1" + sources."iconv-lite-0.6.2" sources."ignore-5.1.8" + sources."ignore-walk-3.0.3" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.7" @@ -69429,12 +69828,24 @@ in }) (sources."inquirer-6.5.2" // { dependencies = [ + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."has-flag-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."mute-stream-0.0.7" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."supports-color-5.5.0" ]; }) @@ -69446,17 +69857,20 @@ in sources."color-name-1.1.3" sources."has-flag-3.0.0" sources."supports-color-5.5.0" + sources."tough-cookie-3.0.1" ]; }) + sources."ip-1.1.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" + sources."is-lambda-1.0.1" sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" @@ -69465,6 +69879,7 @@ in sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" + sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-4.0.0" sources."isstream-0.1.2" @@ -69474,11 +69889,8 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."jsonfile-6.1.0" + sources."jsonparse-1.3.1" (sources."jsprim-1.4.1" // { dependencies = [ sources."extsprintf-1.3.0" @@ -69498,6 +69910,7 @@ in sources."semver-6.3.0" ]; }) + sources."make-fetch-happen-8.0.14" sources."md5-file-5.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -69512,10 +69925,24 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."ms-2.0.0" + sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.3.3" + sources."minipass-flush-1.0.5" + sources."minipass-json-stream-1.0.1" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."negotiator-0.6.2" sources."nice-try-1.0.5" + (sources."node-gyp-7.1.2" // { + dependencies = [ + sources."nopt-5.0.0" + ]; + }) sources."nopt-4.0.3" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -69524,16 +69951,24 @@ in ]; }) sources."normalize-url-4.5.0" + sources."npm-bundled-1.1.1" + sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.0" + sources."npm-packlist-2.1.4" + sources."npm-pick-manifest-6.1.0" + sources."npm-registry-fetch-9.0.0" sources."npm-run-path-4.0.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."objectorarray-1.0.4" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.3.0" + sources."open-7.4.0" sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -69546,12 +69981,14 @@ in ]; }) sources."p-locate-2.0.0" + sources."p-map-4.0.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) + sources."pacote-11.2.6" sources."parent-module-1.0.1" sources."parseurl-1.3.3" sources."path-exists-3.0.0" @@ -69567,33 +70004,36 @@ in sources."pkg-up-2.0.0" sources."plist-3.0.1" sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."promise-retry-2.0.1" sources."promzard-0.3.0" sources."proxy-addr-2.0.6" sources."psl-1.8.0" + sources."puka-1.0.1" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" sources."q-1.5.1" - sources."qs-6.7.0" + sources."qs-6.5.2" + sources."queue-microtask-1.2.2" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ sources."bytes-3.1.0" + sources."iconv-lite-0.4.24" ]; }) sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" sources."read-package-json-2.1.2" + sources."read-package-json-fast-2.0.1" + sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.2" - sources."tough-cookie-2.5.0" - ]; - }) - sources."resolve-1.19.0" + sources."request-2.88.2" + sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."responselike-1.0.2" (sources."restore-cursor-2.0.0" // { @@ -69602,10 +70042,11 @@ in sources."onetime-2.0.1" ]; }) + sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -69618,45 +70059,49 @@ in }) (sources."send-0.17.1" // { dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."ms-2.1.1" ]; }) sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."slash-3.0.0" + sources."smart-buffer-4.1.0" + sources."socks-2.5.1" + sources."socks-proxy-agent-5.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" + sources."ssri-8.0.1" sources."statuses-1.5.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" sources."stringify-package-1.0.1" - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.34.2" + sources."systeminformation-4.34.9" + sources."tar-6.1.0" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tough-cookie-3.0.1" + sources."tough-cookie-2.5.0" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -69664,12 +70109,15 @@ in sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."underscore-1.12.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" sources."unique-string-2.0.0" - sources."universalify-1.0.0" + sources."universalify-2.0.0" sources."unpipe-1.0.0" sources."update-notifier-4.1.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" + sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."valid-identifier-0.0.2" @@ -69678,6 +70126,7 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."which-2.0.2" + sources."wide-align-1.1.3" (sources."widest-line-3.1.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -69728,15 +70177,15 @@ in sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -69853,7 +70302,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globby-9.2.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -69958,7 +70407,7 @@ in sources."p-map-3.0.0" sources."p-timeout-3.2.0" sources."p-try-2.2.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-4.0.0" @@ -69986,7 +70435,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-regex-1.1.0" @@ -70027,7 +70476,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -70107,7 +70556,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -70150,7 +70599,7 @@ in sources."event-emitter-0.3.5" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -70197,7 +70646,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" @@ -70251,10 +70700,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.1.tgz"; - sha512 = "ryEU58YUtn4gxaEQ/Zwt3Bbmkoc3MghLNbNKs1MUg8zDWyM+az1SvMmZ7QaXye9DNNwn5TS2/Ok+fpw2KKvZhA=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.2.tgz"; + sha512 = "B78UC1E8LwvbmvEjIPumKXvu9yeNTpaKrNVf0HpP5AJmGgq9fdipcYKtpqRNAwm06lvhpNhO3jvR9xeRQDsmog=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -70279,7 +70728,7 @@ in sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" sources."inflight-1.0.6" @@ -70349,15 +70798,15 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "3.5.1"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.1.tgz"; - sha512 = "TeaEDgfOSJ3cVilXKeIG2590IjjnSWPvhUUE6xGl3Aqys9O2JQNDyVbC1stnqlbyUgxm8KCOP0piLOk+MXUlZA=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.3.tgz"; + sha512 = "YJWlLKBx4tdOJ7NbUVqKATTAHB4IJTHSTJBAj0eBbdXdmpI4WGGS725MzoapgJPiBWUMtjgZcVcR5MHe3UHczQ=="; }; buildInputs = globalBuildInputs; meta = { description = "Create React Native apps with no build configuration."; - homepage = https://github.com/expo/create-react-native-app; + homepage = "https://github.com/expo/create-react-native-app"; license = "BSD-3-Clause"; }; production = true; @@ -70379,7 +70828,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CSSLint"; - homepage = http://csslint.net/; + homepage = "http://csslint.net/"; license = "MIT"; }; production = true; @@ -70607,7 +71056,7 @@ in sources."fast-bitfield-1.2.2" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - (sources."fd-lock-1.1.1" // { + (sources."fd-lock-1.2.0" // { dependencies = [ sources."node-gyp-build-4.2.3" ]; @@ -70633,7 +71082,7 @@ in sources."global-4.4.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -70734,7 +71183,7 @@ in sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-response-2.1.0" @@ -70818,8 +71267,8 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."random-access-file-2.1.4" - sources."random-access-memory-3.1.1" + sources."random-access-file-2.1.5" + sources."random-access-memory-3.1.2" sources."random-access-storage-1.4.1" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -70909,7 +71358,7 @@ in sources."sorted-indexof-1.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."sparse-bitfield-3.0.3" sources."speedometer-1.1.0" sources."split-string-3.1.0" @@ -71001,13 +71450,13 @@ in sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.2.2" // { + (sources."utp-native-2.3.0" // { dependencies = [ sources."node-gyp-build-4.2.3" sources."readable-stream-3.6.0" @@ -71036,7 +71485,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Dat is the package manager for data. Easily share and version control data."; - homepage = https://datproject.org/; + homepage = "https://datproject.org"; license = "BSD-3-Clause"; }; production = true; @@ -71057,7 +71506,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A DHCP server written in JavaScript"; - homepage = https://github.com/infusion/node-dhcp; + homepage = "https://github.com/infusion/node-dhcp"; license = "MIT OR GPL-2.0"; }; production = true; @@ -71067,10 +71516,10 @@ in diagnostic-languageserver = nodeEnv.buildNodePackage { name = "diagnostic-languageserver"; packageName = "diagnostic-languageserver"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.8.0.tgz"; - sha512 = "UnQGWIszi+uXkZ/pYUDLKuftSOSIvc/ZBSp/W6OF/Qyr2SsEaSD6TuaIo7TiH1MGQX1b2EW9P1WlE+16Ft4MiA=="; + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.8.1.tgz"; + sha512 = "W8lFslQXZ6HEjy9Ba7jLYDzqJZFkWVINWZjNDUZslozm2ZLMH7QWNIa74DKZXLA972ZgY8iJ0WIMxn0Y4+1POw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" @@ -71087,15 +71536,15 @@ in sources."crypto-random-string-2.0.0" sources."del-6.0.0" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.4" - sources."fastq-1.10.0" + sources."fast-glob-3.2.5" + sources."fastq-1.10.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."globby-11.0.1" - sources."graceful-fs-4.2.4" + sources."globby-11.0.2" + sources."graceful-fs-4.2.6" sources."ignore-5.1.8" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -71120,9 +71569,10 @@ in sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."picomatch-2.2.2" + sources."queue-microtask-1.2.2" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."rxjs-6.6.3" sources."slash-3.0.0" sources."temp-dir-2.0.0" @@ -71152,15 +71602,15 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.2.0.tgz"; - sha512 = "D6qT5w2y73pF02c+caAPYn/IG7T/231u8WD/qfyt3MBtnRe8x7ZIQK9+VAxFYvCtqbGuN7MiPVoRctkth/jcuA=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.3.0.tgz"; + sha512 = "nW0l6S6YZlSGrGu6PBHoLmhwqwxgNTSis1hvjaxpnS3Ohalf/e87HC/pkjg3c+AixytqlXPR7nixzVPDJTkNZQ=="; }; dependencies = [ sources."dockerfile-ast-0.1.0" - sources."dockerfile-language-service-0.1.1" - sources."dockerfile-utils-0.1.1" + sources."dockerfile-language-service-0.2.0" + sources."dockerfile-utils-0.2.0" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" @@ -71179,15 +71629,15 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.62.1"; + version = "6.65.3"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.62.1.tgz"; - sha512 = "LM6NwMLF0W/ZCcSEqXUufGiDzGpXpF7uPQjLo5zx0PS/tLQkrkA2sNeNcE6p7dVcX1u9hYRuJisl9PP7hQvsAg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.65.3.tgz"; + sha512 = "GNai5B3ipW7ekXxj0WeFN7IsqY8+hXogeL5WWDn4F5z7DlB8idXmX/0RWv/2tS5Hnh4R9BzW1cJ5s2n85bhsSw=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -71207,7 +71657,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."delay-4.4.0" + sources."delay-4.4.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."eventemitter3-4.0.7" @@ -71299,7 +71749,7 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."uri-js-4.4.0" // { + (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -71349,40 +71799,40 @@ in sha512 = "ohjlUXM2v39rDqGIrlyxdcn9ql+4b+X1u90CXNWjYw5wX6C3wTHRfqFfeV8jajYD6Xc+ufn2X1QeZZWhRBXTlA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/core-7.12.16" + sources."@babel/generator-7.12.15" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-syntax-jsx-7.12.1" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.12" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-react-jsx-7.12.16" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -71516,7 +71966,7 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."keyv-4.0.3" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" @@ -71562,7 +72012,7 @@ in sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."patch-console-1.0.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -71600,7 +72050,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-alpn-1.0.0" sources."resolve-from-3.0.0" sources."responselike-2.0.0" @@ -71647,7 +72097,7 @@ in sources."trim-newlines-3.0.0" sources."type-fest-0.12.0" sources."unicode-emoji-modifier-base-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" sources."widest-line-3.1.0" @@ -71659,7 +72109,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -71685,7 +72135,7 @@ in buildInputs = globalBuildInputs; meta = { description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images."; - homepage = https://www.emojione.com/; + homepage = "https://www.emojione.com"; }; production = true; bypassCache = true; @@ -71697,9 +72147,9 @@ in version = "1.7.5"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -71708,11 +72158,11 @@ in }) sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" - sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.155.3" - sources."@fluentui/react-focus-7.17.0" + sources."@fluentui/keyboard-key-0.2.13" + sources."@fluentui/react-7.160.0" + sources."@fluentui/react-focus-7.17.4" sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.7.0" + sources."@fluentui/theme-1.7.3" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -71723,11 +72173,15 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.141" + sources."@microsoft/load-themed-styles-1.10.147" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - sources."@npmcli/move-file-1.0.1" + (sources."@npmcli/move-file-1.1.2" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/basic-auth-1.1.3" @@ -71735,17 +72189,17 @@ in sources."@types/caseless-0.12.2" sources."@types/chart.js-2.9.24" sources."@types/connect-3.4.34" - sources."@types/engine.io-3.1.4" + sources."@types/engine.io-3.1.5" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.17" + sources."@types/express-serve-static-core-4.17.18" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" sources."@types/hls.js-0.13.1" sources."@types/js-yaml-3.12.5" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."@types/lodash-4.14.161" sources."@types/material-design-lite-1.1.16" - sources."@types/mime-2.0.3" + sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" sources."@types/mithril-2.0.3" @@ -71754,7 +72208,7 @@ in sources."@types/mysql-2.15.15" sources."@types/node-14.11.1" sources."@types/pg-7.14.5" - sources."@types/pg-types-1.11.5" + sources."@types/pg-types-2.2.0" sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" (sources."@types/request-2.48.5" // { @@ -71762,19 +72216,19 @@ in sources."form-data-2.5.1" ]; }) - sources."@types/serve-static-1.13.8" + sources."@types/serve-static-1.13.9" sources."@types/socket.io-2.1.11" sources."@types/socket.io-client-1.4.33" sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.20" - sources."@uifabric/icons-7.5.17" + sources."@uifabric/foundation-7.9.24" + sources."@uifabric/icons-7.5.21" sources."@uifabric/merge-styles-7.19.1" - sources."@uifabric/react-hooks-7.13.9" + sources."@uifabric/react-hooks-7.13.11" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.18" - sources."@uifabric/utilities-7.33.2" + sources."@uifabric/styling-7.18.0" + sources."@uifabric/utilities-7.33.4" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -71961,7 +72415,7 @@ in sources."minizlib-2.1.2" sources."p-map-4.0.0" sources."rimraf-3.0.2" - sources."tar-6.0.5" + sources."tar-6.1.0" ]; }) sources."cache-base-1.0.1" @@ -71971,7 +72425,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."callsite-1.0.0" sources."camelcase-3.0.0" sources."caseless-0.12.0" @@ -72151,9 +72605,10 @@ in sources."each-props-1.3.2" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" + sources."inherits-2.0.4" ]; }) sources."emojis-list-3.0.0" @@ -72181,7 +72636,7 @@ in ]; }) sources."engine.io-parser-2.2.1" - sources."enhanced-resolve-4.3.0" + sources."enhanced-resolve-4.5.0" sources."errno-0.1.8" sources."error-ex-1.3.2" sources."es5-ext-0.10.53" @@ -72228,7 +72683,7 @@ in sources."express-openapi-7.0.1" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -72247,10 +72702,10 @@ in sources."extsprintf-1.3.0" sources."fancy-log-1.3.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-1.1.4" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."figgy-pudding-3.5.2" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" @@ -72319,7 +72774,7 @@ in ]; }) sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -72340,7 +72795,7 @@ in sources."globby-10.0.2" sources."glogg-1.0.2" sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gulp-4.0.2" (sources."gulp-clean-css-4.3.0" // { dependencies = [ @@ -72552,7 +73007,11 @@ in sources."material-design-lite-1.3.0" sources."md5.js-1.3.5" sources."media-typer-0.3.0" - sources."memoizee-0.4.14" + (sources."memoizee-0.4.15" // { + dependencies = [ + sources."next-tick-1.1.0" + ]; + }) (sources."memory-fs-0.5.0" // { dependencies = [ sources."isarray-1.0.0" @@ -72662,7 +73121,7 @@ in }) sources."nan-2.14.2" sources."nanomatch-1.2.13" - (sources."needle-2.5.2" // { + (sources."needle-2.6.0" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" @@ -72737,19 +73196,51 @@ 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.155.3" + sources."office-ui-fabric-react-7.160.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."openapi-default-setter-7.0.1" - sources."openapi-framework-7.2.0" - sources."openapi-jsonschema-parameters-7.0.2" - sources."openapi-request-coercer-7.1.0" - sources."openapi-request-validator-7.2.0" - sources."openapi-response-validator-7.0.1" - sources."openapi-schema-validator-7.0.1" - sources."openapi-security-handler-7.0.1" + (sources."openapi-default-setter-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-framework-7.3.0" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-jsonschema-parameters-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-request-coercer-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-request-validator-7.3.0" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-response-validator-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-schema-validator-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) + (sources."openapi-security-handler-7.2.3" // { + dependencies = [ + sources."openapi-types-7.2.3" + ]; + }) sources."openapi-types-7.0.1" (sources."opencollective-1.0.3" // { dependencies = [ @@ -72865,6 +73356,7 @@ in sources."qs-6.7.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" + sources."queue-microtask-1.2.2" sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" @@ -72913,7 +73405,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -72921,17 +73413,17 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."reusify-1.0.4" - sources."rfdc-1.1.4" + sources."rfdc-1.2.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."run-queue-1.0.3" sources."rx-4.1.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.32.0" + sources."sass-1.32.7" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" @@ -72998,7 +73490,7 @@ in sources."debug-4.1.1" sources."isarray-2.0.1" sources."ms-2.1.3" - (sources."socket.io-parser-3.3.1" // { + (sources."socket.io-parser-3.3.2" // { dependencies = [ sources."component-emitter-1.3.0" sources."debug-3.1.0" @@ -73018,7 +73510,7 @@ in 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."source-map-url-0.4.1" sources."sparkles-1.0.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -73030,7 +73522,7 @@ in sources."sqlite3-5.0.0" sources."sqlstring-2.3.1" sources."sshpk-1.16.1" - (sources."ssri-8.0.0" // { + (sources."ssri-8.0.1" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -73099,7 +73591,7 @@ in sources."sver-compat-1.5.0" sources."swagger-schema-official-2.0.0-bab6bed" sources."swagger-ui-dist-3.34.0" - sources."tail-2.1.1" + sources."tail-2.2.0" sources."tapable-1.1.3" (sources."tar-4.4.13" // { dependencies = [ @@ -73188,7 +73680,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -73230,9 +73722,9 @@ in (sources."watchpack-1.7.5" // { dependencies = [ sources."anymatch-3.1.1" - sources."binary-extensions-2.1.0" - sources."chokidar-3.4.3" - sources."fsevents-2.1.3" + sources."binary-extensions-2.2.0" + sources."chokidar-3.5.1" + sources."fsevents-2.3.2" sources."is-binary-path-2.1.0" sources."readdirp-3.5.0" ]; @@ -73292,7 +73784,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -73338,20 +73830,20 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.17.0"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz"; - sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.19.0.tgz"; + sha512 = "CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.2.2" + sources."@eslint/eslintrc-0.3.0" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -73395,7 +73887,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -73412,7 +73904,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" @@ -73467,14 +73959,14 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.0.3" + sources."ajv-7.1.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."v8-compile-cache-2.2.0" sources."which-2.0.2" sources."word-wrap-1.2.3" @@ -73484,7 +73976,7 @@ in buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; - homepage = https://eslint.org/; + homepage = "https://eslint.org"; license = "MIT"; }; production = true; @@ -73494,20 +73986,22 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "9.1.2"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.1.2.tgz"; - sha512 = "HJ7n92z+gSBLPP/en2pse1SLsFfwOXb8aqHn3FyXwYaE+J5wSM+raBbSmvE9Ttq20IF6Rq/dXxjhiIjuxAUjpw=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-10.0.2.tgz"; + sha512 = "owgGugHDhfzqe2tjbkz+Htv4stRwFfXJEG6lc+c9dKxwgAvuYNurldosLJ2gyC66Uv/cPf4IS70wuUTmNLTrOQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) - sources."@eslint/eslintrc-0.2.2" + sources."@eslint/eslintrc-0.3.0" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -73524,14 +74018,13 @@ in sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; }) sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."core_d-2.0.0" + sources."core_d-3.0.0" sources."cross-spawn-7.0.3" sources."debug-4.3.2" sources."deep-is-0.1.3" @@ -73539,7 +74032,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.17.0" + sources."eslint-7.19.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -73553,7 +74046,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -73570,13 +74063,13 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globals-12.4.0" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" @@ -73623,17 +74116,17 @@ in sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" - sources."supports-color-5.5.0" + sources."supports-color-8.1.1" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.0.3" + sources."ajv-7.1.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."v8-compile-cache-2.2.0" sources."which-2.0.2" sources."word-wrap-1.2.3" @@ -73643,7 +74136,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Makes eslint the fastest linter on the planet"; - homepage = https://github.com/mantoni/eslint_d.js; + homepage = "https://github.com/mantoni/eslint_d.js"; license = "MIT"; }; production = true; @@ -73673,150 +74166,142 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.0.17"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.17.tgz"; - sha512 = "JF8HBs5dUd14zh9cI+u/OEKyRJqJZ2wOPvHlsX2Ohgxw80Wk/BGtTtZzlWY8/PQ+Lm56RWx7RMFPYestsBmpBg=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.1.6.tgz"; + sha512 = "C6UvtUWCsJyFOah57CKNeSP+tZeJDfED7dyHIWDQ+cQx2EYzNQVt4GIOu63u1Hzf3WArehxMroTmMayHCdhTeA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - sources."@babel/core-7.9.0" - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.5" - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - (sources."@babel/helper-define-map-7.10.5" // { + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + (sources."@babel/core-7.9.0" // { dependencies = [ - sources."lodash-4.17.20" + sources."semver-5.7.1" ]; }) - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - (sources."@babel/helper-module-transforms-7.12.1" // { + sources."@babel/generator-7.12.15" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + (sources."@babel/helper-compilation-targets-7.12.16" // { dependencies = [ - sources."lodash-4.17.20" + sources."semver-5.7.1" ]; }) - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.16" + sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-default-from-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/parser-7.12.16" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-export-default-from-7.12.13" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.12.1" + sources."@babel/plugin-syntax-export-default-from-7.12.13" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.1" + sources."@babel/plugin-syntax-flow-7.12.13" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.1" + sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-syntax-typescript-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.10" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-assign-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-react-display-name-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.12" - sources."@babel/plugin-transform-react-jsx-source-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - (sources."@babel/plugin-transform-runtime-7.12.10" // { + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-syntax-typescript-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-assign-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-react-display-name-7.12.13" + sources."@babel/plugin-transform-react-jsx-7.12.16" + sources."@babel/plugin-transform-react-jsx-source-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + (sources."@babel/plugin-transform-runtime-7.12.15" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-typescript-7.12.1" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.11" - sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.7" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - (sources."@babel/traverse-7.12.12" // { + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-typescript-7.12.16" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + (sources."@babel/preset-env-7.12.16" // { dependencies = [ - sources."lodash-4.17.20" - ]; - }) - (sources."@babel/types-7.12.12" // { - dependencies = [ - sources."lodash-4.17.20" + sources."semver-5.7.1" ]; }) + sources."@babel/preset-modules-0.1.4" + sources."@babel/preset-typescript-7.12.16" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" + sources."@expo/apple-utils-0.0.0-alpha.17" sources."@expo/babel-preset-cli-0.2.18" sources."@expo/bunyan-4.0.0" - (sources."@expo/config-3.3.22" // { - dependencies = [ - sources."semver-7.3.4" - ]; - }) - (sources."@expo/config-plugins-1.0.13" // { + sources."@expo/config-3.3.28" + (sources."@expo/config-plugins-1.0.18" // { dependencies = [ sources."slash-3.0.0" sources."uuid-3.4.0" @@ -73824,13 +74309,13 @@ in ]; }) sources."@expo/config-types-40.0.0-beta.2" - (sources."@expo/configure-splash-screen-0.3.2" // { + (sources."@expo/configure-splash-screen-0.3.3" // { dependencies = [ sources."commander-5.1.0" sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.48" // { + (sources."@expo/dev-server-0.1.54" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -73847,42 +74332,22 @@ in sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.74" - sources."@expo/eas-build-job-0.1.2" - (sources."@expo/image-utils-0.3.9" // { + sources."@expo/dev-tools-0.13.82" + (sources."@expo/image-utils-0.3.10" // { dependencies = [ - sources."semver-6.1.1" sources."tempy-0.3.0" ]; }) - (sources."@expo/json-file-8.2.25" // { + (sources."@expo/json-file-8.2.27" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.48" - (sources."@expo/ngrok-2.4.3" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - sources."@expo/ngrok-bin-2.2.8-beta.3" - sources."@expo/ngrok-bin-darwin-ia32-2.2.8" - sources."@expo/ngrok-bin-darwin-x64-2.2.8" - sources."@expo/ngrok-bin-freebsd-ia32-2.2.8" - sources."@expo/ngrok-bin-freebsd-x64-2.2.8" - sources."@expo/ngrok-bin-linux-arm-2.2.8" - sources."@expo/ngrok-bin-linux-arm64-2.2.8" - sources."@expo/ngrok-bin-linux-ia32-2.2.8" - sources."@expo/ngrok-bin-linux-x64-2.2.8" - sources."@expo/ngrok-bin-sunos-x64-2.2.8" - sources."@expo/ngrok-bin-win32-ia32-2.2.8-beta.1" - sources."@expo/ngrok-bin-win32-x64-2.2.8-beta.1" + sources."@expo/metro-config-0.1.54" sources."@expo/osascript-2.0.24" - (sources."@expo/package-manager-0.0.34" // { + (sources."@expo/package-manager-0.0.38" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" sources."semver-5.7.1" @@ -73894,74 +74359,24 @@ in ]; }) sources."@expo/results-1.0.0" - (sources."@expo/schemer-1.3.23" // { - dependencies = [ - sources."ajv-5.5.2" - sources."fast-deep-equal-1.1.0" - sources."get-stream-3.0.0" - sources."got-6.7.1" - sources."json-schema-traverse-0.3.1" - sources."probe-image-size-3.2.0" - ]; - }) + sources."@expo/schemer-1.3.26" sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - sources."@expo/traveling-fastlane-darwin-1.15.1" - sources."@expo/traveling-fastlane-linux-1.15.1" - (sources."@expo/webpack-config-0.12.52" // { + (sources."@expo/webpack-config-0.12.58" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-59.0.14" // { + (sources."@expo/xdl-59.0.22" // { dependencies = [ sources."chownr-1.1.4" - (sources."fs-minipass-1.2.7" // { - dependencies = [ - sources."minipass-2.9.0" - ]; - }) + sources."fs-minipass-1.2.7" sources."indent-string-3.2.0" - sources."lru-cache-5.1.1" - (sources."minizlib-1.3.3" // { - dependencies = [ - sources."minipass-2.9.0" - ]; - }) - sources."mkdirp-1.0.4" - (sources."npm-package-arg-8.1.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.3.4" - sources."yallist-4.0.0" - ]; - }) - (sources."pacote-11.1.0" // { - dependencies = [ - sources."minipass-3.1.3" - (sources."semver-7.3.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - (sources."tar-6.0.5" // { - dependencies = [ - sources."chownr-2.0.0" - ]; - }) - sources."yallist-4.0.0" - ]; - }) - (sources."tar-4.4.6" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) + sources."minipass-2.9.0" + sources."tar-4.4.6" sources."uuid-3.3.2" - sources."validator-11.0.0" - sources."which-2.0.2" sources."xcode-2.1.0" sources."xmldom-0.1.27" sources."yallist-3.1.1" @@ -74018,36 +74433,24 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - (sources."@npmcli/git-2.0.4" // { + (sources."@npmcli/git-2.0.6" // { dependencies = [ sources."mkdirp-1.0.4" - sources."semver-7.3.4" sources."which-2.0.2" ]; }) - sources."@npmcli/installed-package-contents-1.0.5" - (sources."@npmcli/move-file-1.0.1" // { + sources."@npmcli/installed-package-contents-1.0.7" + (sources."@npmcli/move-file-1.1.2" // { dependencies = [ sources."mkdirp-1.0.4" + sources."rimraf-3.0.2" ]; }) - sources."@npmcli/node-gyp-1.0.1" + sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.1" + sources."@npmcli/run-script-1.8.3" sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" sources."@react-native-community/cli-debugger-ui-4.13.1" - (sources."@react-native-community/cli-platform-android-4.13.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."fs-extra-8.1.0" - sources."has-flag-4.0.0" - sources."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) (sources."@react-native-community/cli-platform-ios-4.13.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -74092,9 +74495,9 @@ in sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.167" + sources."@types/lodash-4.14.168" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" sources."@types/node-9.6.61" @@ -74106,12 +74509,12 @@ in sources."@types/tapable-1.0.6" sources."@types/text-table-0.2.1" sources."@types/tmp-0.0.33" - (sources."@types/uglify-js-3.11.1" // { + (sources."@types/uglify-js-3.12.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.25" // { + (sources."@types/webpack-4.41.26" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -74121,7 +74524,7 @@ in sources."source-map-0.7.3" ]; }) - sources."@types/yargs-15.0.12" + sources."@types/yargs-15.0.13" sources."@types/yargs-parser-20.2.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -74149,21 +74552,22 @@ in sources."acorn-6.4.2" sources."address-1.1.2" sources."agent-base-6.0.2" - sources."agentkeepalive-4.1.3" + sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" + sources."ajv-5.5.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."alphanum-sort-1.0.2" - (sources."analytics-node-3.3.0" // { + (sources."analytics-node-3.5.0" // { dependencies = [ - sources."axios-0.17.1" sources."uuid-3.4.0" ]; }) (sources."ansi-align-3.0.0" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -74174,13 +74578,8 @@ in sources."type-fest-0.11.0" ]; }) - (sources."ansi-fragments-0.2.1" // { - dependencies = [ - sources."strip-ansi-5.2.0" - ]; - }) sources."ansi-html-0.0.7" - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."any-base-1.1.0" sources."any-promise-1.3.0" @@ -74202,7 +74601,6 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-2.0.1" - sources."asap-2.0.6" sources."asn1-0.2.4" (sources."asn1.js-5.4.1" // { dependencies = [ @@ -74217,8 +74615,7 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."astral-regex-1.0.0" - sources."async-0.9.2" + sources."async-1.5.2" sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" @@ -74231,14 +74628,7 @@ in }) sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - (sources."axios-0.19.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."follow-redirects-1.5.10" - sources."is-buffer-2.0.5" - sources."ms-2.0.0" - ]; - }) + sources."axios-0.21.1" sources."axios-retry-3.1.9" sources."babel-extract-comments-1.0.0" sources."babel-loader-8.1.0" @@ -74268,7 +74658,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.48" sources."big.js-5.2.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bmp-js-0.1.0" @@ -74308,7 +74698,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.0" + sources."browserslist-4.16.3" sources."buffer-5.7.1" sources."buffer-equal-0.0.1" sources."buffer-from-1.1.1" @@ -74334,7 +74724,7 @@ in sources."normalize-url-4.5.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsite-1.0.0" @@ -74342,13 +74732,12 @@ in (sources."camel-case-4.1.2" // { dependencies = [ sources."pascal-case-3.1.2" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001173" - sources."capture-stack-trace-1.0.1" + sources."caniuse-lite-1.0.30001185" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -74360,7 +74749,7 @@ in ]; }) sources."charenc-0.0.2" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.2" sources."ci-info-1.6.0" @@ -74393,12 +74782,14 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-2.5.0" sources."cli-table3-0.6.0" - (sources."cliui-6.0.0" // { + (sources."cliui-5.0.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."wrap-ansi-6.2.0" + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."wrap-ansi-5.1.0" ]; }) sources."clone-2.1.2" @@ -74442,7 +74833,7 @@ in ]; }) sources."connect-history-api-fallback-1.6.0" - sources."consola-2.15.0" + sources."consola-2.15.3" sources."console-browserify-1.2.0" sources."console-control-strings-1.1.0" sources."constants-browserify-1.0.0" @@ -74462,7 +74853,7 @@ in sources."array-union-2.1.0" sources."find-cache-dir-3.3.1" sources."find-up-4.1.0" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."loader-utils-2.0.0" sources."locate-path-5.0.0" sources."make-dir-3.1.0" @@ -74476,8 +74867,8 @@ in sources."slash-3.0.0" ]; }) - sources."core-js-3.8.2" - (sources."core-js-compat-3.8.2" // { + sources."core-js-3.8.3" + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -74489,10 +74880,13 @@ in sources."bn.js-4.11.9" ]; }) - sources."create-error-class-3.0.2" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."crypt-0.0.2" sources."crypto-browserify-3.12.0" sources."crypto-random-string-1.0.0" @@ -74539,9 +74933,7 @@ in sources."dag-map-1.0.2" sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."dayjs-1.10.1" sources."debug-4.3.2" - sources."debuglog-1.0.1" sources."decache-4.4.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -74549,7 +74941,7 @@ in sources."deep-equal-2.0.5" sources."deep-extend-0.6.0" sources."deep-scope-analyser-1.7.0" - sources."deepmerge-1.5.2" + sources."deepmerge-4.2.2" sources."default-gateway-4.2.0" (sources."defaults-1.0.3" // { dependencies = [ @@ -74588,7 +74980,6 @@ in sources."sudo-prompt-8.2.5" ]; }) - sources."dezalgo-1.0.3" (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -74608,6 +74999,7 @@ in sources."domain-browser-1.2.0" sources."domelementtype-2.1.0" sources."domhandler-3.3.0" + sources."domino-2.1.6" (sources."domutils-2.4.4" // { dependencies = [ sources."domhandler-4.0.0" @@ -74615,7 +75007,7 @@ in }) (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."dot-prop-5.3.0" @@ -74624,8 +75016,8 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.634" - (sources."elliptic-6.5.3" // { + sources."electron-to-chromium-1.3.663" + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -74639,17 +75031,17 @@ in ]; }) sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.3.0" // { + (sources."enhanced-resolve-4.5.0" // { dependencies = [ sources."memory-fs-0.5.0" ]; }) - sources."entities-2.1.0" - sources."env-editor-0.4.1" + sources."entities-2.2.0" + sources."env-editor-0.4.2" sources."env-paths-2.2.0" sources."envinfo-7.5.0" sources."eol-0.9.1" - sources."err-code-1.1.2" + sources."err-code-2.0.3" sources."errno-0.1.8" (sources."error-ex-1.3.2" // { dependencies = [ @@ -74658,8 +75050,8 @@ in }) sources."error-stack-parser-2.0.6" sources."errorhandler-1.5.1" - sources."es-abstract-1.17.7" - sources."es-get-iterator-1.1.1" + sources."es-abstract-1.18.0-next.2" + sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -74701,7 +75093,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.58" // { + (sources."expo-pwa-0.0.64" // { dependencies = [ sources."commander-2.20.0" ]; @@ -74725,10 +75117,10 @@ in ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-deep-equal-1.1.0" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."faye-websocket-0.10.0" sources."figgy-pudding-3.5.2" sources."figures-3.2.0" @@ -74751,7 +75143,7 @@ in sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" @@ -74768,11 +75160,7 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."form-data-2.3.2" // { - dependencies = [ - sources."combined-stream-1.0.6" - ]; - }) + sources."form-data-2.5.1" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."freeport-async-2.0.0" @@ -74795,7 +75183,7 @@ in }) sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ @@ -74807,7 +75195,7 @@ in }) sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-port-3.2.0" sources."get-stream-4.1.0" @@ -74842,7 +75230,7 @@ in sources."responselike-2.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphql-0.13.2" (sources."graphql-tools-3.0.0" // { dependencies = [ @@ -74852,7 +75240,13 @@ in sources."gzip-size-5.1.1" sources."handle-thing-2.0.1" sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + (sources."har-validator-5.1.5" // { + dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" + ]; + }) sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" @@ -74868,11 +75262,7 @@ in sources."kind-of-4.0.0" ]; }) - (sources."hasbin-1.2.3" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) + sources."hasbin-1.2.3" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -74885,7 +75275,7 @@ in sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" sources."hoek-4.2.1" - sources."hosted-git-info-3.0.7" + sources."hosted-git-info-3.0.8" sources."hpack.js-2.1.6" sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" @@ -74966,7 +75356,7 @@ in sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" @@ -74976,7 +75366,7 @@ in sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-function-1.0.2" sources."is-glob-4.0.1" (sources."is-invalid-path-0.1.0" // { @@ -75000,16 +75390,9 @@ in dependencies = [ sources."got-9.6.0" sources."p-timeout-3.2.0" - sources."prepend-http-3.0.1" - (sources."url-parse-lax-3.0.0" // { - dependencies = [ - sources."prepend-http-2.0.0" - ]; - }) ]; }) - sources."is-redirect-1.0.0" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-regexp-1.0.0" sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.2.0" @@ -75019,11 +75402,7 @@ in sources."is-string-1.0.5" sources."is-svg-3.0.0" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."is-typed-array-1.1.4" sources."is-typedarray-1.0.0" sources."is-valid-path-0.1.1" sources."is-weakmap-2.0.1" @@ -75042,11 +75421,10 @@ in sources."supports-color-7.2.0" ]; }) - sources."jetifier-1.6.6" sources."jimp-0.12.1" sources."joi-11.4.0" sources."join-component-1.1.0" - sources."jpeg-js-0.4.2" + sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" @@ -75060,11 +75438,11 @@ in sources."md5-2.2.1" ]; }) - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" @@ -75089,8 +75467,7 @@ in ]; }) sources."locate-path-6.0.0" - sources."lock-0.1.4" - sources."lodash-4.17.15" + sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" sources."lodash.assign-4.2.0" sources."lodash.debounce-4.0.8" @@ -75105,17 +75482,11 @@ in sources."chalk-2.4.2" ]; }) - (sources."logfmt-1.3.2" // { - dependencies = [ - sources."split-0.2.10" - ]; - }) - sources."logkitty-0.7.1" sources."loglevel-1.7.1" sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."lowercase-keys-1.0.1" @@ -75125,7 +75496,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-8.0.12" // { + (sources."make-fetch-happen-8.0.14" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -75156,7 +75527,7 @@ in sources."bn.js-4.11.9" ]; }) - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" @@ -75164,6 +75535,9 @@ in sources."min-document-2.19.0" (sources."mini-css-extract-plugin-0.5.0" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."schema-utils-1.0.0" ]; }) @@ -75181,9 +75555,10 @@ in sources."minipass-3.1.3" ]; }) - (sources."minipass-fetch-1.3.2" // { + (sources."minipass-fetch-1.3.3" // { dependencies = [ sources."minipass-3.1.3" + sources."minizlib-2.1.2" ]; }) (sources."minipass-flush-1.0.5" // { @@ -75206,9 +75581,10 @@ in sources."minipass-3.1.3" ]; }) - (sources."minizlib-2.1.2" // { + (sources."minizlib-1.3.3" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-2.9.0" + sources."yallist-3.1.1" ]; }) sources."mississippi-3.0.0" @@ -75232,13 +75608,18 @@ in sources."nanomatch-1.2.13" sources."native-url-0.2.6" sources."ncp-2.0.0" + (sources."needle-2.6.0" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) sources."negotiator-0.6.2" sources."neo-async-2.6.2" - sources."next-tick-1.1.0" + sources."nested-error-stacks-2.0.1" sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."node-fetch-2.6.1" @@ -75246,7 +75627,6 @@ in (sources."node-gyp-7.1.2" // { dependencies = [ sources."rimraf-3.0.2" - sources."semver-7.3.4" sources."which-2.0.2" ]; }) @@ -75258,34 +75638,30 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."npm-bundled-1.1.1" - (sources."npm-install-checks-4.0.0" // { - dependencies = [ - sources."semver-7.3.4" - ]; - }) + sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" (sources."npm-package-arg-6.1.0" // { dependencies = [ sources."hosted-git-info-2.8.8" + sources."semver-5.7.1" ]; }) sources."npm-packlist-2.1.4" (sources."npm-pick-manifest-6.1.0" // { dependencies = [ sources."npm-package-arg-8.1.0" - sources."semver-7.3.4" ]; }) - (sources."npm-registry-fetch-8.1.5" // { + (sources."npm-registry-fetch-9.0.0" // { dependencies = [ sources."minipass-3.1.3" + sources."minizlib-2.1.2" sources."npm-package-arg-8.1.0" - sources."semver-7.3.4" ]; }) sources."npm-run-path-2.0.2" @@ -75313,22 +75689,10 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - (sources."object.entries-1.1.3" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."object.getownpropertydescriptors-2.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.entries-1.1.3" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" - (sources."object.values-1.1.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.values-1.1.2" sources."obuf-1.1.2" sources."omggif-1.0.10" sources."on-finished-2.3.0" @@ -75341,6 +75705,7 @@ in sources."options-0.0.6" (sources."ora-3.4.0" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."chalk-2.4.2" sources."strip-ansi-5.2.0" ]; @@ -75371,28 +75736,24 @@ in (sources."package-json-6.4.0" // { dependencies = [ sources."got-9.6.0" - sources."prepend-http-2.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-5.1.0" sources."semver-6.3.0" - sources."url-parse-lax-3.0.0" ]; }) - (sources."pacote-11.1.13" // { + (sources."pacote-11.2.6" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" sources."npm-package-arg-8.1.0" - sources."npm-registry-fetch-9.0.0" sources."rimraf-3.0.2" - sources."semver-7.3.4" ]; }) sources."pako-1.0.11" sources."parallel-transform-1.2.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."parse-asn1-5.1.6" @@ -75583,36 +75944,23 @@ in }) sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-4.1.0" - sources."prepend-http-1.0.4" + sources."prepend-http-3.0.1" sources."pretty-bytes-5.5.0" - (sources."pretty-error-2.1.2" // { - dependencies = [ - sources."lodash-4.17.20" - ]; - }) + sources."pretty-error-2.1.2" (sources."pretty-format-25.5.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" ]; }) sources."pretty-time-1.1.0" - (sources."probe-image-size-4.0.0" // { - dependencies = [ - sources."deepmerge-2.2.1" - ]; - }) + sources."probe-image-size-6.0.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" - (sources."promise-retry-1.1.1" // { - dependencies = [ - sources."retry-0.10.1" - ]; - }) + sources."promise-retry-2.0.1" sources."prompts-2.4.0" sources."proxy-addr-2.0.6" sources."prr-1.0.1" @@ -75636,6 +75984,7 @@ in sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" + sources."queue-microtask-1.2.2" sources."quick-lru-5.1.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" @@ -75647,7 +75996,7 @@ in }) sources."raw-body-2.3.3" sources."rc-1.2.8" - (sources."react-dev-utils-11.0.1" // { + (sources."react-dev-utils-11.0.2" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."array-union-2.1.0" @@ -75664,7 +76013,7 @@ in sources."is-wsl-2.2.0" sources."loader-utils-2.0.0" sources."locate-path-5.0.0" - sources."open-7.3.0" + sources."open-7.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."path-key-3.1.1" @@ -75675,18 +76024,17 @@ in sources."which-2.0.2" ]; }) - sources."react-error-overlay-6.0.8" + sources."react-error-overlay-6.0.9" sources."react-is-16.13.1" sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" sources."read-last-lines-1.6.0" - sources."read-package-json-fast-1.2.1" + sources."read-package-json-fast-2.0.1" (sources."readable-stream-2.3.7" // { dependencies = [ sources."isarray-1.0.0" ]; }) - sources."readdir-scoped-modules-1.1.0" sources."readdirp-3.5.0" sources."recursive-readdir-2.2.2" sources."regenerate-1.4.2" @@ -75694,12 +76042,12 @@ in sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."regexpu-core-4.7.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.7" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -75713,7 +76061,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" @@ -75721,7 +76069,6 @@ in sources."domutils-1.7.0" sources."entities-1.1.2" sources."htmlparser2-3.10.1" - sources."lodash-4.17.20" sources."readable-stream-3.6.0" sources."strip-ansi-3.0.1" ]; @@ -75731,14 +76078,20 @@ in sources."replace-string-1.1.0" (sources."request-2.88.2" // { dependencies = [ + sources."form-data-2.3.3" sources."uuid-3.4.0" ]; }) sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" + (sources."requireg-0.2.2" // { + dependencies = [ + sources."resolve-1.7.1" + ]; + }) sources."requires-port-1.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-alpn-1.0.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ @@ -75761,21 +76114,27 @@ in }) sources."ripemd160-2.0.2" sources."router-ips-1.0.0" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."schema-utils-2.7.1" + (sources."schema-utils-2.7.1" // { + dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" + ]; + }) sources."select-hose-2.0.0" (sources."selfsigned-1.10.8" // { dependencies = [ sources."node-forge-0.10.0" ]; }) - sources."semver-5.5.0" + sources."semver-7.3.2" (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" @@ -75814,7 +76173,6 @@ in sources."simple-swizzle-0.2.2" sources."sisteransi-1.0.5" sources."slash-1.0.0" - sources."slice-ansi-2.1.0" (sources."slugid-1.1.0" // { dependencies = [ sources."uuid-2.0.3" @@ -75869,7 +76227,7 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-support-0.4.18" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -75880,7 +76238,7 @@ in sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - (sources."ssri-8.0.0" // { + (sources."ssri-8.0.1" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -75918,11 +76276,7 @@ in ]; }) sources."stream-shift-1.0.1" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - ]; - }) + sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" @@ -75931,11 +76285,7 @@ in sources."is-obj-1.0.1" ]; }) - (sources."strip-ansi-6.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - ]; - }) + sources."strip-ansi-6.0.0" sources."strip-comments-1.0.2" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -75965,9 +76315,10 @@ in }) sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."tar-6.0.5" // { + (sources."tar-6.1.0" // { dependencies = [ sources."minipass-3.1.3" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" ]; }) @@ -75977,7 +76328,7 @@ in sources."array-union-2.1.0" sources."crypto-random-string-2.0.0" sources."del-6.0.0" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."is-path-inside-3.0.2" sources."is-stream-2.0.0" sources."p-map-4.0.0" @@ -76045,6 +76396,7 @@ in sources."tslib-1.14.1" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" + sources."turndown-7.0.0" sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."type-is-1.6.18" @@ -76075,12 +76427,11 @@ in ]; }) sources."untildify-3.0.3" - sources."unzip-response-2.0.1" sources."upath-1.2.0" sources."update-check-1.5.3" sources."upper-case-1.1.3" sources."upper-case-first-1.1.2" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -76090,12 +76441,19 @@ in sources."url-join-4.0.0" (sources."url-loader-4.1.1" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."loader-utils-2.0.0" sources."schema-utils-3.0.0" ]; }) sources."url-parse-1.4.7" - sources."url-parse-lax-1.0.0" + (sources."url-parse-lax-3.0.0" // { + dependencies = [ + sources."prepend-http-2.0.0" + ]; + }) sources."use-3.1.1" sources."utif-2.0.1" (sources."util-0.11.1" // { @@ -76110,7 +76468,6 @@ in sources."uuid-8.3.2" sources."valid-url-1.0.9" sources."validate-npm-package-name-3.0.0" - sources."validator-10.5.0" sources."vary-1.1.2" sources."vendors-1.0.4" sources."verror-1.10.0" @@ -76141,6 +76498,7 @@ in sources."wcwidth-1.0.1" (sources."webpack-4.43.0" // { dependencies = [ + sources."ajv-6.12.6" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -76148,6 +76506,7 @@ in }) sources."cacache-12.0.4" sources."chownr-1.1.4" + sources."fast-deep-equal-3.1.3" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -76158,6 +76517,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."json-schema-traverse-0.4.1" sources."lru-cache-5.1.1" sources."micromatch-3.1.10" sources."rimraf-2.7.1" @@ -76173,6 +76533,7 @@ in sources."webpack-dev-middleware-3.7.3" (sources."webpack-dev-server-3.11.0" // { dependencies = [ + sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."anymatch-2.0.0" sources."binary-extensions-1.13.1" @@ -76184,28 +76545,21 @@ in sources."braces-2.3.2" sources."bytes-3.1.0" sources."chokidar-2.1.8" - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."content-disposition-0.5.3" sources."cookie-0.4.0" - sources."emoji-regex-7.0.3" (sources."express-4.17.1" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."extend-shallow-2.0.1" + sources."fast-deep-equal-3.1.3" sources."fill-range-4.0.0" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."find-up-3.0.0" sources."fsevents-1.2.13" sources."glob-parent-3.1.0" sources."http-errors-1.7.2" @@ -76215,16 +76569,13 @@ in sources."is-binary-path-1.0.1" sources."is-glob-3.1.0" sources."is-number-3.0.0" + sources."json-schema-traverse-0.4.1" sources."kind-of-3.2.2" - sources."locate-path-3.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" sources."ms-2.0.0" sources."normalize-path-2.1.1" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" sources."p-retry-3.0.1" - sources."path-exists-3.0.0" sources."qs-6.7.0" sources."raw-body-2.4.0" sources."readdirp-2.2.1" @@ -76243,24 +76594,10 @@ in sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" sources."statuses-1.5.0" - (sources."string-width-3.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" - (sources."wrap-ansi-5.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."ws-6.2.1" - sources."yargs-13.3.2" - sources."yargs-parser-13.1.2" ]; }) (sources."webpack-log-2.0.0" // { @@ -76293,21 +76630,17 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - (sources."which-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."which-typed-array-1.1.4" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; }) sources."widest-line-3.1.0" sources."with-open-file-0.1.7" - sources."wordwrap-1.0.0" sources."workbox-background-sync-3.6.3" sources."workbox-broadcast-cache-update-3.6.3" (sources."workbox-build-3.6.3" // { @@ -76331,6 +76664,9 @@ in sources."worker-farm-1.7.0" (sources."worker-loader-2.0.0" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."schema-utils-0.4.7" ]; }) @@ -76359,20 +76695,25 @@ in ]; }) sources."xmlbuilder-9.0.7" - sources."xmldoc-1.1.2" sources."xmldom-0.1.31" sources."xtend-4.0.2" sources."y18n-4.0.1" sources."yallist-4.0.0" - (sources."yargs-15.4.1" // { + (sources."yargs-13.3.2" // { dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."find-up-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."locate-path-3.0.0" sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) - sources."yargs-parser-18.1.3" + sources."yargs-parser-13.1.2" sources."yocto-queue-0.1.0" sources."zen-observable-0.8.15" sources."zen-observable-ts-0.8.21" @@ -76444,7 +76785,7 @@ in sources."function-bind-1.1.1" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -76530,7 +76871,7 @@ in sources."repeating-2.0.1" sources."request-2.88.2" sources."request-progress-2.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -76553,7 +76894,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -76575,10 +76916,10 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.1.tgz"; - sha512 = "3mI3r9pj/8XOKXlBd/pcSALey1/XJpa/YMluuJQtRI2vwpuAVRi0XdgRXiKzdA2CJFi0o3gZpqEgn7+TMJm8ZA=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.2.tgz"; + sha512 = "terh0qFI5xNAGp/tL4EtKQKSVQdLYeBpFGOwU7vaoigzFgO3TZpH6JLwF36NeUae9sTdTlQt7X3ti2bOqCDnQQ=="; }; dependencies = [ (sources."@heroku-cli/color-1.1.14" // { @@ -76596,21 +76937,24 @@ in sources."@nodelib/fs.walk-1.2.6" (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.1" + sources."@oclif/plugin-help-3.2.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" + sources."chalk-4.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."has-flag-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" + sources."supports-color-7.2.0" sources."wrap-ansi-4.0.0" ]; }) (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."globby-11.0.1" - sources."tslib-2.0.3" + sources."globby-11.0.2" + sources."tslib-2.1.0" ]; }) sources."@oclif/errors-1.3.4" @@ -76635,7 +76979,7 @@ in }) sources."@oclif/screen-1.0.4" sources."@sindresorhus/is-0.7.0" - sources."abort-controller-3.0.0" + sources."abortcontroller-polyfill-1.7.1" sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.0" @@ -76750,7 +77094,6 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."event-target-shim-5.0.1" sources."execa-0.10.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -76787,11 +77130,11 @@ in sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.10.0" - sources."faunadb-git+https://github.com/fauna/faunadb-js.git#triage/bearer-to-basic" + sources."fastq-1.10.1" + sources."faunadb-4.0.3" sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" sources."for-in-1.0.2" @@ -76838,7 +77181,7 @@ in ]; }) sources."got-8.3.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -76979,7 +77322,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."query-string-5.1.1" - sources."querystringify-2.2.0" + sources."queue-microtask-1.2.2" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -76992,12 +77335,11 @@ in sources."request-2.88.2" sources."request-promise-4.2.6" sources."request-promise-core-1.1.4" - sources."requires-port-1.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."ret-0.1.15" sources."reusify-1.0.4" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -77045,7 +77387,7 @@ in sources."sort-keys-2.0.0" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."split-string-3.1.0" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { @@ -77107,9 +77449,8 @@ in sources."has-values-0.1.4" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" - sources."url-parse-1.4.7" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -77126,7 +77467,7 @@ in buildInputs = globalBuildInputs; meta = { description = "faunadb shell"; - homepage = https://github.com/fauna/fauna-shell; + homepage = "https://github.com/fauna/fauna-shell"; license = "MPL-2.0"; }; production = true; @@ -77136,38 +77477,36 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.1.0"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.1.0.tgz"; - sha512 = "hTfxL2meJSl5WuwAS6bEJ5nay7tu3MNYb4ZL2KmPL7yLM3IeT+Qd2z1evHhW1VvbDXKR6RTwlBxzdWPs4l75kA=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.3.0.tgz"; + sha512 = "tLg1GKpf8Jxlgqq3JttWTOHsOKIyNpro0Ic5sOabmxd1XSeXdK0XW3r3INASoSpy1SYPQn5EEyR1Vs/a0gCu2w=="; }; dependencies = [ - sources."@apidevtools/json-schema-ref-parser-9.0.6" + sources."@apidevtools/json-schema-ref-parser-9.0.7" sources."@dabh/diagnostics-2.0.2" sources."@google-cloud/paginator-3.0.5" sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.0.1" sources."@google-cloud/promisify-2.0.3" - sources."@google-cloud/pubsub-2.7.0" - (sources."@grpc/grpc-js-1.1.8" // { + sources."@google-cloud/pubsub-2.8.0" + (sources."@grpc/grpc-js-1.2.6" // { dependencies = [ - sources."@grpc/proto-loader-0.6.0-pre9" - sources."@types/node-12.19.12" sources."semver-6.3.0" ]; }) - sources."@grpc/proto-loader-0.5.5" + sources."@grpc/proto-loader-0.5.6" sources."@jsdevtools/ono-7.1.3" - sources."@opentelemetry/api-0.11.0" - sources."@opentelemetry/context-base-0.11.0" - (sources."@opentelemetry/core-0.11.0" // { + sources."@opentelemetry/api-0.12.0" + sources."@opentelemetry/context-base-0.12.0" + (sources."@opentelemetry/core-0.12.0" // { dependencies = [ sources."semver-7.3.4" ]; }) - sources."@opentelemetry/resources-0.11.0" - sources."@opentelemetry/semantic-conventions-0.11.0" - sources."@opentelemetry/tracing-0.11.0" + sources."@opentelemetry/resources-0.12.0" + sources."@opentelemetry/semantic-conventions-0.12.0" + sources."@opentelemetry/tracing-0.12.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -77180,9 +77519,10 @@ in sources."@protobufjs/utf8-1.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@tootallnate/once-1.1.2" sources."@types/duplexify-3.6.0" sources."@types/long-4.0.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -77199,8 +77539,8 @@ in ]; }) sources."ansi-escapes-3.2.0" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" sources."anymatch-3.1.1" sources."aproba-1.2.0" @@ -77225,6 +77565,7 @@ in sources."as-array-2.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."ast-types-0.13.4" sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -77241,8 +77582,8 @@ in sources."big-integer-1.6.48" sources."bignumber.js-9.0.1" sources."binary-0.3.0" - sources."binary-extensions-2.1.0" - sources."bl-4.0.3" + sources."binary-extensions-2.2.0" + sources."bl-4.1.0" sources."blakejs-1.1.0" sources."bluebird-3.4.7" (sources."body-parser-1.19.0" // { @@ -77253,7 +77594,10 @@ in }) (sources."boxen-4.2.0" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; @@ -77277,40 +77621,24 @@ in sources."cardinal-2.1.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) + sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cjson-0.3.3" sources."cli-boxes-2.2.1" - (sources."cli-color-1.4.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."cli-color-1.4.0" sources."cli-cursor-2.1.0" sources."cli-spinners-2.5.0" sources."cli-table-0.3.4" sources."cli-width-2.2.1" - sources."cliui-6.0.0" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" - (sources."color-3.0.0" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-string-1.5.4" sources."colors-1.4.0" sources."colorspace-1.1.2" @@ -77370,14 +77698,15 @@ in sources."csv-streamify-3.0.4" sources."d-1.0.1" sources."dashdash-1.14.1" + sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.2" - sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.3" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" + sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -77408,7 +77737,10 @@ in sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" + sources."escodegen-1.14.3" sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-emitter-0.3.5" sources."event-target-shim-5.0.1" @@ -77429,7 +77761,7 @@ in }) (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -77437,6 +77769,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" sources."fast-text-encoding-1.0.3" (sources."fast-url-parser-1.1.3" // { @@ -77446,6 +77779,7 @@ in }) sources."fecha-4.2.0" sources."figures-2.0.0" + sources."file-uri-to-path-2.0.0" sources."filesize-3.6.1" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { @@ -77454,7 +77788,6 @@ in sources."ms-2.0.0" ]; }) - sources."find-up-4.1.0" (sources."flat-arguments-1.0.2" // { dependencies = [ (sources."as-array-1.0.0" // { @@ -77479,15 +77812,21 @@ in }) sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" (sources."fstream-1.0.12" // { dependencies = [ sources."rimraf-2.7.1" ]; }) + (sources."ftp-0.3.10" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) (sources."gauge-2.7.4" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" @@ -77495,31 +77834,28 @@ in }) sources."gaxios-4.1.0" sources."gcp-metadata-4.2.1" - sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" + (sources."get-uri-3.0.2" // { + dependencies = [ + sources."fs-extra-8.1.0" + sources."jsonfile-4.0.0" + ]; + }) sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" - sources."google-auth-library-6.1.3" - sources."google-gax-2.9.2" + sources."google-auth-library-6.1.6" + sources."google-gax-2.10.2" sources."google-p12-pem-3.0.3" sources."got-9.6.0" - sources."graceful-fs-4.2.4" - (sources."gtoken-5.1.0" // { - dependencies = [ - sources."mime-2.4.7" - ]; - }) + sources."graceful-fs-4.2.6" + sources."gtoken-5.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" @@ -77530,6 +77866,7 @@ in sources."inherits-2.0.3" ]; }) + sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -77556,7 +77893,8 @@ in ]; }) sources."install-artifact-from-github-1.2.0" - sources."ip-regex-4.2.0" + sources."ip-1.1.5" + sources."ip-regex-4.3.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" @@ -77614,8 +77952,8 @@ in ]; }) sources."leven-3.1.0" + sources."levn-0.3.0" sources."listenercount-1.0.1" - sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lodash._isnative-2.4.1" sources."lodash._objecttypes-2.4.1" @@ -77652,7 +77990,11 @@ in sources."marked-0.7.0" sources."marked-terminal-3.3.0" sources."media-typer-0.3.0" - sources."memoizee-0.4.14" + (sources."memoizee-0.4.15" // { + dependencies = [ + sources."next-tick-1.1.0" + ]; + }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" @@ -77681,6 +78023,7 @@ in ]; }) sources."negotiator-0.6.2" + sources."netmask-1.0.6" sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-emoji-1.10.0" @@ -77690,7 +78033,7 @@ in dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.4" - sources."tar-6.0.5" + sources."tar-6.1.0" sources."which-2.0.2" ]; }) @@ -77708,6 +78051,7 @@ in sources."onetime-2.0.1" sources."open-6.4.0" sources."openapi3-ts-1.4.0" + sources."optionator-0.8.3" (sources."ora-3.4.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -77717,16 +78061,14 @@ in sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-defer-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" + sources."pac-proxy-agent-4.1.0" + sources."pac-resolver-4.1.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."parseurl-1.3.3" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-to-regexp-0.1.7" @@ -77738,16 +78080,24 @@ in sources."debug-3.2.7" ]; }) + sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-breaker-5.0.0" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.39" + sources."@types/node-13.13.41" ]; }) sources."proxy-addr-2.0.6" + (sources."proxy-agent-4.0.1" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) + sources."proxy-from-env-1.1.0" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -77767,8 +78117,6 @@ in sources."qs-6.5.2" ]; }) - sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."retry-request-4.1.3" @@ -77814,6 +78162,10 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."simple-swizzle-0.2.2" + sources."smart-buffer-4.1.0" + sources."socks-2.5.1" + sources."socks-proxy-agent-5.0.0" + sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -77821,17 +78173,19 @@ in sources."stream-shift-1.0.1" (sources."string-length-1.0.1" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."strip-ansi-3.0.1" ]; }) sources."string-width-4.2.0" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + (sources."strip-ansi-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + ]; + }) sources."strip-json-comments-2.0.1" (sources."superstatic-7.1.0" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" sources."fs-extra-8.1.0" @@ -77882,7 +78236,7 @@ in sources."toxic-1.0.1" sources."traverse-0.3.9" sources."triple-beam-1.3.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."tweetsodium-0.0.5" // { @@ -77891,6 +78245,7 @@ in ]; }) sources."type-1.2.0" + sources."type-check-0.3.2" sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" @@ -77907,12 +78262,15 @@ in }) (sources."update-notifier-4.1.3" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-join-0.0.1" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" @@ -77923,7 +78281,6 @@ in sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."which-1.3.1" - sources."which-module-2.0.0" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -77945,24 +78302,22 @@ in sources."string_decoder-1.1.1" ]; }) - sources."wrap-ansi-6.2.0" + sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xdg-basedir-4.0.0" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.31" + sources."xregexp-2.0.0" sources."xtend-4.0.2" - sources."y18n-4.0.1" sources."yallist-4.0.0" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" sources."zip-stream-2.1.3" ]; buildInputs = globalBuildInputs; meta = { description = "Command-Line Interface for Firebase"; - homepage = https://github.com/firebase/firebase-tools; + homepage = "https://github.com/firebase/firebase-tools"; license = "MIT"; }; production = true; @@ -78027,9 +78382,9 @@ in sha512 = "untVuHgEQjwTXQGiWcwMTi0Uks6ht9R5hb1mDT4AEQitZ/z8UrhvseQsGEC3kVEjfxQ6bdmCMaA/hKTZ5aQDrA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -78079,7 +78434,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."hosted-git-info-3.0.7" + sources."hosted-git-info-3.0.8" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."indent-string-4.0.0" @@ -78099,7 +78454,7 @@ in sources."lodash-4.17.20" sources."lru-cache-6.0.0" sources."map-obj-4.1.0" - (sources."meow-8.1.0" // { + (sources."meow-8.1.2" // { dependencies = [ sources."type-fest-0.18.1" ]; @@ -78123,7 +78478,7 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" @@ -78150,7 +78505,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" sources."rxjs-6.6.3" @@ -78200,44 +78555,11 @@ in flood = nodeEnv.buildNodePackage { name = "flood"; packageName = "flood"; - version = "4.3.1"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/flood/-/flood-4.3.1.tgz"; - sha512 = "dq1ModlLpq8eJGJ3oqKLam+HvHfUvcFCcDb464rdzVHOERXeKzPvjMBynXgED9UZxutEoXQGd32Vyoehnodd4Q=="; + url = "https://registry.npmjs.org/flood/-/flood-4.4.1.tgz"; + sha512 = "C15ULT/FBNrjhF4Qf6d235+Pnmyv9TO6fqy4t/dS41emoHAjJsFZe5opefo6OQXtZ7BBvUz0flgPclq4zM3mkg=="; }; - dependencies = [ - sources."async-2.6.3" - sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.11" - sources."buffer-crc32-0.2.13" - sources."colors-1.4.0" - sources."concat-map-0.0.1" - sources."fd-slicer-1.1.0" - sources."fs.realpath-1.0.0" - sources."geoip-country-4.0.49" - sources."glob-7.1.6" - sources."iconv-lite-0.5.2" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ip-address-6.4.0" - sources."jsbn-1.1.0" - sources."lazy-1.0.11" - sources."lodash-4.17.20" - sources."lodash.find-4.6.0" - sources."lodash.max-4.0.1" - sources."lodash.merge-4.6.2" - sources."lodash.padstart-4.6.1" - sources."lodash.repeat-4.1.0" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."pend-1.2.0" - sources."rimraf-2.7.1" - sources."safer-buffer-2.1.2" - sources."sprintf-js-1.1.2" - sources."wrappy-1.0.2" - sources."yauzl-2.10.0" - ]; buildInputs = globalBuildInputs; meta = { description = "A modern Web UI for various torrent clients with multi-user and multi-client support"; @@ -78296,7 +78618,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."caller-0.0.1" sources."camelcase-2.1.1" sources."chokidar-2.1.8" @@ -78341,8 +78663,6 @@ in sources."defined-0.0.0" sources."director-1.2.7" sources."duplexer-0.1.2" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" sources."eventemitter2-6.4.3" (sources."expand-brackets-2.1.4" // { @@ -78388,7 +78708,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -78396,7 +78716,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."has-value-1.0.0" @@ -78414,7 +78734,6 @@ in sources."is-arguments-1.1.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -78428,8 +78747,7 @@ in ]; }) sources."is-plain-object-2.0.4" - sources."is-regex-1.1.1" - sources."is-symbol-1.0.3" + sources."is-regex-1.1.2" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-3.0.1" @@ -78477,11 +78795,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" sources."optimist-0.6.0" @@ -78505,7 +78821,7 @@ in sources."readable-stream-2.3.7" sources."readdirp-2.2.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -78555,7 +78871,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."split-0.3.3" sources."split-string-3.1.0" sources."stack-trace-0.0.10" @@ -78578,8 +78894,6 @@ in }) sources."stream-combiner-0.0.4" sources."string-width-1.0.2" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-0.1.3" @@ -78669,7 +78983,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command-line JSON viewer"; - homepage = https://fx.wtf/; + homepage = "https://fx.wtf"; license = "MIT"; }; production = true; @@ -78746,7 +79060,7 @@ in }; dependencies = [ sources."asyncmemo-1.0.0" - sources."chloride-2.4.0" + sources."chloride-2.4.1" sources."chloride-test-1.2.4" sources."commander-2.20.3" sources."debug-4.3.2" @@ -78776,8 +79090,8 @@ in sources."jsonpointer-4.1.0" sources."kvgraph-0.1.0" sources."kvset-1.0.0" - sources."libsodium-0.7.8" - sources."libsodium-wrappers-0.7.8" + sources."libsodium-0.7.9" + sources."libsodium-wrappers-0.7.9" sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" @@ -78869,7 +79183,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-3.2.0" + sources."sodium-native-3.2.1" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-caps-1.1.0" @@ -78913,7 +79227,7 @@ in buildInputs = globalBuildInputs; meta = { description = "git hosting on secure-scuttlebutt (ssb)"; - homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256; + homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256"; license = "Fair"; }; production = true; @@ -78947,9 +79261,9 @@ in sha512 = "2H4Y6kXvYRBdh42FUz8gaLkQ5AvtYYBXRgRElXjX/st4QhG+bgHdnCFGYoTbrVc2uA2vS63HtUS8AJ7SNE6Rew=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -78979,11 +79293,11 @@ in sources."arrify-1.0.1" sources."atomically-1.7.0" sources."base64-js-1.5.1" - sources."bl-4.0.3" - (sources."boxen-4.2.0" // { + sources."bl-4.1.0" + (sources."boxen-5.0.0" // { dependencies = [ - sources."chalk-3.0.0" - sources."type-fest-0.8.1" + sources."camelcase-6.2.0" + sources."type-fest-0.20.2" ]; }) sources."buffer-5.7.1" @@ -79036,20 +79350,20 @@ in sources."figures-3.2.0" sources."find-up-3.0.0" sources."function-bind-1.1.1" - sources."fuse.js-6.4.5" + sources."fuse.js-6.4.6" sources."get-stream-6.0.0" - sources."global-dirs-2.1.0" + sources."global-dirs-3.0.0" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.7" + sources."hosted-git-info-3.0.8" sources."http-cache-semantics-4.1.0" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" @@ -79058,14 +79372,14 @@ in sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inherits-2.0.4" - sources."ini-1.3.7" + sources."ini-2.0.0" sources."inquirer-7.3.3" sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-3.0.0" - sources."is-installed-globally-0.3.2" + sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" sources."is-npm-5.0.0" sources."is-obj-2.0.0" @@ -79099,7 +79413,7 @@ in ]; }) sources."map-obj-4.1.0" - (sources."meow-8.1.0" // { + (sources."meow-8.1.2" // { dependencies = [ sources."type-fest-0.18.1" ]; @@ -79121,7 +79435,7 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."ora-5.2.0" + sources."ora-5.3.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -79132,7 +79446,7 @@ in sources."semver-6.3.0" ]; }) - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" @@ -79142,7 +79456,11 @@ in sources."punycode-2.1.1" sources."pupa-2.1.1" sources."quick-lru-4.0.1" - sources."rc-1.2.8" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) (sources."read-pkg-5.2.0" // { dependencies = [ sources."hosted-git-info-2.8.8" @@ -79163,7 +79481,7 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" @@ -79190,7 +79508,6 @@ in sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" @@ -79199,14 +79516,15 @@ in sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - sources."update-notifier-5.0.1" - sources."uri-js-4.4.0" + sources."update-notifier-5.1.0" + sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" sources."which-2.0.2" sources."widest-line-3.1.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" @@ -79233,9 +79551,9 @@ in }; dependencies = [ sources."@ardatan/aggregate-error-0.0.6" - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -79250,39 +79568,56 @@ in sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.0.0" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + (sources."@graphql-tools/utils-7.2.5" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) ]; }) - (sources."@graphql-tools/delegate-7.0.8" // { + (sources."@graphql-tools/delegate-7.0.10" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + sources."@graphql-tools/utils-7.2.5" + sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/graphql-file-loader-6.2.6" // { + (sources."@graphql-tools/graphql-file-loader-6.2.7" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + sources."@graphql-tools/utils-7.2.5" + sources."tslib-2.1.0" + ]; + }) + (sources."@graphql-tools/import-6.2.6" // { + dependencies = [ + sources."tslib-2.1.0" ]; }) - sources."@graphql-tools/import-6.2.5" (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + (sources."@graphql-tools/utils-7.2.5" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.6" // { + (sources."@graphql-tools/merge-6.2.7" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + sources."@graphql-tools/utils-7.2.5" + sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/schema-7.1.2" // { + (sources."@graphql-tools/schema-7.1.3" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + sources."@graphql-tools/utils-7.2.5" + sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/url-loader-6.7.1" // { + (sources."@graphql-tools/url-loader-6.8.0" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + sources."@graphql-tools/utils-7.2.5" + sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/utils-6.2.4" // { @@ -79296,7 +79631,11 @@ in }) (sources."@graphql-tools/wrap-7.0.5" // { dependencies = [ - sources."@graphql-tools/utils-7.2.3" + (sources."@graphql-tools/utils-7.2.5" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) ]; }) sources."@kwsites/file-exists-1.1.1" @@ -79306,7 +79645,7 @@ in sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -79341,12 +79680,12 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."caseless-0.12.0" @@ -79402,8 +79741,8 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" - sources."es-get-iterator-1.1.1" + sources."es-abstract-1.18.0-next.2" + sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" sources."escalade-3.1.1" @@ -79420,10 +79759,10 @@ in sources."extract-files-9.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."figlet-1.5.0" sources."figures-3.2.0" sources."fill-range-7.0.1" @@ -79439,7 +79778,7 @@ in sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -79450,17 +79789,17 @@ in sources."p-cancelable-1.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphql-15.3.0" (sources."graphql-config-3.0.3" // { dependencies = [ sources."cosmiconfig-6.0.0" ]; }) - sources."graphql-subscriptions-1.1.0" + sources."graphql-subscriptions-1.2.0" sources."graphql-type-json-0.3.2" sources."graphql-upload-11.0.0" - sources."graphql-ws-3.1.0" + sources."graphql-ws-4.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -79497,7 +79836,7 @@ in sources."is-arrayish-0.2.1" sources."is-bigint-1.0.1" sources."is-boolean-object-1.1.0" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" @@ -79509,16 +79848,12 @@ in sources."is-number-7.0.0" sources."is-number-object-1.0.4" sources."is-promise-4.0.0" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-set-2.0.2" sources."is-stream-1.1.0" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."is-typed-array-1.1.4" sources."is-typedarray-1.0.0" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" @@ -79563,7 +79898,7 @@ in }) (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."lowercase-keys-1.0.1" @@ -79589,7 +79924,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."node-emoji-1.10.0" @@ -79601,13 +79936,13 @@ in sources."npm-run-path-2.0.2" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.1" - (sources."oas-resolver-2.5.3" // { + (sources."oas-resolver-2.5.4" // { dependencies = [ sources."yargs-16.2.0" ]; }) sources."oas-schema-walker-1.1.5" - sources."oas-validator-5.0.4" + sources."oas-validator-5.0.5" sources."oauth-sign-0.9.0" sources."object-inspect-1.9.0" sources."object-is-1.1.4" @@ -79646,10 +79981,10 @@ in }) sources."parent-module-1.0.1" sources."parse-github-url-1.0.2" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."passwd-user-3.0.0" @@ -79665,9 +80000,10 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."querystringify-2.2.0" + sources."queue-microtask-1.2.2" sources."rc-1.2.8" - sources."reftools-1.1.7" - sources."regexp.prototype.flags-1.3.0" + sources."reftools-1.1.8" + sources."regexp.prototype.flags-1.3.1" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" @@ -79680,7 +80016,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" (sources."rxjs-6.6.3" // { dependencies = [ sources."tslib-1.14.1" @@ -79720,7 +80056,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - (sources."swagger2openapi-7.0.4" // { + (sources."swagger2openapi-7.0.5" // { dependencies = [ sources."yargs-16.2.0" ]; @@ -79739,7 +80075,7 @@ in sources."type-fest-0.3.1" sources."universalify-1.0.0" sources."unixify-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-1.4.7" sources."url-parse-lax-3.0.0" sources."uuid-3.4.0" @@ -79749,11 +80085,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - (sources."which-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."which-typed-array-1.1.4" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -79761,7 +80093,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.4.2" sources."y18n-5.0.5" sources."yallist-4.0.0" sources."yaml-1.10.0" @@ -79954,7 +80286,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -79994,7 +80326,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -80050,21 +80382,99 @@ in makam = nodeEnv.buildNodePackage { name = "makam"; packageName = "makam"; - version = "0.7.37"; + version = "0.7.39"; src = fetchurl { - url = "https://registry.npmjs.org/makam/-/makam-0.7.37.tgz"; - sha512 = "6DGx7FnmgAf+dYXrptwmgC6WDR0+emgM1jMscY/3yitXP3IYq0BvFE2UKq66P16nkHcQHmENK6xTt8M3Z+rdBw=="; + url = "https://registry.npmjs.org/makam/-/makam-0.7.39.tgz"; + sha512 = "6XvSBJfpz1Jr5UHajYsKKLDlFcdYuhVmOJu3IqKsD14BcYoi+oZ+wfta8CVbKvRJDT7mF7e9dzCei8+nlsA3kA=="; }; buildInputs = globalBuildInputs; meta = { description = "The Makam metalanguage -- a tool for rapid language prototyping"; - homepage = http://astampoulis.github.io/makam/; + homepage = "http://astampoulis.github.io/makam/"; license = "GPL-3.0"; }; production = true; bypassCache = true; reconstructLock = true; }; + meshcommander = nodeEnv.buildNodePackage { + name = "meshcommander"; + packageName = "meshcommander"; + version = "0.9.0-d"; + src = fetchurl { + url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.0-d.tgz"; + sha512 = "sA4XtYUB8PZXozUr5G+OLnGyWOXm60nIH7EQUMYQAPHJQuhi52nMHKi6XYOQtByGR+hpeLK0vmi/dKQCj/7oFg=="; + }; + dependencies = [ + sources."accepts-1.3.7" + sources."array-flatten-1.1.1" + sources."body-parser-1.19.0" + sources."bytes-3.1.0" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."debug-2.6.9" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."express-4.17.1" + sources."express-ws-2.0.0" + sources."finalhandler-1.1.2" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."http-errors-1.7.2" + sources."iconv-lite-0.4.24" + sources."inherits-2.0.3" + sources."ipaddr.js-1.9.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" + sources."minimist-1.2.5" + sources."ms-2.0.0" + sources."negotiator-0.6.2" + sources."on-finished-2.3.0" + sources."options-0.0.6" + sources."parseurl-1.3.3" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-2.0.6" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + sources."statuses-1.5.0" + sources."toidentifier-1.0.0" + sources."type-is-1.6.18" + sources."ultron-1.0.2" + sources."unpipe-1.0.0" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" + sources."ws-1.1.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "MeshCommander web server"; + homepage = "http://meshcommander.com"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; gqlint = nodeEnv.buildNodePackage { name = "gqlint"; packageName = "gqlint"; @@ -80125,7 +80535,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.8.20" + sources."blessed-contrib-4.8.21" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" @@ -80197,7 +80607,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.34.2" + sources."systeminformation-4.34.9" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -80281,7 +80691,7 @@ in sources."buffer-equal-1.0.0" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-3.0.0" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -80359,7 +80769,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -80395,7 +80805,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -80408,7 +80818,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" sources."has-1.0.3" @@ -80545,7 +80955,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -80590,7 +81000,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."sparkles-1.0.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -80677,7 +81087,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The streaming build system."; - homepage = https://gulpjs.com/; + homepage = "https://gulpjs.com"; license = "MIT"; }; production = true; @@ -80719,7 +81129,7 @@ in }) sources."buffer-from-1.1.1" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-3.0.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -80765,7 +81175,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -80795,12 +81205,12 @@ in sources."fragment-cache-0.2.1" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gulplog-1.0.0" sources."has-1.0.3" sources."has-symbols-1.0.1" @@ -80936,7 +81346,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -80972,7 +81382,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."sparkles-1.0.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -81031,7 +81441,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for gulp"; - homepage = https://gulpjs.com/; + homepage = "https://gulpjs.com"; license = "MIT"; }; production = true; @@ -81049,7 +81459,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A robust HTML entities encoder/decoder with full Unicode support."; - homepage = https://mths.be/he; + homepage = "https://mths.be/he"; license = "MIT"; }; production = true; @@ -81074,13 +81484,13 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.7" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; meta = { description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = https://kangax.github.io/html-minifier/; + homepage = "https://kangax.github.io/html-minifier/"; license = "MIT"; }; production = true; @@ -81165,7 +81575,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."wrappy-1.0.2" @@ -81174,7 +81584,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The Static Code Analysis Tool for your HTML"; - homepage = https://htmlhint.com/; + homepage = "https://htmlhint.com"; license = "MIT"; }; production = true; @@ -81197,7 +81607,7 @@ in sources."debug-3.2.7" sources."ecstatic-3.3.2" sources."eventemitter3-4.0.7" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."he-1.2.0" sources."http-proxy-1.18.1" sources."lodash-4.17.20" @@ -81207,7 +81617,7 @@ in sources."ms-2.1.3" sources."opener-1.5.2" sources."portfinder-1.0.28" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" sources."union-0.5.0" @@ -81226,14 +81636,14 @@ in hsd = nodeEnv.buildNodePackage { name = "hsd"; packageName = "hsd"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/hsd/-/hsd-2.2.0.tgz"; - sha512 = "9U6ylEa3WPEb5AHb/TuwYDOJaXmR6mfKky8uJml3Y0xUAvO/yg/b4GfBXnMQ2wPQME5fG5Vkx0OLK7MyidtmAw=="; + url = "https://registry.npmjs.org/hsd/-/hsd-2.3.0.tgz"; + sha512 = "tgGO2ortI4HjQrMqmzrp+W3RSadfPdgZWWubNemxnugdiu4gGHCIv2FF3zHZbVd02UVBW+HRKDwqwltvGG+tbQ=="; }; dependencies = [ sources."bcfg-0.1.6" - sources."bcrypto-5.3.0" + sources."bcrypto-5.4.0" sources."bcurl-0.1.9" sources."bdb-1.3.0" sources."bdns-0.1.5" @@ -81246,7 +81656,7 @@ in sources."blru-0.1.6" sources."blst-0.1.5" sources."bmutex-0.1.6" - sources."bns-0.13.0" + sources."bns-0.14.0" sources."brq-0.1.8" sources."bs32-0.1.6" sources."bsert-0.0.10" @@ -81259,18 +81669,18 @@ in sources."bupnp-0.2.6" sources."bval-0.1.6" sources."bweb-0.1.10" - sources."goosig-0.9.0" + sources."goosig-0.10.0" sources."hs-client-0.0.9" sources."loady-0.0.5" sources."mrmr-0.1.10" sources."n64-0.2.10" sources."unbound-0.4.3" - sources."urkel-0.6.3" + sources."urkel-0.7.0" ]; buildInputs = globalBuildInputs; meta = { description = "Cryptocurrency bike-shed"; - homepage = https://github.com/handshake-org/hsd; + homepage = "https://github.com/handshake-org/hsd"; license = "MIT"; }; production = true; @@ -81280,24 +81690,24 @@ in hs-airdrop = nodeEnv.buildNodePackage { name = "hs-airdrop"; packageName = "hs-airdrop"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/hs-airdrop/-/hs-airdrop-0.9.0.tgz"; - sha512 = "eqN7mbITsdiBFdRlFHd91Vgudu5rajvIfPhZ8juWLFBZhxhuXzu1POMy4uHK+02jxNjX+upMMRyDxo4xS/ZudQ=="; + url = "https://registry.npmjs.org/hs-airdrop/-/hs-airdrop-0.10.0.tgz"; + sha512 = "z3H9va3XyqvEG7K6ldUhX47n3TNMtzB9oA/z04SCVwJFk9s6WPbI6Tqkuv4U9obkXtMlwTjVWd5pDO+HZYpzWA=="; }; dependencies = [ - sources."bcrypto-5.3.0" + sources."bcrypto-5.4.0" sources."bfile-0.2.2" sources."brq-0.1.8" sources."bsert-0.0.10" sources."bufio-1.0.7" - sources."goosig-0.9.0" + sources."goosig-0.10.0" sources."loady-0.0.5" ]; buildInputs = globalBuildInputs; meta = { description = "Handshake airdrop redemption"; - homepage = https://github.com/handshake-org/hs-airdrop; + homepage = "https://github.com/handshake-org/hs-airdrop"; license = "MIT"; }; production = true; @@ -81322,7 +81732,7 @@ in buildInputs = globalBuildInputs; meta = { description = "HSD node and wallet client"; - homepage = https://github.com/handshake-org/hs-client; + homepage = "https://github.com/handshake-org/hs-client"; license = "MIT"; }; production = true; @@ -81398,7 +81808,7 @@ in sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."base64-js-1.5.1" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -81469,7 +81879,7 @@ in buildInputs = globalBuildInputs; meta = { description = "IJavascript is a Javascript kernel for the Jupyter notebook"; - homepage = https://n-riesco.github.io/ijavascript; + homepage = "https://n-riesco.github.io/ijavascript"; license = "BSD-3-Clause"; }; production = true; @@ -81554,7 +81964,7 @@ in sources."object-assign-3.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-ansi-2.0.0" @@ -81670,7 +82080,7 @@ in sources."uglify-js-2.8.29" sources."uglify-to-browserify-1.0.2" sources."update-notifier-0.5.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -81685,7 +82095,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites"; - homepage = http://github.com/remy/inliner; + homepage = "http://github.com/remy/inliner"; license = "MIT"; }; production = true; @@ -81704,7 +82114,7 @@ in sources."async-0.2.10" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."bunyan-1.8.14" + sources."bunyan-1.8.15" sources."colors-0.6.2" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -81811,7 +82221,7 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."good-listener-1.2.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."historic-readline-1.0.8" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -81820,7 +82230,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.5.1" - sources."jquery.terminal-2.20.1" + sources."jquery.terminal-2.21.0" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -81850,7 +82260,7 @@ in buildInputs = globalBuildInputs; meta = { description = "High precision scientific calculator with support for physical units"; - homepage = https://github.com/sharkdp/insect; + homepage = "https://github.com/sharkdp/insect"; license = "MIT"; }; production = true; @@ -81884,7 +82294,7 @@ in sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."astral-regex-2.0.0" @@ -81962,7 +82372,7 @@ in sources."get-stream-4.1.0" sources."get-uri-3.0.2" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."http-errors-1.7.3" sources."http-proxy-agent-4.0.1" @@ -82022,7 +82432,7 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."methods-1.1.2" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-fn-1.2.0" @@ -82042,7 +82452,7 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.3.0" + sources."open-7.4.0" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -82053,10 +82463,10 @@ in sources."path-key-3.1.1" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" - sources."proxy-agent-4.0.0" + sources."proxy-agent-4.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."raw-body-2.4.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" @@ -82141,34 +82551,34 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; buildInputs = globalBuildInputs; meta = { description = "A tool for creating and developing Ionic Framework mobile apps."; - homepage = https://ionicframework.com/; + homepage = "https://ionicframework.com"; license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v4.5.0.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "3.7.1"; + version = "4.5.0"; src = fetchurl { - name = "iosevka-3.7.1.tar.gz"; - url = https://codeload.github.com/be5invis/Iosevka/tar.gz/v3.7.1; - sha256 = "ed7aee70af326ef22458f8f7603c599fd2f5164ae8062fbd6fb7d56864d98aca"; + name = "iosevka-4.5.0.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v4.5.0"; + sha256 = "f6dc0160e927241c7a63f5278d6e19b1da93f23defa02486b9a3ac7bdd3bde74"; }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@ot-builder/bin-composite-types-0.10.37" - sources."@ot-builder/bin-util-0.10.37" - (sources."@ot-builder/cli-help-shower-0.10.37" // { + sources."@ot-builder/bin-composite-types-1.0.1" + sources."@ot-builder/bin-util-1.0.1" + (sources."@ot-builder/cli-help-shower-1.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -82178,7 +82588,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-proc-0.10.37" // { + (sources."@ot-builder/cli-proc-1.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -82188,7 +82598,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-shared-0.10.37" // { + (sources."@ot-builder/cli-shared-1.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -82198,87 +82608,65 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/common-impl-0.10.37" - sources."@ot-builder/errors-0.10.37" - sources."@ot-builder/io-bin-cff-0.10.37" - sources."@ot-builder/io-bin-encoding-0.10.37" - sources."@ot-builder/io-bin-ext-private-0.10.37" - sources."@ot-builder/io-bin-font-0.10.37" - sources."@ot-builder/io-bin-glyph-store-0.10.37" - sources."@ot-builder/io-bin-layout-0.10.37" - sources."@ot-builder/io-bin-metadata-0.10.37" - sources."@ot-builder/io-bin-metric-0.10.37" - sources."@ot-builder/io-bin-name-0.10.37" - sources."@ot-builder/io-bin-sfnt-0.10.37" - sources."@ot-builder/io-bin-ttf-0.10.37" - sources."@ot-builder/ot-0.10.37" - sources."@ot-builder/ot-encoding-0.10.37" - sources."@ot-builder/ot-ext-private-0.10.37" - sources."@ot-builder/ot-glyphs-0.10.37" - sources."@ot-builder/ot-layout-0.10.37" - sources."@ot-builder/ot-metadata-0.10.37" - sources."@ot-builder/ot-name-0.10.37" - sources."@ot-builder/ot-sfnt-0.10.37" - sources."@ot-builder/ot-standard-glyph-namer-0.10.37" - sources."@ot-builder/prelude-0.10.37" - sources."@ot-builder/primitive-0.10.37" - sources."@ot-builder/rectify-0.10.37" - sources."@ot-builder/stat-glyphs-0.10.37" - sources."@ot-builder/trace-0.10.37" - sources."@ot-builder/var-store-0.10.37" - sources."@ot-builder/variance-0.10.37" - sources."@unicode/unicode-13.0.0-1.0.2" - sources."abbrev-1.1.1" - sources."ajv-6.12.6" + sources."@ot-builder/common-impl-1.0.1" + sources."@ot-builder/errors-1.0.1" + sources."@ot-builder/io-bin-cff-1.0.1" + sources."@ot-builder/io-bin-encoding-1.0.1" + sources."@ot-builder/io-bin-ext-private-1.0.1" + sources."@ot-builder/io-bin-font-1.0.1" + sources."@ot-builder/io-bin-glyph-store-1.0.1" + sources."@ot-builder/io-bin-layout-1.0.1" + sources."@ot-builder/io-bin-metadata-1.0.1" + sources."@ot-builder/io-bin-metric-1.0.1" + sources."@ot-builder/io-bin-name-1.0.1" + sources."@ot-builder/io-bin-sfnt-1.0.1" + sources."@ot-builder/io-bin-ttf-1.0.1" + sources."@ot-builder/ot-1.0.1" + sources."@ot-builder/ot-encoding-1.0.1" + sources."@ot-builder/ot-ext-private-1.0.1" + sources."@ot-builder/ot-glyphs-1.0.1" + sources."@ot-builder/ot-layout-1.0.1" + sources."@ot-builder/ot-metadata-1.0.1" + sources."@ot-builder/ot-name-1.0.1" + sources."@ot-builder/ot-sfnt-1.0.1" + sources."@ot-builder/ot-standard-glyph-namer-1.0.1" + sources."@ot-builder/prelude-1.0.1" + sources."@ot-builder/primitive-1.0.1" + sources."@ot-builder/rectify-1.0.1" + sources."@ot-builder/stat-glyphs-1.0.1" + sources."@ot-builder/trace-1.0.1" + sources."@ot-builder/var-store-1.0.1" + sources."@ot-builder/variance-1.0.1" + sources."@unicode/unicode-13.0.0-1.0.3" sources."amdefine-1.0.1" - sources."ansi-regex-2.1.1" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" sources."async-0.9.2" - sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" - sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."bufferstreams-2.0.1" - sources."camelcase-3.0.0" - sources."caseless-0.12.0" + sources."camelcase-5.3.1" sources."chainsaw-0.0.9" sources."chalk-2.4.2" - sources."chownr-1.1.4" sources."cldr-5.8.0" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" - sources."cliui-3.2.0" - sources."code-point-at-1.1.0" + sources."cliui-7.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.8" sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" sources."css-2.2.4" sources."css-parse-2.0.0" - sources."dashdash-1.14.1" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."ejs-3.1.5" + sources."ejs-3.1.6" sources."emoji-regex-8.0.0" - sources."error-ex-1.3.2" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."escodegen-2.0.0" (sources."escope-1.0.3" // { @@ -82306,103 +82694,41 @@ in }) sources."estraverse-5.2.0" sources."esutils-2.0.3" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."file-uri-to-path-1.0.0" - sources."filelist-1.0.1" - sources."find-up-1.1.2" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-9.0.1" - sources."fs-minipass-1.2.7" + sources."filelist-1.0.2" + sources."find-up-4.1.0" + sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-2.7.4" - sources."get-caller-file-1.0.3" - sources."getpass-0.1.7" + sources."get-caller-file-2.0.5" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-unicode-2.0.1" sources."hashish-0.0.4" - sources."hosted-git-info-2.8.8" - sources."http-signature-1.2.0" sources."iconv-lite-0.6.2" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."invert-kv-1.0.0" - sources."is-arrayish-0.2.1" sources."is-core-module-2.2.0" - sources."is-fullwidth-code-point-1.0.0" - sources."is-typedarray-1.0.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."isstream-0.1.2" sources."jake-10.8.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."jsprim-1.4.1" - sources."lcid-1.0.0" + sources."jsonfile-6.1.0" sources."levn-0.3.0" - sources."load-json-file-1.1.0" sources."locate-path-5.0.0" sources."lru-cache-2.5.0" sources."memoizeasync-1.1.0" - sources."microbuffer-1.0.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-1.2.5" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) - sources."minizlib-1.3.3" sources."mkdirp-1.0.4" sources."ms-2.0.0" - sources."nan-2.14.2" - (sources."node-gyp-4.0.0" // { - dependencies = [ - sources."mkdirp-0.5.5" - sources."semver-5.3.0" - sources."which-1.3.1" - ]; - }) - sources."nopt-3.0.6" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."os-homedir-1.0.2" - sources."os-locale-1.4.0" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."ot-builder-0.10.37" - (sources."otb-ttc-bundle-0.10.37" // { + sources."ot-builder-1.0.1" + (sources."otb-ttc-bundle-1.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -82415,38 +82741,21 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."pako-1.0.11" - sources."parse-json-2.2.0" sources."passerror-1.1.1" - sources."patel-0.33.1" - sources."path-exists-2.1.0" + sources."patel-0.34.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" - sources."path-type-1.1.0" sources."patrisika-0.22.2" sources."patrisika-scopes-0.11.1" sources."pegjs-0.10.0" - sources."performance-now-2.1.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" - sources."process-nextick-args-2.0.1" - sources."psl-1.8.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.7" - sources."request-2.88.2" sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."resolve-1.19.0" + sources."require-main-filename-2.0.0" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" sources."resumer-0.0.0" - sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semaphore-async-await-1.5.1" @@ -82460,11 +82769,7 @@ in sources."signal-exit-3.0.3" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" - sources."spdx-correct-3.1.1" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" + sources."source-map-url-0.4.1" (sources."spiro-2.0.0" // { dependencies = [ sources."tslib-1.14.1" @@ -82472,12 +82777,9 @@ in }) sources."split-1.0.1" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.1" sources."stack-trace-0.0.9" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" (sources."stylus-0.54.8" // { dependencies = [ sources."semver-6.3.0" @@ -82485,70 +82787,50 @@ in ]; }) sources."supports-color-5.5.0" - (sources."tar-4.4.13" // { - dependencies = [ - sources."mkdirp-0.5.5" - sources."yallist-3.1.1" - ]; - }) sources."through-2.3.8" sources."toposort-2.0.2" - sources."tough-cookie-2.5.0" sources."traverse-0.3.9" sources."ts-process-promises-1.0.2" - sources."tslib-2.0.3" - sources."ttf2woff-2.0.2" - sources."ttf2woff2-3.0.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + sources."tslib-2.1.0" sources."type-check-0.3.2" - sources."typo-geom-0.11.0" + sources."typo-geom-0.11.1" sources."unicoderegexp-0.4.1" - sources."universalify-1.0.0" - sources."uri-js-4.4.0" + sources."universalify-2.0.0" sources."urix-0.1.0" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."validate-npm-package-license-3.0.4" (sources."verda-1.2.1" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."camelcase-5.3.1" sources."chalk-4.1.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."find-up-4.1.0" - sources."get-caller-file-2.0.5" sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."path-exists-4.0.0" - sources."require-main-filename-2.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" - sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."y18n-4.0.1" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" ]; }) - sources."verror-1.10.0" + sources."wawoff2-1.0.2" sources."which-2.0.2" - sources."which-module-1.0.0" - sources."wide-align-1.1.3" + sources."which-module-2.0.0" sources."word-wrap-1.2.3" sources."wordwrap-0.0.3" - sources."wrap-ansi-2.1.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."wrappy-1.0.2" sources."xmldom-0.4.0" sources."xpath-0.0.32" - sources."y18n-3.2.2" + sources."y18n-5.0.5" sources."yallist-4.0.0" - sources."yargs-6.6.0" - sources."yargs-parser-4.2.1" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -82575,7 +82857,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."escape-string-regexp-1.0.5" - sources."filelist-1.0.1" + sources."filelist-1.0.2" sources."has-flag-3.0.0" sources."minimatch-3.0.4" sources."supports-color-5.5.0" @@ -82606,7 +82888,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."bufrw-1.3.0" - sources."chai-4.2.0" + sources."chai-4.3.0" sources."chai-as-promised-7.1.1" sources."chalk-2.4.2" sources."check-error-1.0.2" @@ -82639,7 +82921,7 @@ in sources."once-1.4.0" sources."opentracing-0.14.5" sources."path-is-absolute-1.0.1" - sources."pathval-1.1.0" + sources."pathval-1.1.1" sources."process-0.10.1" sources."rxjs-5.5.12" sources."semaphore-async-await-1.5.1" @@ -82669,7 +82951,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Implementation of the Language Server Protocol for JavaScript and TypeScript"; - homepage = https://github.com/sourcegraph/javascript-typescript-langserver; + homepage = "https://github.com/sourcegraph/javascript-typescript-langserver"; license = "Apache-2.0"; }; production = true; @@ -82679,26 +82961,26 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.5.1"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.5.1.tgz"; - sha512 = "V90a+QTDf5SSW8Il0BcWtdqdtDZYd/YFltqRzXGBRwO2nFggeUAuXcQxs5ZxEhQF3Jzvx3yGfrYioZR7B30D2A=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.6.4.tgz"; + sha512 = "jfiqk9aqN3mAZ+TIGqubTKGTBB5Q8KRmeXS2qr/2N80KFJHCqdCFhsyI/E2hfdd3CA4Gu5Ls9WTxXA3MW/XjwA=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.14" - sources."@joplin/fork-sax-1.2.18" - sources."@joplin/lib-1.0.15" - (sources."@joplin/renderer-1.0.23" // { + sources."@joplin/fork-htmlparser2-4.1.23" + sources."@joplin/fork-sax-1.2.27" + sources."@joplin/lib-1.0.18" + (sources."@joplin/renderer-1.0.26" // { dependencies = [ sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - sources."@joplin/turndown-4.0.36" - sources."@joplin/turndown-plugin-gfm-1.0.18" + sources."@joplin/turndown-4.0.45" + sources."@joplin/turndown-plugin-gfm-1.0.27" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -82738,7 +83020,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.821.0" // { + (sources."aws-sdk-2.842.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -82753,8 +83035,8 @@ in sources."base64-js-1.5.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-2.1.0" - (sources."bl-4.0.3" // { + sources."binary-extensions-2.2.0" + (sources."bl-4.1.0" // { dependencies = [ sources."buffer-5.7.1" sources."readable-stream-3.6.0" @@ -82772,7 +83054,7 @@ in sources."caseless-0.12.0" sources."chalk-4.1.0" sources."charenc-0.0.2" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."chownr-1.1.4" sources."chroma-js-2.1.0" sources."clean-css-4.2.3" @@ -82879,7 +83161,7 @@ in ]; }) sources."end-of-stream-1.4.4" - sources."entities-2.1.0" + sources."entities-2.2.0" sources."entity-decode-2.0.2" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" @@ -82899,7 +83181,7 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."find-up-2.1.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -82914,7 +83196,7 @@ in }) sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."fstream-1.0.12" (sources."gauge-2.7.4" // { dependencies = [ @@ -82927,7 +83209,7 @@ in sources."github-from-package-0.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -82936,7 +83218,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" - sources."highlight.js-10.5.0" + sources."highlight.js-10.6.0" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" @@ -82945,7 +83227,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" @@ -83023,7 +83305,7 @@ in sources."isobject-2.1.0" sources."isstream-0.1.2" sources."jmespath-0.15.0" - sources."jpeg-js-0.4.2" + sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" sources."jsdom-15.2.1" @@ -83037,12 +83319,8 @@ in sources."commander-2.20.3" ]; }) - (sources."keytar-7.3.0" // { - dependencies = [ - sources."node-addon-api-3.1.0" - ]; - }) - sources."khroma-1.1.1" + sources."keytar-7.3.0" + sources."khroma-1.2.0" sources."klaw-1.3.1" sources."lazyness-1.2.0" sources."levenshtein-1.0.5" @@ -83090,7 +83368,7 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.8.4" + sources."mermaid-8.9.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-response-2.1.0" @@ -83100,7 +83378,7 @@ in sources."debug-4.3.2" sources."html-minifier-4.0.0" sources."ms-2.1.2" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.7" ]; }) sources."minimatch-3.0.4" @@ -83122,7 +83400,7 @@ in sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - sources."needle-2.5.2" + sources."needle-2.6.0" sources."nextgen-events-1.3.4" sources."no-case-2.3.2" (sources."node-abi-2.19.3" // { @@ -83130,7 +83408,7 @@ in sources."semver-5.7.1" ]; }) - sources."node-addon-api-2.0.0" + sources."node-addon-api-3.1.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" @@ -83172,7 +83450,7 @@ in }) sources."omggif-1.0.10" sources."once-1.4.0" - sources."open-7.3.0" + sources."open-7.4.0" sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -83251,7 +83529,6 @@ in sources."color-3.1.3" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" - sources."node-addon-api-3.1.0" sources."simple-get-4.0.0" ]; }) @@ -83270,15 +83547,15 @@ in 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."source-map-url-0.4.1" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - sources."sqlite3-5.0.0" + sources."sqlite3-5.0.1" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-kit-0.11.8" + sources."string-kit-0.11.10" sources."string-padding-1.0.2" sources."string-to-stream-1.1.1" (sources."string-width-1.0.2" // { @@ -83324,7 +83601,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.44.3" + sources."terminal-kit-1.47.0" (sources."terser-4.8.0" // { dependencies = [ sources."commander-2.20.3" @@ -83366,7 +83643,7 @@ in sources."unorm-1.6.0" sources."unpack-string-0.0.2" sources."upper-case-1.1.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.10.3" // { dependencies = [ @@ -83397,7 +83674,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -83418,10 +83695,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.13.0"; + version = "1.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz"; - sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.5.tgz"; + sha512 = "MsXlH6Z/BiRYSkSRW3clNDqDjSpiSNOiG8xYVUBXt4k0LnGvDhlTGOlHX1VFtAdoLmtwjxMG5qiWKy/g+Ipv5w=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -83452,7 +83729,7 @@ in buildInputs = globalBuildInputs; meta = { description = "beautifier.io for node"; - homepage = https://beautifier.io/; + homepage = "https://beautifier.io/"; license = "MIT"; }; production = true; @@ -83489,13 +83766,13 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.11" + sources."@babel/parser-7.12.16" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" sources."entities-2.0.3" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" @@ -83542,7 +83819,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" @@ -83569,7 +83846,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = http://jshint.com/; + homepage = "http://jshint.com/"; license = "MIT"; }; production = true; @@ -83612,7 +83889,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JSON diff"; - homepage = https://github.com/andreyvit/json-diff; + homepage = "https://github.com/andreyvit/json-diff"; }; production = true; bypassCache = true; @@ -83654,20 +83931,20 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; meta = { description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; - homepage = https://github.com/whitlockjc/json-refs; + homepage = "https://github.com/whitlockjc/json-refs"; license = "MIT"; }; production = true; @@ -83696,11 +83973,7 @@ in sources."array-flatten-1.1.1" sources."basic-auth-2.0.1" sources."body-parser-1.19.0" - (sources."boxen-4.2.0" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) + sources."boxen-5.0.0" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -83708,7 +83981,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."chalk-4.1.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -83763,9 +84036,9 @@ in sources."fresh-0.5.2" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" - sources."global-dirs-2.1.0" + sources."global-dirs-3.0.0" sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -83774,11 +84047,11 @@ in sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inherits-2.0.3" - sources."ini-1.3.7" + sources."ini-2.0.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."is-installed-globally-0.3.2" + sources."is-installed-globally-0.4.0" sources."is-npm-5.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" @@ -83845,7 +84118,11 @@ in sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."rc-1.2.8" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."require-directory-2.1.1" @@ -83881,15 +84158,14 @@ in sources."strip-ansi-5.2.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."term-size-2.2.1" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."unpipe-1.0.0" - sources."update-notifier-5.0.1" + sources."update-notifier-5.1.0" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."vary-1.1.2" @@ -83911,7 +84187,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Get a full fake REST API with zero coding in less than 30 seconds"; - homepage = https://github.com/typicode/json-server; + homepage = "https://github.com/typicode/json-server"; license = "MIT"; }; production = true; @@ -83938,7 +84214,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Validate JSON"; - homepage = http://zaach.github.com/jsonlint/; + homepage = "http://zaach.github.com/jsonlint/"; }; production = true; bypassCache = true; @@ -83947,85 +84223,74 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.2.3"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.2.3.tgz"; - sha512 = "tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ=="; + url = "https://registry.npmjs.org/karma/-/karma-6.1.0.tgz"; + sha512 = "QmRZ6HdKe6mHd89Az6yb85URRyDbXmn2IBo3lic7cwkkLjDWpjrMJxPAKlwNa5dFM1iHdT+kjtNJM0J5YAH90A=="; }; dependencies = [ + sources."@types/component-emitter-1.2.10" + sources."@types/cookie-0.4.0" + sources."@types/cors-2.8.9" + sources."@types/node-14.14.26" sources."accepts-1.3.7" - sources."after-0.8.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" - sources."arraybuffer.slice-0.0.7" - sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" - sources."binary-extensions-2.1.0" - sources."blob-0.0.5" + sources."binary-extensions-2.2.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."bytes-3.1.0" - sources."camelcase-5.3.1" - sources."chokidar-3.4.3" - sources."cliui-6.0.0" + sources."chokidar-3.5.1" + sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.4.0" - sources."component-bind-1.0.0" sources."component-emitter-1.3.0" - sources."component-inherit-0.0.3" sources."concat-map-0.0.1" sources."connect-3.7.0" sources."content-type-1.0.4" sources."cookie-0.4.1" + sources."cors-2.8.5" sources."custom-event-1.0.1" sources."date-format-3.0.0" sources."debug-2.6.9" - sources."decamelize-1.2.0" sources."depd-1.1.2" sources."di-0.0.1" sources."dom-serialize-2.2.1" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-3.5.0" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - }) - (sources."engine.io-client-3.5.0" // { + (sources."engine.io-4.1.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) - sources."engine.io-parser-2.2.1" + sources."engine.io-parser-4.0.2" sources."ent-2.2.0" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."eventemitter3-4.0.7" sources."extend-3.0.2" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."find-up-4.1.0" sources."flatted-2.0.2" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.4" - sources."has-binary2-1.0.3" - sources."has-cors-1.1.0" + sources."graceful-fs-4.2.6" sources."http-errors-1.7.2" sources."http-proxy-1.18.1" sources."iconv-lite-0.4.24" - sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-binary-path-2.1.0" @@ -84033,10 +84298,8 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."isarray-2.0.1" sources."isbinaryfile-4.0.6" sources."jsonfile-4.0.0" - sources."locate-path-5.0.0" sources."lodash-4.17.20" (sources."log4js-6.3.0" // { dependencies = [ @@ -84045,22 +84308,17 @@ in ]; }) sources."media-typer-0.3.0" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" + sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" sources."parseurl-1.3.3" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" sources."qjobs-1.2.0" @@ -84069,31 +84327,22 @@ in sources."raw-body-2.4.0" sources."readdirp-3.5.0" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" - sources."rfdc-1.1.4" + sources."rfdc-1.2.0" sources."rimraf-3.0.2" sources."safer-buffer-2.1.2" - sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - (sources."socket.io-2.4.0" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - }) - sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.4.0" // { + (sources."socket.io-3.1.1" // { dependencies = [ - sources."debug-3.1.0" - sources."socket.io-parser-3.3.1" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) - (sources."socket.io-parser-3.4.1" // { + sources."socket.io-adapter-2.1.0" + (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."component-emitter-1.2.1" - sources."debug-4.1.1" - sources."ms-2.1.3" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) sources."source-map-0.6.1" @@ -84108,29 +84357,26 @@ in sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."tmp-0.2.1" - sources."to-array-0.1.4" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."type-is-1.6.18" - sources."ua-parser-js-0.7.22" + sources."ua-parser-js-0.7.23" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" + sources."vary-1.1.2" sources."void-elements-2.0.1" - sources."which-module-2.0.0" - sources."wrap-ansi-6.2.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.2" - sources."xmlhttprequest-ssl-1.5.5" - sources."y18n-4.0.1" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" - sources."yeast-0.1.2" + sources."ws-7.4.3" + sources."y18n-5.0.5" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; - homepage = http://karma-runner.github.io/; + homepage = "http://karma-runner.github.io/"; license = "MIT"; }; production = true; @@ -84150,7 +84396,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-equal-1.0.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."clone-2.1.2" sources."clone-buffer-1.0.0" sources."clone-stats-1.0.0" @@ -84166,11 +84412,11 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inflight-1.0.6" @@ -84227,7 +84473,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; - homepage = https://github.com/mweibel/lcov-result-merger; + homepage = "https://github.com/mweibel/lcov-result-merger"; license = "MIT"; }; production = true; @@ -84436,7 +84682,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."underscore-1.9.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" (sources."utile-0.3.0" // { dependencies = [ sources."async-0.9.2" @@ -84500,9 +84746,9 @@ in sha512 = "vk1lfVRFm+UuEFA7wkLKeSF7Iz13W+N/vFd48aW2yuS7Kv0RbNm2/qcDPV863056LMfkRlsEe+QYOw3palj5Lg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" (sources."@evocateur/libnpmaccess-3.1.2" // { dependencies = [ sources."aproba-2.0.0" @@ -84597,29 +84843,29 @@ in sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@octokit/auth-token-2.4.4" - (sources."@octokit/endpoint-6.0.10" // { + sources."@octokit/auth-token-2.4.5" + (sources."@octokit/endpoint-6.0.11" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-2.0.1" + sources."@octokit/openapi-types-4.0.2" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/plugin-request-log-1.0.2" + sources."@octokit/plugin-request-log-1.0.3" (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.12" // { + (sources."@octokit/request-5.4.14" // { dependencies = [ - sources."@octokit/request-error-2.0.4" + sources."@octokit/request-error-2.0.5" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -84630,11 +84876,11 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.1.2" + sources."@octokit/types-6.8.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -84675,7 +84921,7 @@ in ]; }) sources."bcrypt-pbkdf-1.0.2" - sources."before-after-hook-2.1.0" + sources."before-after-hook-2.1.1" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -84690,7 +84936,7 @@ in sources."byte-size-5.0.1" sources."cacache-12.0.4" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -84828,10 +85074,10 @@ in sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" - sources."envinfo-7.7.3" + sources."envinfo-7.7.4" sources."err-code-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -84895,6 +85141,7 @@ in sources."extend-shallow-2.0.1" ]; }) + sources."filter-obj-1.1.0" sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" @@ -84915,7 +85162,7 @@ in }) sources."genfun-5.0.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" (sources."get-pkg-repo-1.4.0" // { dependencies = [ sources."camelcase-2.1.1" @@ -84976,7 +85223,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.4.3" + sources."git-url-parse-11.4.4" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -84986,7 +85233,7 @@ in sources."pify-4.0.1" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" (sources."handlebars-4.7.6" // { dependencies = [ sources."source-map-0.6.1" @@ -85042,7 +85289,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-ci-2.0.0" sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" @@ -85063,7 +85310,7 @@ in sources."is-obj-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-ssh-1.3.2" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" @@ -85112,15 +85359,15 @@ in sources."map-cache-0.2.2" sources."map-obj-4.1.0" sources."map-visit-1.0.0" - (sources."meow-8.1.0" // { + (sources."meow-8.1.2" // { dependencies = [ sources."find-up-4.1.0" - sources."hosted-git-info-3.0.7" + sources."hosted-git-info-3.0.8" sources."locate-path-5.0.0" sources."lru-cache-6.0.0" sources."normalize-package-data-3.0.0" sources."p-locate-4.1.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -85241,7 +85488,11 @@ in sources."parallel-transform-1.2.0" sources."parse-github-repo-url-1.4.1" sources."parse-json-4.0.0" - sources."parse-path-4.0.2" + (sources."parse-path-4.0.3" // { + dependencies = [ + sources."qs-6.9.6" + ]; + }) sources."parse-url-5.0.2" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -85273,6 +85524,7 @@ in sources."punycode-2.1.1" sources."q-1.5.1" sources."qs-6.5.2" + sources."query-string-6.14.0" sources."quick-lru-4.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.5" @@ -85306,7 +85558,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -85377,12 +85629,13 @@ in sources."sort-keys-2.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" sources."split-1.0.1" + sources."split-on-first-1.1.0" sources."split-string-3.1.0" sources."split2-2.2.0" sources."sprintf-js-1.0.3" @@ -85407,6 +85660,7 @@ in }) sources."stream-each-1.2.3" sources."stream-shift-1.0.1" + sources."strict-uri-encode-2.0.0" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -85451,7 +85705,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.7" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -85470,7 +85724,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -85533,23 +85787,28 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-4.0.0.tgz"; - sha512 = "av1eEa2D0xZfF7fjLJS/Dld7zAYSLU7EOEJvuOELeaNI3i6L/81AdjbK5/pytaRkBwi7ZEa0433IDvMLskKCOw=="; + url = "https://registry.npmjs.org/less/-/less-4.1.1.tgz"; + sha512 = "w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw=="; }; dependencies = [ - sources."copy-anything-2.0.1" + sources."copy-anything-2.0.3" + sources."debug-3.2.7" sources."errno-0.1.8" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" + sources."iconv-lite-0.4.24" sources."image-size-0.5.5" sources."is-what-3.12.0" sources."make-dir-2.1.0" sources."mime-1.6.0" - sources."native-request-1.0.8" + sources."ms-2.1.3" + sources."needle-2.6.0" sources."parse-node-version-1.0.1" sources."pify-4.0.1" sources."prr-1.0.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" sources."semver-5.7.1" sources."source-map-0.6.1" sources."tslib-1.14.1" @@ -85557,7 +85816,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org"; license = "Apache-2.0"; }; production = true; @@ -85582,7 +85841,7 @@ in buildInputs = globalBuildInputs; meta = { description = "clean-css plugin for less.js"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org"; }; production = true; bypassCache = true; @@ -85712,7 +85971,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -85850,7 +86109,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."split-0.3.3" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { @@ -86060,7 +86319,7 @@ in sources."github-slugger-1.3.0" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-binary2-1.0.3" // { @@ -86320,7 +86579,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."socket.io-2.4.0" // { + (sources."socket.io-2.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" @@ -86331,7 +86590,7 @@ in dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" - sources."socket.io-parser-3.3.1" + sources."socket.io-parser-3.3.2" ]; }) (sources."socket.io-parser-3.4.1" // { @@ -86344,7 +86603,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -86394,7 +86653,7 @@ in sources."isobject-3.0.1" ]; }) - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -86402,14 +86661,14 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { description = "Live Markdown previews for your favourite editor."; - homepage = https://github.com/shime/livedown; + homepage = "https://github.com/shime/livedown"; license = "MIT"; }; production = true; @@ -86422,57 +86681,56 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.5" - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + sources."@babel/core-7.12.16" + sources."@babel/generator-7.12.15" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + sources."@babel/helper-compilation-targets-7.12.16" + sources."@babel/helper-create-class-features-plugin-7.12.16" + sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" + sources."@babel/parser-7.12.16" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" @@ -86483,47 +86741,47 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.11" + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-runtime-7.12.15" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/preset-env-7.12.16" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -86538,16 +86796,16 @@ in sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" sources."@types/babel__traverse-7.11.0" - sources."@types/estree-0.0.45" - sources."@types/graceful-fs-4.1.4" + sources."@types/estree-0.0.46" + sources."@types/graceful-fs-4.1.5" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.20" + sources."@types/json-schema-7.0.7" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" - sources."@types/yargs-15.0.12" + sources."@types/yargs-15.0.13" sources."@types/yargs-parser-20.2.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -86663,9 +86921,9 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."buffer-5.7.1" sources."readable-stream-3.6.0" @@ -86698,7 +86956,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.0" + sources."browserslist-4.16.3" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -86712,9 +86970,9 @@ in }) sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001185" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -86726,11 +86984,10 @@ in sources."supports-color-7.2.0" ]; }) - (sources."chokidar-3.4.3" // { + (sources."chokidar-3.5.1" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" - sources."fsevents-2.1.3" sources."is-number-7.0.0" sources."to-regex-range-5.0.1" ]; @@ -86787,7 +87044,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.8.2" // { + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -86838,8 +87095,8 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.634" - (sources."elliptic-6.5.3" // { + sources."electron-to-chromium-1.3.663" + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -86847,7 +87104,7 @@ in 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."enhanced-resolve-4.5.0" // { dependencies = [ sources."memory-fs-0.5.0" ]; @@ -86933,12 +87190,12 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-package-type-0.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -86958,7 +87215,7 @@ in }) sources."globals-11.12.0" sources."google-closure-compiler-js-20170910.0.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" (sources."gunzip-maybe-1.4.2" // { dependencies = [ sources."browserify-zlib-0.1.4" @@ -87064,7 +87321,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-0.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" @@ -87148,7 +87405,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" @@ -87182,7 +87439,7 @@ in sources."paredit.js-0.3.6" sources."parents-1.0.1" sources."parse-asn1-5.1.6" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" @@ -87243,7 +87500,7 @@ in sources."regex-not-1.0.2" sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.7" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -87255,7 +87512,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -87348,7 +87605,7 @@ in sources."source-map-0.6.1" ]; }) - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -87462,7 +87719,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -87498,7 +87755,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."webpack-4.44.2" // { + (sources."webpack-4.46.0" // { dependencies = [ sources."acorn-6.4.2" sources."micromatch-3.1.10" @@ -87587,7 +87844,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Madoko is a fast scholarly Markdown processor written in Koka"; - homepage = http://madoko.codeplex.com/; + homepage = "http://madoko.codeplex.com"; }; production = true; bypassCache = true; @@ -87596,10 +87853,10 @@ in markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.5.tgz"; - sha512 = "raCr1YMrIqCUFrBTp90UHDsar/79TPgzlVHA7gSi1DnhM2/BC1lm49V+PGzBd1ZpIYwkmzQ6TYm0AfK7A82/Dw=="; + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.6.tgz"; + sha512 = "GWzd54hNol2Zwf6fFEhUYqi9wbib1BMdcphvGCZqhinaAKhiILDaQkX7sn2u9GMoItmZ1jQK0f8wULOK/M+M4w=="; }; dependencies = [ sources."ajv-6.12.6" @@ -87645,7 +87902,7 @@ in sources."link-check-4.5.4" sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" - sources."marked-1.2.7" + sources."marked-1.2.9" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."ms-2.1.3" @@ -87663,7 +87920,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" ]; @@ -87764,7 +88021,7 @@ in sources."eslint-3.19.0" sources."espree-3.5.4" sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -87780,7 +88037,7 @@ in sources."exit-hook-1.1.1" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -87803,7 +88060,7 @@ in sources."glob-7.1.6" sources."globals-9.18.0" sources."glogg-1.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gulp-eslint-3.0.1" (sources."gulp-util-3.0.8" // { dependencies = [ @@ -87904,7 +88161,7 @@ in sources."replace-ext-0.0.1" sources."request-2.88.0" sources."require-uncached-1.0.3" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-1.0.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.3" @@ -87949,7 +88206,7 @@ in sources."type-1.2.0" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -87965,7 +88222,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Bot to publish twitter, tumblr or rss posts to an mastodon account."; - homepage = https://github.com/yogthos/mastodon-bot; + homepage = "https://github.com/yogthos/mastodon-bot"; license = "MIT"; }; production = true; @@ -88021,7 +88278,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; - homepage = https://bitbucket.org/aahmed/meat; + homepage = "https://bitbucket.org/aahmed/meat"; }; production = true; bypassCache = true; @@ -88030,20 +88287,20 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.8.4-1"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.4-1.tgz"; - sha512 = "4rg3vEBnNMx7cVM4y/pRa6WAbKSoFvPZc4GGUkar4it/pH3PpktOq/wr99mOOu8L/uQEJHpRxed+eRpK75Rn/w=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.0.tgz"; + sha512 = "DF3nwcCi2ihM3OXIcCn4cNKUxSSU9UeyVuH9bNpgtymjpwAFU45jJXCK9RHtNhLtdjuXz+tcE/sYop3tnBGSuw=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" - sources."bl-4.0.3" + sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" @@ -88119,11 +88376,11 @@ in sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."khroma-1.1.1" + sources."khroma-1.2.0" sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lower-case-1.1.4" - sources."mermaid-8.8.4" + sources."mermaid-8.9.0" sources."minify-4.1.3" sources."minimatch-3.0.4" sources."mkdirp-classic-0.5.3" @@ -88165,12 +88422,12 @@ in sources."through-2.3.8" sources."try-catch-2.0.1" sources."try-to-catch-1.1.1" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.7" sources."unbzip2-stream-1.4.3" sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -88186,29 +88443,29 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.4.1.tgz"; - sha512 = "ymTdhda+4t6njz8xY8ySZS4nDEDEb+zXhmn1JzzxlribUqELcKZ6FwC8JF8HhHg3tcKeFAwVLzL6kHcaqL+okQ=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.5.0.tgz"; + sha512 = "j2ukrvANZQUreLl2grOQxPl0pbRSoJthYLqujdphZdwJyDwYjPqGOs+KrWwY26QbfqG2Toy06qFnYTaGx9txIg=="; }; dependencies = [ sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" - sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.155.3" - sources."@fluentui/react-focus-7.17.0" + sources."@fluentui/keyboard-key-0.2.13" + sources."@fluentui/react-7.160.0" + sources."@fluentui/react-focus-7.17.4" sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.7.0" - sources."@microsoft/load-themed-styles-1.10.141" + sources."@fluentui/theme-1.7.3" + sources."@microsoft/load-themed-styles-1.10.147" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.20" - sources."@uifabric/icons-7.5.17" + sources."@uifabric/foundation-7.9.24" + sources."@uifabric/icons-7.5.21" sources."@uifabric/merge-styles-7.19.1" - sources."@uifabric/react-hooks-7.13.9" + sources."@uifabric/react-hooks-7.13.11" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.18" - sources."@uifabric/utilities-7.33.2" + sources."@uifabric/styling-7.18.0" + sources."@uifabric/utilities-7.33.4" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -88275,7 +88532,7 @@ in sources."eventemitter3-4.0.7" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-7.2.0" + sources."express-openapi-7.3.0" sources."external-editor-2.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -88335,20 +88592,20 @@ 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.155.3" + sources."office-ui-fabric-react-7.160.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."openapi-default-setter-7.0.1" - sources."openapi-framework-7.2.0" - sources."openapi-jsonschema-parameters-7.0.2" - sources."openapi-request-coercer-7.1.0" - sources."openapi-request-validator-7.2.0" - sources."openapi-response-validator-7.0.1" - sources."openapi-schema-validator-7.0.1" - sources."openapi-security-handler-7.0.1" - sources."openapi-types-7.0.1" + sources."openapi-default-setter-7.2.3" + sources."openapi-framework-7.3.0" + sources."openapi-jsonschema-parameters-7.2.3" + sources."openapi-request-coercer-7.2.3" + sources."openapi-request-validator-7.3.0" + sources."openapi-response-validator-7.2.3" + sources."openapi-schema-validator-7.2.3" + sources."openapi-security-handler-7.2.3" + sources."openapi-types-7.2.3" (sources."opencollective-1.0.3" // { dependencies = [ sources."minimist-1.2.0" @@ -88426,8 +88683,8 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.38.0" - sources."tail-2.1.1" + sources."swagger-ui-dist-3.43.0" + sources."tail-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" @@ -88436,7 +88693,7 @@ in sources."tslib-1.14.1" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -88448,7 +88705,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Japanese DTV Tuner Server Service."; - homepage = https://github.com/Chinachu/Mirakurun; + homepage = "https://github.com/Chinachu/Mirakurun"; license = "Apache-2.0"; }; production = true; @@ -88458,10 +88715,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.2.1"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; - sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz"; + sha512 = "TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -88469,36 +88726,45 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."balanced-match-1.0.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."camelcase-5.3.1" - sources."chalk-4.1.0" - sources."chokidar-3.4.3" - (sources."cliui-5.0.0" // { + sources."camelcase-6.2.0" + (sources."chalk-4.1.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."supports-color-7.2.0" + ]; + }) + sources."chokidar-3.5.1" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."debug-4.2.0" - sources."decamelize-1.2.0" - sources."diff-4.0.2" - sources."emoji-regex-7.0.3" + (sources."debug-4.3.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."decamelize-4.0.0" + sources."diff-5.0.0" + sources."emoji-regex-8.0.0" + sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - sources."esprima-4.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-5.0.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -88514,74 +88780,58 @@ in sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" sources."isexe-2.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-4.0.0" sources."locate-path-6.0.0" sources."log-symbols-4.0.0" sources."minimatch-3.0.4" - sources."ms-2.1.2" - sources."nanoid-3.1.12" + sources."ms-2.1.3" + sources."nanoid-3.1.20" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" - sources."p-try-2.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" sources."randombytes-2.1.0" sources."readdirp-3.5.0" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."safe-buffer-5.2.1" sources."serialize-javascript-5.0.1" - sources."set-blocking-2.0.0" - sources."sprintf-js-1.0.3" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.0" + sources."supports-color-8.1.1" sources."to-regex-range-5.0.1" sources."which-2.0.2" - sources."which-module-2.0.0" sources."wide-align-1.1.3" - sources."workerpool-6.0.2" - (sources."wrap-ansi-5.1.0" // { + sources."workerpool-6.1.0" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) sources."wrappy-1.0.2" - sources."y18n-4.0.1" - (sources."yargs-13.3.2" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."yargs-parser-13.1.2" - (sources."yargs-unparser-2.0.0" // { + sources."y18n-5.0.5" + (sources."yargs-16.2.0" // { dependencies = [ - sources."camelcase-6.2.0" - sources."decamelize-4.0.0" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) + sources."yargs-parser-20.2.4" + sources."yargs-unparser-2.0.0" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; - homepage = https://mochajs.org/; + homepage = "https://mochajs.org/"; license = "MIT"; }; production = true; @@ -88629,14 +88879,14 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -88707,7 +88957,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Neovim client API and neovim remote plugin provider"; - homepage = https://github.com/neovim/node-client; + homepage = "https://github.com/neovim/node-client"; license = "MIT"; }; production = true; @@ -88717,65 +88967,64 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.70.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.70.0.tgz"; - sha512 = "VET5LUeZP2TX+xBXYQdiKkVyQfeW+HkeL7pRE2fGOi14fLE3BYSjjdmnCHDX83hgYniHIxKJBH/52zkyQ+m+2Q=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.7.1.tgz"; + sha512 = "hqvtdK1A6COn6JDw9jJPs02RN9XJmI/ke1LsO8CmtsoDByvhUfjnOUmtX00lk5KHBCMEkmxKBNkG5AVZyhjZSw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + (sources."@babel/core-7.12.16" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.5" // { + sources."@babel/generator-7.12.15" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + (sources."@babel/helper-compilation-targets-7.12.16" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.16" + sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" @@ -88785,99 +89034,129 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.11" // { + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + (sources."@babel/preset-env-7.12.16" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" - sources."@bugsnag/browser-7.5.4" - sources."@bugsnag/core-7.5.4" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" + sources."@bugsnag/browser-7.6.0" + sources."@bugsnag/core-7.6.0" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.5.4" - sources."@bugsnag/node-7.5.4" + sources."@bugsnag/js-7.6.0" + sources."@bugsnag/node-7.6.0" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-8.0.1" // { + (sources."@netlify/build-9.1.2" // { dependencies = [ - sources."@netlify/zip-it-and-ship-it-2.0.0" sources."ansi-styles-4.3.0" sources."chalk-3.0.0" - sources."resolve-2.0.0-next.2" + sources."execa-3.4.0" + sources."locate-path-5.0.0" + sources."resolve-2.0.0-next.3" + ]; + }) + (sources."@netlify/cache-utils-1.0.6" // { + dependencies = [ + sources."locate-path-5.0.0" ]; }) - sources."@netlify/cache-utils-1.0.6" - (sources."@netlify/config-2.4.3" // { + (sources."@netlify/config-4.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."execa-3.4.0" ]; }) - (sources."@netlify/functions-utils-1.3.4" // { + (sources."@netlify/framework-info-2.3.0" // { dependencies = [ - sources."@netlify/zip-it-and-ship-it-2.0.0" - sources."resolve-2.0.0-next.2" + sources."locate-path-5.0.0" ]; }) - (sources."@netlify/git-utils-1.0.6" // { + sources."@netlify/functions-utils-1.3.12" + (sources."@netlify/git-utils-1.0.7" // { dependencies = [ sources."braces-3.0.2" + sources."execa-3.4.0" sources."fill-range-7.0.1" sources."is-number-7.0.0" sources."micromatch-4.0.2" sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/open-api-1.0.0" - sources."@netlify/plugin-edge-handlers-1.10.0" + sources."@netlify/open-api-1.3.0" + (sources."@netlify/plugin-edge-handlers-1.11.3" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.4" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."del-6.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.5" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."globby-11.0.2" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."p-map-4.0.0" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) sources."@netlify/plugins-list-2.2.0" - sources."@netlify/run-utils-1.0.5" - sources."@netlify/traffic-mesh-agent-0.27.0" - sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.0" - sources."@netlify/traffic-mesh-agent-linux-x64-0.27.0" - sources."@netlify/traffic-mesh-agent-win32-x64-0.27.0" - (sources."@netlify/zip-it-and-ship-it-1.7.0" // { + (sources."@netlify/run-utils-1.0.5" // { dependencies = [ - sources."resolve-2.0.0-next.2" + sources."execa-3.4.0" + ]; + }) + sources."@netlify/traffic-mesh-agent-0.27.10" + sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" + sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" + sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" + (sources."@netlify/zip-it-and-ship-it-2.3.0" // { + dependencies = [ + sources."locate-path-5.0.0" + sources."resolve-2.0.0-next.3" ]; }) (sources."@nodelib/fs.scandir-2.1.4" // { @@ -88900,26 +89179,27 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."strip-ansi-5.2.0" - (sources."supports-color-5.5.0" // { - dependencies = [ - sources."has-flag-3.0.0" - ]; - }) + sources."supports-color-5.5.0" ]; }) (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.1" + sources."@oclif/plugin-help-3.2.2" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" - sources."wrap-ansi-4.0.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + ]; + }) ]; }) (sources."@oclif/config-1.17.0" // { @@ -88928,22 +89208,23 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fill-range-7.0.1" sources."glob-parent-5.1.1" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."ignore-5.1.8" sources."is-number-7.0.0" sources."micromatch-4.0.2" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."@oclif/errors-1.3.4" // { dependencies = [ sources."ansi-styles-4.3.0" sources."clean-stack-3.0.1" + sources."escape-string-regexp-4.0.0" sources."wrap-ansi-7.0.0" ]; }) @@ -88980,6 +89261,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."fs-extra-7.0.1" + sources."has-flag-3.0.0" sources."indent-string-3.2.0" sources."is-wsl-1.1.0" sources."semver-5.7.1" @@ -88991,41 +89273,35 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."fs-extra-9.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."tslib-2.0.3" - sources."universalify-1.0.0" + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."tslib-2.1.0" + sources."universalify-2.0.0" ]; }) sources."@oclif/screen-1.0.4" - sources."@octokit/auth-token-2.4.4" - (sources."@octokit/endpoint-6.0.10" // { + sources."@octokit/auth-token-2.4.5" + (sources."@octokit/endpoint-6.0.11" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-2.0.1" + sources."@octokit/openapi-types-4.0.2" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/plugin-request-log-1.0.2" + sources."@octokit/plugin-request-log-1.0.3" (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.12" // { + (sources."@octokit/request-5.4.14" // { dependencies = [ - sources."@octokit/request-error-2.0.4" + sources."@octokit/request-error-2.0.5" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -89036,19 +89312,23 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.1.2" - sources."@rollup/plugin-babel-5.2.2" - (sources."@rollup/plugin-commonjs-15.1.0" // { + sources."@octokit/types-6.8.3" + sources."@rollup/plugin-babel-5.2.3" + (sources."@rollup/plugin-commonjs-17.1.0" // { dependencies = [ sources."estree-walker-2.0.2" ]; }) sources."@rollup/plugin-inject-4.0.2" sources."@rollup/plugin-json-4.1.0" - sources."@rollup/plugin-node-resolve-9.0.0" + sources."@rollup/plugin-node-resolve-11.1.1" sources."@rollup/pluginutils-3.1.0" sources."@sindresorhus/is-0.14.0" - sources."@sindresorhus/slugify-1.1.0" + (sources."@sindresorhus/slugify-1.1.0" // { + dependencies = [ + sources."escape-string-regexp-4.0.0" + ]; + }) (sources."@sindresorhus/transliterate-0.1.1" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -89061,14 +89341,14 @@ in sources."@types/glob-7.1.3" sources."@types/got-8.3.5" sources."@types/hast-2.3.1" - sources."@types/http-proxy-1.17.4" + sources."@types/http-proxy-1.17.5" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.20" - sources."@types/node-fetch-2.5.7" + sources."@types/node-14.14.26" + sources."@types/node-fetch-2.5.8" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" sources."@types/resolve-1.17.1" @@ -89078,14 +89358,10 @@ in sources."@types/yargs-parser-20.2.0" sources."@typescript-eslint/typescript-estree-2.34.0" sources."@ungap/from-entries-0.2.1" - (sources."abstract-leveldown-0.12.4" // { - dependencies = [ - sources."xtend-3.0.0" - ]; - }) sources."accepts-1.3.7" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" + sources."ajv-7.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -89096,7 +89372,7 @@ in }) sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" - sources."ansi-styles-5.0.0" + sources."ansi-styles-5.1.0" sources."ansicolors-0.3.2" sources."anymatch-3.1.1" (sources."archive-type-4.0.0" // { @@ -89122,11 +89398,6 @@ in sources."array-unique-0.3.2" sources."arrify-2.0.1" sources."ascii-table-0.0.9" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) sources."assign-symbols-1.0.0" sources."ast-module-types-2.7.1" sources."async-3.2.0" @@ -89134,7 +89405,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.821.0" // { + (sources."aws-sdk-2.842.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -89151,10 +89422,9 @@ in ]; }) sources."base64-js-1.5.1" - sources."before-after-hook-2.1.0" - sources."binary-extensions-2.1.0" - sources."bl-4.0.3" - sources."bn.js-5.1.3" + sources."before-after-hook-2.1.1" + sources."binary-extensions-2.2.0" + sources."bl-4.1.0" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" @@ -89173,14 +89443,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-fs-1.0.0" - sources."browserify-rsa-4.1.0" - sources."browserify-sign-4.2.1" - sources."browserslist-4.16.0" + sources."browserslist-4.16.3" sources."btoa-lite-1.0.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -89189,7 +89452,6 @@ in sources."buffer-es6-4.9.3" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" - sources."buffer-xor-1.0.3" sources."builtin-modules-3.2.0" sources."builtins-1.0.3" sources."byline-5.0.0" @@ -89201,10 +89463,10 @@ in ]; }) sources."cachedir-2.3.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001185" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -89213,14 +89475,14 @@ in sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) sources."character-entities-html4-1.1.4" sources."character-entities-legacy-1.1.4" sources."chardet-0.7.0" - (sources."chokidar-3.4.3" // { + (sources."chokidar-3.5.1" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -89230,7 +89492,6 @@ in ]; }) sources."ci-info-2.0.0" - sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -89252,7 +89513,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" - sources."cli-progress-3.8.2" + sources."cli-progress-3.9.0" sources."cli-spinners-2.5.0" (sources."cli-ux-5.5.1" // { dependencies = [ @@ -89261,17 +89522,17 @@ in sources."argparse-1.0.10" sources."chalk-4.1.0" sources."clean-stack-3.0.1" + sources."escape-string-regexp-4.0.0" sources."extract-stack-2.0.0" - sources."has-flag-4.0.0" sources."js-yaml-3.14.1" sources."supports-hyperlinks-2.1.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."type-fest-0.11.0" ]; }) sources."cli-width-2.2.1" sources."cliui-6.0.0" - sources."clone-0.1.19" + sources."clone-1.0.4" sources."clone-response-1.0.2" sources."collection-visit-1.0.0" (sources."color-3.0.0" // { @@ -89299,12 +89560,6 @@ in ]; }) sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - ]; - }) (sources."concordance-4.0.0" // { dependencies = [ sources."semver-5.7.1" @@ -89334,7 +89589,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.8.2" // { + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -89348,20 +89603,7 @@ in }) sources."crc-3.8.0" sources."crc32-stream-3.0.1" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - sources."which-1.3.1" - ]; - }) - sources."crypto-browserify-3.12.0" + sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-time-2.1.0" @@ -89387,6 +89629,7 @@ in dependencies = [ sources."bl-1.2.3" sources."file-type-5.2.0" + sources."is-stream-1.1.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."tar-stream-1.6.2" @@ -89395,11 +89638,13 @@ in (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" + sources."is-stream-1.1.0" ]; }) (sources."decompress-targz-4.1.1" // { dependencies = [ sources."file-type-5.2.0" + sources."is-stream-1.1.0" ]; }) (sources."decompress-unzip-4.0.1" // { @@ -89412,13 +89657,8 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepmerge-4.2.2" - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) + sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."deferred-leveldown-0.2.0" sources."define-properties-1.1.3" sources."define-property-2.0.2" (sources."del-5.1.0" // { @@ -89429,7 +89669,6 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."deprecation-2.3.1" - sources."des.js-1.0.1" sources."destroy-1.0.4" sources."detective-amd-3.0.1" sources."detective-cjs-3.1.1" @@ -89440,11 +89679,6 @@ in sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" sources."detective-typescript-5.8.0" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -89467,6 +89701,7 @@ in sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" sources."p-event-2.3.1" + sources."p-finally-1.0.0" sources."p-timeout-2.0.1" sources."pify-3.0.0" sources."sort-keys-2.0.0" @@ -89474,25 +89709,21 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.663" sources."elf-cam-0.1.1" - (sources."elliptic-6.5.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."envinfo-7.7.3" - sources."errno-0.1.8" + sources."env-paths-2.2.0" + sources."envinfo-7.7.4" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" + sources."esbuild-0.8.44" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-4.0.0" + sources."escape-string-regexp-1.0.5" (sources."escodegen-1.14.3" // { dependencies = [ sources."source-map-0.6.1" @@ -89506,16 +89737,10 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."events-1.1.1" - sources."evp_bytestokey-1.0.3" - (sources."execa-3.4.0" // { + (sources."execa-5.0.0" // { dependencies = [ - sources."cross-spawn-7.0.3" - sources."is-stream-2.0.0" - sources."npm-run-path-4.0.1" - sources."p-finally-2.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."get-stream-6.0.0" + sources."human-signals-2.1.0" ]; }) (sources."expand-brackets-2.1.4" // { @@ -89565,20 +89790,17 @@ in ]; }) sources."extract-stack-1.0.0" + sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-equals-1.6.3" + sources."fast-equals-2.0.0" sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" sources."fast-stringify-1.1.2" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) + sources."figures-3.2.0" sources."file-size-0.0.5" sources."file-type-8.1.0" sources."filename-reserved-regex-2.0.0" @@ -89594,14 +89816,17 @@ in sources."debug-2.6.9" ]; }) - sources."find-up-4.1.0" + (sources."find-up-4.1.0" // { + dependencies = [ + sources."locate-path-5.0.0" + ]; + }) sources."flatten-1.0.3" sources."flush-write-stream-2.0.0" sources."fn.name-1.1.0" sources."folder-walker-3.2.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."for-in-1.0.2" - sources."foreach-2.0.5" sources."form-data-3.0.0" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -89616,20 +89841,13 @@ in sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" - (sources."fwd-stream-1.0.4" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.0.34" - sources."string_decoder-0.10.31" - ]; - }) sources."gensync-1.0.0-beta.2" sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-port-5.1.1" sources."get-proxy-2.1.0" sources."get-stream-5.2.0" @@ -89661,7 +89879,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fill-range-7.0.1" sources."glob-parent-5.1.1" sources."ignore-5.1.8" @@ -89678,14 +89896,14 @@ in sources."to-readable-stream-1.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" (sources."has-ansi-0.1.0" // { dependencies = [ sources."ansi-regex-0.2.1" ]; }) - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" (sources."has-glob-1.0.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -89701,26 +89919,18 @@ in ]; }) sources."has-yarn-2.1.0" - sources."hash-base-3.1.0" - sources."hash.js-1.1.7" - (sources."hasha-5.2.2" // { - dependencies = [ - sources."is-stream-2.0.0" - ]; - }) + sources."hasha-5.2.2" sources."hast-util-from-parse5-6.0.1" sources."hast-util-is-element-1.1.0" sources."hast-util-parse-selector-2.2.5" sources."hast-util-to-html-7.1.2" sources."hast-util-whitespace-1.0.4" sources."hastscript-6.0.0" - sources."hmac-drbg-1.0.1" sources."hosted-git-info-2.8.8" sources."html-void-elements-1.0.5" sources."http-cache-semantics-4.1.0" (sources."http-call-5.3.0" // { dependencies = [ - sources."is-stream-2.0.0" sources."parse-json-4.0.0" ]; }) @@ -89743,21 +89953,18 @@ in sources."human-signals-1.1.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" - sources."idb-wrapper-1.7.2" sources."ieee754-1.2.1" sources."ignore-4.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."indexes-of-1.0.1" - sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."escape-string-regexp-1.0.5" sources."figures-2.0.0" sources."is-fullwidth-code-point-2.0.0" (sources."string-width-2.1.1" // { @@ -89782,7 +89989,6 @@ in }) sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" - sources."is-0.2.7" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" @@ -89807,29 +90013,24 @@ in ]; }) sources."is-obj-2.0.0" - sources."is-object-0.1.2" + sources."is-object-1.0.2" sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.2" sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" sources."is-reference-1.2.1" sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" + sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" - sources."isbuffer-0.0.0" sources."iserror-0.0.2" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."isurl-1.0.0" // { - dependencies = [ - sources."is-object-1.0.2" - ]; - }) + sources."isurl-1.0.0" sources."jest-get-type-24.9.0" sources."jest-validate-24.9.0" sources."jest-worker-26.6.2" @@ -89841,11 +90042,16 @@ in sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" - sources."json5-2.1.3" + sources."json-schema-traverse-1.0.0" + sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."junk-3.1.0" sources."jwt-decode-3.1.2" - sources."keep-func-props-3.0.1" + (sources."keep-func-props-3.0.1" // { + dependencies = [ + sources."mimic-fn-3.1.0" + ]; + }) sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" @@ -89861,48 +90067,6 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."level-blobs-0.1.7" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - (sources."level-filesystem-1.2.0" // { - dependencies = [ - sources."xtend-2.2.0" - ]; - }) - sources."level-fix-range-2.0.0" - sources."level-hooks-4.5.0" - (sources."level-js-2.2.4" // { - dependencies = [ - sources."object-keys-0.4.0" - sources."xtend-2.1.2" - ]; - }) - (sources."level-peek-1.0.6" // { - dependencies = [ - sources."level-fix-range-1.0.2" - ]; - }) - (sources."level-sublevel-5.2.3" // { - dependencies = [ - sources."object-keys-0.2.0" - sources."xtend-2.0.6" - ]; - }) - (sources."levelup-0.18.6" // { - dependencies = [ - sources."bl-0.8.2" - sources."isarray-0.0.1" - sources."prr-0.0.0" - sources."readable-stream-1.0.34" - sources."semver-2.3.2" - sources."string_decoder-0.10.31" - sources."xtend-3.0.0" - ]; - }) sources."leven-3.1.0" sources."levn-0.3.0" sources."lines-and-columns-1.1.6" @@ -89912,7 +90076,12 @@ in sources."type-fest-0.3.1" ]; }) - sources."locate-path-5.0.0" + (sources."locate-path-6.0.0" // { + dependencies = [ + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + ]; + }) sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" sources."lodash.camelcase-4.3.0" @@ -89937,6 +90106,9 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."fast-equals-1.6.3" + sources."micro-memoize-2.1.2" + sources."moize-5.4.7" ]; }) sources."log-symbols-3.0.0" @@ -89947,7 +90119,6 @@ in }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."ltgt-2.2.1" sources."macos-release-2.4.1" sources."magic-string-0.25.7" (sources."make-dir-3.1.0" // { @@ -89966,7 +90137,6 @@ in }) sources."md5-hex-2.0.0" sources."md5-o-matic-0.1.1" - sources."md5.js-1.3.5" sources."media-typer-0.3.0" sources."memoize-one-5.1.1" sources."merge-descriptors-1.0.1" @@ -89974,20 +90144,13 @@ in sources."merge2-1.4.1" sources."methods-1.1.2" sources."micro-api-client-3.3.0" - sources."micro-memoize-2.1.2" + sources."micro-memoize-4.0.9" sources."micromatch-3.1.10" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) sources."mime-1.6.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" - sources."mimic-fn-3.1.0" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -89997,7 +90160,7 @@ in }) sources."mkdirp-0.5.5" sources."module-definition-3.3.1" - sources."moize-5.4.7" + sources."moize-6.0.0" (sources."move-file-1.2.0" // { dependencies = [ (sources."cp-file-6.2.0" // { @@ -90021,30 +90184,17 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-6.0.9" // { + (sources."netlify-6.1.7" // { dependencies = [ - sources."@netlify/zip-it-and-ship-it-2.0.0" - sources."qs-6.9.4" - sources."resolve-2.0.0-next.2" + sources."qs-6.9.6" ]; }) sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" - (sources."netlify-redirect-parser-2.5.0" // { - dependencies = [ - sources."@netlify/config-0.11.11" - sources."@netlify/open-api-0.18.1" - sources."ansi-styles-4.3.0" - sources."argparse-1.0.10" - sources."chalk-3.0.0" - sources."js-yaml-3.14.1" - sources."netlify-4.9.0" - sources."qs-6.9.4" - ]; - }) + sources."netlify-redirect-parser-3.0.3" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."node-source-walk-4.2.0" sources."noop2-2.0.0" (sources."normalize-package-data-2.5.0" // { @@ -90059,7 +90209,7 @@ in sources."pify-3.0.0" ]; }) - sources."npm-run-path-2.0.2" + sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -90079,19 +90229,14 @@ in sources."object-visit-1.0.1" sources."object.assign-4.1.2" sources."object.pick-1.3.0" - sources."octal-1.0.0" sources."octokit-pagination-methods-1.1.0" sources."omit.js-2.0.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - (sources."onetime-5.1.2" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) - sources."open-7.3.0" + sources."onetime-5.1.2" + sources."open-7.4.0" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -90121,13 +90266,17 @@ in sources."p-map-2.1.0" ]; }) - sources."p-finally-1.0.0" + sources."p-finally-2.0.1" sources."p-is-promise-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-map-3.0.0" sources."p-reduce-2.1.0" - sources."p-timeout-3.2.0" + (sources."p-timeout-3.2.0" // { + dependencies = [ + sources."p-finally-1.0.0" + ]; + }) sources."p-try-2.2.0" sources."p-wait-for-3.2.0" (sources."package-json-6.5.0" // { @@ -90141,24 +90290,31 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."parse-asn1-5.1.6" sources."parse-github-repo-url-1.4.1" sources."parse-github-url-1.0.2" sources."parse-gitignore-1.0.1" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."parse-ms-2.1.0" sources."parse5-6.0.1" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" - sources."password-prompt-1.1.2" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."pbkdf2-3.1.1" sources."pend-1.2.0" sources."picomatch-2.2.2" sources."pify-4.0.1" @@ -90168,6 +90324,7 @@ in sources."posix-character-classes-0.1.1" (sources."postcss-7.0.35" // { dependencies = [ + sources."has-flag-3.0.0" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -90191,22 +90348,16 @@ in sources."property-information-5.6.0" sources."proto-list-1.2.4" sources."proxy-addr-2.0.6" - sources."prr-1.0.1" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) sources."pump-3.0.0" - sources."punycode-1.3.2" + sources."punycode-2.1.1" sources."pupa-2.1.1" sources."qs-6.7.0" sources."query-string-5.1.1" sources."querystring-0.2.0" + sources."queue-microtask-1.2.2" sources."random-bytes-1.0.0" sources."random-item-3.1.0" sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."range-parser-1.2.1" (sources."raw-body-2.4.1" // { dependencies = [ @@ -90233,7 +90384,7 @@ in sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.7" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -90244,10 +90395,11 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" sources."require-package-name-2.0.1" sources."requires-port-1.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" (sources."restore-cursor-2.0.0" // { @@ -90259,12 +90411,21 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."ripemd160-2.0.2" - sources."rollup-2.36.0" - sources."rollup-plugin-node-builtins-2.1.2" + sources."rollup-2.38.5" + (sources."rollup-plugin-inject-3.0.2" // { + dependencies = [ + sources."estree-walker-0.6.1" + ]; + }) + sources."rollup-plugin-node-polyfills-0.2.1" sources."rollup-plugin-terser-7.0.2" + (sources."rollup-pluginutils-2.8.2" // { + dependencies = [ + sources."estree-walker-0.6.1" + ]; + }) sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-join-0.1.3" @@ -90298,9 +90459,8 @@ in ]; }) sources."setprototypeof-1.1.1" - sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -90350,7 +90510,7 @@ in sources."source-map-0.6.1" ]; }) - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."sourcemap-codec-1.4.8" sources."space-separated-tokens-1.1.5" sources."spdx-correct-3.1.1" @@ -90385,7 +90545,6 @@ in sources."ansi-regex-0.2.1" sources."ansi-styles-1.1.0" sources."chalk-0.5.1" - sources."escape-string-regexp-1.0.5" sources."strip-ansi-0.3.0" sources."supports-color-0.2.0" ]; @@ -90393,7 +90552,6 @@ in sources."statsd-client-0.4.5" sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" - sources."string-range-1.2.2" sources."string-width-4.2.0" (sources."string_decoder-1.1.1" // { dependencies = [ @@ -90412,16 +90570,8 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - (sources."strip-outer-1.0.1" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - (sources."supports-color-7.2.0" // { - dependencies = [ - sources."has-flag-4.0.0" - ]; - }) + sources."strip-outer-1.0.1" + sources."supports-color-7.2.0" (sources."supports-hyperlinks-1.0.1" // { dependencies = [ sources."has-flag-2.0.0" @@ -90475,22 +90625,17 @@ in sources."toml-3.0.0" sources."tomlify-j0.4-3.0.0" sources."treeify-1.1.0" - (sources."trim-repeated-1.0.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) + sources."trim-repeated-1.0.0" sources."triple-beam-1.3.0" sources."trough-1.0.5" sources."tslib-1.14.1" - sources."tsutils-3.18.0" + sources."tsutils-3.20.0" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-fest-0.8.1" sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."typedarray-to-buffer-1.0.4" - sources."typescript-3.9.7" + sources."typedarray-to-buffer-3.1.5" + sources."typescript-3.9.9" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -90533,8 +90678,13 @@ in sources."chalk-3.0.0" ]; }) + sources."uri-js-4.4.1" sources."urix-0.1.0" - sources."url-0.10.3" + (sources."url-0.10.3" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -90564,15 +90714,20 @@ in sources."widest-line-3.1.0" (sources."windows-release-3.3.3" // { dependencies = [ + sources."cross-spawn-6.0.5" sources."execa-1.0.0" sources."get-stream-4.1.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."path-key-2.0.1" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" ]; }) - (sources."winston-3.3.3" // { - dependencies = [ - sources."is-stream-2.0.0" - ]; - }) + sources."winston-3.3.3" (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -90586,11 +90741,7 @@ in ]; }) sources."wrappy-1.0.2" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."typedarray-to-buffer-3.1.5" - ]; - }) + sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -90601,12 +90752,13 @@ in sources."yargs-parser-18.1.3" sources."yarn-1.22.10" sources."yauzl-2.10.0" + sources."yocto-queue-0.1.0" sources."zip-stream-3.0.1" ]; buildInputs = globalBuildInputs; meta = { description = "Netlify command line tool"; - homepage = https://github.com/netlify/cli; + homepage = "https://github.com/netlify/cli"; license = "MIT"; }; production = true; @@ -90680,7 +90832,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-unicode-2.0.1" @@ -90728,11 +90880,11 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.0.5" + sources."tar-6.1.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -90762,7 +90914,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/prebuild/node-gyp-build; + homepage = "https://github.com/prebuild/node-gyp-build"; license = "MIT"; }; production = true; @@ -90862,7 +91014,7 @@ in ]; }) sources."glob-5.0.15" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-1.0.3" @@ -90966,7 +91118,7 @@ in sources."qs-6.4.0" ]; }) - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -91061,7 +91213,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; + homepage = "http://github.com/node-inspector/node-inspector"; }; production = true; bypassCache = true; @@ -91109,7 +91261,7 @@ in sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."ms-2.1.3" - sources."needle-2.5.2" + sources."needle-2.6.0" sources."nopt-4.0.3" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" @@ -91155,16 +91307,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.6"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.6.tgz"; - sha512 = "Sy6ZNRFxN4KwT/eGFBt9L6aMXK0XGRwBNlhoFMPObSujLJVMUKHxirHAMst5CvUYigijFXM6ILRC6p/XqYHZRg=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.9.tgz"; + sha512 = "1BXFaT7oDd5VM80O+1Lf72P9wCkYjg3CODROPRIPvcSEke6ubMo1M5GFsgh5EwGPLlTTlkuSgI+a4T3UhjAzbQ=="; }; dependencies = [ - sources."@babel/runtime-7.12.5" - sources."@node-red/editor-api-1.2.6" - sources."@node-red/editor-client-1.2.6" - (sources."@node-red/nodes-1.2.6" // { + sources."@babel/runtime-7.12.13" + sources."@node-red/editor-api-1.2.9" + sources."@node-red/editor-client-1.2.9" + (sources."@node-red/nodes-1.2.9" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -91178,9 +91330,9 @@ in }) ]; }) - sources."@node-red/registry-1.2.6" - sources."@node-red/runtime-1.2.6" - sources."@node-red/util-1.2.6" + sources."@node-red/registry-1.2.9" + sources."@node-red/runtime-1.2.9" + sources."@node-red/util-1.2.9" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -91208,11 +91360,11 @@ in sources."assert-plus-1.0.0" sources."async-0.1.22" sources."async-limiter-1.0.1" - sources."async-mutex-0.2.4" + sources."async-mutex-0.2.6" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.19.2" + sources."axios-0.21.1" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -91236,7 +91388,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."inherits-2.0.4" sources."readable-stream-3.6.0" @@ -91291,7 +91443,7 @@ in sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."denque-1.4.1" + sources."denque-1.5.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."detect-libc-1.0.3" @@ -91333,11 +91485,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."follow-redirects-1.13.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" @@ -91365,7 +91513,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -91439,7 +91587,7 @@ in }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-2.4.6" + sources."mime-2.4.7" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."minimatch-3.0.4" @@ -91464,7 +91612,7 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; }) (sources."mqtt-packet-6.7.0" // { @@ -91475,10 +91623,10 @@ in }) sources."ms-2.0.0" sources."multer-1.4.2" - sources."mustache-4.0.1" + sources."mustache-4.1.0" sources."mute-stream-0.0.8" sources."nan-2.14.0" - (sources."needle-2.5.2" // { + (sources."needle-2.6.0" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" @@ -91497,7 +91645,7 @@ in sources."yallist-3.1.1" ]; }) - (sources."node-red-admin-0.2.6" // { + (sources."node-red-admin-0.2.7" // { dependencies = [ sources."bcrypt-3.0.8" ]; @@ -91596,7 +91744,7 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."tail-2.1.1" + sources."tail-2.2.0" (sources."tar-6.0.5" // { dependencies = [ sources."mkdirp-1.0.4" @@ -91619,19 +91767,19 @@ in sources."punycode-1.4.1" ]; }) - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.11.6" + sources."uglify-js-3.12.4" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -91656,7 +91804,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Low-code programming for event-driven applications"; - homepage = http://nodered.org/; + homepage = "http://nodered.org"; license = "Apache-2.0"; }; production = true; @@ -91666,10 +91814,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.8.0.tgz"; - sha512 = "v5QBcH6KxWVVRftbXdpGPIo3s0nPRcTJ56vLLbnmk0f1+32efqpI5t+fYekRys5yJPKFlXDRJCo6o8qnw581gQ=="; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.9.0.tgz"; + sha512 = "CZLF+Pu2g/eYhrIAznhKIg0i3McCXQuwd1meNb+ruiRTrNE2p5oc0RNQUKD3ZAId+JQdHKhFc+19G+wmS8g46w=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -91683,7 +91831,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.1" + sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" @@ -91726,7 +91874,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -91747,6 +91895,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" + sources."lru-cache-6.0.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."minimatch-3.0.4" @@ -91801,12 +91950,12 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.1.3" + sources."semver-7.3.4" sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."slasp-0.0.4" @@ -91824,7 +91973,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.0.5" // { + (sources."tar-6.1.0" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -91835,7 +91984,7 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uid-number-0.0.5" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -91849,7 +91998,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; @@ -91859,10 +92008,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.6.tgz"; - sha512 = "4I3YDSKXg6ltYpcnZeHompqac4E6JeAMpGm8tJnB9Y3T0ehasLa4139dJOcCrB93HHrUMsCrKtoAlXTqT5n4AQ=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz"; + sha512 = "XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -91877,7 +92026,7 @@ in sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."balanced-match-1.0.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."boxen-4.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -91894,7 +92043,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."clone-response-1.0.2" @@ -91913,12 +92062,12 @@ in sources."end-of-stream-1.4.4" sources."escape-goat-2.1.1" sources."fill-range-7.0.1" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."global-dirs-2.1.0" sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -92012,7 +92161,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; - homepage = http://nodemon.io/; + homepage = "https://nodemon.io"; license = "MIT"; }; production = true; @@ -92022,15 +92171,15 @@ in np = nodeEnv.buildNodePackage { name = "np"; packageName = "np"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/np/-/np-7.2.0.tgz"; - sha512 = "jfMFJXAJlGkCowMPGzA8Ywbmywk7I9hT96DsOcWjDsjq/zP5h6m3VZDcZ1AWYoCBPg4E/lFrJxROmiQH3OWnzA=="; + url = "https://registry.npmjs.org/np/-/np-7.3.0.tgz"; + sha512 = "rbKZ7YMtdyv7k2ViAfhkcmDUimQxTMDyGs8qH3Ex2tzoxei9ZSrQUm2LkTzZ7Uwtde9pIAyud/rwsyxS4w9lDg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -92055,7 +92204,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -92077,10 +92226,11 @@ in sources."arrify-1.0.1" sources."async-exit-hook-2.0.1" sources."balanced-match-1.0.0" - (sources."boxen-4.2.0" // { + (sources."boxen-5.0.0" // { dependencies = [ - sources."chalk-3.0.0" - sources."type-fest-0.8.1" + sources."camelcase-6.2.0" + sources."type-fest-0.20.2" + sources."wrap-ansi-7.0.0" ]; }) sources."brace-expansion-1.1.11" @@ -92149,8 +92299,8 @@ in sources."escape-string-regexp-4.0.0" sources."execa-5.0.0" sources."external-editor-3.1.0" - sources."fast-glob-3.2.4" - sources."fastq-1.10.0" + sources."fast-glob-3.2.5" + sources."fastq-1.10.1" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -92165,14 +92315,14 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."global-dirs-2.1.0" - sources."globby-11.0.1" + sources."globby-11.0.2" (sources."got-10.7.0" // { dependencies = [ sources."get-stream-5.2.0" sources."type-fest-0.10.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."hard-rejection-2.1.0" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -92182,7 +92332,7 @@ in }) sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.7" + sources."hosted-git-info-3.0.8" sources."http-cache-semantics-4.1.0" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" @@ -92331,7 +92481,7 @@ in sources."mimic-fn-3.1.0" ]; }) - (sources."meow-8.1.0" // { + (sources."meow-8.1.2" // { dependencies = [ sources."type-fest-0.18.1" ]; @@ -92367,7 +92517,7 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."open-7.3.0" + sources."open-7.4.0" sources."org-regex-1.0.0" sources."os-tmpdir-1.0.2" (sources."ow-0.21.0" // { @@ -92419,7 +92569,7 @@ in ]; }) sources."parent-module-1.0.1" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -92441,6 +92591,7 @@ in sources."escape-goat-2.1.1" ]; }) + sources."queue-microtask-1.2.2" sources."quick-lru-4.0.1" sources."rc-1.2.8" (sources."read-pkg-5.2.0" // { @@ -92459,7 +92610,7 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" (sources."resolve-cwd-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -92471,7 +92622,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."rxjs-6.6.3" sources."safer-buffer-2.1.2" sources."scoped-regex-2.1.0" @@ -92499,7 +92650,6 @@ in sources."supports-color-7.2.0" sources."supports-hyperlinks-2.1.0" sources."symbol-observable-3.0.0" - sources."term-size-2.2.1" sources."terminal-link-2.1.1" sources."through-2.3.8" sources."tmp-0.0.33" @@ -92510,7 +92660,13 @@ in sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - sources."update-notifier-5.0.1" + (sources."update-notifier-5.1.0" // { + dependencies = [ + sources."global-dirs-3.0.0" + sources."ini-2.0.0" + sources."is-installed-globally-0.4.0" + ]; + }) sources."url-parse-lax-3.0.0" sources."vali-date-1.0.0" sources."validate-npm-package-license-3.0.4" @@ -92546,15 +92702,20 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.10"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.10.tgz"; - sha512 = "FT23Qy/JMA+qxEYReMOr1MY7642fKn8Onn+72LASPi872Owvmw0svm+/DXTHOC3yO9CheEO+EslyXEpdBdRtIA=="; + url = "https://registry.npmjs.org/npm/-/npm-7.5.3.tgz"; + sha512 = "4MhBvHrQ82v5cvoWe7tX+IK8Z2xsbde9IS9sCP3SKpRo4JOHxe14tpZ/ZOTCy8xkp0DhBYqjxECmWv2EZK8BXg=="; }; + dependencies = [ + sources."@npmcli/installed-package-contents-1.0.7" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + ]; buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; - homepage = https://docs.npmjs.com/; + homepage = "https://docs.npmjs.com/"; license = "Artistic-2.0"; }; production = true; @@ -92564,25 +92725,28 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "10.2.5"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.5.tgz"; - sha512 = "R0BN+MqE6T12k0iGivF0WKfn3tuaeQuCai0haVvmsr7GcoPXU+yrlHxl9aFlO2XZ6z4m+pCd107YnbJDcRAf8Q=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.1.1.tgz"; + sha512 = "0K2csepXxqXd3sh05qxU9BcW/pvFBatlM6E4UKKVFe6XlGjQXo4TfI5vRT4uZLG0v2Zj/bWUouQiZvEg5iAFHA=="; }; dependencies = [ + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.4" - sources."@npmcli/installed-package-contents-1.0.5" - sources."@npmcli/move-file-1.0.1" - sources."@npmcli/node-gyp-1.0.1" + sources."@npmcli/git-2.0.6" + sources."@npmcli/installed-package-contents-1.0.7" + sources."@npmcli/move-file-1.1.2" + sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.1" + sources."@npmcli/run-script-1.8.3" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.1.3" + sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-align-3.0.0" // { @@ -92598,8 +92762,8 @@ in sources."ansi-styles-4.3.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" - sources."argparse-1.0.10" - sources."asap-2.0.6" + sources."argparse-2.0.1" + sources."array-union-2.1.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -92607,12 +92771,9 @@ in sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - (sources."boxen-4.2.0" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) + sources."boxen-5.0.0" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."builtins-1.0.3" sources."cacache-15.0.5" (sources."cacheable-request-6.1.0" // { @@ -92621,7 +92782,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."caseless-0.12.0" sources."chalk-4.1.0" sources."chownr-2.0.0" @@ -92652,14 +92813,13 @@ in sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" sources."debug-4.3.2" - sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" - sources."dezalgo-1.0.3" + sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" @@ -92667,15 +92827,17 @@ in sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" - sources."err-code-1.1.2" + sources."err-code-2.0.3" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.10.1" sources."figgy-pudding-3.5.2" + sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -92694,25 +92856,28 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" - (sources."global-dirs-2.1.0" // { + sources."glob-parent-5.1.1" + (sources."global-dirs-3.0.0" // { dependencies = [ - sources."ini-1.3.7" + sources."ini-2.0.0" ]; }) + sources."globby-11.0.2" sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.7" + sources."hosted-git-info-3.0.8" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.2" + sources."ignore-5.1.8" sources."ignore-walk-3.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -92723,10 +92888,13 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-ci-2.0.0" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-installed-globally-0.3.2" + sources."is-glob-4.0.1" + sources."is-installed-globally-0.4.0" sources."is-lambda-1.0.1" sources."is-npm-5.0.0" + sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-typedarray-1.0.0" @@ -92735,7 +92903,7 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jju-1.4.0" - sources."js-yaml-3.14.1" + sources."js-yaml-4.0.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" @@ -92743,7 +92911,7 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."jsonlines-0.1.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" @@ -92768,15 +92936,20 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.12" + sources."make-fetch-happen-8.0.14" + sources."map-age-cleaner-0.1.3" + sources."mem-8.0.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.2" sources."mime-db-1.45.0" sources."mime-types-2.1.28" + sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.2" + sources."minipass-fetch-1.3.3" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -92800,6 +92973,7 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" + sources."p-defer-1.0.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-map-4.0.0" @@ -92809,16 +92983,18 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.1.13" + sources."pacote-11.2.6" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" + sources."path-type-4.0.0" sources."performance-now-2.1.0" + sources."picomatch-2.2.2" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" - sources."promise-retry-1.1.1" + sources."promise-retry-2.0.1" sources."prompts-2.4.0" sources."psl-1.8.0" sources."puka-1.0.1" @@ -92826,19 +93002,21 @@ in sources."punycode-2.1.1" sources."pupa-2.1.1" sources."qs-6.5.2" + sources."queue-microtask-1.2.2" sources."rc-1.2.8" - sources."rc-config-loader-3.0.0" - sources."read-package-json-fast-1.2.1" + sources."rc-config-loader-4.0.0" + sources."read-package-json-fast-2.0.1" sources."readable-stream-2.3.7" - sources."readdir-scoped-modules-1.1.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remote-git-tags-3.0.0" sources."request-2.88.2" sources."require-from-string-2.0.2" sources."responselike-1.0.2" - sources."retry-0.10.1" + sources."retry-0.12.0" + sources."reusify-1.0.4" sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-7.3.4" @@ -92851,31 +93029,31 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" + sources."slash-3.0.0" sources."smart-buffer-4.1.0" sources."socks-2.5.1" sources."socks-proxy-agent-5.0.0" sources."spawn-please-1.0.0" - sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - sources."ssri-8.0.0" + sources."ssri-8.0.1" sources."string-width-4.2.0" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.0.5" - sources."term-size-2.2.1" + sources."tar-6.1.0" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" - sources."update-notifier-5.0.1" - sources."uri-js-4.4.0" + sources."update-notifier-5.1.0" + sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -92891,6 +93069,7 @@ in ]; }) sources."widest-line-3.1.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" @@ -92900,7 +93079,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json allows"; - homepage = https://github.com/raineorshine/npm-check-updates; + homepage = "https://github.com/raineorshine/npm-check-updates"; license = "Apache-2.0"; }; production = true; @@ -93063,7 +93242,7 @@ in sources."tweetnacl-0.14.5" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -93074,7 +93253,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; - homepage = https://github.com/NixOS/npm2nix; + homepage = "https://github.com/NixOS/npm2nix"; }; production = true; bypassCache = true; @@ -93115,7 +93294,7 @@ in buildInputs = globalBuildInputs; meta = { description = "OCaml language server"; - homepage = https://github.com/freebroccolo/ocaml-language-server; + homepage = "https://github.com/freebroccolo/ocaml-language-server"; license = "Apache-2.0"; }; production = true; @@ -93131,112 +93310,111 @@ in sha512 = "G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + (sources."@babel/core-7.12.16" // { dependencies = [ - sources."json5-2.1.3" + sources."json5-2.2.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.11" // { + (sources."@babel/generator-7.12.15" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.5" - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + sources."@babel/helper-compilation-targets-7.12.16" + sources."@babel/helper-create-class-features-plugin-7.12.16" + sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.1" + sources."@babel/plugin-syntax-flow-7.12.13" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.1" + sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.10" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.12" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.11" + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-react-jsx-7.12.16" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/preset-env-7.12.16" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -93334,7 +93512,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.16.0" + sources."browserslist-4.16.3" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -93345,13 +93523,13 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001185" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -93378,7 +93556,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.8.2" // { + (sources."core-js-compat-3.8.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -93472,7 +93650,7 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domain-browser-1.2.0" @@ -93486,17 +93664,17 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.634" - (sources."elliptic-6.5.3" // { + sources."electron-to-chromium-1.3.663" + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; }) sources."encodeurl-1.0.2" sources."entities-1.1.2" - sources."envinfo-7.7.3" + sources."envinfo-7.7.4" sources."error-ex-1.3.2" - (sources."es-abstract-1.18.0-next.1" // { + (sources."es-abstract-1.18.0-next.2" // { dependencies = [ sources."object-inspect-1.9.0" ]; @@ -93545,7 +93723,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-port-3.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -93557,7 +93735,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globals-11.12.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -93620,7 +93798,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" sources."is-core-module-2.2.0" (sources."is-data-descriptor-1.0.0" // { @@ -93643,7 +93821,7 @@ in sources."is-number-3.0.0" sources."is-obj-2.0.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-resolvable-1.1.0" sources."is-svg-3.0.0" sources."is-symbol-1.0.3" @@ -93741,7 +93919,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -93891,7 +94069,7 @@ in }) sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { + (sources."regjsparser-0.6.7" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -93903,7 +94081,7 @@ in sources."request-2.88.2" sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -93959,7 +94137,7 @@ in 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."source-map-url-0.4.1" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -94045,7 +94223,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -94136,11 +94314,11 @@ in ]; }) sources."brace-expansion-1.1.11" - sources."bunyan-1.8.14" + sources."bunyan-1.8.15" sources."bunyan-syslog-udp-0.2.0" sources."busboy-0.3.1" sources."bytes-3.0.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."clarinet-0.11.0" @@ -94203,10 +94381,10 @@ in sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."handlebars-4.7.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -94347,10 +94525,10 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.7" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -94358,7 +94536,7 @@ in sources."verror-1.10.0" sources."which-module-2.0.0" sources."wikimedia-langconv-0.1.0" - sources."wikipeg-2.0.3" + sources."wikipeg-2.0.5" sources."wordwrap-1.0.0" sources."worker-farm-1.7.0" sources."wrap-ansi-5.1.0" @@ -94487,7 +94665,7 @@ in sources."fs.realpath-1.0.0" sources."get-value-2.0.6" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -94596,7 +94774,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -94702,7 +94880,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."chalk-1.1.3" @@ -94735,8 +94913,6 @@ in sources."dns-txt-2.0.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."external-editor-2.2.0" sources."fifo-0.1.4" @@ -94751,10 +94927,10 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" @@ -94786,13 +94962,11 @@ in sources."ipaddr.js-2.0.0" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" - sources."is-callable-1.2.2" sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-regex-1.1.1" - sources."is-symbol-1.0.3" + sources."is-regex-1.1.2" sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."k-bucket-0.6.0" @@ -94810,7 +94984,7 @@ in sources."magnet-uri-5.4.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -94827,10 +95001,8 @@ in sources."number-is-nan-1.0.1" sources."numeral-2.0.6" sources."object-assign-4.1.1" - sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" - sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" @@ -94871,7 +95043,8 @@ in sources."plist-1.2.0" sources."process-nextick-args-2.0.1" sources."pump-2.0.1" - sources."random-access-file-2.1.4" + sources."queue-microtask-1.2.2" + sources."random-access-file-2.1.5" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" @@ -94882,14 +95055,14 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.7" sources."redent-1.0.0" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."repeating-2.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."run-series-1.1.9" sources."rusha-0.8.13" sources."rxjs-5.5.12" @@ -94916,8 +95089,6 @@ in sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" (sources."string2compact-1.3.0" // { dependencies = [ sources."ipaddr.js-1.9.1" @@ -94967,7 +95138,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; - homepage = https://github.com/mafintosh/peerflix; + homepage = "https://github.com/mafintosh/peerflix"; license = "MIT"; }; production = true; @@ -95018,7 +95189,7 @@ in sources."ws-1.1.5" ]; }) - sources."bl-4.0.3" + sources."bl-4.1.0" sources."blob-0.0.5" sources."bn.js-4.11.9" sources."bncode-0.5.3" @@ -95105,7 +95276,7 @@ in sources."get-browser-rtc-1.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-binary2-1.0.3" // { @@ -95221,7 +95392,8 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."random-access-file-2.1.4" + sources."queue-microtask-1.2.2" + sources."random-access-file-2.1.5" sources."random-access-storage-1.4.1" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" @@ -95237,7 +95409,7 @@ in ]; }) sources."rimraf-2.7.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."run-series-1.1.9" sources."rusha-0.8.13" sources."safe-buffer-5.1.2" @@ -95264,7 +95436,7 @@ in sources."ws-2.3.1" ]; }) - (sources."socket.io-2.4.0" // { + (sources."socket.io-2.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" @@ -95275,7 +95447,7 @@ in dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" - sources."socket.io-parser-3.3.1" + sources."socket.io-parser-3.3.2" ]; }) (sources."socket.io-parser-3.4.1" // { @@ -95313,7 +95485,7 @@ in sources."ultron-1.1.1" sources."uniq-1.0.1" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."utp-0.0.7" @@ -95322,7 +95494,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -95341,10 +95513,10 @@ in pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; - version = "4.5.1"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/pm2/-/pm2-4.5.1.tgz"; - sha512 = "gEOYugy4vEGazszDtjbZcWnZhHpBLKl0JiYhEnIJqmMj576a0D5LNCmd9grJswB1ziZim+9YInqFrG3FQTxvEg=="; + url = "https://registry.npmjs.org/pm2/-/pm2-4.5.4.tgz"; + sha512 = "2xKXrKz21i1R3BK2XxVIPq5Iy9fKHBVgZ+KMfRrx72mc7bq84SG/D+iTO32ihLf2Qe+N1o8rDskAt4M30JWyiA=="; }; dependencies = [ (sources."@opencensus/core-0.0.9" // { @@ -95389,10 +95561,9 @@ in sources."tslib-1.9.3" ]; }) - (sources."@pm2/js-api-0.6.1" // { + (sources."@pm2/js-api-0.6.7" // { dependencies = [ sources."async-2.6.3" - sources."debug-3.2.7" sources."eventemitter2-6.4.3" ]; }) @@ -95416,17 +95587,18 @@ in sources."semver-5.7.1" ]; }) - sources."axios-0.19.2" + sources."axios-0.21.1" sources."balanced-match-1.0.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."blessed-0.1.81" + sources."bodec-0.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.1" sources."bytes-3.1.0" sources."chalk-3.0.0" sources."charm-0.1.2" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."cli-tableau-2.0.1" sources."co-4.6.0" sources."color-convert-2.0.1" @@ -95436,6 +95608,7 @@ in sources."continuation-local-storage-3.2.1" sources."core-util-is-1.0.2" sources."cron-1.8.2" + sources."culvert-0.1.2" sources."data-uri-to-buffer-1.2.0" sources."dayjs-1.8.36" (sources."debug-4.3.2" // { @@ -95466,14 +95639,9 @@ in sources."fclone-1.0.11" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."follow-redirects-1.13.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" (sources."ftp-0.3.10" // { dependencies = [ sources."readable-stream-1.1.14" @@ -95486,6 +95654,8 @@ in sources."ms-2.0.0" ]; }) + sources."git-node-fs-1.0.0" + sources."git-sha1-0.1.2" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."has-1.0.3" @@ -95505,6 +95675,7 @@ in sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."ini-1.3.8" sources."ip-1.1.5" sources."is-binary-path-2.1.0" sources."is-core-module-2.2.0" @@ -95512,6 +95683,7 @@ in sources."is-glob-4.0.1" sources."is-number-7.0.0" sources."isarray-0.0.1" + sources."js-git-0.7.8" sources."lazy-1.0.11" sources."levn-0.3.0" sources."lodash-4.17.20" @@ -95521,7 +95693,7 @@ in sources."mkdirp-1.0.4" sources."module-details-from-path-1.0.3" sources."moment-2.29.1" - sources."moment-timezone-0.5.32" + sources."moment-timezone-0.5.33" sources."ms-2.1.3" sources."mute-stream-0.0.8" (sources."needle-2.4.0" // { @@ -95540,6 +95712,7 @@ in sources."optionator-0.8.3" sources."pac-proxy-agent-3.0.1" sources."pac-resolver-3.0.0" + sources."pako-0.2.9" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."picomatch-2.2.2" @@ -95572,7 +95745,7 @@ in }) sources."readdirp-3.5.0" sources."require-in-the-middle-5.1.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."run-series-1.1.9" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -95599,19 +95772,19 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.34.2" + sources."systeminformation-4.34.9" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."tv4-1.3.0" sources."type-check-0.3.2" sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - (sources."vizion-0.2.13" // { + (sources."vizion-2.2.1" // { dependencies = [ - sources."async-1.5.2" + sources."async-2.6.3" ]; }) sources."word-wrap-1.2.3" @@ -95624,7 +95797,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Production process manager for Node.JS applications with a built-in load balancer."; - homepage = http://pm2.keymetrics.io/; + homepage = "http://pm2.keymetrics.io/"; license = "AGPL-3.0"; }; production = true; @@ -95634,15 +95807,15 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.14.3"; + version = "5.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.14.3.tgz"; - sha512 = "PFjHFWCsHgaNCpOwOAgN6H71PA8td8PnwSE1ArXz//OyfdfIwws1s23XLmokhHcnE3JsBSiIR3NOW8JZ5QcxlQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.17.1.tgz"; + sha512 = "jSQZCzWyf3tZSANyWnA/errzlnomqrZQO11yvURLxkLDyJvzi5D1equahjJXyT/ubd7S2iJb8dlkHvqR5ORb3w=="; }; buildInputs = globalBuildInputs; meta = { description = "Fast, disk space efficient package manager"; - homepage = https://pnpm.js.org/; + homepage = "https://pnpm.js.org"; license = "MIT"; }; production = true; @@ -95661,7 +95834,7 @@ in sources."commander-2.11.0" sources."file-or-stdin-1.0.2" sources."get-stdin-5.0.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."inspect-with-kind-1.0.5" sources."kind-of-6.0.3" sources."poor-mans-t-sql-formatter-1.6.10" @@ -95686,9 +95859,9 @@ in sha512 = "leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -95707,11 +95880,11 @@ in sources."anymatch-3.1.1" sources."array-union-2.1.0" sources."at-least-node-1.0.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."braces-3.0.2" sources."callsites-3.1.0" sources."chalk-4.1.0" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -95723,16 +95896,16 @@ in sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - sources."fast-glob-3.2.4" - sources."fastq-1.10.0" + sources."fast-glob-3.2.5" + sources."fastq-1.10.1" sources."fill-range-7.0.1" - sources."fs-extra-9.0.1" - sources."fsevents-2.1.3" + sources."fs-extra-9.1.0" + sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."get-stdin-8.0.0" sources."glob-parent-5.1.1" - sources."globby-11.0.1" - sources."graceful-fs-4.2.4" + sources."globby-11.0.2" + sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."ignore-5.1.8" sources."import-cwd-3.0.0" @@ -95750,11 +95923,7 @@ in sources."is-number-7.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."jsonfile-6.1.0" sources."lines-and-columns-1.1.6" sources."lodash.difference-4.5.0" sources."lodash.forown-4.4.0" @@ -95765,25 +95934,26 @@ in sources."micromatch-4.0.2" sources."normalize-path-3.0.0" sources."parent-module-1.0.1" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."pify-2.3.0" - sources."postcss-load-config-3.0.0" + sources."postcss-load-config-3.0.1" sources."postcss-reporter-7.0.2" sources."pretty-hrtime-1.0.3" + sources."queue-microtask-1.2.2" sources."read-cache-1.0.0" sources."readdirp-3.5.0" sources."require-directory-2.1.1" sources."resolve-from-4.0.0" sources."reusify-1.0.4" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."slash-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" - sources."universalify-1.0.0" + sources."universalify-2.0.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.5" sources."yaml-1.10.0" @@ -95811,7 +95981,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Prettier is an opinionated code formatter"; - homepage = https://prettier.io/; + homepage = "https://prettier.io"; license = "MIT"; }; production = true; @@ -95948,7 +96118,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -95963,7 +96133,7 @@ in sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.6" sources."globule-1.3.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" (sources."hash-base-3.1.0" // { dependencies = [ @@ -96055,7 +96225,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" @@ -96113,7 +96283,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A build system for PureScript projects"; - homepage = https://github.com/purescript-contrib/pulp; + homepage = "https://github.com/purescript-contrib/pulp"; license = "LGPL-3.0+"; }; production = true; @@ -96143,7 +96313,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Language Server Protocol server for PureScript wrapping purs ide server functionality"; - homepage = https://github.com/nwolverson/purescript-language-server; + homepage = "https://github.com/nwolverson/purescript-language-server"; license = "MIT"; }; production = true; @@ -96153,10 +96323,10 @@ in purescript-psa = nodeEnv.buildNodePackage { name = "purescript-psa"; packageName = "purescript-psa"; - version = "0.8.0"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-psa/-/purescript-psa-0.8.0.tgz"; - sha512 = "N76JjHcBbJMf4/rs8dnCniFi7TL9iBbV0BycXuwEtSYnmiaogng0tFmnliqubQyZ5FpDU9ET8Bq1NjH3Hmx5PA=="; + url = "https://registry.npmjs.org/purescript-psa/-/purescript-psa-0.8.2.tgz"; + sha512 = "4Olf0aQQrNCfcDLXQI3gJgINEQ+3U+4QPLmQ2LHX2L/YOXSwM7fOGIUs/wMm/FQnwERUyQmHKQTJKB4LIjE2fg=="; }; buildInputs = globalBuildInputs; meta = { @@ -96171,10 +96341,10 @@ in purty = nodeEnv.buildNodePackage { name = "purty"; packageName = "purty"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/purty/-/purty-6.3.0.tgz"; - sha512 = "l70uQyz+t5GvCPzOorUbIhRX3oQW9i8Kgwr0LvS6nUq+UM4rMJdYcHazuupcLVInvNsbd290EnpjaRgAITt0dw=="; + url = "https://registry.npmjs.org/purty/-/purty-6.3.1.tgz"; + sha512 = "KfOSejzz4PExqRwhRuLIJoggKY+cCVLGt+fB4csiyEv3ATX0IB93udl66UW4ZVj/zNJ4Ds+FK9nLfEXcNwBo5A=="; }; buildInputs = globalBuildInputs; meta = { @@ -96189,10 +96359,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.99"; + version = "1.1.109"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.99.tgz"; - sha512 = "DAfK8uVLGF1nuBeFvEXhvApCecuHEpe8ncjnFW/WsBBIQ5JOsjjpwlUDvTutNjkoH9QCTqvg72g6ip9PdWFL/w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.109.tgz"; + sha512 = "CAaPMKMmeucbbaDLADjhtOdr/KEKknALovBlGh+VbFqAVta1rxrytiIzF2V6xKWx0QpKdkRixkItSa8rTWalnw=="; }; buildInputs = globalBuildInputs; meta = { @@ -96335,7 +96505,7 @@ in sources."reduce-flatten-1.0.1" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.7.1" @@ -96441,22 +96611,22 @@ in sources."available-typed-arrays-1.0.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."chalk-1.1.3" sources."colors-0.6.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" - sources."es-abstract-1.17.7" - sources."es-get-iterator-1.1.1" + sources."es-abstract-1.18.0-next.2" + sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -96467,20 +96637,16 @@ in sources."is-arguments-1.1.0" sources."is-bigint-1.0.1" sources."is-boolean-object-1.1.0" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-date-object-1.0.2" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-object-1.0.4" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-set-2.0.2" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."is-typed-array-1.1.4" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" @@ -96499,7 +96665,7 @@ in sources."pkginfo-0.4.1" sources."prompt-0.2.14" sources."read-1.0.7" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."semver-5.7.1" @@ -96512,11 +96678,7 @@ in sources."utile-0.2.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - (sources."which-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."which-typed-array-1.1.4" (sources."winston-0.8.3" // { dependencies = [ sources."pkginfo-0.3.1" @@ -96557,7 +96719,7 @@ in sources."esprima-3.1.3" sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -96581,7 +96743,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; - homepage = https://facebook.github.io/react; + homepage = "https://facebook.github.io/react"; license = "BSD-3-Clause"; }; production = true; @@ -96591,18 +96753,21 @@ in readability-cli = nodeEnv.buildNodePackage { name = "readability-cli"; packageName = "readability-cli"; - version = "1.2.1"; + version = "2.2.1-pre"; src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-1.2.1.tgz"; - sha512 = "oS0m68Y02lcMnrCYh3loRj3o8pGjhBAk8petnaJuvvE6eif3bjj60mTByFhZTlYRWNLuQaq/Yqe8Wk0yFI2wdQ=="; + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.2.1-pre.tgz"; + sha512 = "1f8y1ZeGRYskJyZZQzXVw5OlzQKs597JEr48wBzD6ZhmDhUbtqxswsFYROfCigWpkxywBsykesDy8ENKDOYQZg=="; }; dependencies = [ - sources."@mozilla/readability-0.3.0" + sources."@gardenapple/yargs-17.0.0-candidate.0" + sources."@mozilla/readability-0.4.1" sources."abab-2.0.5" sources."acorn-7.4.1" sources."acorn-globals-6.0.0" sources."acorn-walk-7.2.0" sources."ajv-6.12.6" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -96611,6 +96776,9 @@ in sources."bcrypt-pbkdf-1.0.2" sources."browser-process-hrtime-1.0.0" sources."caseless-0.12.0" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."cssom-0.4.4" @@ -96629,7 +96797,10 @@ in sources."webidl-conversions-5.0.0" ]; }) + sources."dompurify-2.2.6" sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" + sources."escalade-3.1.1" sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" @@ -96641,6 +96812,7 @@ in sources."fast-levenshtein-2.0.6" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -96648,6 +96820,7 @@ in sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."ip-regex-2.1.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-potential-custom-element-name-1.0.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" @@ -96662,7 +96835,6 @@ in sources."lodash.sortby-4.7.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" - sources."minimist-1.2.5" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."optionator-0.8.3" @@ -96683,19 +96855,22 @@ in sources."tough-cookie-2.5.0" ]; }) + sources."require-directory-2.1.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" sources."source-map-0.6.1" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."symbol-tree-3.2.4" sources."tough-cookie-3.0.1" sources."tr46-2.0.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" @@ -96705,9 +96880,12 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.4.0" sources."word-wrap-1.2.3" - sources."ws-7.4.2" + sources."wrap-ansi-7.0.0" + sources."ws-7.4.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" + sources."y18n-5.0.5" + sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -96722,37 +96900,38 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.10.2.tgz"; - sha512 = "AQHx67+fJ+7PZUGf0Vl24XO02isSLHU7fh/OXu6wreFm6B1+xrVhcehV9um2nk63Zq9GFenjnv2GoXEyMSGc7Q=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.10.3.tgz"; + sha512 = "j4dwDetXrQT5sz1wl6/ZckQ0Ynl9Z+Q/De+e4Qz29dqAq0itimml55DcGRDMyIfEcyYkFgdzpusvWIAi1t/OUw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - (sources."@babel/generator-7.12.11" // { + sources."@babel/code-frame-7.12.13" + (sources."@babel/generator-7.12.15" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.39" + sources."@scarf/scarf-1.1.0" + sources."@types/node-13.13.41" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -96772,7 +96951,7 @@ in sources."babel-plugin-syntax-jsx-6.18.0" sources."base64-js-1.5.1" sources."better-ajv-errors-0.6.7" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bn.js-5.1.3" sources."braces-3.0.2" sources."brorand-1.1.0" @@ -96798,7 +96977,7 @@ in sources."camelcase-5.3.1" sources."camelize-1.0.0" sources."chalk-2.4.2" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."cipher-base-1.0.4" sources."classnames-2.2.6" sources."clipboard-2.0.6" @@ -96810,7 +96989,7 @@ in sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.8.2" + sources."core-js-3.8.3" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -96834,9 +97013,10 @@ in }) sources."domain-browser-1.2.0" sources."dompurify-2.2.6" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" + sources."inherits-2.0.4" ]; }) sources."emoji-regex-8.0.0" @@ -96854,7 +97034,7 @@ in sources."find-up-4.1.0" sources."foreach-2.0.5" sources."format-util-1.0.5" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."glob-parent-5.1.1" sources."globals-11.12.0" @@ -96911,9 +97091,9 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.0.4" - sources."mobx-react-7.0.5" - sources."mobx-react-lite-3.1.6" + sources."mobx-6.1.6" + sources."mobx-react-7.1.0" + sources."mobx-react-lite-3.2.0" sources."ms-2.1.2" sources."neo-async-2.6.2" sources."node-fetch-h2-2.3.0" @@ -96922,7 +97102,7 @@ in sources."normalize-path-3.0.0" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.1" - (sources."oas-resolver-2.5.3" // { + (sources."oas-resolver-2.5.4" // { dependencies = [ sources."yargs-16.2.0" ]; @@ -96943,7 +97123,7 @@ in sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" - sources."polished-3.6.7" + sources."polished-3.7.0" sources."postcss-value-parser-4.1.0" sources."prismjs-1.23.0" sources."process-0.11.10" @@ -96962,7 +97142,7 @@ in sources."react-16.14.0" sources."react-dom-16.14.0" sources."react-is-16.13.1" - sources."react-tabs-3.1.2" + sources."react-tabs-3.2.0" (sources."readable-stream-2.3.7" // { dependencies = [ sources."inherits-2.0.4" @@ -96972,8 +97152,8 @@ in ]; }) sources."readdirp-3.5.0" - sources."redoc-2.0.0-rc.48" - sources."reftools-1.1.7" + sources."redoc-2.0.0-rc.49" + sources."reftools-1.1.8" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -97009,9 +97189,9 @@ in sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."tty-browserify-0.0.0" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.7" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -97071,7 +97251,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The HTML Presentation Framework"; - homepage = https://revealjs.com/; + homepage = "https://revealjs.com"; license = "MIT"; }; production = true; @@ -97081,18 +97261,18 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.36.0"; + version = "2.38.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz"; - sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.38.5.tgz"; + sha512 = "VoWt8DysFGDVRGWuHTqZzT02J0ASgjVq/hPs9QcBOGMd7B+jfTr/iqMVEyOi901rE3xq+Deq66GzIT1yt7sGwQ=="; }; dependencies = [ - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" ]; buildInputs = globalBuildInputs; meta = { description = "Next-generation ES module bundler"; - homepage = https://rollupjs.org/; + homepage = "https://rollupjs.org/"; license = "MIT"; }; production = true; @@ -97105,14 +97285,14 @@ in version = "0.4.0-dev"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - (sources."@eslint/eslintrc-0.2.2" // { + (sources."@eslint/eslintrc-0.3.0" // { dependencies = [ sources."ignore-4.0.6" ]; @@ -97120,33 +97300,34 @@ in sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - sources."@rollup/plugin-commonjs-17.0.0" - sources."@rollup/plugin-node-resolve-11.0.1" + sources."@rollup/plugin-commonjs-17.1.0" + sources."@rollup/plugin-node-resolve-11.1.1" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ sources."estree-walker-1.0.1" ]; }) + sources."@tootallnate/once-1.1.2" sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.3" sources."@types/mocha-8.2.0" sources."@types/node-12.12.70" - sources."@types/node-fetch-2.5.7" + sources."@types/node-fetch-2.5.8" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.52.0" - sources."@typescript-eslint/eslint-plugin-4.12.0" - sources."@typescript-eslint/experimental-utils-4.12.0" - sources."@typescript-eslint/parser-4.12.0" - sources."@typescript-eslint/scope-manager-4.12.0" - sources."@typescript-eslint/types-4.12.0" - sources."@typescript-eslint/typescript-estree-4.12.0" - sources."@typescript-eslint/visitor-keys-4.12.0" + sources."@types/vscode-1.53.0" + sources."@typescript-eslint/eslint-plugin-4.15.0" + sources."@typescript-eslint/experimental-utils-4.15.0" + sources."@typescript-eslint/parser-4.15.0" + sources."@typescript-eslint/scope-manager-4.15.0" + sources."@typescript-eslint/types-4.15.0" + sources."@typescript-eslint/typescript-estree-4.15.0" + sources."@typescript-eslint/visitor-keys-4.15.0" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" - sources."agent-base-4.3.0" + sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" @@ -97158,15 +97339,21 @@ in sources."asynckit-0.4.0" sources."azure-devops-node-api-7.2.0" sources."balanced-match-1.0.0" - sources."binary-extensions-2.1.0" + sources."big-integer-1.6.48" + sources."binary-0.3.0" + sources."binary-extensions-2.2.0" + sources."bluebird-3.4.7" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" sources."buffer-crc32-0.2.13" + sources."buffer-indexof-polyfill-1.0.2" + sources."buffers-0.1.1" sources."builtin-modules-3.2.0" sources."callsites-3.1.0" - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" + sources."chainsaw-0.1.0" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -97178,16 +97365,8 @@ in }) sources."cheerio-1.0.0-rc.5" sources."cheerio-select-tmp-0.1.1" - sources."chokidar-3.4.3" - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."chokidar-3.5.1" + sources."cliui-7.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" @@ -97195,22 +97374,24 @@ in sources."commandpost-1.4.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."css-select-3.1.2" sources."css-what-4.0.0" sources."debug-4.3.2" - sources."decamelize-1.2.0" + sources."decamelize-4.0.0" sources."deep-is-0.1.3" sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" sources."denodeify-1.2.1" - sources."diff-4.0.2" + sources."diff-5.0.0" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" sources."dom-serializer-1.2.0" sources."domelementtype-2.1.0" sources."domhandler-4.0.0" sources."domutils-2.4.4" + sources."duplexer2-0.1.4" (sources."editorconfig-0.15.3" // { dependencies = [ sources."lru-cache-4.1.5" @@ -97221,10 +97402,9 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."entities-2.1.0" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.17.0" // { + (sources."eslint-7.19.0" // { dependencies = [ sources."ignore-4.0.6" ]; @@ -97242,7 +97422,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -97256,43 +97436,40 @@ in sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.0" sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."form-data-3.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" + (sources."fstream-1.0.12" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globals-12.4.0" - sources."globby-11.0.1" + sources."globby-11.0.2" + sources."graceful-fs-4.2.6" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" sources."he-1.2.0" sources."htmlparser2-6.0.0" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."https-proxy-agent-2.2.4" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" sources."ignore-5.1.8" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" @@ -97307,6 +97484,7 @@ in sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" sources."is-reference-1.2.1" + sources."isarray-1.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" @@ -97315,6 +97493,7 @@ in sources."leven-3.1.0" sources."levn-0.4.1" sources."linkify-it-2.2.0" + sources."listenercount-1.0.1" sources."locate-path-6.0.0" sources."lodash-4.17.20" sources."log-symbols-4.0.0" @@ -97332,18 +97511,26 @@ in sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."minimatch-3.0.4" - (sources."mocha-8.2.1" // { + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + (sources."mocha-8.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."argparse-2.0.1" + (sources."debug-4.3.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) sources."escape-string-regexp-4.0.0" sources."has-flag-4.0.0" - sources."js-yaml-3.14.0" - sources."supports-color-7.2.0" + sources."js-yaml-4.0.0" + sources."ms-2.1.3" + sources."supports-color-8.1.1" ]; }) sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanoid-3.1.12" + sources."nanoid-3.1.20" sources."natural-compare-1.4.0" sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" @@ -97356,7 +97543,6 @@ in sources."osenv-0.1.5" sources."p-limit-3.1.0" sources."p-locate-5.0.0" - sources."p-try-2.2.0" sources."parent-module-1.0.1" (sources."parse-semver-1.1.1" // { dependencies = [ @@ -97373,26 +97559,32 @@ in sources."pend-1.2.0" sources."picomatch-2.2.2" sources."prelude-ls-1.2.1" + sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."pseudomap-1.0.2" sources."punycode-2.1.1" + sources."queue-microtask-1.2.2" sources."randombytes-2.1.0" sources."read-1.0.7" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."readdirp-3.5.0" sources."regexpp-3.1.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.36.0" - sources."run-parallel-1.1.10" + sources."rollup-2.38.5" + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.4" sources."serialize-javascript-5.0.1" - sources."set-blocking-2.0.0" + sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."sigmund-1.0.1" @@ -97407,20 +97599,26 @@ in sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" sources."string-width-4.2.0" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.0.3" + sources."ajv-7.1.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" sources."tmp-0.0.29" sources."to-regex-range-5.0.1" - sources."tslib-2.0.3" - (sources."tsutils-3.18.0" // { + sources."traverse-0.3.9" + sources."tslib-2.1.0" + (sources."tsutils-3.20.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -97429,14 +97627,16 @@ in sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."typed-rest-client-1.2.0" - sources."typescript-4.1.3" + sources."typescript-4.1.5" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.8.3" - sources."uri-js-4.4.0" + sources."unzipper-0.10.11" + sources."uri-js-4.4.1" sources."url-join-1.1.0" + sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" - (sources."vsce-1.83.0" // { + (sources."vsce-1.85.0" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" @@ -97447,13 +97647,8 @@ in sources."vscode-languageclient-7.0.0" sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-types-3.16.0" - (sources."vscode-test-1.4.1" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) + sources."vscode-test-1.5.0" sources."which-2.0.2" - sources."which-module-2.0.0" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -97463,40 +97658,20 @@ in ]; }) sources."word-wrap-1.2.3" - sources."workerpool-6.0.2" - (sources."wrap-ansi-5.1.0" // { + sources."workerpool-6.1.0" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) sources."wrappy-1.0.2" - sources."y18n-4.0.1" + sources."y18n-5.0.5" sources."yallist-4.0.0" - (sources."yargs-13.3.2" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."find-up-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."yargs-parser-13.1.2" - (sources."yargs-unparser-2.0.0" // { - dependencies = [ - sources."camelcase-6.2.0" - sources."decamelize-4.0.0" - ]; - }) + sources."yargs-16.2.0" + sources."yargs-parser-20.2.4" + sources."yargs-unparser-2.0.0" sources."yauzl-2.10.0" sources."yazl-2.5.1" sources."yocto-queue-0.1.0" @@ -97626,7 +97801,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid2-0.0.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-0.4.9" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -97643,18 +97818,18 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.32.0"; + version = "1.32.7"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.0.tgz"; - sha512 = "fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.7.tgz"; + sha512 = "C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A=="; }; dependencies = [ sources."anymatch-3.1.1" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."braces-3.0.2" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."fill-range-7.0.1" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."glob-parent-5.1.1" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" @@ -97668,7 +97843,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A pure JavaScript implementation of Sass."; - homepage = https://github.com/sass/dart-sass; + homepage = "https://github.com/sass/dart-sass"; license = "MIT"; }; production = true; @@ -97787,7 +97962,7 @@ in sources."supports-color-5.5.0" sources."term-size-1.2.0" sources."update-check-1.5.2" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."vary-1.1.2" sources."which-1.3.1" sources."widest-line-2.0.1" @@ -97806,10 +97981,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.17.0"; + version = "2.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.17.0.tgz"; - sha512 = "OVlrvBESW0aQB3G/SrZQ3WFmALhHRU9qUJ/LLoyFlpddAY4hr0APOixWehiHvf4aI7Vuo04lP9zffttjhviOPA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.23.0.tgz"; + sha512 = "D5RN0ywVPxL4EFfIzREx9K7vgkHlXBQQn9zTfDzlfz2WHkmKX0kW3LG89J51UYNdeKlBN1YXPIphybzZH3ujOw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -97841,9 +98016,10 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.4.3" // { + (sources."@serverless/components-3.6.2" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."js-yaml-3.14.1" sources."ramda-0.27.1" sources."strip-ansi-6.0.0" ]; @@ -97851,13 +98027,27 @@ in (sources."@serverless/core-1.1.2" // { dependencies = [ sources."fs-extra-7.0.1" + sources."js-yaml-3.14.1" sources."semver-6.3.0" ]; }) - sources."@serverless/enterprise-plugin-4.4.1" + (sources."@serverless/enterprise-plugin-4.4.3" // { + dependencies = [ + sources."js-yaml-3.14.1" + ]; + }) sources."@serverless/event-mocks-1.1.1" - sources."@serverless/platform-client-3.1.4" - sources."@serverless/platform-client-china-2.0.9" + (sources."@serverless/platform-client-3.11.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + ]; + }) + (sources."@serverless/platform-client-china-2.1.4" // { + dependencies = [ + sources."adm-zip-0.5.2" + sources."js-yaml-3.14.1" + ]; + }) (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" @@ -97871,14 +98061,13 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-2.2.0" // { + (sources."@serverless/utils-3.1.0" // { dependencies = [ - sources."argparse-2.0.1" - sources."js-yaml-4.0.0" + sources."jwt-decode-3.1.2" sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.0.12" + sources."@serverless/utils-china-1.0.14" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" @@ -97886,9 +98075,9 @@ in sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.167" + sources."@types/lodash-4.14.168" sources."@types/long-4.0.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -97915,10 +98104,10 @@ in sources."file-type-4.4.0" ]; }) - (sources."archiver-5.1.0" // { + (sources."archiver-5.2.0" // { dependencies = [ sources."async-3.2.0" - sources."bl-4.0.3" + sources."bl-4.1.0" sources."tar-stream-2.2.0" ]; }) @@ -97945,7 +98134,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.821.0" // { + (sources."aws-sdk-2.842.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -97954,14 +98143,14 @@ in }) sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.19.2" + sources."axios-0.21.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.4" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" (sources."bl-2.2.1" // { dependencies = [ @@ -97979,19 +98168,13 @@ in }) sources."blob-0.0.5" sources."bluebird-3.7.2" - (sources."boxen-4.2.0" // { + (sources."boxen-5.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.2.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" ]; }) sources."brace-expansion-1.1.11" @@ -98013,7 +98196,7 @@ in ]; }) sources."cachedir-2.3.0" - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."caseless-0.12.0" (sources."chainsaw-0.1.0" // { dependencies = [ @@ -98031,7 +98214,7 @@ in }) sources."chardet-0.7.0" sources."child-process-ext-2.1.1" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."chownr-1.1.4" sources."cli-boxes-2.2.1" (sources."cli-color-2.0.0" // { @@ -98066,7 +98249,7 @@ in sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" - sources."crc32-stream-4.0.1" + sources."crc32-stream-4.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -98078,8 +98261,8 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.10.1" - sources."debug-3.1.0" + sources."dayjs-1.10.4" + sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."decompress-4.2.1" sources."decompress-response-3.3.0" @@ -98141,7 +98324,11 @@ in sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."end-of-stream-1.4.4" - sources."engine.io-client-3.5.0" + (sources."engine.io-client-3.5.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."engine.io-parser-2.2.1" sources."env-variable-0.0.6" sources."es5-ext-0.10.53" @@ -98169,11 +98356,11 @@ in sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" sources."figures-3.2.0" @@ -98185,7 +98372,7 @@ in sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" - sources."follow-redirects-1.5.10" + sources."follow-redirects-1.13.2" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."formidable-1.2.2" @@ -98197,20 +98384,16 @@ in ]; }) sources."fs-constants-1.0.0" - (sources."fs-extra-9.0.1" // { + (sources."fs-extra-9.1.0" // { dependencies = [ - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" ]; }) sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fs2-0.3.9" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" (sources."gauge-2.7.4" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -98223,7 +98406,7 @@ in sources."github-from-package-0.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."globby-11.0.1" + sources."globby-11.0.2" (sources."got-11.8.1" // { dependencies = [ sources."@sindresorhus/is-4.0.0" @@ -98240,7 +98423,7 @@ in sources."responselike-2.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -98304,13 +98487,18 @@ in sources."isstream-0.1.2" sources."isurl-1.0.0" sources."jmespath-0.15.0" - sources."js-yaml-3.14.1" + (sources."js-yaml-4.0.0" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-cycle-1.3.0" (sources."json-refs-3.0.15" // { dependencies = [ sources."commander-4.1.1" + sources."js-yaml-3.14.1" ]; }) sources."json-schema-0.2.3" @@ -98318,7 +98506,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - (sources."jszip-3.5.0" // { + (sources."jszip-3.6.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -98328,7 +98516,6 @@ in sources."jwt-decode-2.2.0" (sources."kafka-node-5.0.0" // { dependencies = [ - sources."debug-2.6.9" sources."uuid-3.4.0" ]; }) @@ -98367,7 +98554,11 @@ in sources."pify-3.0.0" ]; }) - sources."memoizee-0.4.14" + (sources."memoizee-0.4.15" // { + dependencies = [ + sources."next-tick-1.1.0" + ]; + }) sources."merge2-1.4.1" sources."methods-1.1.2" sources."micromatch-4.0.2" @@ -98410,7 +98601,7 @@ in sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-5.1.2" - sources."open-7.3.0" + sources."open-7.4.0" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -98456,7 +98647,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.39" + sources."@types/node-13.13.41" sources."long-4.0.0" ]; }) @@ -98467,6 +98658,7 @@ in sources."qs-6.5.2" sources."query-string-5.1.1" sources."querystring-0.2.0" + sources."queue-microtask-1.2.2" sources."quick-lru-5.1.1" sources."ramda-0.26.1" sources."rc-1.2.8" @@ -98491,7 +98683,8 @@ in sources."retry-0.10.1" sources."reusify-1.0.4" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" + sources."run-parallel-limit-1.1.0" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -98506,7 +98699,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.31.0" // { + (sources."simple-git-2.34.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -98515,9 +98708,14 @@ in sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."snappy-6.3.5" - sources."socket.io-client-2.4.0" - (sources."socket.io-parser-3.3.1" // { + (sources."socket.io-client-2.4.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."socket.io-parser-3.3.2" // { dependencies = [ + sources."debug-3.1.0" sources."isarray-2.0.1" ]; }) @@ -98547,6 +98745,8 @@ in sources."strip-outer-1.0.1" (sources."superagent-3.8.3" // { dependencies = [ + sources."debug-3.2.7" + sources."ms-2.1.3" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -98574,7 +98774,7 @@ in sources."untildify-3.0.3" ]; }) - (sources."tar-6.0.5" // { + (sources."tar-6.1.0" // { dependencies = [ sources."chownr-2.0.0" sources."mkdirp-1.0.4" @@ -98593,7 +98793,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."term-size-2.2.1" sources."text-hex-1.0.0" sources."throat-5.0.0" sources."through-2.3.8" @@ -98611,13 +98810,13 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-2.1.0" + sources."type-2.2.0" sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unbzip2-stream-1.4.3" sources."universalify-0.1.2" sources."untildify-4.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" (sources."url-0.10.3" // { dependencies = [ sources."punycode-1.3.2" @@ -98648,9 +98847,20 @@ in sources."string_decoder-1.1.1" ]; }) + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.5.5" @@ -98667,7 +98877,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more"; - homepage = https://serverless.com/framework/docs/; + homepage = "https://serverless.com/framework/docs/"; license = "MIT"; }; production = true; @@ -98883,7 +99093,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."utf8-2.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -99003,7 +99213,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."get-value-2.0.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graceful-readlink-1.0.1" sources."has-flag-3.0.0" sources."has-value-1.0.0" @@ -99102,7 +99312,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -99312,12 +99522,13 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.437.3"; + version = "1.452.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.437.3.tgz"; - sha512 = "DFcYz8Q8LT/XNCNxaeEoGahazvkEhWS//JWJTfr6W1d5jMnORQauPxxj4RR3WGjKewSDl2eElwK1jhi5RNOP9g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.452.0.tgz"; + sha512 = "afwZGN8ze1J1SMGtI5TbjYtESREWFD78oqum1azV6fuCOwS5j8aYcEFep358dqUcKnKEG5TIJ0J09+fW/AvSjw=="; }; dependencies = [ + sources."@open-policy-agent/opa-wasm-1.2.0" sources."@sindresorhus/is-2.1.1" sources."@snyk/cli-interface-2.11.0" (sources."@snyk/cocoapods-lockfile-parser-3.5.2" // { @@ -99329,7 +99540,7 @@ in sources."@snyk/dep-graph-1.21.0" sources."@snyk/docker-registry-v2-client-1.13.9" sources."@snyk/gemfile-1.2.0" - (sources."@snyk/java-call-graph-builder-1.18.0" // { + (sources."@snyk/java-call-graph-builder-1.19.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -99338,7 +99549,7 @@ in sources."@snyk/rpm-parser-2.2.1" (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) (sources."@snyk/snyk-docker-pull-3.2.3" // { @@ -99352,11 +99563,10 @@ in sources."@types/graphlib-2.1.7" sources."@types/hosted-git-info-2.7.0" sources."@types/http-cache-semantics-4.0.0" - sources."@types/js-yaml-3.12.5" + sources."@types/js-yaml-3.12.6" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/responselike-1.0.0" - sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.3.0" @@ -99372,19 +99582,23 @@ in sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" sources."archy-1.0.0" - sources."argparse-1.0.10" + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) sources."asap-2.0.6" sources."asn1-0.2.4" (sources."ast-types-0.14.2" // { dependencies = [ - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."async-3.2.0" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -99460,7 +99674,7 @@ in sources."string_decoder-1.3.0" ]; }) - sources."dockerfile-ast-0.0.30" + sources."dockerfile-ast-0.1.0" sources."dot-prop-5.3.0" sources."dotnet-deps-parser-5.0.0" sources."duplexer3-0.1.4" @@ -99503,12 +99717,12 @@ in sources."glob-7.1.6" sources."global-dirs-2.1.0" sources."got-11.4.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" sources."gunzip-maybe-1.4.2" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" - (sources."hosted-git-info-3.0.7" // { + (sources."hosted-git-info-3.0.8" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -99567,7 +99781,7 @@ in sources."isexe-2.0.0" sources."js-yaml-3.14.1" sources."json-buffer-3.0.1" - (sources."jszip-3.5.0" // { + (sources."jszip-3.6.0" // { dependencies = [ sources."pako-1.0.11" ]; @@ -99581,17 +99795,30 @@ in sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" + sources."lodash.constant-3.0.0" + sources."lodash.filter-4.6.0" sources."lodash.findkey-4.6.0" sources."lodash.flatmap-4.5.0" sources."lodash.flatten-4.4.0" + sources."lodash.foreach-4.5.0" sources."lodash.get-4.4.2" + sources."lodash.has-4.5.2" sources."lodash.invert-4.3.0" sources."lodash.isempty-4.4.0" sources."lodash.isequal-4.5.0" + sources."lodash.isfunction-3.0.9" + sources."lodash.isundefined-3.0.1" + sources."lodash.keys-4.2.0" + sources."lodash.map-4.6.0" sources."lodash.merge-4.6.2" + sources."lodash.reduce-4.6.0" sources."lodash.set-4.3.2" + sources."lodash.size-4.2.0" sources."lodash.topairs-4.3.0" + sources."lodash.transform-4.6.0" + sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" + sources."lodash.values-4.3.0" sources."lowercase-keys-2.0.0" sources."lru-cache-5.1.1" sources."macos-release-2.4.1" @@ -99616,7 +99843,7 @@ in sources."object-hash-2.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.3.0" + sources."open-7.4.0" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -99656,6 +99883,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" + sources."promise-queue-2.2.5" sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" @@ -99703,10 +99931,10 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) - (sources."snyk-docker-plugin-4.13.1" // { + (sources."snyk-docker-plugin-4.16.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -99720,7 +99948,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.11.0" // { + (sources."snyk-gradle-plugin-3.12.3" // { dependencies = [ (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ @@ -99736,11 +99964,11 @@ in sources."rimraf-3.0.2" sources."supports-color-7.2.0" sources."tmp-0.2.1" - sources."tslib-2.0.3" + sources."tslib-2.1.0" ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.25.0" // { + (sources."snyk-mvn-plugin-2.25.1" // { dependencies = [ sources."@snyk/cli-interface-2.9.1" (sources."@snyk/dep-graph-1.19.4" // { @@ -99767,7 +99995,7 @@ in sources."uuid-8.3.2" ]; }) - (sources."snyk-nuget-plugin-1.19.4" // { + (sources."snyk-nuget-plugin-1.20.0" // { dependencies = [ sources."jszip-3.4.0" sources."pako-1.0.11" @@ -99779,9 +100007,14 @@ in sources."tslib-1.11.1" ]; }) - (sources."snyk-poetry-lockfile-parser-1.1.1" // { + (sources."snyk-poetry-lockfile-parser-1.1.5" // { dependencies = [ - sources."tslib-2.0.3" + (sources."@snyk/dep-graph-1.23.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."tslib-2.1.0" ]; }) (sources."snyk-policy-1.14.1" // { @@ -99795,20 +100028,16 @@ in }) ]; }) - sources."snyk-python-plugin-1.19.1" + sources."snyk-python-plugin-1.19.4" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.2.7" ]; }) - (sources."snyk-resolve-deps-4.4.0" // { + (sources."snyk-resolve-deps-4.7.2" // { dependencies = [ - sources."@types/node-6.14.13" - sources."debug-3.2.7" - sources."hosted-git-info-2.8.8" sources."lru-cache-4.1.5" sources."semver-5.7.1" - sources."snyk-module-1.9.1" sources."yallist-2.1.2" ]; }) @@ -99834,7 +100063,7 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."split-ca-1.0.1" - sources."sprintf-js-1.0.3" + sources."sprintf-js-1.1.2" sources."ssh2-0.8.9" sources."ssh2-streams-0.4.10" sources."statuses-1.5.0" @@ -99896,6 +100125,7 @@ in ]; }) sources."url-parse-lax-3.0.0" + sources."utf8-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vscode-languageserver-types-3.16.0" @@ -99934,16 +100164,16 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "3.0.5"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz"; - sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz"; + sha512 = "7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -99951,17 +100181,17 @@ in sources."cookie-0.4.1" sources."cors-2.8.5" sources."debug-4.3.2" - sources."engine.io-4.0.6" + sources."engine.io-4.1.1" sources."engine.io-parser-4.0.2" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" - sources."socket.io-adapter-2.0.3" - sources."socket.io-parser-4.0.3" + sources."socket.io-adapter-2.1.0" + sources."socket.io-parser-4.0.4" sources."vary-1.1.2" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; buildInputs = globalBuildInputs; meta = { @@ -100028,7 +100258,7 @@ in sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" @@ -100097,7 +100327,7 @@ in sources."redent-2.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."restore-cursor-2.0.0" sources."round-to-3.0.0" sources."safe-buffer-5.2.1" @@ -100157,6 +100387,13 @@ in sha512 = "+KXfMBecoFFAo0C4FTfSsH2ZXtrL2aQDXgVlQ0NrYdNLHW2TEnibV0hG3yq3hOlAEUQmrwVHZATfVToO825gxA=="; }; dependencies = [ + (sources."@sammacbeth/random-access-idb-mutable-file-0.1.1" // { + dependencies = [ + sources."buffer-5.1.0" + sources."random-access-storage-1.3.0" + ]; + }) + sources."@types/minimatch-3.0.3" sources."abstract-leveldown-6.0.3" sources."aligned-block-file-1.2.2" sources."ansi-escapes-1.4.0" @@ -100167,17 +100404,25 @@ in sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-differ-3.0.0" sources."array-filter-1.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" + (sources."async-append-only-log-3.0.3" // { + dependencies = [ + sources."push-stream-11.0.0" + ]; + }) sources."async-each-1.0.3" sources."async-single-1.0.5" sources."async-write-2.1.0" sources."atob-2.1.2" sources."atomic-file-1.1.5" + sources."atomically-1.7.0" + sources."atomically-universal-0.1.1" sources."attach-ware-1.1.1" sources."available-typed-arrays-1.0.2" sources."bail-1.0.5" @@ -100193,19 +100438,24 @@ in sources."bash-color-0.0.4" sources."binary-extensions-1.13.1" sources."binary-search-1.3.6" + sources."binary-search-bounds-2.0.5" sources."bindings-1.5.0" + sources."bipf-1.4.0" sources."blake2s-1.1.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."broadcast-stream-0.2.2" sources."buffer-5.7.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-2.1.1" sources."ccount-1.1.0" sources."chalk-1.1.3" @@ -100214,7 +100464,7 @@ in sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."charwise-3.0.1" - sources."chloride-2.4.0" + sources."chloride-2.4.1" sources."chloride-test-1.2.4" sources."chokidar-1.7.0" (sources."class-utils-0.3.6" // { @@ -100240,6 +100490,8 @@ in sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.6" sources."collection-visit-1.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."commander-2.20.3" sources."compare-at-paths-1.0.0" sources."component-emitter-1.3.0" @@ -100261,6 +100513,7 @@ in sources."continuable-series-1.2.0" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" + sources."cpu-percentage-1.0.3" sources."cross-spawn-6.0.5" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" @@ -100291,16 +100544,31 @@ in sources."abstract-leveldown-6.3.0" ]; }) + sources."end-of-stream-1.4.4" sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - sources."es-abstract-1.17.7" - (sources."es-get-iterator-1.1.1" // { + (sources."es-abstract-1.18.0-next.2" // { + dependencies = [ + sources."object-inspect-1.9.0" + ]; + }) + (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" ]; }) sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" + (sources."execa-4.1.0" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."onetime-5.1.2" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."exit-hook-1.1.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -100313,9 +100581,11 @@ in }) sources."extend.js-0.0.2" sources."extglob-0.3.2" + sources."fastintcompression-0.0.4" sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" + sources."find-up-4.1.0" (sources."flumecodec-0.0.0" // { dependencies = [ sources."level-codec-6.2.0" @@ -100342,7 +100612,7 @@ in sources."mkdirp-1.0.4" ]; }) - (sources."flumeview-reduce-1.3.17" // { + (sources."flumeview-reduce-1.4.0" // { dependencies = [ (sources."atomic-file-2.1.1" // { dependencies = [ @@ -100360,16 +100630,18 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" + sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."glob-6.0.4" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."globby-4.1.0" sources."gossip-query-2.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-ansi-2.0.0" + sources."has-flag-4.0.0" sources."has-network-0.0.1" sources."has-symbols-1.0.1" (sources."has-value-1.0.0" // { @@ -100391,8 +100663,10 @@ in sources."he-0.5.0" sources."heap-0.2.6" sources."hoox-0.0.1" + sources."human-signals-1.1.1" sources."idb-kv-store-4.5.0" sources."ieee754-1.2.1" + sources."ignore-5.1.8" sources."immediate-3.2.3" sources."increment-buffer-1.0.1" sources."inflight-1.0.6" @@ -100413,7 +100687,7 @@ in sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-canonical-base64-1.1.1" (sources."is-data-descriptor-1.0.0" // { dependencies = [ @@ -100438,6 +100712,7 @@ in sources."is-negative-zero-2.0.1" sources."is-number-2.1.0" sources."is-number-object-1.0.4" + sources."is-options-1.0.1" (sources."is-plain-object-2.0.4" // { dependencies = [ sources."isobject-3.0.1" @@ -100445,15 +100720,12 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-set-2.0.2" + sources."is-stream-2.0.0" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."is-typed-array-1.1.4" sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.17" sources."is-weakmap-2.0.1" @@ -100462,6 +100734,14 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" + (sources."jitdb-2.0.7" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."push-stream-11.0.0" + sources."typedarray-to-buffer-4.0.0" + ]; + }) + sources."jsesc-3.0.2" sources."json-buffer-2.0.11" sources."kind-of-3.2.2" sources."layered-graph-1.1.3" @@ -100486,8 +100766,10 @@ in }) sources."levelup-4.4.0" sources."libnested-1.5.0" - sources."libsodium-0.7.8" - sources."libsodium-wrappers-0.7.8" + sources."libsodium-0.7.9" + sources."libsodium-wrappers-0.7.9" + sources."locate-path-5.0.0" + sources."lodash.debounce-4.0.8" sources."lodash.get-4.4.2" sources."log-symbols-1.0.2" sources."log-update-1.0.2" @@ -100502,7 +100784,9 @@ in sources."markdown-table-0.4.0" sources."math-random-1.0.4" sources."mdmanifest-1.0.8" + sources."merge-stream-2.0.0" sources."micromatch-2.3.11" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -100511,12 +100795,20 @@ in ]; }) sources."mkdirp-0.5.5" + sources."mkdirp-classic-0.5.3" sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" + sources."mri-1.1.6" sources."ms-2.1.2" sources."multiblob-1.13.7" sources."multiblob-http-1.0.0" sources."multicb-1.2.2" + (sources."multimatch-4.0.0" // { + dependencies = [ + sources."array-union-2.1.0" + sources."arrify-2.0.1" + ]; + }) sources."multiserver-3.7.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" @@ -100541,12 +100833,18 @@ in sources."napi-macros-2.0.0" sources."ncp-2.0.0" sources."nearley-2.20.1" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" sources."npm-prefix-1.2.0" + (sources."npm-run-path-4.0.1" // { + dependencies = [ + sources."path-key-3.1.1" + ]; + }) sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -100561,7 +100859,7 @@ in }) ]; }) - sources."object-inspect-1.9.0" + sources."object-inspect-1.7.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -100579,7 +100877,7 @@ in sources."observ-0.2.0" sources."observ-debounce-1.1.1" sources."obv-0.0.1" - sources."obz-1.0.2" + sources."obz-1.0.3" sources."on-change-network-0.0.2" sources."on-wakeup-1.0.1" sources."once-1.4.0" @@ -100589,11 +100887,16 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" + sources."p-defer-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" sources."packet-stream-2.0.5" sources."packet-stream-codec-1.1.3" sources."parse-entities-1.2.2" sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" @@ -100601,13 +100904,25 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."plur-2.1.2" + sources."polyraf-1.1.0" sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" + sources."prettier-2.2.1" + (sources."pretty-quick-3.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-3.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."private-box-0.3.1" sources."process-nextick-args-2.0.1" + sources."promisify-4loc-1.0.0" sources."promisize-1.1.2" sources."prr-1.0.1" sources."pull-abortable-4.0.0" + sources."pull-async-1.0.0" + sources."pull-awaitable-1.0.0" sources."pull-box-stream-1.0.13" sources."pull-cat-1.1.11" sources."pull-catch-1.0.1" @@ -100645,6 +100960,7 @@ in sources."pull-sink-through-0.0.0" sources."pull-sort-1.0.2" sources."pull-stream-3.6.14" + sources."pull-thenable-1.0.0" (sources."pull-through-1.0.18" // { dependencies = [ sources."looper-3.0.0" @@ -100660,10 +100976,28 @@ in sources."pull-write-1.1.4" sources."pull-write-file-0.2.4" sources."pull-ws-3.3.2" + sources."pump-3.0.0" sources."push-stream-10.1.2" sources."push-stream-to-pull-stream-1.0.3" + sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" + sources."random-access-chrome-file-1.1.4" + sources."random-access-file-2.1.5" + (sources."random-access-idb-1.2.1" // { + dependencies = [ + sources."buffer-from-0.1.2" + ]; + }) + (sources."random-access-idb-mutable-file-0.3.0" // { + dependencies = [ + sources."buffer-5.1.0" + sources."random-access-storage-1.3.0" + ]; + }) + sources."random-access-memory-3.1.2" + sources."random-access-storage-1.4.1" + sources."random-access-web-2.0.3" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" @@ -100728,7 +101062,7 @@ in }) sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."relative-url-1.0.2" (sources."remark-3.2.3" // { dependencies = [ @@ -100755,6 +101089,7 @@ in sources."rwlock-5.0.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."sanitize-filename-1.6.3" sources."secret-handshake-1.1.20" sources."secret-stack-6.3.2" sources."semver-5.7.1" @@ -100768,7 +101103,12 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - sources."side-channel-1.0.4" + (sources."side-channel-1.0.4" // { + dependencies = [ + sources."object-inspect-1.9.0" + ]; + }) + sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -100806,10 +101146,10 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-3.2.0" + sources."sodium-native-3.2.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" sources."ssb-blobs-1.2.2" @@ -100817,8 +101157,30 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" + (sources."ssb-db2-1.11.2" // { + dependencies = [ + sources."abstract-leveldown-6.2.3" + sources."flumecodec-0.0.1" + sources."level-6.0.1" + sources."level-codec-6.2.0" + sources."level-js-5.0.2" + sources."mkdirp-1.0.4" + sources."push-stream-11.0.0" + (sources."ssb-keys-8.0.2" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) + sources."typedarray-to-buffer-4.0.0" + ]; + }) sources."ssb-ebt-5.6.7" - sources."ssb-friends-4.3.0" + (sources."ssb-friends-4.4.3" // { + dependencies = [ + sources."flumecodec-0.0.1" + sources."level-codec-6.2.0" + ]; + }) sources."ssb-gossip-1.1.1" (sources."ssb-invite-2.1.6" // { dependencies = [ @@ -100845,6 +101207,7 @@ in sources."ssb-query-2.4.5" sources."ssb-ref-2.14.3" sources."ssb-replicate-1.3.2" + sources."ssb-sort-1.1.3" sources."ssb-unix-socket-1.0.0" sources."ssb-validate-4.1.3" sources."ssb-ws-6.2.3" @@ -100873,23 +101236,19 @@ in ]; }) sources."string-width-1.0.2" - (sources."string.prototype.trim-1.2.3" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trim-1.2.3" sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" + sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" (sources."tape-4.13.3" // { dependencies = [ sources."glob-7.1.6" sources."is-regex-1.0.5" - sources."object-inspect-1.7.0" ]; }) sources."text-table-0.2.0" @@ -100905,13 +101264,17 @@ in }) sources."to-space-case-1.0.0" sources."to-vfile-1.0.0" + sources."too-hot-1.0.0" + sources."traverse-0.6.6" sources."trim-0.0.1" sources."trim-lines-1.1.3" sources."trim-trailing-lines-1.1.4" + sources."truncate-utf8-bytes-1.0.2" sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" + sources."typedfastbitset-0.2.1" sources."typewiselite-1.0.0" sources."uint48be-2.0.1" sources."ultron-1.0.2" @@ -100936,7 +101299,9 @@ in sources."urix-0.1.0" sources."use-3.1.1" sources."user-home-2.0.0" + sources."utf8-byte-length-1.0.4" sources."util-deprecate-1.0.2" + sources."varint-5.0.2" sources."vfile-1.4.0" sources."vfile-find-down-1.0.0" sources."vfile-find-up-1.0.0" @@ -100946,11 +101311,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - (sources."which-typed-array-1.1.4" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."which-typed-array-1.1.4" sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" @@ -100961,7 +101322,7 @@ in buildInputs = globalBuildInputs; meta = { description = "network protocol layer for secure-scuttlebutt"; - homepage = https://github.com/ssbc/ssb-server; + homepage = "https://github.com/ssbc/ssb-server"; license = "MIT"; }; production = true; @@ -100979,7 +101340,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Send metric data from statsd to Stackdriver"; - homepage = https://www.stackdriver.com/; + homepage = "https://www.stackdriver.com"; license = "MIT"; }; production = true; @@ -101054,7 +101415,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.821.0" // { + (sources."aws-sdk-2.842.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -101094,10 +101455,11 @@ in sources."buffer-from-1.1.1" sources."bufferutil-1.3.0" sources."bufferview-1.0.1" - sources."bunyan-1.8.14" + sources."bunyan-1.8.15" sources."busboy-0.2.14" sources."bytebuffer-3.5.5" sources."bytes-3.1.0" + sources."call-bind-1.0.2" sources."camelcase-1.2.1" sources."caseless-0.11.0" sources."center-align-0.1.3" @@ -101192,14 +101554,14 @@ in dependencies = [ sources."cookie-0.4.1" sources."debug-4.1.1" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; }) (sources."engine.io-client-3.5.0" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; }) sources."engine.io-parser-2.2.1" @@ -101237,7 +101599,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -101248,6 +101610,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -101260,7 +101623,7 @@ in sources."debug-3.2.7" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-2.0.6" @@ -101315,7 +101678,7 @@ in sources."is-my-json-valid-2.20.5" sources."is-promise-2.2.2" sources."is-property-1.0.2" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -101544,7 +101907,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."ret-0.2.2" sources."rethinkdb-2.4.2" sources."retry-0.9.0" @@ -101580,7 +101943,7 @@ in sources."signal-exit-3.0.3" sources."slash-1.0.0" sources."sntp-1.0.9" - (sources."socket.io-2.4.0" // { + (sources."socket.io-2.4.1" // { dependencies = [ sources."debug-4.1.1" ]; @@ -101591,7 +101954,7 @@ in sources."debug-3.1.0" sources."isarray-2.0.1" sources."ms-2.0.0" - sources."socket.io-parser-3.3.1" + sources."socket.io-parser-3.3.2" ]; }) (sources."socket.io-parser-3.4.1" // { @@ -101642,7 +102005,7 @@ in dependencies = [ sources."debug-3.2.7" sources."form-data-2.5.1" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -101655,7 +102018,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.14.1" sources."lodash-3.10.1" - sources."qs-6.9.4" + sources."qs-6.9.6" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -101705,7 +102068,7 @@ in sources."uid2-0.0.3" sources."ultron-1.0.2" sources."unpipe-1.0.0" - (sources."uri-js-4.4.0" // { + (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -101820,35 +102183,35 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "13.8.0"; + version = "13.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz"; - sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.10.0.tgz"; + sha512 = "eDuLrL0wzPKbl5/TbNGZcbw0lTIGbDEr5W6lCODvb1gAg0ncbgCRt7oU0C2VFDvbrcY0A3MFZOwltwTRmc0XCw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/core-7.12.16" + sources."@babel/generator-7.12.15" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/parser-7.12.16" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -101859,7 +102222,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-7.0.3" + sources."ajv-7.1.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -101870,11 +102233,11 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.0" + sources."browserslist-4.16.3" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001185" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -101906,13 +102269,13 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.1.0" - sources."entities-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.634" + sources."electron-to-chromium-1.3.663" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -101921,14 +102284,14 @@ in sources."execall-2.0.0" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."file-entry-cache-6.0.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -101938,13 +102301,13 @@ in sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hosted-git-info-3.0.7" + sources."hosted-git-info-3.0.8" sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" sources."ignore-5.1.8" @@ -101979,9 +102342,9 @@ in sources."jsesc-2.5.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."kind-of-6.0.3" - sources."known-css-properties-0.20.0" + sources."known-css-properties-0.21.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.20" @@ -101990,12 +102353,12 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.1.0" sources."mathml-tag-names-2.1.3" - sources."mdast-util-from-markdown-0.8.4" - sources."mdast-util-to-markdown-0.6.2" + sources."mdast-util-from-markdown-0.8.5" + sources."mdast-util-to-markdown-0.6.5" sources."mdast-util-to-string-2.0.0" - sources."meow-8.1.0" + sources."meow-9.0.0" sources."merge2-1.4.1" - sources."micromark-2.11.2" + sources."micromark-2.11.4" sources."micromatch-4.0.2" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -102006,7 +102369,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" (sources."normalize-package-data-3.0.0" // { dependencies = [ sources."semver-7.3.4" @@ -102021,7 +102384,7 @@ in sources."p-try-2.2.0" sources."parent-module-1.0.1" sources."parse-entities-2.0.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -102049,6 +102412,7 @@ in sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.1.0" sources."punycode-2.1.1" + sources."queue-microtask-1.2.2" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -102069,11 +102433,11 @@ in sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."signal-exit-3.0.3" @@ -102115,7 +102479,7 @@ in sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.0.4" sources."unist-util-stringify-position-2.0.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" @@ -102132,7 +102496,101 @@ in buildInputs = globalBuildInputs; meta = { description = "A mighty, modern CSS linter."; - homepage = https://stylelint.io/; + homepage = "https://stylelint.io"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + svelte-language-server = nodeEnv.buildNodePackage { + name = "svelte-language-server"; + packageName = "svelte-language-server"; + version = "0.12.9"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.9.tgz"; + sha512 = "a1J4BTiP2uJ4LLk3/iuw4G9t2FbmTel0V8wyeuSVBPk+aZVAvt9sQ19Um0OFyUdwXWQVJn/jRTcrFYVXqE4Bgg=="; + }; + dependencies = [ + sources."@babel/code-frame-7.12.13" + sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/highlight-7.12.13" + sources."@emmetio/abbreviation-2.2.0" + sources."@emmetio/css-abbreviation-2.1.2" + sources."@emmetio/scanner-1.0.0" + sources."@types/node-14.14.26" + sources."@types/parse-json-4.0.0" + sources."@types/pug-2.0.4" + sources."@types/sass-1.16.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" + sources."binary-extensions-2.2.0" + sources."braces-3.0.2" + sources."callsites-3.1.0" + sources."chalk-2.4.2" + sources."chokidar-3.5.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."cosmiconfig-7.0.0" + sources."dedent-js-1.0.1" + sources."detect-indent-6.0.0" + sources."emmet-2.3.0" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."estree-walker-2.0.2" + sources."fill-range-7.0.1" + sources."fsevents-2.3.2" + sources."glob-parent-5.1.1" + sources."has-flag-3.0.0" + sources."import-fresh-3.3.0" + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."jsonc-parser-2.3.1" + sources."lines-and-columns-1.1.6" + sources."lodash-4.17.20" + sources."lower-case-2.0.2" + sources."min-indent-1.0.1" + sources."no-case-3.0.4" + sources."normalize-path-3.0.0" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."pascal-case-3.1.2" + sources."path-type-4.0.0" + sources."picomatch-2.2.2" + sources."prettier-2.2.1" + sources."prettier-plugin-svelte-2.1.4" + sources."readdirp-3.5.0" + sources."resolve-from-4.0.0" + sources."source-map-0.7.3" + sources."strip-indent-3.0.0" + sources."supports-color-5.5.0" + sources."svelte-3.32.3" + sources."svelte-preprocess-4.6.8" + sources."svelte2tsx-0.1.169" + sources."to-regex-range-5.0.1" + sources."tslib-2.1.0" + sources."typescript-4.1.5" + sources."vscode-css-languageservice-5.0.0" + sources."vscode-emmet-helper-2.1.2" + sources."vscode-html-languageservice-4.0.0" + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageserver-7.0.0" + sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.16.0" + sources."vscode-nls-5.0.0" + sources."vscode-uri-2.1.2" + sources."yaml-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A language server for Svelte"; + homepage = "https://github.com/sveltejs/language-tools#readme"; license = "MIT"; }; production = true; @@ -102152,7 +102610,7 @@ in sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."boolbase-1.0.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."chalk-2.4.2" sources."coa-2.0.2" sources."color-convert-1.9.3" @@ -102175,20 +102633,20 @@ in }) sources."domelementtype-1.3.1" sources."domutils-1.7.0" - sources."entities-2.1.0" - sources."es-abstract-1.18.0-next.1" + sources."entities-2.2.0" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-date-object-1.0.2" sources."is-negative-zero-2.0.1" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-symbol-1.0.3" sources."js-yaml-3.14.1" sources."mdn-data-2.0.4" @@ -102218,7 +102676,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = https://github.com/svg/svgo; + homepage = "https://github.com/svg/svgo"; license = "MIT"; }; production = true; @@ -102430,7 +102888,7 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" (sources."graphlib-2.1.8" // { dependencies = [ sources."lodash-4.17.20" @@ -102620,7 +103078,7 @@ in dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" - sources."qs-6.9.4" + sources."qs-6.9.6" sources."superagent-3.8.3" ]; }) @@ -102718,7 +103176,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."spark-md5-1.0.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -102797,7 +103255,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.7" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -102917,7 +103375,7 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."long-4.0.0" - sources."mime-2.4.7" + sources."mime-2.5.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."minimist-1.2.5" @@ -102958,7 +103416,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-module-2.0.0" @@ -102997,7 +103455,7 @@ in sources."errno-0.1.8" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-1.0.0" @@ -103029,28 +103487,29 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.7.7"; + version = "11.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.7.7.tgz"; - sha512 = "YSF2xLyvX5odEb142kqU2x0oUmL6yj4+mDolKb+ul5y7/HKEUgjq2G4GwkEtIOij1B52mbvS+MApI4Fx5VhhMA=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.8.2.tgz"; + sha512 = "YrTGagGzWKXYw6VjW4uhJ1y7LoW8zqWZIr8sWgeQVIFE84+G/cHPoZ8RhFlia+RZ4YryZPNOqevuF4vG+dbKNQ=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/ast-tester-2.2.5" - sources."@textlint/ast-traverse-2.2.6" - sources."@textlint/feature-flag-3.2.5" - sources."@textlint/fixer-formatter-3.2.6" - sources."@textlint/kernel-3.3.7" - sources."@textlint/linter-formatter-3.2.6" - sources."@textlint/markdown-to-ast-6.2.6" - sources."@textlint/module-interop-1.1.5" - sources."@textlint/text-to-ast-3.2.5" - sources."@textlint/textlint-plugin-markdown-5.2.7" - sources."@textlint/textlint-plugin-text-4.2.7" - sources."@textlint/types-1.4.6" - sources."@textlint/utils-1.1.5" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/ast-tester-2.3.2" + sources."@textlint/ast-traverse-2.3.2" + sources."@textlint/feature-flag-3.3.2" + sources."@textlint/fixer-formatter-3.3.2" + sources."@textlint/kernel-3.4.2" + sources."@textlint/linter-formatter-3.3.2" + sources."@textlint/markdown-to-ast-6.3.2" + sources."@textlint/module-interop-1.2.2" + sources."@textlint/source-code-fixer-3.4.2" + sources."@textlint/text-to-ast-3.3.2" + sources."@textlint/textlint-plugin-markdown-5.3.2" + sources."@textlint/textlint-plugin-text-4.3.2" + sources."@textlint/types-1.5.2" + sources."@textlint/utils-1.2.2" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -103061,7 +103520,7 @@ in sources."boundary-1.0.1" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" (sources."chalk-1.1.3" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -103084,8 +103543,6 @@ in sources."define-properties-1.1.3" sources."diff-4.0.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."extend-3.0.2" @@ -103098,10 +103555,10 @@ in sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-symbols-1.0.1" @@ -103113,7 +103570,6 @@ in sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" @@ -103121,8 +103577,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-hexadecimal-1.0.4" sources."is-plain-obj-1.1.0" - sources."is-regex-1.1.1" - sources."is-symbol-1.0.3" + sources."is-regex-1.1.2" sources."is-utf8-0.2.1" sources."is-whitespace-character-1.0.4" sources."is-word-character-1.0.4" @@ -103130,7 +103585,7 @@ in sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."jsonify-0.0.0" sources."levn-0.4.1" sources."load-json-file-1.1.0" @@ -103146,10 +103601,8 @@ in sources."ms-2.1.2" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" - sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" - sources."object.assign-4.1.2" sources."once-1.4.0" sources."optionator-0.9.1" sources."p-limit-1.3.0" @@ -103181,13 +103634,13 @@ in ]; }) sources."readable-stream-2.3.7" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."remark-frontmatter-1.3.3" sources."remark-parse-5.0.0" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.7.1" @@ -103203,8 +103656,6 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" (sources."strip-ansi-6.0.0" // { dependencies = [ @@ -103253,7 +103704,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The pluggable linting tool for text and markdown."; - homepage = https://github.com/textlint/textlint/; + homepage = "https://github.com/textlint/textlint/"; license = "MIT"; }; production = true; @@ -103269,13 +103720,13 @@ in sha1 = "9139c65b8da891c983b368a50a286338cd76777a"; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.5" + sources."@textlint/ast-node-types-4.4.1" sources."txt-to-ast-3.0.3" ]; buildInputs = globalBuildInputs; meta = { description = "Latex plugin for [textlint](https://github.com/textlint/textlint "textlint")."; - homepage = https://github.com/elzup/textlint-plugin-latex; + homepage = "https://github.com/elzup/textlint-plugin-latex"; license = "MIT"; }; production = true; @@ -103291,30 +103742,20 @@ in sha1 = "8d49dd02b3a7a88d7e6b32817f9e202c5c6596b9"; }; dependencies = [ - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.2" - sources."is-date-object-1.0.2" - sources."is-regex-1.1.1" - sources."is-symbol-1.0.3" sources."match-index-1.0.3" - sources."object-inspect-1.9.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."regexp.prototype.flags-1.3.0" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."regexp.prototype.flags-1.3.1" ]; buildInputs = globalBuildInputs; meta = { description = "textlint rule check that abbreviations within parentheses."; - homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses; + homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses"; license = "MIT"; }; production = true; @@ -103330,13 +103771,13 @@ in sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/types-1.4.6" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/types-1.5.2" sources."@types/hast-2.3.1" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" @@ -103446,7 +103887,7 @@ in ]; }) sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -103553,7 +103994,7 @@ in }) sources."parse-english-4.2.0" sources."parse-entities-2.0.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" sources."parse-latin-4.3.0" sources."parse5-6.0.1" sources."path-exists-4.0.0" @@ -103593,7 +104034,7 @@ in sources."remark-retext-4.0.0" sources."remark-stringify-8.1.1" sources."repeat-string-1.6.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."retext-english-3.0.4" @@ -103683,7 +104124,7 @@ in sources."is-plain-obj-2.1.0" ]; }) - sources."unified-message-control-3.0.2" + sources."unified-message-control-3.0.3" sources."unique-string-2.0.0" sources."unist-util-inspect-5.0.1" sources."unist-util-is-4.0.4" @@ -103729,7 +104170,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule for alex"; - homepage = https://github.com/textlint-rule/textlint-rule-alex; + homepage = "https://github.com/textlint-rule/textlint-rule-alex"; license = "MIT"; }; production = true; @@ -103754,7 +104195,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check common misspellings"; - homepage = https://github.com/io-monad/textlint-rule-common-misspellings; + homepage = "https://github.com/io-monad/textlint-rule-common-misspellings"; license = "GPL-3.0"; }; production = true; @@ -103776,7 +104217,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to check correct usage of diacritics"; - homepage = https://github.com/sapegin/textlint-rule-diacritics; + homepage = "https://github.com/sapegin/textlint-rule-diacritics"; license = "MIT"; }; production = true; @@ -103813,7 +104254,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that specify the maximum word count of a sentence."; - homepage = https://github.com/azu/textlint-rule-en-max-word-count; + homepage = "https://github.com/azu/textlint-rule-en-max-word-count"; license = "MIT"; }; production = true; @@ -103866,24 +104307,24 @@ in sha512 = "HydBbkWjnMn4KrnlpnusY1BGjIG+64UySxRCvRphUAIiuJL2nbkdrIIiOjwfQhllKUa7Sf33bs6RAcbEWjZVfg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/types-1.4.6" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/types-1.5.2" sources."boundary-1.0.1" sources."buffer-from-1.1.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."concat-stream-2.0.0" sources."define-properties-1.1.3" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inherits-2.0.4" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-date-object-1.0.2" sources."is-negative-zero-2.0.1" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-symbol-1.0.3" sources."object-assign-4.1.1" sources."object-inspect-1.9.0" @@ -103907,7 +104348,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check no start with duplicated conjunction."; - homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction; + homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction"; license = "MIT"; }; production = true; @@ -103924,7 +104365,7 @@ in }; dependencies = [ sources."array.prototype.find-2.1.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."check-ends-with-period-1.0.1" sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" @@ -103932,12 +104373,12 @@ in sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-date-object-1.0.2" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-symbol-1.0.3" sources."object-inspect-1.9.0" sources."object-keys-1.1.1" @@ -103948,7 +104389,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check with or without period in list item."; - homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item; + homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item"; license = "MIT"; }; production = true; @@ -103958,14 +104399,14 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.8.tgz"; - sha512 = "D945uyFkeMo6KJhMJaFTEHudP+Jkl00rLOQKRibV1zl933muR6NXqz+uXAvitPAEWH20kwQA40E0Cd1t8nJQ1w=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.9.tgz"; + sha512 = "UW7nWrqBUHfz/sRLTFo40BNjwXOiXSHg00TJuYY4GVDQtsWRLyAsOnXSBqClP4i6wl7ejMBeYmB5mfllYAYMgA=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/types-1.4.6" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/types-1.5.2" sources."boundary-1.0.1" sources."lodash-4.17.20" sources."split-lines-2.0.0" @@ -103978,7 +104419,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to find filler words, buzzwords and chiches"; - homepage = https://github.com/sapegin/textlint-rule-stop-words; + homepage = "https://github.com/sapegin/textlint-rule-stop-words"; license = "MIT"; }; production = true; @@ -103988,14 +104429,14 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.4.tgz"; - sha512 = "kLw4qL8RwY2lCNqgKveHc5sjCDlS5Tdw2TXWOrHvSvQxqaVOwsv3+51oMIQLGfJzQrhFSMlSlw5MvfaOerBvPQ=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.5.tgz"; + sha512 = "VW+ea4ByLPddSUqoFkVVJF8zWnO8kqKwvC681wGFAjI4CYz9WhjEQH1ikhoEHXnd5AFXNArcjyoa8hoihrXy0w=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/types-1.4.6" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/types-1.5.2" sources."boundary-1.0.1" sources."lodash-4.17.20" sources."strip-json-comments-3.1.1" @@ -104008,7 +104449,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TextLint rule to check correct terms spelling"; - homepage = https://github.com/sapegin/textlint-rule-terminology; + homepage = "https://github.com/sapegin/textlint-rule-terminology"; license = "MIT"; }; production = true; @@ -104025,19 +104466,19 @@ in }; dependencies = [ sources."array-includes-3.1.2" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-capitalized-1.0.0" sources."is-date-object-1.0.2" sources."is-negative-zero-2.0.1" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-string-1.0.5" sources."is-symbol-1.0.3" sources."object-inspect-1.9.0" @@ -104049,7 +104490,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check unexpanded acronym word."; - homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym; + homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym"; license = "MIT"; }; production = true; @@ -104065,15 +104506,15 @@ in sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e"; }; dependencies = [ - sources."@textlint/ast-node-types-4.3.5" - sources."@textlint/types-1.4.6" + sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/types-1.5.2" sources."adverb-where-0.0.9" sources."boundary-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."define-properties-1.1.3" sources."e-prime-0.10.4" sources."function-bind-1.1.1" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."no-cliches-0.1.1" @@ -104092,7 +104533,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check your English style with write good"; - homepage = https://github.com/textlint-rule/textlint-rule-write-good; + homepage = "https://github.com/textlint-rule/textlint-rule-write-good"; license = "MIT"; }; production = true; @@ -104115,7 +104556,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -104191,7 +104632,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.8.2" + sources."core-js-3.8.3" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -104268,7 +104709,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."got-11.5.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -104346,7 +104787,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - (sources."needle-2.5.2" // { + (sources."needle-2.6.0" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" @@ -104414,7 +104855,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.1" + sources."peek-readable-3.1.3" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -104470,7 +104911,7 @@ in sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.1.3" - (sources."socket.io-parser-3.3.1" // { + (sources."socket.io-parser-3.3.2" // { dependencies = [ sources."component-emitter-1.3.0" sources."debug-3.1.0" @@ -104499,14 +104940,14 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.0.6" + sources."strtok3-6.0.8" sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" sources."to-array-0.1.4" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" - sources."token-types-2.0.0" + sources."token-types-2.1.1" sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" @@ -104516,7 +104957,7 @@ in sources."ua-parser-js-0.7.21" sources."uc.micro-1.0.6" sources."unpipe-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."urlsafe-base64-1.0.0" sources."util-deprecate-1.0.2" @@ -104530,7 +104971,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -104539,7 +104980,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The self-hosted Web IRC client"; - homepage = https://thelounge.chat/; + homepage = "https://thelounge.chat/"; license = "MIT"; }; production = true; @@ -104549,15 +104990,15 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.124.0"; + version = "0.125.2"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.124.0.tgz"; - sha512 = "ROXp1Ly7YyF+jC910DQyAWj++Qlw2lQv0qwYLNQwdDbjk4bsOXAfGO92wYTMPNei1GMJUmCxSxc3MjGBTS09Rg=="; + url = "https://registry.npmjs.org/three/-/three-0.125.2.tgz"; + sha512 = "7rIRO23jVKWcAPFdW/HREU2NZMGWPBZ4XwEMt0Ak0jwLUKVJhcKM55eCBWyGZq/KiQbeo1IeuAoo/9l2dzhTXA=="; }; buildInputs = globalBuildInputs; meta = { description = "JavaScript 3D library"; - homepage = https://threejs.org/; + homepage = "https://threejs.org/"; license = "MIT"; }; production = true; @@ -104629,7 +105070,7 @@ in sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-signature-1.2.0" @@ -104684,7 +105125,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-1.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."uuid-8.3.2" sources."verror-1.10.0" (sources."winston-2.4.5" // { @@ -104711,10 +105152,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.12.0"; + version = "7.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.12.0.tgz"; - sha512 = "ArYQDI90SwshcxQBE8ogpY1UHMwm5aiZ4GtqzGZG+wn9F5jHUbkDwNXfbVIGQZrFcg/vDtzhscUzI7UIphjJMA=="; + url = "https://registry.npmjs.org/triton/-/triton-7.12.2.tgz"; + sha512 = "xzGDHq2Jt6THs+/Kz1XiTEaco67KmeBzUFqCROPIaMS4BL8UNXoY0cU2ZyH1/4Brrzn70muAOgl7PYDokNb4Pw=="; }; dependencies = [ sources."asn1-0.2.4" @@ -104899,7 +105340,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; - homepage = https://github.com/joyent/node-triton; + homepage = "https://github.com/joyent/node-triton"; license = "MPL-2.0"; }; production = true; @@ -104948,7 +105389,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TSUN: a repl for TypeScript Upgraded Node"; - homepage = https://github.com/HerringtonDarkholme/typescript-repl; + homepage = "https://github.com/HerringtonDarkholme/typescript-repl"; license = "MIT"; }; production = true; @@ -104981,15 +105422,15 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.1.3"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; - sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz"; + sha512 = "6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA=="; }; buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; - homepage = https://www.typescriptlang.org/; + homepage = "https://www.typescriptlang.org/"; license = "Apache-2.0"; }; production = true; @@ -104999,17 +105440,17 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.4.0.tgz"; - sha512 = "K8jNOmDFn+QfrCh8ujby2pGDs5rpjYZQn+zvQnf42rxG4IHbfw5CHoMvbGkWPK/J5Gw8/l5K3i03kVZC2IBElg=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.1.tgz"; + sha512 = "60Kguhwk/R1BB4pEIb6B9C7Ix7JzLzYnsODlmorYMPjMeEV0rCBqTR6FGAj4wVw/eHrHcpwLENmmURKUd8aybA=="; }; dependencies = [ sources."command-exists-1.2.6" sources."commander-2.20.3" sources."crypto-random-string-1.0.0" sources."fs-extra-7.0.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."jsonfile-4.0.0" sources."p-debounce-1.0.0" sources."temp-dir-1.0.0" @@ -105026,6 +105467,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Language Server Protocol (LSP) implementation for TypeScript using tsserver"; + homepage = "https://github.com/theia-ide/typescript-language-server#readme"; license = "Apache-2.0"; }; production = true; @@ -105035,10 +105477,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.4"; + version = "3.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; - sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.7.tgz"; + sha512 = "SIZhkoh+U/wjW+BHGhVwE9nt8tWJspncloBcFapkpGRwNPqcH8pzX36BXe3TPBjzHWPMUZotpCigak/udWNr1Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -105084,7 +105526,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -105240,7 +105682,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."open-7.3.0" + sources."open-7.3.1" sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { dependencies = [ @@ -105296,7 +105738,7 @@ in ]; }) sources."socket.io-adapter-2.0.3" - (sources."socket.io-parser-4.0.3" // { + (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -105338,7 +105780,7 @@ in }) sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."y18n-5.0.5" sources."yallist-2.1.2" sources."yargs-16.2.0" @@ -105357,10 +105799,10 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.17.3"; + version = "5.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.17.3.tgz"; - sha512 = "gxLAxIxFmq+36eB0ETCo4F29+/gWFfGftLxpCs8/fVKW9ILfJnEBd3M+7qdQKRHhVbImqsPetaKzwtIYH7/EPw=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.19.1.tgz"; + sha512 = "zUyyUYl2GgpAqdaQ3f/riNdaued3030hiJAjreX7/3XBiJ64vmF1l42x3KD8rq24ff9xLFwe0qyfnQOk4nK+fg=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -105387,7 +105829,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."d3-array-2.9.1" + sources."d3-array-2.11.0" sources."d3-color-2.0.0" sources."d3-delaunay-5.3.0" sources."d3-dispatch-2.0.0" @@ -105426,6 +105868,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + sources."internmap-1.0.0" sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" @@ -105437,7 +105880,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.3" sources."nan-2.14.2" - sources."needle-2.5.2" + sources."needle-2.6.0" sources."node-fetch-2.6.1" sources."node-pre-gyp-0.11.0" sources."nopt-4.0.3" @@ -105457,7 +105900,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."require-directory-2.1.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."rimraf-2.7.1" sources."rw-1.3.3" sources."safe-buffer-5.1.2" @@ -105475,7 +105918,7 @@ in sources."tar-4.4.13" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" - sources."vega-5.17.3" + sources."vega-5.19.1" sources."vega-canvas-1.2.6" sources."vega-crossfilter-4.0.5" sources."vega-dataflow-5.7.3" @@ -105484,18 +105927,18 @@ in sources."vega-expression-4.0.1" sources."vega-force-4.0.7" sources."vega-format-1.0.4" - sources."vega-functions-5.10.0" + sources."vega-functions-5.12.0" sources."vega-geo-4.3.8" sources."vega-hierarchy-4.0.9" sources."vega-label-1.0.0" sources."vega-loader-4.4.0" - sources."vega-parser-6.1.2" + sources."vega-parser-6.1.3" sources."vega-projection-1.4.5" sources."vega-regression-1.0.9" sources."vega-runtime-6.1.3" sources."vega-scale-7.1.1" - sources."vega-scenegraph-4.9.2" - sources."vega-selections-5.1.5" + sources."vega-scenegraph-4.9.3" + sources."vega-selections-5.3.0" sources."vega-statistics-1.7.9" sources."vega-time-2.0.4" sources."vega-transforms-4.9.3" @@ -105577,7 +106020,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Vega-Lite is a concise high-level language for interactive visualization."; - homepage = https://vega.github.io/vega-lite/; + homepage = "https://vega.github.io/vega-lite/"; license = "BSD-3-Clause"; }; production = true; @@ -105763,13 +106206,13 @@ in "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; - version = "1.5.3"; + version = "1.6.1"; 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.66" - sources."@types/vscode-1.52.0" + sources."@types/vscode-1.53.0" sources."@types/yauzl-2.9.1" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -105828,7 +106271,7 @@ in }) sources."base64-js-1.5.1" sources."big.js-5.2.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.1.3" @@ -105864,7 +106307,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -105959,7 +106402,7 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -105967,10 +106410,17 @@ in 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."enhanced-resolve-4.5.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."memory-fs-0.5.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."entities-2.1.0" sources."errno-0.1.8" - (sources."es-abstract-1.18.0-next.1" // { + (sources."es-abstract-1.18.0-next.2" // { dependencies = [ sources."object.assign-4.1.2" ]; @@ -106028,18 +106478,7 @@ in 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."findup-sync-3.0.0" sources."flat-4.1.1" (sources."flush-write-stream-1.1.1" // { dependencies = [ @@ -106062,7 +106501,7 @@ in sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.3" sources."glob-parent-5.1.1" @@ -106072,7 +106511,7 @@ in ]; }) sources."global-prefix-1.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -106114,7 +106553,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" - sources."is-callable-1.2.2" + sources."is-callable-1.2.3" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -106125,7 +106564,7 @@ in sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-symbol-1.0.3" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -106135,16 +106574,12 @@ in 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."json5-1.0.1" 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."loader-utils-1.4.0" sources."locate-path-3.0.0" sources."lodash-4.17.20" sources."log-symbols-3.0.0" @@ -106159,7 +106594,7 @@ in }) sources."md5.js-1.3.5" sources."mdurl-1.0.1" - (sources."memory-fs-0.5.0" // { + (sources."memory-fs-0.4.1" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -106167,7 +106602,27 @@ in ]; }) sources."memory-streams-0.1.3" - sources."micromatch-4.0.2" + (sources."micromatch-3.1.10" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-range-2.1.1" + ]; + }) (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.11.9" @@ -106358,7 +106813,7 @@ in 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."source-map-url-0.4.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."ssri-6.0.1" @@ -106431,6 +106886,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-loader-6.2.2" // { dependencies = [ + sources."micromatch-4.0.2" sources."semver-6.3.0" ]; }) @@ -106439,7 +106895,7 @@ in sources."tunnel-0.0.4" sources."typed-rest-client-1.2.0" sources."typedarray-0.0.6" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."uc.micro-1.0.6" sources."underscore-1.8.3" sources."union-value-1.0.1" @@ -106457,7 +106913,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -106474,12 +106930,13 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."vm-browserify-1.1.2" - sources."vsce-1.83.0" - sources."vscode-debugadapter-testsupport-1.43.0" - sources."vscode-debugprotocol-1.43.0" + sources."vsce-1.85.0" + sources."vscode-debugadapter-testsupport-1.44.0" + sources."vscode-debugprotocol-1.44.0" (sources."watchpack-1.7.5" // { dependencies = [ - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" + sources."fsevents-2.3.2" sources."readdirp-3.5.0" ]; }) @@ -106499,7 +106956,6 @@ in 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" @@ -106507,32 +106963,7 @@ in 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-4.46.0" (sources."webpack-cli-3.3.12" // { dependencies = [ sources."supports-color-6.1.0" @@ -106554,6 +106985,7 @@ in sources."xtend-4.0.2" sources."y18n-4.0.1" sources."yallist-3.1.1" + sources."yaml-1.10.0" (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -106681,7 +107113,7 @@ in sources."git-clone-0.1.0" sources."glob-7.1.6" sources."got-6.7.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gray-matter-2.1.1" sources."handlebars-4.7.6" sources."har-schema-2.0.0" @@ -106826,12 +107258,12 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.7" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" sources."unzip-response-2.0.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" sources."user-home-2.0.0" @@ -106867,9 +107299,9 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -106885,7 +107317,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -106937,7 +107369,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bootstrap-vue-helper-json-1.1.1" (sources."boxen-3.2.0" // { dependencies = [ @@ -107085,7 +107517,7 @@ in sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."ms-2.1.2" - sources."vue-eslint-parser-7.3.0" + sources."vue-eslint-parser-7.4.1" ]; }) sources."eslint-scope-4.0.3" @@ -107093,7 +107525,7 @@ in sources."eslint-visitor-keys-1.3.0" sources."espree-5.0.1" sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -107160,7 +107592,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -107181,7 +107613,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -107268,7 +107700,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-beautify-1.13.0" // { + (sources."js-beautify-1.13.5" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -107279,7 +107711,7 @@ in sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."jsonc-parser-1.0.3" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -107490,7 +107922,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -107554,7 +107986,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."space-separated-tokens-1.1.5" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -107627,7 +108059,7 @@ in sources."source-map-0.7.3" ]; }) - sources."stylus-supremacy-2.14.5" + sources."stylus-supremacy-2.15.0" sources."supports-color-5.5.0" sources."symbol-0.2.3" (sources."table-5.4.6" // { @@ -107659,7 +108091,7 @@ in sources."type-check-0.3.2" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."typescript-3.9.7" + sources."typescript-3.9.9" (sources."typescript-eslint-parser-16.0.1" // { dependencies = [ sources."semver-5.5.0" @@ -107710,7 +108142,7 @@ in }) sources."untildify-2.1.0" sources."update-notifier-3.0.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -107786,7 +108218,7 @@ in buildInputs = globalBuildInputs; meta = { description = "vue-language-server"; - homepage = https://github.com/vuejs/vetur/tree/master/server; + homepage = "https://github.com/vuejs/vetur/tree/master/server"; license = "MIT"; }; production = true; @@ -107796,15 +108228,15 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-5.4.1.tgz"; - sha512 = "AnTjSFtvidZfmVYzvceM/XixsigiWU3l66UzcxgXxXhOoEQU5ZHlXFGVJdHEYfkI5SnEyDG+WlhsdTUHNLOXJw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-5.5.0.tgz"; + sha512 = "f+NHiYwbTS0X6eSLkBDWoCYkkIJweVazGf4MD8S+kRX/5z40WsYsnRdVWG+p34Z6rCyNvlHHrnO2S1W8WWg7Tw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -107831,7 +108263,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/yauzl-2.9.1" sources."JSONSelect-0.2.1" sources."acorn-7.4.1" @@ -107902,9 +108334,9 @@ in }) sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" - sources."bl-4.0.3" + sources."bl-4.1.0" sources."bluebird-2.9.34" sources."boolbase-1.0.0" (sources."boxen-4.2.0" // { @@ -107926,15 +108358,15 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-6.0.0" sources."caseless-0.12.0" sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.3" - (sources."chokidar-3.4.3" // { + (sources."chokidar-3.5.1" // { dependencies = [ - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" ]; }) (sources."chrome-launcher-0.13.4" // { @@ -107994,7 +108426,7 @@ in sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" - sources."crc32-stream-4.0.1" + sources."crc32-stream-4.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."css-select-1.2.0" @@ -108036,8 +108468,6 @@ in sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."es6-error-4.1.1" sources."es6-promise-2.3.0" sources."es6-promisify-6.1.1" @@ -108066,7 +108496,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -108165,7 +108595,7 @@ in ]; }) sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -108182,7 +108612,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graceful-readlink-1.0.1" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -108208,7 +108638,7 @@ in sources."human-signals-1.1.1" sources."ieee754-1.2.1" sources."ignore-4.0.6" - sources."import-fresh-3.2.1" + sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -108221,7 +108651,6 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -108238,10 +108667,9 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-relative-0.1.3" sources."is-stream-2.0.0" - sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -108368,7 +108796,7 @@ in sources."neo-async-2.6.2" sources."next-tick-1.1.0" sources."node-forge-0.10.0" - (sources."node-notifier-8.0.0" // { + (sources."node-notifier-8.0.1" // { dependencies = [ sources."uuid-8.3.2" ]; @@ -108392,11 +108820,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -108453,7 +108879,7 @@ in sources."readdirp-3.5.0" sources."regenerator-runtime-0.13.7" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."regexpp-3.1.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -108543,11 +108969,11 @@ in sources."kind-of-3.2.2" ]; }) - sources."sonic-boom-1.3.0" + sources."sonic-boom-1.3.2" 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."source-map-url-0.4.1" sources."spawn-sync-1.0.15" sources."split-0.3.3" sources."split-string-3.1.0" @@ -108579,8 +109005,6 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" @@ -108643,7 +109067,7 @@ in }) sources."upath-2.0.1" sources."update-notifier-5.0.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -108652,7 +109076,7 @@ in sources."v8-compile-cache-2.2.0" sources."verror-1.10.0" sources."vfile-location-3.2.0" - sources."watchpack-1.7.4" + sources."watchpack-1.7.5" (sources."watchpack-chokidar2-2.0.1" // { dependencies = [ sources."anymatch-2.0.0" @@ -108698,7 +109122,7 @@ in ]; }) sources."write-file-atomic-3.0.3" - sources."ws-7.3.1" + sources."ws-7.4.2" sources."xdg-basedir-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -108727,7 +109151,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A command line tool to help build, run, and test web extensions"; - homepage = https://github.com/mozilla/web-ext; + homepage = "https://github.com/mozilla/web-ext"; license = "MPL-2.0"; }; production = true; @@ -108737,48 +109161,46 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.11.1"; + version = "5.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.11.1.tgz"; - sha512 = "tNUIdAmYJv+nupRs/U/gqmADm6fgrf5xE+rSlSsf2PgsGO7j2WG7ccU6AWNlOJlHFl+HnmXlBmHIkiLf+XA9mQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.21.2.tgz"; + sha512 = "xHflCenx+AM4uWKX71SWHhxml5aMXdy2tu/vdi4lClm7PADKxlyDAFFN1rEFzNV0MAoPpHtBeJnl/+K6F4QBPg=="; }; dependencies = [ sources."@types/eslint-7.2.6" sources."@types/eslint-scope-3.7.0" - sources."@types/estree-0.0.45" - sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.20" - sources."@webassemblyjs/ast-1.9.1" - sources."@webassemblyjs/floating-point-hex-parser-1.9.1" - sources."@webassemblyjs/helper-api-error-1.9.1" - sources."@webassemblyjs/helper-buffer-1.9.1" - sources."@webassemblyjs/helper-code-frame-1.9.1" - sources."@webassemblyjs/helper-fsm-1.9.1" - sources."@webassemblyjs/helper-module-context-1.9.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" - sources."@webassemblyjs/helper-wasm-section-1.9.1" - sources."@webassemblyjs/ieee754-1.9.1" - sources."@webassemblyjs/leb128-1.9.1" - sources."@webassemblyjs/utf8-1.9.1" - sources."@webassemblyjs/wasm-edit-1.9.1" - sources."@webassemblyjs/wasm-gen-1.9.1" - sources."@webassemblyjs/wasm-opt-1.9.1" - sources."@webassemblyjs/wasm-parser-1.9.1" - sources."@webassemblyjs/wast-parser-1.9.1" - sources."@webassemblyjs/wast-printer-1.9.1" + sources."@types/estree-0.0.46" + sources."@types/json-schema-7.0.7" + sources."@types/node-14.14.26" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-buffer-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/helper-wasm-section-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/wasm-edit-1.11.0" + sources."@webassemblyjs/wasm-gen-1.11.0" + sources."@webassemblyjs/wasm-opt-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.0.4" + sources."acorn-8.0.5" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.16.0" + sources."browserslist-4.16.3" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001173" + sources."caniuse-lite-1.0.30001185" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.634" - sources."enhanced-resolve-5.4.1" + sources."electron-to-chromium-1.3.663" + sources."enhanced-resolve-5.7.0" + sources."es-module-lexer-0.3.26" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -108790,24 +109212,19 @@ in sources."events-3.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."find-up-5.0.0" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."jest-worker-26.6.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."loader-runner-4.1.0" - sources."locate-path-6.0.0" + sources."loader-runner-4.2.0" sources."merge-stream-2.0.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."neo-async-2.6.2" - sources."node-releases-1.1.69" + sources."node-releases-1.1.70" sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - sources."pkg-dir-5.0.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" @@ -108823,17 +109240,17 @@ in sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-5.0.3" + sources."terser-webpack-plugin-5.1.1" sources."tslib-1.14.1" - sources."uri-js-4.4.0" - sources."watchpack-2.1.0" + sources."uri-js-4.4.1" + sources."watchpack-2.1.1" sources."webpack-sources-2.2.0" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; - homepage = https://github.com/webpack/webpack; + homepage = "https://github.com/webpack/webpack"; license = "MIT"; }; production = true; @@ -108843,21 +109260,23 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.3.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.3.1.tgz"; - sha512 = "/F4+9QNZM/qKzzL9/06Am8NXIkGV+/NqQ62Dx7DSqudxxpAgBqYn6V7+zp+0Y7JuWksKUbczRY3wMTd+7Uj6OA=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.5.0.tgz"; + sha512 = "wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.2" - sources."@webpack-cli/info-1.2.1" - sources."@webpack-cli/serve-1.2.1" + sources."@webpack-cli/configtest-1.0.1" + sources."@webpack-cli/info-1.2.2" + sources."@webpack-cli/serve-1.3.0" sources."ansi-colors-4.1.1" + sources."clone-deep-4.0.1" sources."colorette-1.2.1" - sources."commander-6.2.1" + sources."commander-7.0.0" sources."cross-spawn-7.0.3" sources."enquirer-2.3.6" - sources."envinfo-7.7.3" + sources."envinfo-7.7.4" sources."execa-5.0.0" sources."fastest-levenshtein-1.0.12" sources."find-up-4.1.0" @@ -108868,10 +109287,12 @@ in sources."import-local-3.0.2" sources."interpret-2.2.0" sources."is-core-module-2.2.0" + sources."is-plain-object-2.0.4" sources."is-stream-2.0.0" sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."kind-of-6.0.3" sources."locate-path-5.0.0" - sources."lodash-4.17.20" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" @@ -108884,16 +109305,18 @@ in sources."path-parse-1.0.6" sources."pkg-dir-4.2.0" sources."rechoir-0.7.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" + sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."strip-final-newline-2.0.0" sources."v8-compile-cache-2.2.0" - sources."webpack-merge-4.2.2" + sources."webpack-merge-5.7.3" sources."which-2.0.2" + sources."wildcard-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -108908,15 +109331,15 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz"; - sha512 = "u4R3mRzZkbxQVa+MBWi2uVpB5W59H3ekZAJsQlKUTdl7Elcah2EhygTPLmeFXybQkf9i2+L0kn7ik9SnXa6ihQ=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz"; + sha512 = "A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ=="; }; dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -108968,7 +109391,7 @@ in sources."buffer-indexof-1.1.1" sources."bytes-3.0.0" sources."cache-base-1.0.1" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."camelcase-5.3.1" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -109045,8 +109468,6 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."errno-0.1.8" - sources."es-abstract-1.17.7" - sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" @@ -109103,7 +109524,7 @@ in ]; }) sources."find-up-3.0.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.13.2" sources."for-in-1.0.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -109112,7 +109533,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.0.2" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -109126,7 +109547,7 @@ in sources."pify-2.3.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."handle-thing-2.0.1" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -109161,7 +109582,6 @@ in sources."is-arguments-1.1.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -109178,9 +109598,8 @@ in sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.1" + sources."is-regex-1.1.2" sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" @@ -109232,11 +109651,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."obuf-1.1.2" sources."on-finished-2.3.0" @@ -109290,7 +109707,7 @@ in }) sources."readdirp-2.2.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" + sources."regexp.prototype.flags-1.3.1" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -109379,7 +109796,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -109411,8 +109828,6 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -109448,7 +109863,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -109464,7 +109879,7 @@ in sources."wbuf-1.7.3" (sources."webpack-dev-middleware-3.7.3" // { dependencies = [ - sources."mime-2.4.7" + sources."mime-2.5.0" ]; }) sources."webpack-log-2.0.0" @@ -109506,7 +109921,7 @@ in sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - sources."@types/json-schema-7.0.6" + sources."@types/json-schema-7.0.7" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."array-union-2.1.0" @@ -109515,18 +109930,18 @@ in sources."dir-glob-3.0.1" sources."emojis-list-3.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.10.0" + sources."fastq-1.10.1" sources."fill-range-7.0.1" sources."glob-parent-5.1.1" - sources."globby-11.0.1" + sources."globby-11.0.2" sources."ignore-5.1.8" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" sources."json-schema-traverse-0.4.1" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."loader-utils-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" @@ -109536,21 +109951,22 @@ in sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."punycode-2.1.1" + sources."queue-microtask-1.2.2" sources."randombytes-2.1.0" sources."reusify-1.0.4" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.0.0" sources."serialize-javascript-5.0.1" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { description = "Copy files && directories with webpack"; - homepage = https://github.com/webpack-contrib/copy-webpack-plugin; + homepage = "https://github.com/webpack-contrib/copy-webpack-plugin"; license = "MIT"; }; production = true; @@ -109577,7 +109993,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.39" + sources."@types/node-13.13.41" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -109599,13 +110015,13 @@ in ]; }) sources."bittorrent-peerid-1.3.3" - (sources."bittorrent-protocol-3.2.0" // { + (sources."bittorrent-protocol-3.3.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.15.0" // { + (sources."bittorrent-tracker-9.16.1" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -109615,7 +110031,7 @@ in ]; }) sources."blob-to-buffer-1.2.9" - sources."block-stream2-2.0.0" + sources."block-stream2-2.1.0" sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" @@ -109642,7 +110058,7 @@ in sources."mime-1.6.0" ]; }) - sources."chunk-store-stream-4.1.1" + sources."chunk-store-stream-4.2.0" sources."clivas-0.2.0" sources."common-tags-1.8.0" sources."compact2string-1.4.1" @@ -109655,7 +110071,7 @@ in ]; }) sources."core-util-is-1.0.2" - sources."create-torrent-4.4.2" + sources."create-torrent-4.5.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" (sources."dlnacasts-0.1.0" // { @@ -109668,13 +110084,13 @@ in sources."ecstatic-4.1.4" sources."ee-first-1.1.1" sources."elementtree-0.1.7" - sources."end-of-stream-1.4.1" + sources."end-of-stream-1.4.4" sources."err-code-2.0.3" sources."escape-html-1.0.3" sources."executable-4.1.1" sources."filestream-5.0.0" sources."freelist-1.0.3" - (sources."fs-chunk-store-2.0.2" // { + (sources."fs-chunk-store-2.0.3" // { dependencies = [ sources."thunky-1.1.0" ]; @@ -109700,7 +110116,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."junk-3.1.0" - sources."k-bucket-5.0.0" + sources."k-bucket-5.1.0" sources."k-rpc-5.1.0" sources."k-rpc-socket-1.11.1" sources."last-one-wins-1.0.4" @@ -109717,22 +110133,22 @@ in sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" sources."mediasource-2.4.0" - sources."memory-chunk-store-1.3.0" - sources."mime-2.4.7" + sources."memory-chunk-store-1.3.2" + sources."mime-2.5.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."mp4-box-encoding-1.4.1" - sources."mp4-stream-3.1.0" + sources."mp4-stream-3.1.2" sources."ms-2.0.0" (sources."multicast-dns-6.2.3" // { dependencies = [ sources."thunky-1.1.0" ]; }) - sources."multistream-4.0.1" + sources."multistream-4.1.0" sources."napi-macros-2.0.0" sources."netmask-1.0.6" sources."network-address-1.1.2" @@ -109742,7 +110158,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.3.0" + sources."open-7.4.0" sources."package-json-versionify-1.0.4" (sources."parse-torrent-7.1.3" // { dependencies = [ @@ -109765,7 +110181,7 @@ in sources."pump-3.0.0" sources."qap-3.3.1" sources."queue-microtask-1.2.2" - sources."random-access-file-2.1.4" + sources."random-access-file-2.1.5" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" @@ -109780,8 +110196,8 @@ in ]; }) sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" - sources."run-parallel-limit-1.0.6" + sources."run-parallel-1.2.0" + sources."run-parallel-limit-1.1.0" sources."run-series-1.1.9" sources."rusha-0.8.13" sources."safe-buffer-5.2.1" @@ -109796,7 +110212,7 @@ in ]; }) sources."simple-sha1-3.0.1" - (sources."simple-websocket-8.1.1" // { + (sources."simple-websocket-9.1.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -109842,10 +110258,10 @@ in sources."ut_pex-2.0.1" sources."utf-8-validate-5.0.4" sources."util-deprecate-1.0.2" - sources."utp-native-2.2.2" + sources."utp-native-2.3.0" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.112.0" // { + (sources."webtorrent-0.114.1" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -109853,13 +110269,13 @@ in sources."magnet-uri-6.1.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" - sources."parse-torrent-9.1.0" + sources."parse-torrent-9.1.3" sources."simple-get-4.0.0" ]; }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -109867,7 +110283,7 @@ in buildInputs = globalBuildInputs; meta = { description = "WebTorrent, the streaming torrent client. For the command line."; - homepage = https://webtorrent.io/; + homepage = "https://webtorrent.io"; license = "MIT"; }; production = true; @@ -109895,10 +110311,10 @@ in write-good = nodeEnv.buildNodePackage { name = "write-good"; packageName = "write-good"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/write-good/-/write-good-1.0.4.tgz"; - sha512 = "NA7P2MQ2yw4k+SYq9NQMB0GLchzoprbMRoJgMquLoWzucTozni8k/3hvXvldyDQbgPpPZObzOGvcB6UgqzggzQ=="; + url = "https://registry.npmjs.org/write-good/-/write-good-1.0.6.tgz"; + sha512 = "7oWy7O3sGnc7ht7pL0ki5SDIt746vgthEdoKT5ldFYkTQ2J7xJn998qHRiiR1SEpFhNZYd0gZUwoRN3xM/GSkQ=="; }; dependencies = [ sources."adverb-where-0.2.1" @@ -109906,7 +110322,7 @@ in sources."e-prime-0.10.4" sources."no-cliches-0.2.2" sources."passive-voice-0.1.0" - sources."too-wordy-0.2.2" + sources."too-wordy-0.3.1" sources."weasel-words-0.1.1" ]; buildInputs = globalBuildInputs; @@ -109922,10 +110338,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.13.0"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.0.tgz"; - sha512 = "5FHW7dUAyIjEM3mRzIplE0pZut2K30cA+K7coaOxFxi82LTk/oiVLS4/AQFnOtGicSyoi4YOiRqpMZ04vgtuew=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.15.0.tgz"; + sha512 = "idaCYstdGoV5Pi7PKxbUkGHt6jAI3l+nxNWrsVCetxrEgfH6T7qytfT0pF3n4NdfDNPHPHcqnl69FzCFDVfHnQ=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -109963,7 +110379,7 @@ in sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" - sources."yaml-language-server-parser-0.1.1" + sources."yaml-language-server-parser-0.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -110001,16 +110417,16 @@ in sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" - sources."@babel/runtime-7.12.5" + sources."@babel/highlight-7.12.13" + sources."@babel/runtime-7.12.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.20" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -110039,11 +110455,7 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - (sources."axios-0.18.1" // { - dependencies = [ - sources."is-buffer-2.0.5" - ]; - }) + sources."axios-0.21.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -110136,7 +110548,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.8.2" + sources."core-js-3.8.3" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -110228,7 +110640,7 @@ in sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.1.0" sources."figures-2.0.0" - sources."filelist-1.0.1" + sources."filelist-1.0.2" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -110238,11 +110650,7 @@ in sources."find-up-2.1.0" sources."find-versions-2.0.0" sources."first-chunk-stream-2.0.0" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."follow-redirects-1.13.2" sources."for-in-1.0.2" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" @@ -110288,7 +110696,7 @@ in sources."p-cancelable-0.4.1" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."grouped-queue-1.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -110477,9 +110885,10 @@ in sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" sources."nice-try-1.0.5" + sources."node-fetch-2.6.1" sources."normalize-package-data-2.5.0" sources."normalize-url-2.0.1" - sources."npm-api-1.0.0" + sources."npm-api-1.0.1" sources."npm-conf-1.1.3" (sources."npm-keyword-5.0.0" // { dependencies = [ @@ -110535,7 +110944,7 @@ in sources."p-try-1.0.0" sources."package-json-5.0.0" sources."pad-component-0.0.1" - sources."paged-request-2.0.1" + sources."paged-request-2.0.2" sources."parse-help-1.0.0" sources."parse-json-2.2.0" sources."pascalcase-0.1.1" @@ -110613,7 +111022,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -110682,7 +111091,7 @@ in sources."sort-on-3.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."spawn-sync-1.0.15" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -110815,7 +111224,7 @@ in sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" @@ -110907,12 +111316,12 @@ in sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.12.0" // { + (sources."yeoman-generator-4.13.0" // { dependencies = [ sources."debug-4.3.2" sources."diff-4.0.2" sources."dir-glob-2.2.2" - sources."ejs-3.1.5" + sources."ejs-3.1.6" sources."find-up-3.0.0" sources."globby-9.2.0" sources."ignore-4.0.6" @@ -110932,7 +111341,7 @@ in sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."parse-json-5.1.0" + sources."parse-json-5.2.0" (sources."path-type-3.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -110962,7 +111371,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for running Yeoman generators"; - homepage = http://yeoman.io/; + homepage = "http://yeoman.io"; license = "BSD-2-Clause"; }; production = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/caqti/async.nix b/nixpkgs/pkgs/development/ocaml-modules/caqti/async.nix new file mode 100644 index 000000000000..0e0da6a94bb7 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/caqti/async.nix @@ -0,0 +1,11 @@ +{ lib, buildDunePackage, async_kernel, async_unix, caqti, core_kernel }: + +buildDunePackage { + pname = "caqti-async"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ]; + + meta = caqti.meta // { description = "Async support for Caqti"; }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix b/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix new file mode 100644 index 000000000000..6df0af597c21 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildDunePackage, cppo, logs, ptime, uri }: + +buildDunePackage rec { + pname = "caqti"; + version = "1.3.0"; + useDune2 = true; + + minimumOCamlVersion = "4.04"; + + src = fetchFromGitHub { + owner = "paurkedal"; + repo = "ocaml-${pname}"; + rev = "v${version}"; + sha256 = "1ksjchfjnh059wvd95my1sv9b0ild0dfaiynbf2xsaz7zg1y4xmw"; + }; + + buildInputs = [ cppo ]; + propagatedBuildInputs = [ logs ptime uri ]; + + meta = { + description = "Unified interface to relational database libraries"; + license = "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception"; + maintainers = with lib.maintainers; [ bcc32 ]; + homepage = "https://github.com/paurkedal/ocaml-caqti"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix new file mode 100644 index 000000000000..5f4f681540e9 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, caqti, mariadb }: + +buildDunePackage { + pname = "caqti-driver-mariadb"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ caqti mariadb ]; + + meta = caqti.meta // { + description = "MariaDB driver for Caqti using C bindings"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix new file mode 100644 index 000000000000..a1b427a5edf4 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, caqti, postgresql }: + +buildDunePackage { + pname = "caqti-driver-postgresql"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ caqti postgresql ]; + + meta = caqti.meta // { + description = "PostgreSQL driver for Caqti based on C bindings"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix new file mode 100644 index 000000000000..5282ba5ef505 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, caqti, ocaml_sqlite3 }: + +buildDunePackage { + pname = "caqti-driver-sqlite3"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; + + meta = caqti.meta // { + description = "Sqlite3 driver for Caqti using C bindings"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/caqti/dynload.nix b/nixpkgs/pkgs/development/ocaml-modules/caqti/dynload.nix new file mode 100644 index 000000000000..6ed86683728b --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/caqti/dynload.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, caqti }: + +buildDunePackage { + pname = "caqti-dynload"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ caqti ]; + + meta = caqti.meta // { + description = "Dynamic linking of Caqti drivers using findlib.dynload"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/caqti/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/caqti/lwt.nix new file mode 100644 index 000000000000..f02fa377f806 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/caqti/lwt.nix @@ -0,0 +1,11 @@ +{ lib, buildDunePackage, caqti, logs, lwt }: + +buildDunePackage { + pname = "caqti-lwt"; + useDune2 = true; + inherit (caqti) version src; + + propagatedBuildInputs = [ caqti logs lwt ]; + + meta = caqti.meta // { description = "Lwt support for Caqti"; }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/nixpkgs/pkgs/development/ocaml-modules/caqti/type-calendar.nix new file mode 100644 index 000000000000..d2050e2cf474 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/caqti/type-calendar.nix @@ -0,0 +1,14 @@ +{ lib, buildDunePackage, calendar, caqti }: + +buildDunePackage { + pname = "caqti-type-calendar"; + version = "1.2.0"; + useDune2 = true; + inherit (caqti) src; + + propagatedBuildInputs = [ calendar caqti ]; + + meta = caqti.meta // { + description = "Date and time field types using the calendar library"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix index acd5d83e4f1e..8b0c4ee9ebbc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchurl, buildDunePackage, bigarray-compat }: +{ lib, fetchurl, buildDunePackage, bigarray-compat, alcotest, ocaml }: buildDunePackage rec { pname = "cstruct"; - version = "5.0.0"; + version = "6.0.0"; useDune2 = true; @@ -10,11 +10,15 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz"; - sha256 = "1z403q2nkgz5x07j0ypy6q0mk2yxgqbp1jlqkngbajna7124x2pb"; + sha256 = "0xi6cj85z033fqrqdkwac6gg07629vzdhx03c3lhiwwc4lpnv8bq"; }; propagatedBuildInputs = [ bigarray-compat ]; + # alcotest isn't available for OCaml < 4.05 due to fmt + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest ]; + meta = { description = "Access C-like structures directly from OCaml"; license = lib.licenses.isc; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix index 113df1e89b5c..df8941d1260d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -8,7 +8,7 @@ buildDunePackage { pname = "cstruct-lwt"; inherit (cstruct) version src useDune2 meta; - minimumOCamlVersion = "4.02"; + minimumOCamlVersion = "4.03"; propagatedBuildInputs = [ cstruct lwt ]; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix index 44343812090d..aa003295e908 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,4 +1,7 @@ -{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned, ppxlib }: +{ lib, buildDunePackage, cstruct, sexplib, ppxlib, stdlib-shims +, ounit, cppo, ppx_sexp_conv, cstruct-unix, cstruct-sexp +, fetchpatch +}: if !lib.versionAtLeast (cstruct.version or "1") "3" then cstruct @@ -8,7 +11,22 @@ buildDunePackage { pname = "ppx_cstruct"; inherit (cstruct) version src useDune2 meta; - minimumOCamlVersion = "4.03"; + minimumOCamlVersion = "4.07"; - propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ]; + # prevent ANSI escape sequences from messing up the test cases + # https://github.com/mirage/ocaml-cstruct/issues/283 + patches = [ + (fetchpatch { + url = "https://github.com/mirage/ocaml-cstruct/pull/285/commits/60dfed98b4c34455bf339ac60e2ed5ef05feb48f.patch"; + sha256 = "1x9i62nrlfy9l44vb0a7qjfrg2wyki4c8nmmqnzwpcbkgxi3q6n5"; + }) + ]; + + propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; + + # disable until ppx_sexp_conv uses ppxlib 0.20.0 (or >= 0.16.0) + # since the propagation of the older ppxlib breaks the ppx_cstruct + # build. + doCheck = false; + checkInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ]; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix index 742cb6522ebf..b04810e48038 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -8,8 +8,11 @@ buildDunePackage rec { pname = "cstruct-sexp"; inherit (cstruct) version src useDune2 meta; - doCheck = lib.versionAtLeast ocaml.version "4.03"; - checkInputs = lib.optional doCheck alcotest; + minimumOCamlVersion = "4.03"; + + # alcotest is only available on OCaml >= 4.05 due to fmt + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ cstruct sexplib ]; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix b/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix index 491b2844ef1d..1c48b509c414 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix @@ -26,5 +26,12 @@ buildDunePackage rec { substituteInPlace src/curly.ml \ --replace "exe=\"curl\"" "exe=\"${curl}/bin/curl\"" ''; + + meta = with lib; { + description = "Curly is a brain dead wrapper around the curl command line utility"; + homepage = "https://github.com/rgrinberg/curly"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix index 0d4229c03ea3..cd14d2a06af5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "diet"; version = "0.4"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/ocaml-diet/releases/download/v${version}/diet-v${version}.tbz"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix index 6f0d355fed5b..e2d2a2c5dc9f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix @@ -4,7 +4,7 @@ }: with lib; let fetched = import ../../../build-support/coq/meta-fetch/default.nix - {inherit stdenv fetchzip; } ({ + {inherit lib stdenv fetchzip; } ({ release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5"; releaseRev = v: "v${v}"; @@ -17,9 +17,9 @@ buildDunePackage rec { minimumOCamlVersion = "4.04"; - buildInputs = [ perl ncurses ppxlib ]; + buildInputs = [ perl ncurses ]; - propagatedBuildInputs = [ camlp5 ppx_deriving re ]; + propagatedBuildInputs = [ camlp5 ppxlib ppx_deriving re ]; meta = { description = "Embeddable λProlog Interpreter"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin-watcher/default.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin-watcher/default.nix index 55dc9ca866be..82818b39492d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin-watcher/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin-watcher/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "irmin-watcher"; version = "0.4.1"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/irmin-watcher/releases/download/${version}/irmin-watcher-${version}.tbz"; sha256 = "00d4ph4jbsw6adp3zqdrwi099hfcf7p1xzi0685qr7bgcmandjfv"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix index 3fd7877d2bb4..053ab412f88d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, type_conv}: +{lib, buildOcamlJane, type_conv}: buildOcamlJane { name = "variantslib"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix b/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix index ec25e8e7f418..cc2c65009ff3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchFromGitHub -, menhir, ppx_deriving, re, uutf, uucp, ounit2 }: +, menhir, ppxlib, ppx_deriving, re, uutf, uucp, ounit2 }: buildDunePackage rec { pname = "jingoo"; @@ -17,7 +17,7 @@ buildDunePackage rec { }; buildInputs = [ menhir ]; - propagatedBuildInputs = [ ppx_deriving re uutf uucp ]; + propagatedBuildInputs = [ ppxlib ppx_deriving re uutf uucp ]; checkInputs = [ ounit2 ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix b/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix index 1c7622f2805a..3950c13d3fcf 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix @@ -1,4 +1,5 @@ { lib, buildDunePackage, fetchFromGitHub, alcotest, cryptokit, fmt, yojson +, ppxlib , base64, re, ppx_deriving }: buildDunePackage rec { @@ -16,6 +17,8 @@ buildDunePackage rec { sha256 = "1p799zk8j9c0002xzi2x7ndj1bzqf14744ampcqndrjnsi7mq71s"; }; + buildInputs = [ ppxlib ]; + propagatedBuildInputs = [ cryptokit fmt yojson base64 re ppx_deriving ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix b/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix index d1ebe95be89d..7636942033a9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix @@ -1,18 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, - rdkafka, zlib }: +{ lib, fetchurl, buildDunePackage +, rdkafka, zlib }: buildDunePackage rec { pname = "kafka"; - version = "0.4"; + version = "0.5"; - src = fetchFromGitHub { - owner = "didier-wenzek"; - repo = "ocaml-kafka"; - rev = version; - sha256 = "0lb8x0wh7sf8v9mjwhq32azjz54kw49fsjfb7m76z4nhxfkjw5hy"; - }; + useDune2 = true; - buildInputs = [ base cmdliner ocaml_lwt zlib ]; + src = fetchurl { + url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz"; + sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy"; + }; propagatedBuildInputs = [ rdkafka zlib ]; @@ -20,7 +18,7 @@ buildDunePackage rec { homepage = "https://github.com/didier-wenzek/ocaml-kafka"; description = "OCaml bindings for Kafka"; license = licenses.mit; - maintainers = [ maintainers.rixed ]; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/kafka/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/kafka/lwt.nix new file mode 100644 index 000000000000..a6cef66b2761 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/kafka/lwt.nix @@ -0,0 +1,19 @@ +{ buildDunePackage +, kafka +, lwt +, cmdliner +}: + +buildDunePackage rec { + pname = "kafka_lwt"; + + inherit (kafka) version useDune2 src; + + buildInputs = [ cmdliner ]; + + propagatedBuildInputs = [ kafka lwt ]; + + meta = kafka.meta // { + description = "OCaml bindings for Kafka, Lwt bindings"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix index 73548021688b..8910a8738129 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix @@ -24,5 +24,6 @@ buildDunePackage rec { maintainers = with maintainers; [ kazcw ]; + broken = true; # Not compatible with ppx_deriving ≥ 5.0 }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix index 59e13330e58f..28a6f5f43d7f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "lwt-dllist"; version = "1.0.0"; + useDune2 = true; + minimumOCamlVersion = "4.03"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix index 83146ef9104b..ee0c3b5b00cc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,21 +1,25 @@ { lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml -, cppo, ocaml-migrate-parsetree, ocplib-endian, result +, cppo, dune-configurator, ocaml-migrate-parsetree, ocplib-endian, result , mmap, seq +, ocaml-syntax-shims }: let inherit (lib) optional versionAtLeast; in buildDunePackage rec { pname = "lwt"; - version = "5.3.0"; + version = "5.4.0"; + + useDune2 = true; src = fetchzip { url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2"; + sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cppo ocaml-migrate-parsetree ] + buildInputs = [ cppo dune-configurator ocaml-migrate-parsetree ] + ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix index 05a5a28dcd7b..9213e1af94f2 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "lwt_log"; version = "1.1.1"; + useDune2 = true; + minimumOCamlVersion = "4.02"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix index e74a743e6b18..173094aacb84 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "1.1.3"; minimumOCamlVersion = "4.02"; + useDune2 = true; src = fetchzip { url = "https://github.com/aantron/${pname}/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix new file mode 100644 index 000000000000..ed3e5999b416 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, buildOasisPackage +, ctypes, mariadb, libmysqlclient }: + +buildOasisPackage rec { + pname = "mariadb"; + version = "1.1.4"; + + minimumOCamlVersion = "4.07.0"; + + src = fetchFromGitHub { + owner = "andrenth"; + repo = "ocaml-mariadb"; + rev = version; + sha256 = "1rxqvxr6sv4x2hsi05qm9jz0asaq969m71db4ckl672rcql1kwbr"; + }; + + buildInputs = [ mariadb libmysqlclient ]; + propagatedBuildInputs = [ ctypes ]; + + meta = { + description = "OCaml bindings for MariaDB"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcc32 ]; + homepage = "https://github.com/andrenth/ocaml-mariadb"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix index 4418c50568c8..7051c51cc5cc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,20 +1,21 @@ { lib, fetchurl, buildDunePackage, opaline, ocaml , alcotest -, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, odoc, ocaml_lwt, pandoc, re }: +, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc, ocaml_lwt, re, result, csexp +, pandoc}: buildDunePackage rec { pname = "mdx"; - version = "1.8.0"; + version = "1.8.1"; useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "1p2ip73da271as0x1gfbajik3mf1bkc8l54276vgacn1ja3saj52"; + sha256 = "1szik1lyg2vs8jrisnvjdc29n0ifls8mghimff4jcz6f48haa3cv"; }; nativeBuildInputs = [ cppo ]; buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version odoc re ]; + propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc re ]; checkInputs = [ alcotest ocaml_lwt pandoc ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix index 9b9a1ae185ec..d34513afef9f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "mirage-bootvar-unix"; version = "0.1.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/mirage-bootvar-unix/releases/download/${version}/mirage-bootvar-unix-${version}.tbz"; sha256 = "0r92s6y7nxg0ci330a7p0hii4if51iq0sixn20cnm5j4a2clprbf"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-device/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-device/default.nix index d86d133dedb6..d233277b7a79 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-device/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-device/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mirage-device"; version = "2.0.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/mirage-device/releases/download/v${version}/mirage-device-v${version}.tbz"; sha256 = "18alxyi6wlxqvb4lajjlbdfkgcajsmklxi9xqmpcz07j51knqa04"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix index 5edf8a347ad0..b04c0bb4a7c9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -2,7 +2,7 @@ , ipaddr, cstruct, lwt, rresult, logs, lru , tcpip, ethernet, stdlib-shims , alcotest, mirage-clock-unix -, ppx_deriving +, ppxlib, ppx_deriving }: buildDunePackage rec { @@ -19,8 +19,8 @@ buildDunePackage rec { sha256 = "0cy95j184hi8fm1h6z6x1brjfrmbq3zjy2mqz99m8ys9vwkb63ma"; }; - nativeBuildInputs = [ - ppx_deriving + buildInputs = [ + ppxlib ]; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildDunePackage rec { tcpip ethernet stdlib-shims + ppx_deriving ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix index ae52ed478e06..055e6db3a645 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -15,6 +15,10 @@ let ''; in +if !versionAtLeast ocaml.version "4.08" +then throw "nocrypto is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-nocrypto-${version}"; version = "0.5.4"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index faadaf214f51..5d8d967bf4fd 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -1,9 +1,11 @@ -{ lib, fetchFromGitHub, buildDunePackage, result, ppx_derivers }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, result, ppx_derivers }: buildDunePackage rec { pname = "ocaml-migrate-parsetree"; version = "1.8.0"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; + src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; diff --git a/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix index 22c1ecdf7032..3106fe83fd70 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (opam) src version; + useDune2 = true; + nativeBuildInputs = [ unzip cppo ]; propagatedBuildInputs = [ ocamlgraph re ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix index 04079fcb4761..dd16a369881c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -1,35 +1,22 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, ocaml, findlib }: +{ lib, buildDunePackage, fetchFromGitHub }: -stdenv.mkDerivation rec { +buildDunePackage rec { version = "2.1.2"; - name = "ocaml${ocaml.version}-opam-file-format-${version}"; + pname = "opam-file-format"; + + useDune2 = true; src = fetchFromGitHub { owner = "ocaml"; - repo = "opam-file-format"; + repo = pname; rev = version; sha256 = "19xppn2s3yjid8jc1wh8gdf5mgmlpzby2cf2slmnbyrgln3vj6i2"; }; - buildInputs = [ ocaml findlib ]; - - installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; - - patches = [ - ./optional-static.patch - # fix no implementation error for OpamParserTypes - # can be removed at next release presumably - (fetchpatch { - url = "https://github.com/ocaml/opam-file-format/pull/41/commits/2a9a92ec334e0bf2adf8d2b4c1b83f1f9f68df8f.patch"; - sha256 = "090nl7yciyyidmbjfryw3wyx7srh6flnrr4zgyhv4kvjsvq944y2"; - }) - ]; - meta = { description = "Parser and printer for the opam file syntax"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch deleted file mode 100644 index 5501fdd0c6c3..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -1,1 +1,5 @@ --TARGETS = opam-file-format.cma opam-file-format.cmxa opam-file-format.cmxs -+TARGETS = opam-file-format.cma opam-file-format.cmxa -+ -+ifeq "$(NATDYNLINK)" "true" -+TARGETS = $(TARGETS) opam-file-format.cmxs -+endif - -all: $(TARGETS) - diff --git a/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix b/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix index 34e14959e327..afe9e7d39b57 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: +{ lib, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: buildDunePackage rec { pname = "parany"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix b/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix index 64cc7c0c6b73..4bc409245eed 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { pname = "parse-argv"; version = "0.2.0"; + useDune2 = true; + minimumOCamlVersion = "4.03"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix index d0dcb5b489f8..f67d614af3ae 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { sha256 = "1rdypc83nap9j2ml9r6n1pzgf79gk1yffwyi6fmcrl7zmy01cg0n"; }; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; useDune2 = true; propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix index d3d6097b4462..b284f7ef5eba 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving +{ lib, buildDunePackage, fetchFromGitHub, ppx_deriving , alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }: buildDunePackage rec { diff --git a/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix b/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix new file mode 100644 index 000000000000..82875dbd8b33 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/postgresql/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildDunePackage, postgresql }: + +buildDunePackage rec { + pname = "postgresql"; + version = "4.6.3"; + + minimumOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "mmottl"; + repo = "postgresql-ocaml"; + rev = version; + sha256 = "0fd96qqwkwjhv6pawk4wivwncszkif0sq05f0g5gd28jzwrsvpqr"; + }; + + buildInputs = [ postgresql ]; + + meta = { + description = "Bindings to the PostgreSQL library"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ bcc32 ]; + homepage = "https://mmottl.github.io/postgresql-ocaml"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 37a3a55229d4..910e53900966 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,20 +1,34 @@ -{ lib, fetchzip, buildDunePackage -, cppo, ppxfind, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree +{ lib, fetchurl, buildDunePackage +, cppo, ppxlib, ppx_derivers, result, ounit, ocaml-migrate-parsetree }: +let params = + if lib.versionAtLeast ppxlib.version "0.15" + then { + version = "5.1"; + sha256 = "1i64fd7qrfzbam5hfbl01r0sx4iihsahcwqj13smmrjlnwi3nkxh"; + } else { + version = "5.0"; + sha256 = "0fkzrn4pdyvf1kl0nwvhqidq01pnq3ql8zk1jd56hb0cxaw851w3"; + } +; in + buildDunePackage rec { pname = "ppx_deriving"; - version = "4.5"; + inherit (params) version; + + useDune2 = true; - src = fetchzip { - url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz"; - sha256 = "1v2xldag54n0xk69vv3j4nln9bzkkpq3rildq118sydzsc9v239z"; + src = fetchurl { + url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-v${version}.tbz"; + inherit (params) sha256; }; - buildInputs = [ ppxfind cppo ounit ]; - propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ppx_tools result ]; + buildInputs = [ ppxlib cppo ]; + propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers result ]; doCheck = true; + checkInputs = [ ounit ]; meta = with lib; { description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix index f85e32d72c7f..6f23af44b949 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix @@ -1,22 +1,19 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo, ppx_tools, ppx_deriving -, ppxfind }: - -if lib.versionAtLeast ocaml.version "4.11" -then throw "ppx_deriving_protobuf is not available for OCaml ${ocaml.version}" -else +{ lib, fetchurl, buildDunePackage, cppo, ppx_deriving +, ppxlib +}: buildDunePackage rec { pname = "ppx_deriving_protobuf"; - version = "2.7"; + version = "3.0.0"; + + useDune2 = true; - src = fetchFromGitHub { - owner = "ocaml-ppx"; - repo = pname; - rev = "v${version}"; - sha256 = "0aq4f3gbkhhai0c8i5mcw2kpqy8l610f4dknwkrxh0nsizwbwryn"; + src = fetchurl { + url = "https://github.com/ocaml-ppx/ppx_deriving_protobuf/releases/download/v${version}/ppx_deriving_protobuf-v${version}.tbz"; + sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj"; }; - buildInputs = [ cppo ppx_tools ppxfind ppx_deriving ]; + buildInputs = [ cppo ppxlib ppx_deriving ]; meta = with lib; { homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 9af2c6edb320..bef60b3f381c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -1,25 +1,26 @@ -{ lib, buildDunePackage, fetchFromGitHub, ppxfind, ounit +{ lib, buildDunePackage, fetchFromGitHub, ppxlib, ounit , ppx_deriving, yojson }: buildDunePackage rec { pname = "ppx_deriving_yojson"; - version = "3.5.3"; + version = "3.6.1"; - minimumOCamlVersion = "4.04"; + useDune2 = true; + + minimumOCamlVersion = "4.07"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; rev = "v${version}"; - sha256 = "030638gp39mr4hkilrjhd98q4s8gjqxifm6fy6bwqrg74hmrl2y5"; + sha256 = "1icz5h6p3pfj7my5gi7wxpflrb8c902dqa17f9w424njilnpyrbk"; }; - buildInputs = [ ppxfind ounit ]; - - propagatedBuildInputs = [ ppx_deriving yojson ]; + propagatedBuildInputs = [ ppxlib ppx_deriving yojson ]; doCheck = true; + checkInputs = [ ounit ]; meta = { description = "A Yojson codec generator for OCaml >= 4.04"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix index 3e06af881c56..8097c9145e48 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -4,7 +4,7 @@ let param = let v6_3 = { version = "6.3"; sha256 = "1skf4njvkifwx0qlsrc0jn891gvvcp5ryd6kkpx56hck7nnxv8x6"; - useDune2 = lib.versionAtLeast ocaml.version "4.12"; + useDune2 = true; buildInputs = [cppo]; }; in { diff --git a/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix b/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix new file mode 100644 index 000000000000..a3c0a5add3d2 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchurl +, mtime, terminal_size, alcotest, astring, fmt +}: + +buildDunePackage rec { + pname = "progress"; + version = "0.1.1"; + + minimumOCamlVersion = "4.08"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz"; + sha256 = "90c6bec19d014a4c6b0b67006f08bdfcf36981d2176769bebe0ccd75d6785a32"; + }; + + propagatedBuildInputs = [ mtime terminal_size ]; + + doCheck = true; + checkInputs = [ alcotest astring fmt ]; + + meta = with lib; { + description = "Progress bar library for OCaml"; + homepage = "https://github.com/CraigFe/progress"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix index 50ad5ea94eb9..d99ec7ed3208 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml +, jsooSupport ? true +}: stdenv.mkDerivation rec { version = "0.8.5"; @@ -10,11 +12,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg js_of_ocaml ]; + buildInputs = [ findlib topkg ] + ++ lib.optional jsooSupport js_of_ocaml; propagatedBuildInputs = [ result ]; - buildPhase = "${topkg.run} build --with-js_of_ocaml true"; + buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}"; inherit (topkg) installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/resource-pooling/default.nix b/nixpkgs/pkgs/development/ocaml-modules/resource-pooling/default.nix index 773fb76bcc75..51407f6b49df 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/resource-pooling/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/resource-pooling/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { version = "1.1"; pname = "resource-pooling"; + useDune2 = true; + minimumOCamlVersion = "4.06"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/ocaml-modules/semaphore-compat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/semaphore-compat/default.nix new file mode 100644 index 000000000000..a686ef42e708 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/semaphore-compat/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "semaphore-compat"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/mirage/semaphore-compat/releases/download/${version}/semaphore-compat-${version}.tbz"; + sha256 = "139c5rxdp4dg1jcwyyxvhxr8213l1xdl2ab0mc288rfcppsiyxrb"; + }; + + useDune2 = true; + + meta = with lib; { + description = "Compatibility Semaphore module"; + homepage = "https://github.com/mirage/semaphore-compat"; + license = licenses.lgpl21Only; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix index 9a574a0457a5..1f4fd7b85805 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,17 +1,20 @@ -{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl }: +{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl +, dune-configurator }: buildDunePackage rec { pname = "ssl"; - version = "0.5.9"; + version = "0.5.10"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ssl"; - rev = version; - sha256 = "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0"; + rev = "v${version}"; + sha256 = "1rszqiqayh67xlwd5411k8vib47x9kapdr037z1majd2c14z3kcb"; }; + useDune2 = true; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [openssl]; meta = { @@ -20,6 +23,7 @@ buildDunePackage rec { license = "LGPL+link exception"; maintainers = [ lib.maintainers.maggesi + lib.maintainers.anmonteiro ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix b/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix new file mode 100644 index 000000000000..9036fc55bef7 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, fetchurl, alcotest }: + +buildDunePackage rec { + pname = "terminal_size"; + version = "0.1.4"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/cryptosense/terminal_size/releases/download/v${version}/terminal_size-v${version}.tbz"; + sha256 = "fdca1fee7d872c4a8e5ab003d9915b6782b272e2a3661ca877f2d78dd25371a7"; + }; + + checkInputs = [ alcotest ]; + doCheck = true; + + meta = with lib; { + description = "Get the dimensions of the terminal"; + homepage = "https://github.com/cryptosense/terminal_size"; + license = licenses.bsd2; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix index 5d5e7dedd233..bf0e06507c9e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "tyxml"; version = "4.4.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz"; sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix b/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix index c8d9436461aa..bda50bdb78ed 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix @@ -1,24 +1,22 @@ -{ lib, buildDunePackage, fetchFromGitLab, ppx_tools, ppx_deriving, result, cppo }: +{ lib, buildDunePackage, fetchFromGitLab, ppxlib, ppx_deriving, result }: buildDunePackage rec { pname = "visitors"; - version = "20200210"; + version = "20210127"; useDune2 = true; - minimumOCamlVersion = "4.02.3"; + minimumOCamlVersion = "4.07"; src = fetchFromGitLab { owner = "fpottier"; repo = pname; rev = version; domain = "gitlab.inria.fr"; - sha256 = "12i099h1hc1walabiwqbinnpgcxkc1wn72913v7v6vvyif21rb5a"; + sha256 = "0b73h7d4yv04a0b5x2i222jknbcgf9vvxzfjxzy2jwanxz9d873z"; }; - buildInputs = [ cppo ]; - - propagatedBuildInputs = [ ppx_tools ppx_deriving result ]; + propagatedBuildInputs = [ ppxlib ppx_deriving result ]; meta = with lib; { homepage = "https://gitlab.inria.fr/fpottier/visitors"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix b/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix index b46386b1666f..828df66b41d5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "wtf8"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix index 666106fdb17a..189920290e37 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchurl -, cstruct, ppx_cstruct, lwt, ounit +, cstruct, ppx_cstruct, lwt, ounit, stdlib-shims }: buildDunePackage rec { @@ -16,7 +16,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ ppx_cstruct ]; - propagatedBuildInputs = [ cstruct lwt ]; + propagatedBuildInputs = [ stdlib-shims cstruct lwt ]; doCheck = true; checkInputs = [ ounit ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix index d454d244959f..9779004085c3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,9 +1,12 @@ -{ lib, fetchFromGitHub, buildDunePackage, czmq, stdint }: +{ lib, fetchFromGitHub, buildDunePackage, dune-configurator, czmq, stdint }: buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "zmq"; version = "20180726"; + + useDune2 = true; + src = fetchFromGitHub { owner = "issuu"; repo = "ocaml-zmq"; @@ -11,7 +14,7 @@ buildDunePackage rec { sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf"; }; - buildInputs = [ czmq ]; + buildInputs = [ czmq dune-configurator ]; propagatedBuildInputs = [ stdint ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix index f8fc06791b1b..6717e787f199 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "zmq-lwt"; - inherit (zmq) version src meta; + inherit (zmq) version src useDune2 meta; propagatedBuildInputs = [ zmq ocaml_lwt ]; } diff --git a/nixpkgs/pkgs/development/perl-modules/MNI/default.nix b/nixpkgs/pkgs/development/perl-modules/MNI/default.nix index c0fc8f281085..2ef7b90842ea 100644 --- a/nixpkgs/pkgs/development/perl-modules/MNI/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/MNI/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildPerlPackage, lib, stdenv }: +{ fetchFromGitHub, buildPerlPackage, lib }: buildPerlPackage { pname = "MNI-Perllib"; diff --git a/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 3c555ca37ab5..5efac53f8375 100644 --- a/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang +{ lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang , DBDmysql, DBI, IOSocketSSL, TermReadKey }: diff --git a/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix b/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix index 94d83845e292..c89ec1619c17 100644 --- a/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix @@ -3,10 +3,10 @@ buildPerlPackage rec { pname = "po4a"; - version = "0.55"; + version = "0.62"; src = fetchurl { url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz"; - sha256 = "1qss4q5df3nsydsbggb7gg50bn0kdxq5wn8riqm9zwkiq6a4bifg"; + sha256 = "0eb510a66f59de68cf7a205342036cc9fc08b39334b91f1456421a5f3359e68b"; }; nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ]; propagatedBuildInputs = [ TextWrapI18N LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; diff --git a/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix b/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix index 29bcc9bab25f..d6945083f634 100644 --- a/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix @@ -1,4 +1,4 @@ -{buildPerlPackage, lib, stdenv, fetchurl, DBDmysql}: +{buildPerlPackage, lib, fetchurl, DBDmysql}: buildPerlPackage { pname = "maatkit"; diff --git a/nixpkgs/pkgs/development/php-packages/composer/2.0.nix b/nixpkgs/pkgs/development/php-packages/composer/2.0.nix index 4ff982bf8d2d..5b0234fa7a14 100644 --- a/nixpkgs/pkgs/development/php-packages/composer/2.0.nix +++ b/nixpkgs/pkgs/development/php-packages/composer/2.0.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "composer"; - version = "2.0.8"; + version = "2.0.9"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0f0msrqrszhwj7ki9y5wrlwglwanmdcc132l7kz0wvj45gaz0890"; + sha256 = "sha256-JPqlvIB+OZ8y6aIaM/u1sGht+ciFDvq+LAR8LM+5+cw="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix index 46da30248097..ae0159444430 100644 --- a/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "pdo_sqlsrv"; - version = "5.8.1"; - sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0"; + version = "5.9.0"; + sha256 = "0n4cnkldvyp1lrpj18ky2ii2dcaa51dsmh8cspixm7w76dxl3khg"; internalDeps = [ php.extensions.pdo ]; diff --git a/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix index 1ed33e7bb5e8..c855b975e546 100644 --- a/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "php-cs-fixer"; - version = "2.18.0"; + version = "2.18.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-euvk/Rs6fZIJVWprzKiTVNPlGOsCN6t58DzvwYh3wDA="; + sha256 = "sha256-451be1O/y92ib5hZNVbf8iCkD+e9DoK47Z7IkMnwuo0="; }; phases = [ "installPhase" ]; diff --git a/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index c363150babcf..f8124e43d7f5 100644 --- a/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.68"; + version = "0.12.74"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-qplQi12ecZjtaM8XawiO+qSwEdTXByrxWZLf3N7gfNc="; + sha256 = "sha256-zEDqswyldyXha836ye+FmE4yYxH+7AzEvlKJYOje0xQ="; }; phases = [ "installPhase" ]; diff --git a/nixpkgs/pkgs/development/php-packages/redis/default.nix b/nixpkgs/pkgs/development/php-packages/redis/default.nix index a61ae1194ffb..fedc7a7ffde2 100644 --- a/nixpkgs/pkgs/development/php-packages/redis/default.nix +++ b/nixpkgs/pkgs/development/php-packages/redis/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "redis"; - version = "5.3.2"; - sha256 = "1cfsbxf3q3im0cmalgk76jpz581zr92z03c1viy93jxb53k2vsgl"; + version = "5.3.3"; + sha256 = "sha256-N3iRYeFkzVIjmjDJojjaYf7FyDlc2sOFtu2PDFD9kvA="; internalDeps = with php.extensions; [ session diff --git a/nixpkgs/pkgs/development/php-packages/smbclient/default.nix b/nixpkgs/pkgs/development/php-packages/smbclient/default.nix new file mode 100644 index 000000000000..1aec97251e1b --- /dev/null +++ b/nixpkgs/pkgs/development/php-packages/smbclient/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib, pkgs }: +buildPecl { + pname = "smbclient"; + version = "1.0.4"; + sha256 = "07p72m5kbdyp3r1mfxhiayzdvymhc8afwcxa9s86m96sxbmlbbp8"; + + # TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66 + LIBSMBCLIENT_INCDIR = "${pkgs.samba.dev}/include/samba-4.0"; + + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.samba ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix b/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix index 341152277cae..939be27671b1 100644 --- a/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix +++ b/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "sqlsrv"; - version = "5.8.1"; - sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r"; + version = "5.9.0"; + sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a"; buildInputs = [ pkgs.unixODBC diff --git a/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix b/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix index 2b06fcdce7d2..74884f36f033 100644 --- a/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: buildPythonPackage rec { pname = "FormEncode"; diff --git a/nixpkgs/pkgs/development/python-modules/GitPython/default.nix b/nixpkgs/pkgs/development/python-modules/GitPython/default.nix index 2edb8c51e3a0..0081051628df 100644 --- a/nixpkgs/pkgs/development/python-modules/GitPython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/GitPython/default.nix @@ -1,13 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, substituteAll +, git +, gitdb +, ddt +}: buildPythonPackage rec { - version = "3.1.11"; pname = "GitPython"; + version = "3.1.13"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8"; + sha256 = "sha256-hiGn53fidqXsg4tZKAulJy3RRKGBacNskD2LOLmfdQo="; }; patches = [ @@ -17,16 +25,16 @@ buildPythonPackage rec { }) ]; - checkInputs = [ nose ] ++ lib.optional isPy27 mock; propagatedBuildInputs = [ gitdb ddt ]; # Tests require a git repo doCheck = false; + pythonImportsCheck = [ "git" ]; - meta = { + meta = with lib; { description = "Python Git Library"; - maintainers = [ ]; homepage = "https://github.com/gitpython-developers/GitPython"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix b/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix index be4bb9e31d32..486f8a4556f5 100644 --- a/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: +{ lib, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: buildPythonPackage rec { version = "0.12.4"; pname = "HTSeq"; diff --git a/nixpkgs/pkgs/development/python-modules/IPy/default.nix b/nixpkgs/pkgs/development/python-modules/IPy/default.nix index f142c2459223..05587ef07401 100644 --- a/nixpkgs/pkgs/development/python-modules/IPy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/IPy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "IPy"; diff --git a/nixpkgs/pkgs/development/python-modules/PyLD/default.nix b/nixpkgs/pkgs/development/python-modules/PyLD/default.nix index 247b7f0332f5..5a4741a730ac 100644 --- a/nixpkgs/pkgs/development/python-modules/PyLD/default.nix +++ b/nixpkgs/pkgs/development/python-modules/PyLD/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }: +{ lib, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }: let diff --git a/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix b/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix index ebedb3c69693..8c34e75139f6 100644 --- a/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , capstone}: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/nixpkgs/pkgs/development/python-modules/Wand/default.nix index d7ad28c01336..e180f0cea332 100644 --- a/nixpkgs/pkgs/development/python-modules/Wand/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Wand/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , imagemagick7Big diff --git a/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 28515e6f6028..6da500413f0e 100644 --- a/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/aadict/default.nix b/nixpkgs/pkgs/development/python-modules/aadict/default.nix index cf6976fa6c1e..de3ec6fa7f05 100644 --- a/nixpkgs/pkgs/development/python-modules/aadict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aadict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/aafigure/default.nix b/nixpkgs/pkgs/development/python-modules/aafigure/default.nix index 5350443eeaab..0b9f14571781 100644 --- a/nixpkgs/pkgs/development/python-modules/aafigure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aafigure/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pillow }: +{ lib, buildPythonPackage, fetchPypi, pillow }: buildPythonPackage rec { pname = "aafigure"; diff --git a/nixpkgs/pkgs/development/python-modules/acebinf/default.nix b/nixpkgs/pkgs/development/python-modules/acebinf/default.nix index f8134aaf5b31..7889e007d83e 100644 --- a/nixpkgs/pkgs/development/python-modules/acebinf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/acebinf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyvcf diff --git a/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix index 75408244e66a..c979104914da 100644 --- a/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix +++ b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse , openssl }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/actdiag/default.nix b/nixpkgs/pkgs/development/python-modules/actdiag/default.nix index ca47018f56f4..92917f6ea954 100644 --- a/nixpkgs/pkgs/development/python-modules/actdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/actdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, docutils, blockdiag, reportlab }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index f03d3fd64e7b..cc8ee9462504 100644 --- a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "2.27.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0rnmy74rjjcyni5sr8h1djffpj7wngn2wqckl5vknp2smaihp34l"; + sha256 = "sha256-Wd8Qq/jE/C/zx1CRuKLt5Tz8VHY/4bwUa229aDcCFjk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/adal/default.nix b/nixpkgs/pkgs/development/python-modules/adal/default.nix index f7e973c8f693..55dc21240ec2 100644 --- a/nixpkgs/pkgs/development/python-modules/adal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests, pyjwt, dateutil }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/aenum/default.nix b/nixpkgs/pkgs/development/python-modules/aenum/default.nix index f21d8f4195a4..b5fb2999c961 100644 --- a/nixpkgs/pkgs/development/python-modules/aenum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aenum/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }: +{ lib, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }: buildPythonPackage rec { pname = "aenum"; - version = "2.2.6"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "260225470b49429f5893a195a8b99c73a8d182be42bf90c37c93e7b20e44eaae"; + sha256 = "17cd8cfed1ee4b617198c9fabbabd70ebd8f01e54ac29cd6c3a92df14bd86656"; }; # For Python 3, locale has to be set to en_US.UTF-8 for diff --git a/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix b/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix index 099fb1701cb4..0299a94ebb0f 100644 --- a/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }: +{ lib, fetchPypi, buildPythonPackage, agate, dbf, dbfread }: buildPythonPackage rec { pname = "agate-dbf"; diff --git a/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index 566951ea71d1..29bbfa81ed23 100644 --- a/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: +{ lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { pname = "agate-sql"; diff --git a/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/nixpkgs/pkgs/development/python-modules/ailment/default.nix new file mode 100644 index 000000000000..e23db23d151e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pyvex +}: + +buildPythonPackage rec { + pname = "ailment"; + version = "9.0.5739"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "1fjwksia6h7w7m5zhys65yr4zxvyfgp9hr1k5dn802p9kvz34bpc"; + }; + + propagatedBuildInputs = [ pyvex ]; + + # Tests depend on angr (possibly a circular dependency) + doCheck = false; + #pythonImportsCheck = [ "ailment" ]; + + meta = with lib; { + description = "The angr Intermediate Language"; + homepage = "https://github.com/angr/ailment"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index 308219865393..2e7c9c2401c3 100644 --- a/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix b/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix new file mode 100644 index 000000000000..dd74a21bf9b8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "aiocoap"; + version = "0.4b3"; + + src = fetchFromGitHub { + owner = "chrysn"; + repo = pname; + rev = version; + sha256 = "1zjg475xgvi19rqg7jmfgy5nfabq50aph0231p9jba211ps7cmxw"; + }; + + checkPhase = '' + ${python.interpreter} -m aiocoap.cli.defaults + ${python.interpreter} -m unittest discover -v + ''; + + pythonImportsCheck = [ "aiocoap" ]; + + meta = with lib; { + description = "Python CoAP library"; + homepage = "https://aiocoap.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aiodns/default.nix b/nixpkgs/pkgs/development/python-modules/aiodns/default.nix index 4ba4bd59af27..1adc6f815244 100644 --- a/nixpkgs/pkgs/development/python-modules/aiodns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiodns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , isPy27, isPyPy, python, pycares, typing, trollius }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix b/nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix index 4bdd2b1327cd..0d6796706cbd 100644 --- a/nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioeventlet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , eventlet diff --git a/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix b/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix index 0b6c68de8b4c..3f2ee2fee3ea 100644 --- a/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix @@ -1,27 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, slixmpp, async-timeout, aiohttp }: +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +, isPy3k +, slixmpp +}: buildPythonPackage rec { pname = "aioharmony"; - version = "0.2.6"; + version = "0.2.7"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "90f4d1220d44b48b21a57e0273aa3c4a51599d0097af88e8be26df151e599344"; + sha256 = "sha256-aej8xC0Bsy6ip7IwO6onp55p6afkz8yZnz14cCExSPA="; }; - disabled = !isPy3k; + propagatedBuildInputs = [ + aiohttp + async-timeout + slixmpp + ]; - #aioharmony does not seem to include tests + # aioharmony does not seem to include tests doCheck = false; pythonImportsCheck = [ "aioharmony.harmonyapi" "aioharmony.harmonyclient" ]; - propagatedBuildInputs = [ slixmpp async-timeout aiohttp ]; - meta = with lib; { homepage = "https://github.com/ehendrix23/aioharmony"; - description = - "Asyncio Python library for connecting to and controlling the Logitech Harmony"; + description = "Python library for interacting the Logitech Harmony devices"; license = licenses.asl20; maintainers = with maintainers; [ oro ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aioinflux/default.nix b/nixpkgs/pkgs/development/python-modules/aioinflux/default.nix new file mode 100644 index 000000000000..25aa7f587b25 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aioinflux/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, ciso8601 +, pandas +}: + +buildPythonPackage rec { + pname = "aioinflux"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jy5mcg9wdz546s9wdwsgkxhm2ac4dmphd9vz243db39j1m0a3bj"; + }; + + propagatedBuildInputs = [ aiohttp ciso8601 pandas ]; + + # Tests require InfluxDB server + doCheck = false; + + pythonImportsCheck = [ "aioinflux" ]; + + meta = with lib; { + description = "Asynchronous Python client for InfluxDB"; + homepage = "https://github.com/gusutabopb/aioinflux"; + license = licenses.mit; + maintainers = with maintainers; [ liamdiprose lopsided98 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix b/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix index 1c5ce1e2faeb..91d83e93cbd8 100644 --- a/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix b/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix new file mode 100644 index 000000000000..c802633e5723 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix @@ -0,0 +1,54 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, freezegun +, poetry-core +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiorecollect"; + version = "1.0.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "0dlz8zmqcn6g6000lfgcy5krpfafzdzrznmk6iwra65wcs7l9392"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + freezegun + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + # Ignore the examples as they are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "aiorecollect" ]; + + meta = with lib; { + description = "Python library for the Recollect Waste API"; + longDescription = '' + aiorecollect is a Python asyncio-based library for the ReCollect + Waste API. It allows users to programmatically retrieve schedules + for waste removal in their area, including trash, recycling, compost + and more. + ''; + homepage = "https://github.com/bachya/aiorecollect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioredis/default.nix b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix index 94f503fe2cc3..fe48ba0e1e18 100644 --- a/nixpkgs/pkgs/development/python-modules/aioredis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pkgs, async-timeout, hiredis, isPyPy, isPy27 }: diff --git a/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix index d73ae2b35dfb..fe3943c25b1c 100644 --- a/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , netifaces diff --git a/nixpkgs/pkgs/development/python-modules/ajpy/default.nix b/nixpkgs/pkgs/development/python-modules/ajpy/default.nix index 0dd135e139fd..926b5ed7efee 100644 --- a/nixpkgs/pkgs/development/python-modules/ajpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ajpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ajpy"; diff --git a/nixpkgs/pkgs/development/python-modules/alabaster/default.nix b/nixpkgs/pkgs/development/python-modules/alabaster/default.nix index b4cc69e555bc..72eda332f951 100644 --- a/nixpkgs/pkgs/development/python-modules/alabaster/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alabaster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pygments }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix b/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix index b563a80447f2..10438d540816 100644 --- a/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb +{ lib, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb , pyopenssl, nose, isPy3k, pythonOlder, mock }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/nixpkgs/pkgs/development/python-modules/alembic/default.nix index 142c6d1c416c..5a4ef5e0bc6e 100644 --- a/nixpkgs/pkgs/development/python-modules/alembic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alembic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, coverage, setuptools , Mako, sqlalchemy, python-editor, dateutil }: diff --git a/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix b/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix index dd2d82578ea2..82783dd16bb5 100644 --- a/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk }: diff --git a/nixpkgs/pkgs/development/python-modules/alerta/default.nix b/nixpkgs/pkgs/development/python-modules/alerta/default.nix index 19dd17ee3f02..e69503777d4e 100644 --- a/nixpkgs/pkgs/development/python-modules/alerta/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alerta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six, click, requests, requests-hawk, pytz, tabulate, pythonOlder }: diff --git a/nixpkgs/pkgs/development/python-modules/alot/default.nix b/nixpkgs/pkgs/development/python-modules/alot/default.nix index 21c6aaff2fbc..1f4617ce9c0d 100644 --- a/nixpkgs/pkgs/development/python-modules/alot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k +{ lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k , notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme , service-identity , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null diff --git a/nixpkgs/pkgs/development/python-modules/altair/default.nix b/nixpkgs/pkgs/development/python-modules/altair/default.nix index a3b515ebeca8..37c1efd9c1b6 100644 --- a/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , entrypoints , glibcLocales , ipython diff --git a/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix b/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix index ed266c0db788..44dc739f1ca8 100644 --- a/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }: buildPythonPackage rec { pname = "amazon_kclpy"; diff --git a/nixpkgs/pkgs/development/python-modules/amply/default.nix b/nixpkgs/pkgs/development/python-modules/amply/default.nix index 32bcbb4589ab..0589caf1e6a1 100644 --- a/nixpkgs/pkgs/development/python-modules/amply/default.nix +++ b/nixpkgs/pkgs/development/python-modules/amply/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , setuptools_scm diff --git a/nixpkgs/pkgs/development/python-modules/amqp/default.nix b/nixpkgs/pkgs/development/python-modules/amqp/default.nix index b614ae453d25..6e6d95ba8f91 100644 --- a/nixpkgs/pkgs/development/python-modules/amqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/amqp/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: buildPythonPackage rec { pname = "amqp"; - version = "5.0.3"; + version = "5.0.5"; src = fetchPypi { inherit pname version; - sha256 = "1733ebf713050504fd9d2ebc661f1fc95b3588f99ee87d2e39c84c27bfd815dc"; + sha256 = "affdd263d8b8eb3c98170b78bf83867cdb6a14901d586e00ddb65bfe2f0c4e60"; }; propagatedBuildInputs = [ vine ]; diff --git a/nixpkgs/pkgs/development/python-modules/amqplib/default.nix b/nixpkgs/pkgs/development/python-modules/amqplib/default.nix index c7b4dc865bb8..430065b7d1f8 100644 --- a/nixpkgs/pkgs/development/python-modules/amqplib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/amqplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python }: +{ lib, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "amqplib"; diff --git a/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/nixpkgs/pkgs/development/python-modules/androidtv/default.nix index 91140dc0bf1a..ec00c31147b0 100644 --- a/nixpkgs/pkgs/development/python-modules/androidtv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -1,29 +1,40 @@ -{ aiofiles, adb-shell, buildPythonPackage, fetchFromGitHub, isPy3k, lib, mock -, pure-python-adb, python }: +{ lib +, adb-shell +, aiofiles +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, mock +, pure-python-adb +, pytestCheckHook +, python +}: buildPythonPackage rec { pname = "androidtv"; - version = "0.0.50"; + version = "0.0.57"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "1iqw40szwgzvhv3fbnx2wwfnw0d3clcwk9vsq1xsn30fjil2vl7b"; + sha256 = "sha256-xOLMUf72VHeBzbMnhJGOnUIKkflnY4rV9NS/P1aYLJc="; }; propagatedBuildInputs = [ adb-shell pure-python-adb ] ++ lib.optionals (isPy3k) [ aiofiles ]; - checkInputs = [ mock ]; - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests -t . - ''; + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "androidtv" ]; meta = with lib; { description = - "Communicate with an Android TV or Fire TV device via ADB over a network."; + "Communicate with an Android TV or Fire TV device via ADB over a network"; homepage = "https://github.com/JeffLIrion/python-androidtv/"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; diff --git a/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix b/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix index 804402a4ca67..538cb11db13f 100644 --- a/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , dateutil, mock, isPy3k }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/annoy/default.nix b/nixpkgs/pkgs/development/python-modules/annoy/default.nix index 0bd060843809..d5f24492c90a 100644 --- a/nixpkgs/pkgs/development/python-modules/annoy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/annoy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , h5py diff --git a/nixpkgs/pkgs/development/python-modules/anonip/default.nix b/nixpkgs/pkgs/development/python-modules/anonip/default.nix index 9c1b3abf9800..0663fddd6fb0 100644 --- a/nixpkgs/pkgs/development/python-modules/anonip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anonip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }: buildPythonPackage rec { pname = "anonip"; diff --git a/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix b/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix index 3d96061362e9..99a419a60fae 100644 --- a/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ansicolor"; diff --git a/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix b/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix index 7d6dd2127e67..fab91690ab23 100644 --- a/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "ansicolors"; diff --git a/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix b/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix index 6a3571960d03..ba0c06f536aa 100644 --- a/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "ansiconv"; diff --git a/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix b/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix index 1af39e970bcd..1d0aef1ee5d3 100644 --- a/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix @@ -1,11 +1,10 @@ { lib -, buildPythonPackage -, fetchPypi -, tox -, pytest , ansicolors +, buildPythonPackage , coverage -, pytestcov +, fetchPypi +, pytest-cov +, pytestCheckHook , textwrap3 }: @@ -20,20 +19,15 @@ buildPythonPackage rec { }; checkInputs = [ - tox - pytest ansicolors coverage - pytestcov + pytest-cov + pytestCheckHook ]; - propagatedBuildInputs = [ - textwrap3 - ]; + propagatedBuildInputs = [ textwrap3 ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "ansiwrap" ]; meta = with lib; { description = "Textwrap, but savvy to ANSI colors and styles"; diff --git a/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/nixpkgs/pkgs/development/python-modules/anyio/default.nix index f79bf23896fd..1c3c72a8e2c7 100644 --- a/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anyio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "2.0.2"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "06nazfrm2sclp3lpgsn9wl8vmqxvx36s3gr2gnqz3zhjpf3glkxv"; + sha256 = "0k5c4a7xcbiyah8rgrfh2hwj3l3a9al7rh2lyz9ip4rr1hwnqvaf"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix b/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix index ca2cb03f9672..705b7b721f8f 100644 --- a/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix @@ -143,11 +143,9 @@ buildPythonPackage rec { --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \ --replace "flask-admin==1.5.3" "flask-admin" \ --replace "flask-login>=0.3, <0.5" "flask-login" \ - --replace "pendulum==1.4.4" "pendulum" \ --replace "cached_property~=1.5" "cached_property" \ --replace "dill>=0.2.2, <0.3" "dill" \ --replace "configparser>=3.5.0, <3.6.0" "configparser" \ - --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \ --replace "colorlog==4.0.2" "colorlog" \ --replace "funcsigs==1.0.0" "funcsigs" \ --replace "flask-swagger==0.2.13" "flask-swagger" \ diff --git a/nixpkgs/pkgs/development/python-modules/apipkg/default.nix b/nixpkgs/pkgs/development/python-modules/apipkg/default.nix index 604c37b42ba1..10e2369e12ee 100644 --- a/nixpkgs/pkgs/development/python-modules/apipkg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apipkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, setuptools_scm, isPy3k }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/nixpkgs/pkgs/development/python-modules/apispec/default.nix index 0dea059f76af..ac6eb0957778 100644 --- a/nixpkgs/pkgs/development/python-modules/apispec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apispec/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.0.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "360e28e5e84a4d7023b16de2b897327fe3da63ddc8e01f9165b9113b7fe1c48a"; + sha256 = "fbbd069caa22c0270bc71a5330b46b5a4e1984d8345b9236ca02fbca23094647"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index bc47de371288..6f2c55d45cb6 100644 --- a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }: buildPythonPackage rec { version = "0.2.6"; diff --git a/nixpkgs/pkgs/development/python-modules/apsw/default.nix b/nixpkgs/pkgs/development/python-modules/apsw/default.nix index de74480765a0..8933d4e91bcc 100644 --- a/nixpkgs/pkgs/development/python-modules/apsw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apsw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , sqlite, isPyPy }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 4506f422f928..79f21a2762c5 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.5327"; + version = "9.0.5739"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "0r7nj2hf51c954ihfxyhpbz1sd9lrc6i9zfkz11s22wpggvp06mz"; + sha256 = "sha256-6qjX0r2vLYgJdrKBVKedplfa1yhWv9tBvTu5BsViXBc="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aresponses/default.nix b/nixpkgs/pkgs/development/python-modules/aresponses/default.nix index 53353a137886..f2a7f0f8f26b 100644 --- a/nixpkgs/pkgs/development/python-modules/aresponses/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aresponses/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aresponses"; - version = "2.1.2"; + version = "2.1.4"; disabled = !isPy3k; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "CircleUp"; repo = pname; rev = version; - sha256 = "007wrk4wdy97a81imgzxd6sm5dly9v7abmxh9fyfi0vp1p7s75bw"; + sha256 = "sha256-crMiMZ2IDuYDFt8Bixg3NRhlUa2tqmfzd7ZeHM+2Iu4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/argh/default.nix b/nixpkgs/pkgs/development/python-modules/argh/default.nix index 0e2beb6a31eb..bbe120ec14fe 100644 --- a/nixpkgs/pkgs/development/python-modules/argh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/argh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/args/default.nix b/nixpkgs/pkgs/development/python-modules/args/default.nix index cb349484f276..9faf16037d04 100644 --- a/nixpkgs/pkgs/development/python-modules/args/default.nix +++ b/nixpkgs/pkgs/development/python-modules/args/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "args"; diff --git a/nixpkgs/pkgs/development/python-modules/aria2p/default.nix b/nixpkgs/pkgs/development/python-modules/aria2p/default.nix index 076fec8c56ba..2bb950beb282 100644 --- a/nixpkgs/pkgs/development/python-modules/aria2p/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aria2p/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , aria2, poetry, pytest, pytestcov, pytest_xdist, responses , asciimatics, loguru, requests, setuptools, websocket_client }: diff --git a/nixpkgs/pkgs/development/python-modules/arrow/default.nix b/nixpkgs/pkgs/development/python-modules/arrow/default.nix index 7dbe3b98fca3..d87f1ede3ccd 100644 --- a/nixpkgs/pkgs/development/python-modules/arrow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/arrow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , nose, chai, simplejson, backports_functools_lru_cache , python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/asana/default.nix b/nixpkgs/pkgs/development/python-modules/asana/default.nix index ed5e441df970..c7839f051478 100644 --- a/nixpkgs/pkgs/development/python-modules/asana/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asana/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, pythonAtLeast, pytest, requests, requests_oauthlib, six -, fetchFromGitHub, responses, lib, stdenv +, fetchFromGitHub, responses, lib }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/asn1ate/default.nix b/nixpkgs/pkgs/development/python-modules/asn1ate/default.nix index 2735bbf2f70f..a141fc746f78 100644 --- a/nixpkgs/pkgs/development/python-modules/asn1ate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asn1ate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyparsing }: +{ lib, buildPythonPackage, fetchFromGitHub, pyparsing }: buildPythonPackage rec { pname = "asn1ate"; diff --git a/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix b/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix new file mode 100644 index 000000000000..1d6c7b45d15b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, aspell, aspellDicts, python }: + +buildPythonPackage rec { + pname = "aspell-python"; + version = "1.15"; + disabled = isPy27; + + src = fetchPypi { + inherit version; + pname = "aspell-python-py3"; + extension = "tar.bz2"; + sha256 = "13dk3jrvqmfvf2w9b8afj37d8bh32kcx295lyn3z7r8qch792hi0"; + }; + + buildInputs = [ aspell ]; + + checkPhase = '' + export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell" + export HOME=$(mktemp -d) + ${python.interpreter} test/unittests.py + ''; + + pythonImportsCheck = [ "aspell" ]; + + meta = with lib; { + description = "Python wrapper for aspell (C extension and python version)"; + homepage = "https://github.com/WojciechMula/aspell-python"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/nixpkgs/pkgs/development/python-modules/asteval/default.nix new file mode 100644 index 000000000000..0d4d41a54730 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/asteval/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asteval"; + version = "0.9.22"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "newville"; + repo = pname; + rev = version; + sha256 = "sha256-93IBv6beYE/VTKJCWUbA1QTRdmQdn2kg35KBw6kmDis="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "asteval" ]; + + meta = with lib; { + description = "AST evaluator of Python expression using ast module"; + homepage = "https://github.com/newville/asteval"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/astral/default.nix b/nixpkgs/pkgs/development/python-modules/astral/default.nix index 4ea53e17eb0e..8c97ef6750f7 100644 --- a/nixpkgs/pkgs/development/python-modules/astral/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astral/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: buildPythonPackage rec { pname = "astral"; diff --git a/nixpkgs/pkgs/development/python-modules/astunparse/default.nix b/nixpkgs/pkgs/development/python-modules/astunparse/default.nix index c9001da5c70f..b32df24f5bbd 100644 --- a/nixpkgs/pkgs/development/python-modules/astunparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astunparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , six diff --git a/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix b/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix new file mode 100644 index 000000000000..088681a19895 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, async_generator +, paho-mqtt +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "asyncio_mqtt"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hwfgww1ywhjvkpnvafbk2hxlqkrngfdz0sx5amzw68srzazvl6g"; + }; + + propagatedBuildInputs = [ + paho-mqtt + ] ++ lib.optional (pythonOlder "3.7") async_generator; + + doCheck = false; # no tests + + pythonImportsCheck = [ "asyncio_mqtt" ]; + + meta = with lib; { + description = "Idomatic asyncio wrapper around paho-mqtt"; + homepage = "https://github.com/sbtinstruments/asyncio-mqtt"; + license = licenses.bsd3; + changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/master/CHANGELOG.md"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index d3684ea57200..9271adeb617f 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , cryptography , bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl , openssl, openssh, pytestCheckHook }: diff --git a/nixpkgs/pkgs/development/python-modules/asysocks/default.nix b/nixpkgs/pkgs/development/python-modules/asysocks/default.nix index 66c66535a127..b5028e4bebc3 100644 --- a/nixpkgs/pkgs/development/python-modules/asysocks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asysocks/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.0.11"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "11ygrhkqm524i4qp2myjvpsmg1lsn32nsqxqla96sbj84qfnhv0q"; + sha256 = "sha256-NH53FaOJx79q5IIYeiz976H9Q8Vnw13qFw4zgRc2TTw="; }; # Upstream hasn't release the tests yet diff --git a/nixpkgs/pkgs/development/python-modules/atomiclong/default.nix b/nixpkgs/pkgs/development/python-modules/atomiclong/default.nix index 7bcb36d548d8..0fccc943c8a4 100644 --- a/nixpkgs/pkgs/development/python-modules/atomiclong/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atomiclong/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, cffi }: +{ lib, buildPythonPackage, fetchPypi, pytest, cffi }: buildPythonPackage rec { pname = "atomiclong"; diff --git a/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix b/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix index e958b0f16d62..5335c044cd27 100644 --- a/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "atomicwrites"; diff --git a/nixpkgs/pkgs/development/python-modules/atomman/default.nix b/nixpkgs/pkgs/development/python-modules/atomman/default.nix index 147d2e77debc..b576504588aa 100644 --- a/nixpkgs/pkgs/development/python-modules/atomman/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atomman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , cython , datamodeldict , matplotlib diff --git a/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix b/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix index 6b8b8dccef81..4802ea867b7b 100644 --- a/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , configparser diff --git a/nixpkgs/pkgs/development/python-modules/attrdict/default.nix b/nixpkgs/pkgs/development/python-modules/attrdict/default.nix index 5c7514f9da63..cb87b9027f04 100644 --- a/nixpkgs/pkgs/development/python-modules/attrdict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/attrdict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }: +{ lib, buildPythonPackage, fetchPypi, coverage, nose, six }: buildPythonPackage rec { pname = "attrdict"; diff --git a/nixpkgs/pkgs/development/python-modules/authlib/default.nix b/nixpkgs/pkgs/development/python-modules/authlib/default.nix index 3e6faae9af09..4fa14a60ff83 100644 --- a/nixpkgs/pkgs/development/python-modules/authlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/authlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest diff --git a/nixpkgs/pkgs/development/python-modules/authres/default.nix b/nixpkgs/pkgs/development/python-modules/authres/default.nix index c3d0402d48d1..196e573717b7 100644 --- a/nixpkgs/pkgs/development/python-modules/authres/default.nix +++ b/nixpkgs/pkgs/development/python-modules/authres/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, python }: +{ lib, fetchPypi, buildPythonPackage, python }: buildPythonPackage rec { pname = "authres"; diff --git a/nixpkgs/pkgs/development/python-modules/autograd/default.nix b/nixpkgs/pkgs/development/python-modules/autograd/default.nix index fef97a7a6f48..0bdee21b69c2 100644 --- a/nixpkgs/pkgs/development/python-modules/autograd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autograd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, future }: +{ lib, buildPythonPackage, fetchPypi, numpy, future }: buildPythonPackage rec { pname = "autograd"; diff --git a/nixpkgs/pkgs/development/python-modules/autologging/default.nix b/nixpkgs/pkgs/development/python-modules/autologging/default.nix index 7cd66dc2c3fe..fdd935303d02 100644 --- a/nixpkgs/pkgs/development/python-modules/autologging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autologging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "Autologging"; diff --git a/nixpkgs/pkgs/development/python-modules/automat/default.nix b/nixpkgs/pkgs/development/python-modules/automat/default.nix index fa395f119ee5..20f54870e1f9 100644 --- a/nixpkgs/pkgs/development/python-modules/automat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/automat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, m2r, setuptools_scm, six, attrs }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix index afeaef406611..c748c0cb8c1a 100644 --- a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales +{ lib, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales , toml }: diff --git a/nixpkgs/pkgs/development/python-modules/av/default.nix b/nixpkgs/pkgs/development/python-modules/av/default.nix index c2edbdcf6a38..bf21025e8622 100644 --- a/nixpkgs/pkgs/development/python-modules/av/default.nix +++ b/nixpkgs/pkgs/development/python-modules/av/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "av"; - version = "8.0.2"; + version = "8.0.3"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "a3bba6bf68766b8a1a057f28869c7078cf0a1ec3207c7788c2ce8fe6f6bd8267"; + sha256 = "521814309c91d526b6b5c9517018aef2dd12bc3d86351037db69aa67730692b8"; }; checkInputs = [ numpy ]; diff --git a/nixpkgs/pkgs/development/python-modules/avion/default.nix b/nixpkgs/pkgs/development/python-modules/avion/default.nix new file mode 100644 index 000000000000..a456c110ff42 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/avion/default.nix @@ -0,0 +1,37 @@ +{ lib +, bluepy +, buildPythonPackage +, csrmesh +, fetchPypi +, pycryptodome +, requests +}: + +buildPythonPackage rec { + pname = "avion"; + version = "0.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zgv45086b97ngyqxdp41wxb7hpn9g7alygc21j9y3dib700vzdz"; + }; + + propagatedBuildInputs = [ + bluepy + csrmesh + pycryptodome + requests + ]; + + # Project has no test + doCheck = false; + # bluepy/uuids.json is not found + # pythonImportsCheck = [ "avion" ]; + + meta = with lib; { + description = "Python API for controlling Avi-on Bluetooth dimmers"; + homepage = "https://github.com/mjg59/python-avion"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix b/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix index 3e9a0e492d3c..e0294246fb2d 100644 --- a/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }: buildPythonPackage rec { pname = "avro-python3"; diff --git a/nixpkgs/pkgs/development/python-modules/avro/default.nix b/nixpkgs/pkgs/development/python-modules/avro/default.nix index 35cab724a862..5a38e86eee37 100644 --- a/nixpkgs/pkgs/development/python-modules/avro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/avro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: buildPythonPackage rec { pname = "avro"; diff --git a/nixpkgs/pkgs/development/python-modules/avro3k/default.nix b/nixpkgs/pkgs/development/python-modules/avro3k/default.nix index b600bc75c7a3..f6ad9bf086cc 100644 --- a/nixpkgs/pkgs/development/python-modules/avro3k/default.nix +++ b/nixpkgs/pkgs/development/python-modules/avro3k/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "avro3k"; diff --git a/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix index 00882cb08279..47ca9859b5e7 100644 --- a/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, unidecode, regex, python }: +{ lib, buildPythonPackage, fetchPypi, unidecode, regex, python }: buildPythonPackage rec { pname = "awesome-slugify"; diff --git a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index 2c00baf39a8b..2a532beca473 100644 --- a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.1.3"; + version = "21.2.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-D31wmBrYFCArHddAINWjfTPow4K2TD+wGfmRUuIaBdA="; + sha256 = "1yl09csypa64nhsw7dc6kj8iybm1wkhfzylyfyq8b7jpwdx7ql31"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 52298faa0cc8..1c067bcec282 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.31.0"; + version = "1.32.0"; src = fetchPypi { inherit pname version; - sha256 = "3a1d73d098161e60966b0d53bb310c98e4f66101688cce3d1697903643782d79"; + sha256 = "jL+sAlKbeXA1QeJVQbAcgIaPEbD/Ko+QMrI1Ew2dVq4="; }; # Tests are not included in the PyPI package @@ -26,10 +26,9 @@ buildPythonPackage rec { six ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ]; - meta = { + meta = with lib; { homepage = "https://github.com/awslabs/serverless-application-model"; description = "Python library to transform SAM templates into AWS CloudFormation templates"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.andreabedini ]; + license = licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 033ef0cccea4..5f4b005b6efe 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "14.0.0"; + version = "15.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1d3b2c9ebd57c8874e11d29e7dd05a1f078d2156fc9683e2f2ad41024e448bf6"; + sha256 = "9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix index d9375942b4d3..ead8dbd3f015 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.2.0"; + version = "0.3.0"; pname = "azure-mgmt-botservice"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "10sxllwvybjlp35h5mjdxhkw2wzpl4b03i08p4jnv8cswrc8h7dj"; + sha256 = "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index b204add2b5e9..dfadfbbc10e4 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -5,23 +5,25 @@ , msrestazure , azure-common , azure-mgmt-nspkg +, azure-mgmt-core , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "6.0.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "590cd35c9f1556a2d93d93a88b5c5661f716de094f22db30f4d05dc58a131c84"; + sha256 = "f1216f505126483c568be511a3e0e654f886f13730dae5368609ff0573528cf2"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index a89d94f3d706..ec1caa5c3e4a 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.15.0"; + version = "1.0.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5e98c360609a77b443b2fe431e0337e5cb705b4f02d0204791f9985f7ce68836"; + sha256 = "e2c0cecd634c0a106e389f39ad767bfd1d718d90692e4e3c9664b1fe9a792ade"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index 95bcd9dbc406..b15fd3afa097 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { - version = "17.0.0"; + version = "17.1.0"; pname = "azure-mgmt-network"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199"; + sha256 = "f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index 61ef82d74acc..76ef894b96ad 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b12318392e6f5100246c60de88879e24b15db104d00f9704a4ff51e7344594f1"; + sha256 = "1dc97f48f3edb67116da8604ab76ef93233319f56455532be307f323e9ebf0e6"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index 22b6281fa769..fcde20b9bf79 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "f81cb52b220774aab93ffcf25bdc17e03fd84b6916836640789f86fbf636b984"; + sha256 = "3cf37df471f75441b0afe98a0f3a548434e9bc6a6426dca8c089950b5423f63f"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index da43f6e5690e..cd695132d7ae 100644 --- a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook , requests, arrow, logfury, tqdm }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/babelfish/default.nix b/nixpkgs/pkgs/development/python-modules/babelfish/default.nix index 5ac044292156..ba015f597ce6 100644 --- a/nixpkgs/pkgs/development/python-modules/babelfish/default.nix +++ b/nixpkgs/pkgs/development/python-modules/babelfish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "babelfish"; diff --git a/nixpkgs/pkgs/development/python-modules/babelgladeextractor/default.nix b/nixpkgs/pkgs/development/python-modules/babelgladeextractor/default.nix index 0df03754127b..b1516d1abdb8 100644 --- a/nixpkgs/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/babelgladeextractor/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , isPy3k , buildPythonPackage , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix b/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix index 5fe922b90462..52163abe8bcf 100644 --- a/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "backports.shutil_which"; diff --git a/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix b/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix index 5216149ddc2c..6086178c9597 100644 --- a/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, future }: +{ lib, buildPythonPackage, fetchPypi, future }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/backports_os/default.nix b/nixpkgs/pkgs/development/python-modules/backports_os/default.nix index b3e231bcd05d..39973e433eed 100644 --- a/nixpkgs/pkgs/development/python-modules/backports_os/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports_os/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools_scm diff --git a/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix b/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix index 08f98de79f27..a9950eb704f8 100644 --- a/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, mock }: buildPythonPackage rec { pname = "backports.unittest_mock"; diff --git a/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix b/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix index 9770fb45981d..c04b88a3f328 100644 --- a/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools_scm diff --git a/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix b/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix index 59542e61c56b..f07c5e90d517 100644 --- a/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub +{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub , wheel, pytestCheckHook, pytestrunner }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/bap/default.nix b/nixpkgs/pkgs/development/python-modules/bap/default.nix index d2575afb77d2..03abf67f86a0 100644 --- a/nixpkgs/pkgs/development/python-modules/bap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bap/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}: +{lib, buildPythonPackage, fetchFromGitHub, bap, requests}: buildPythonPackage rec { pname = "bap"; diff --git a/nixpkgs/pkgs/development/python-modules/base58/default.nix b/nixpkgs/pkgs/development/python-modules/base58/default.nix index a36727429ca7..1437683941bb 100644 --- a/nixpkgs/pkgs/development/python-modules/base58/default.nix +++ b/nixpkgs/pkgs/development/python-modules/base58/default.nix @@ -1,19 +1,29 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }: +{ lib +, buildPythonPackage +, fetchPypi +, pyhamcrest +, pytest-benchmark +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "base58"; - version = "2.0.1"; - disabled = isPy27; # python 2 abandoned upstream + version = "2.1.0"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "365c9561d9babac1b5f18ee797508cd54937a724b6e419a130abad69cec5ca79"; + sha256 = "sha256-FxpUe0o8YeGuOAciSm967HXjZMQ5XnViZJ1zNXaAAaI="; }; - checkInputs = [ pytest pyhamcrest ]; - checkPhase = '' - pytest - ''; + checkInputs = [ + pyhamcrest + pytest-benchmark + pytestCheckHook + ]; + + pythonImportsCheck = [ "base58" ]; meta = with lib; { description = "Base58 and Base58Check implementation"; diff --git a/nixpkgs/pkgs/development/python-modules/basemap/default.nix b/nixpkgs/pkgs/development/python-modules/basemap/default.nix index c97548bdee88..2fadda388ba0 100644 --- a/nixpkgs/pkgs/development/python-modules/basemap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/basemap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , numpy diff --git a/nixpkgs/pkgs/development/python-modules/batinfo/default.nix b/nixpkgs/pkgs/development/python-modules/batinfo/default.nix index 0ed3486272d3..17d28c129141 100644 --- a/nixpkgs/pkgs/development/python-modules/batinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/batinfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "batinfo"; diff --git a/nixpkgs/pkgs/development/python-modules/bayespy/default.nix b/nixpkgs/pkgs/development/python-modules/bayespy/default.nix index b470d21b1bea..6ebe9919ec9b 100644 --- a/nixpkgs/pkgs/development/python-modules/bayespy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bayespy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , pytest, nose, glibcLocales , numpy, scipy, matplotlib, h5py }: diff --git a/nixpkgs/pkgs/development/python-modules/bcdoc/default.nix b/nixpkgs/pkgs/development/python-modules/bcdoc/default.nix index 185fcb86b0b7..29c267aa45fb 100644 --- a/nixpkgs/pkgs/development/python-modules/bcdoc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bcdoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, six }: +{ lib, buildPythonPackage, fetchPypi, docutils, six }: buildPythonPackage rec { pname = "bcdoc"; diff --git a/nixpkgs/pkgs/development/python-modules/bcrypt/3_1.nix b/nixpkgs/pkgs/development/python-modules/bcrypt/3_1.nix index c70161cf28b0..df57eb3cd0c9 100644 --- a/nixpkgs/pkgs/development/python-modules/bcrypt/3_1.nix +++ b/nixpkgs/pkgs/development/python-modules/bcrypt/3_1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , isPyPy, cffi, pytest, six }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix b/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix index e74b0934b308..cfd17262a2b3 100644 --- a/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, pythonOlder +{ lib, buildPythonPackage, isPyPy, fetchPypi, pythonOlder , cffi, pycparser, mock, pytest, py, six }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/nixpkgs/pkgs/development/python-modules/beancount/default.nix index fa97c7c97a94..e4a6a5f5625e 100644 --- a/nixpkgs/pkgs/development/python-modules/beancount/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beancount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , beautifulsoup4, bottle, chardet, dateutil , google_api_python_client, lxml, oauth2client , ply, python_magic, pytest, requests }: diff --git a/nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix b/nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix index a74f6c6f8f28..ffdb2f6f8f2a 100644 --- a/nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beanstalkc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage }: +{ lib, fetchFromGitHub, buildPythonPackage }: buildPythonPackage rec { pname = "beanstalkc"; diff --git a/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix b/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix index 555669da243e..b00c03a09c14 100644 --- a/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: +{ lib, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: buildPythonPackage rec { pname = "beautifulsoup4"; diff --git a/nixpkgs/pkgs/development/python-modules/bedup/default.nix b/nixpkgs/pkgs/development/python-modules/bedup/default.nix index f38d4263c248..454a972f177b 100644 --- a/nixpkgs/pkgs/development/python-modules/bedup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bedup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , btrfs-progs diff --git a/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 6ee8b6499b58..d47c5d716a73 100644 --- a/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , click, click-log, pure-pcapy3 , pyserial-asyncio, voluptuous, zigpy , asynctest, pytestCheckHook, pytest-asyncio }: diff --git a/nixpkgs/pkgs/development/python-modules/bespon/default.nix b/nixpkgs/pkgs/development/python-modules/bespon/default.nix index 555a0a487581..da6820ef6ecc 100644 --- a/nixpkgs/pkgs/development/python-modules/bespon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bespon/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "BespON"; src = fetchPypi { inherit pname version; - sha256 = "a75cd7e62746fb0fef9b98aa157a44f9ed2ef63e952f7ae4ec5b3c2892669187"; + sha256 = "2f2bda67fea8ee95c8aa7e885835ab88bdbfa392a94077ce1c9d29017420ce7a"; }; propagatedBuildInputs = [ ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Encodes and decodes data in the BespON format."; homepage = "https://github.com/gpoore/bespon_py"; - license = licenses.lgpl3; + license = licenses.bsd3; maintainers = with maintainers; [ synthetica ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix b/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix index 424b8ef4ef36..459d3c51d7ed 100644 --- a/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , betamax, requests_toolbelt }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix b/nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix index 3d3cad4d95b5..0ddc9845bfa7 100644 --- a/nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/betamax-serializers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , betamax, pyyaml }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/betamax/default.nix b/nixpkgs/pkgs/development/python-modules/betamax/default.nix index 5e1469bfc52d..5906a531f22d 100644 --- a/nixpkgs/pkgs/development/python-modules/betamax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/betamax/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "betamax"; diff --git a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index 22807bb35351..d62c929e877d 100644 --- a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.5.8"; + version = "1.6.0"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "5b8c3b9047d2e00e25746d55f56f62071f0a82dd2de59371a1ee589fe28b2852"; + sha256 = "6858eab83068d34a9d41155c931ca8db9faef2272710d9730c2135915c19be82"; }; # needs packages which are not available in nixpkgs diff --git a/nixpkgs/pkgs/development/python-modules/billiard/default.nix b/nixpkgs/pkgs/development/python-modules/billiard/default.nix index 4f8aa3565da2..2d4eabf215ea 100644 --- a/nixpkgs/pkgs/development/python-modules/billiard/default.nix +++ b/nixpkgs/pkgs/development/python-modules/billiard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }: buildPythonPackage rec { pname = "billiard"; diff --git a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index c2f059dd93dc..b9120d412cb0 100644 --- a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub +, stdenv , zlib , xz , ncompress @@ -17,25 +18,23 @@ , matplotlib , nose , pycrypto -, pyqtgraph ? null }: +, pyqtgraph +, visualizationSupport ? false }: -let - visualizationSupport = (pyqtgraph != null) && (matplotlib != null); - version = "2.2.0"; -in -buildPythonPackage { +buildPythonPackage rec { pname = "binwalk"; - inherit version; + version = "2.2.0"; src = fetchFromGitHub { - owner = "devttys0"; + owner = "ReFirmLabs"; repo = "binwalk"; - rev = "be738a52e09b0da2a6e21470e0dbcd5beb42ed1b"; + rev = "v${version}"; sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ] - ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ]; + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools lzma pycrypto ] + ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ] + ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ]; # setup.py only installs version.py during install, not test postPatch = '' @@ -49,6 +48,8 @@ buildPythonPackage { checkInputs = [ nose ]; + pythonImportsCheck = [ "binwalk" ]; + meta = with lib; { homepage = "https://github.com/ReFirmLabs/binwalk"; description = "A tool for searching a given binary image for embedded files"; diff --git a/nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix b/nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix index 559661bbb4f3..b874f1af525a 100644 --- a/nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitbucket-api/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , requests_oauthlib, nose, sh }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix b/nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix index 50075fe70fce..bb1fa1d6c17c 100644 --- a/nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: buildPythonPackage rec { pname = "bitbucket-cli"; diff --git a/nixpkgs/pkgs/development/python-modules/bitmath/default.nix b/nixpkgs/pkgs/development/python-modules/bitmath/default.nix index 49992c561f73..5643ea29bc2a 100644 --- a/nixpkgs/pkgs/development/python-modules/bitmath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitmath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: buildPythonPackage rec { pname = "bitmath"; diff --git a/nixpkgs/pkgs/development/python-modules/bitstring/default.nix b/nixpkgs/pkgs/development/python-modules/bitstring/default.nix index d6eaf31056ff..ed67f2be5c5f 100644 --- a/nixpkgs/pkgs/development/python-modules/bitstring/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitstring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "bitstring"; diff --git a/nixpkgs/pkgs/development/python-modules/bjoern/default.nix b/nixpkgs/pkgs/development/python-modules/bjoern/default.nix index 2949ecbf6f92..ef599d89be2b 100644 --- a/nixpkgs/pkgs/development/python-modules/bjoern/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bjoern/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, libev, python }: +{ lib, buildPythonPackage, fetchPypi, libev, python }: buildPythonPackage rec { pname = "bjoern"; diff --git a/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix b/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix index 536ad1f14b66..80aed4e6fef5 100644 --- a/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix +++ b/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/nixpkgs/pkgs/development/python-modules/bleak/default.nix index 06dc3217dc87..38390e8377e9 100644 --- a/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: buildPythonPackage rec { pname = "bleak"; diff --git a/nixpkgs/pkgs/development/python-modules/blessed/default.nix b/nixpkgs/pkgs/development/python-modules/blessed/default.nix index 7adacecc647a..f0167625cf64 100644 --- a/nixpkgs/pkgs/development/python-modules/blessed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blessed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six +{ lib, buildPythonPackage, fetchPypi, fetchpatch, six , wcwidth, pytest, mock, glibcLocales }: diff --git a/nixpkgs/pkgs/development/python-modules/blessings/default.nix b/nixpkgs/pkgs/development/python-modules/blessings/default.nix index 5263a92ec3d9..00b7fd9a63d7 100644 --- a/nixpkgs/pkgs/development/python-modules/blessings/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blessings/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/nixpkgs/pkgs/development/python-modules/blinker/default.nix index e33ad1626318..5591113ab0ad 100644 --- a/nixpkgs/pkgs/development/python-modules/blinker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blinker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "blinker"; diff --git a/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix b/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix index 5e7cd42362dc..8e7dd0b11fb5 100644 --- a/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix @@ -1,30 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pyusb }: +{ lib +, buildPythonPackage +, fetchPypi +, pyusb +}: buildPythonPackage rec { pname = "BlinkStick"; - version = "1.1.8"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408"; + sha256 = "0rdk3i81s6byw23za0bxvkh7sj5l16qxxgc2c53qjg3klc24wcm9"; }; - patches = [ - (fetchpatch { - url = "https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch"; - sha256 = "1mcmxlnkbfxwp84qz32l5rlc7r9anh9yhnqaj1y8rny5s13jb01f"; - }) - (fetchpatch { - url = "https://github.com/arvydas/blinkstick-python/pull/54.patch"; - sha256 = "1gjq6xbai794bbdyrv82i96l1a7qkwvlhzd6sa937dy5ivv6s6hl"; - }) - ]; + # Upstream fix https://github.com/arvydas/blinkstick-python/pull/54 + # https://github.com/arvydas/blinkstick-python/pull/54/commits/b9bee2cd72f799f1210e5d9e13207f93bbc2d244.patch + # has line ending issues after 1.2.0 + postPatch = '' + substituteInPlace setup.py --replace "pyusb==1.0.0" "pyusb>=1.0.0" + ''; propagatedBuildInputs = [ pyusb ]; + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "blinkstick" ]; + meta = with lib; { description = "Python package to control BlinkStick USB devices"; - homepage = "https://pypi.python.org/pypi/BlinkStick/"; + homepage = "https://github.com/arvydas/blinkstick-python"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/blis/default.nix b/nixpkgs/pkgs/development/python-modules/blis/default.nix index eeb62e8fed32..5d292c93fbbb 100644 --- a/nixpkgs/pkgs/development/python-modules/blis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython @@ -35,6 +35,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; platforms = platforms.x86_64; - maintainers = with maintainers; [ danieldk ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/blist/default.nix b/nixpkgs/pkgs/development/python-modules/blist/default.nix index 505f01af5fe4..d4dcb54c5cd1 100644 --- a/nixpkgs/pkgs/development/python-modules/blist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchpatch , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/blivet/default.nix b/nixpkgs/pkgs/development/python-modules/blivet/default.nix index 94abc39fd285..fd97fa206480 100644 --- a/nixpkgs/pkgs/development/python-modules/blivet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock +{ lib, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock , pyudev, six, libselinux, multipath-tools, lsof, util-linux }: diff --git a/nixpkgs/pkgs/development/python-modules/block-io/default.nix b/nixpkgs/pkgs/development/python-modules/block-io/default.nix index 3a9704d71bc5..b823b8711a53 100644 --- a/nixpkgs/pkgs/development/python-modules/block-io/default.nix +++ b/nixpkgs/pkgs/development/python-modules/block-io/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }: +{ lib, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }: buildPythonPackage rec { pname = "block-io"; diff --git a/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix index 5adc854d0263..f5d8b93c4816 100644 --- a/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , setuptools, funcparserlib, pillow, webcolors, reportlab, docutils }: diff --git a/nixpkgs/pkgs/development/python-modules/bluepy-devices/default.nix b/nixpkgs/pkgs/development/python-modules/bluepy-devices/default.nix new file mode 100644 index 000000000000..c1baeedcb5e4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bluepy-devices/default.nix @@ -0,0 +1,29 @@ +{ lib +, bluepy +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "bluepy-devices"; + version = "0.2.1"; + + src = fetchPypi { + pname = "bluepy_devices"; + inherit version; + sha256 = "02zzzivxq2vifgs65m2rm8pqlsbzsbc419c032irzvfxjx539mr8"; + }; + + propagatedBuildInputs = [ bluepy ]; + + # Project has no test + doCheck = false; + pythonImportsCheck = [ "bluepy_devices" ]; + + meta = with lib; { + description = "Python BTLE Device Interface for bluepy"; + homepage = "https://github.com/bimbar/bluepy_devices"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bluepy/default.nix b/nixpkgs/pkgs/development/python-modules/bluepy/default.nix index d833d20934d6..11930050ba34 100644 --- a/nixpkgs/pkgs/development/python-modules/bluepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bluepy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkg-config diff --git a/nixpkgs/pkgs/development/python-modules/boltons/default.nix b/nixpkgs/pkgs/development/python-modules/boltons/default.nix index 13e264340da1..f4842981c4a7 100644 --- a/nixpkgs/pkgs/development/python-modules/boltons/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boltons/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "boltons"; diff --git a/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix b/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix index 48bc53bbeeda..f80a8deb9ab4 100644 --- a/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , spglib diff --git a/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 92972470f1c0..1d3e0cca6749 100644 --- a/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.57"; # N.B: if you change this, change botocore too + version = "1.17.5"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-SkmcwvU91VeojG22pVJ0iiq9g//tpwzrcdyNs5oCcxQ="; + sha256 = "sha256-1qr7gE/KK2fGXdp4rYtK/tkB4AQHEgi4TIBNNFrZ67o="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/nixpkgs/pkgs/development/python-modules/botocore/default.nix index a17e6c728cf7..05c333d93979 100644 --- a/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.57"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.5"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-x1bWX/qYnFwOkheBdeQav3sYrRmy/i6C4ZLwheJk4Do="; + sha256 = "sha256-BKHfdZaB9fFxrMs1TYY7/tB3TWSk6O41/0mDV1VmCk4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bottle/default.nix b/nixpkgs/pkgs/development/python-modules/bottle/default.nix index 213d69dd9890..eeaf34a44ebc 100644 --- a/nixpkgs/pkgs/development/python-modules/bottle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bottle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "bottle"; diff --git a/nixpkgs/pkgs/development/python-modules/box2d/default.nix b/nixpkgs/pkgs/development/python-modules/box2d/default.nix index 92ac90ab6d4d..e6f6a390f374 100644 --- a/nixpkgs/pkgs/development/python-modules/box2d/default.nix +++ b/nixpkgs/pkgs/development/python-modules/box2d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , swig2 diff --git a/nixpkgs/pkgs/development/python-modules/bpython/default.nix b/nixpkgs/pkgs/development/python-modules/bpython/default.nix index 108d8ec0c66b..8a37ed0bd978 100644 --- a/nixpkgs/pkgs/development/python-modules/bpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bpython/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , curtsies diff --git a/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/nixpkgs/pkgs/development/python-modules/braintree/default.nix index 7eba4743f0ff..7ad0b5604fc6 100644 --- a/nixpkgs/pkgs/development/python-modules/braintree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.5.0"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "98b9775e3d5f793c0a47df6b3649cd175705ee2d9163f7853e8c73acec7b923f"; + sha256 = "ef19892f99fa497c90684db6d41442e94b2d3b0ed00afe2c574e46d89cb9a89c"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/brother/default.nix b/nixpkgs/pkgs/development/python-modules/brother/default.nix index 394021ff2b21..3e86aac02f1f 100644 --- a/nixpkgs/pkgs/development/python-modules/brother/default.nix +++ b/nixpkgs/pkgs/development/python-modules/brother/default.nix @@ -4,16 +4,24 @@ buildPythonPackage rec { pname = "brother"; - version = "0.1.18"; + version = "0.2.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "14fiwhgcgymgqsl9kcfb0597rcjxvdknhwbakpdf0xp2ph6cj266"; + sha256 = "sha256-yOloGkOVhXcTt0PAjf3yWUItN1okO94DndRFsImiuz4="; }; + # pytest-error-for-skips is not packaged + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --error-for-skips" "" + substituteInPlace setup.py \ + --replace "\"pytest-error-for-skips\"" "" + ''; + propagatedBuildInputs = [ pysnmp ]; diff --git a/nixpkgs/pkgs/development/python-modules/brottsplatskartan/default.nix b/nixpkgs/pkgs/development/python-modules/brottsplatskartan/default.nix new file mode 100644 index 000000000000..8daf79f208d6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/brottsplatskartan/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-cov +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "brottsplatskartan"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "chrillux"; + repo = pname; + rev = version; + sha256 = "07iwmnchvpw156j23yfccg4c32izbwm8b02bjr1xgmcwzbq21ks9"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "brottsplatskartan" ]; + + meta = with lib; { + description = "Python API wrapper for brottsplatskartan.se"; + homepage = "https://github.com/chrillux/brottsplatskartan"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix b/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix index 9877a03a087e..82459398ca73 100644 --- a/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix b/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix index f70f71c1a699..339e649c53af 100644 --- a/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , aflplusplus diff --git a/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix b/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix index 209565fa21b7..584b7b126055 100644 --- a/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , pybluez }: buildPythonPackage { pname = "bt-proximity"; - version = "0.0.20180217"; + version = "0.2"; # pypi only has a pre-compiled wheel and no sources src = fetchFromGitHub { @@ -18,6 +18,8 @@ buildPythonPackage { # there are no tests doCheck = false; + pythonImportsCheck = [ "bt_proximity" ]; + meta = with lib; { description = "Bluetooth Proximity Detection using Python"; homepage = "https://github.com/FrederikBolding/bluetooth-proximity"; diff --git a/nixpkgs/pkgs/development/python-modules/btchip/default.nix b/nixpkgs/pkgs/development/python-modules/btchip/default.nix index ebb14a77b564..e34b58907ea8 100644 --- a/nixpkgs/pkgs/development/python-modules/btchip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/btchip/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }: +{ lib, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }: buildPythonPackage rec { pname = "btchip-python"; - version = "0.1.31"; + version = "0.1.32"; src = fetchPypi { inherit pname version; - sha256 = "4167f3c6ea832dd189d447d0d7a8c2a968027671ae6f43c680192f2b72c39b2c"; + sha256 = "34f5e0c161c08f65dc0d070ba2ff4c315ed21c4b7e0faa32a46862d0dc1b8f55"; }; propagatedBuildInputs = [ hidapi pyscard ecdsa ]; @@ -14,6 +14,8 @@ buildPythonPackage rec { # tests requires hardware doCheck = false; + pythonImportsCheck = [ "btchip.btchip" ]; + meta = with lib; { description = "Python communication library for Ledger Hardware Wallet products"; homepage = "https://github.com/LedgerHQ/btchip-python"; diff --git a/nixpkgs/pkgs/development/python-modules/btrees/default.nix b/nixpkgs/pkgs/development/python-modules/btrees/default.nix index 471ba54215de..3da6852c54df 100644 --- a/nixpkgs/pkgs/development/python-modules/btrees/default.nix +++ b/nixpkgs/pkgs/development/python-modules/btrees/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , persistent diff --git a/nixpkgs/pkgs/development/python-modules/btrfs/default.nix b/nixpkgs/pkgs/development/python-modules/btrfs/default.nix index 8ea93fe005e7..adaf1f610e35 100644 --- a/nixpkgs/pkgs/development/python-modules/btrfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/btrfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix b/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix index 5e3b0b4e89f7..338453684806 100644 --- a/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix b/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix index 3d27384efe18..c59d2196d207 100644 --- a/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, setuptools +{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools , twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six , jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }: diff --git a/nixpkgs/pkgs/development/python-modules/bugz/default.nix b/nixpkgs/pkgs/development/python-modules/bugz/default.nix index 5324a43e1b0c..a57e957efe67 100644 --- a/nixpkgs/pkgs/development/python-modules/bugz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bugz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix b/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix index fc122ecd233c..365f36542985 100644 --- a/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pep8, coverage, logilab_common, requests }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index 84476a2ca361..f4c5bfb16221 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.10.0"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "06fgp5gpacyx1sqh1f6590r792d5lhzspwmjli592ajx69ckzzwf"; + sha256 = "0jmgpvgn36kfc1sa27a1l1g26dawhl99a1wl8gn4ajbcbcvc2pkh"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index 90c2f0991970..f3dc0440ac5c 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1wr8fxa80c6vq55zv7k9rf61r805flrhd2v28qfl05jz1inghysb"; + sha256 = "0ymqkjz1zk4gs0hkxjh07napc4k24xxb8f3pganw27fca60xcii0"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index 92e78f940d53..ed2f363901e1 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0bzn00qqx0xd9r4rrz01y9zmiwjlhcanrs13r1yzp2mycn9q5865"; + sha256 = "0x2k95lwx2gz2zj2ys646qiylhyqzlbiqf1k3q1l8w1wlggwv3xp"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0yh0dpg27gl3pk3nimj1yb6rw7kxvsv1bvzc6hbcfx3a9qdajicj"; + sha256 = "0fpam6x8x207la1xrr8m45yx35r646iizrs4gsaghlysmr95jb3i"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0b9fffr53wfq328csrqgdinafbs1v5s7yn4ky8faw6sqyd8l197v"; + sha256 = "0ari338hmi1bb1pln3mxv4k9aclbcby6z3km61wg3va511qhrrbq"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0pz1kmq731ap79l05l13f10r81lzgif5aydpsfz3k5fa9flvxjxs"; + sha256 = "0a5nrklyzfasaa119y4ivr7449rvsgifpkyravinacrl1g9phlls"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1jf72dzmgwrkqbr2f8s2dvf0zpvl3vbdq0qsf0g8xal272l7cmca"; + sha256 = "0rris2p7ic9p9ms3qcczia4nn5mb1yx2gv5mlnmg2yligjad2jaf"; }; buildInputs = [ buildbot-pkg ]; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index bf5e1e6ae989..02139d15e75a 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "1s51ycgnvjbxc2y358vw6rnw8xsx9grj6pxzfxjrph784igy22r0"; + sha256 = "10ap7jlxs9vcmnyafr62mxlgsp709165nw55xmv9sw18r7m8wsm6"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/nixpkgs/pkgs/development/python-modules/buildout/default.nix b/nixpkgs/pkgs/development/python-modules/buildout/default.nix index 0751b284a786..a9fe66a37ea2 100644 --- a/nixpkgs/pkgs/development/python-modules/buildout/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "zc.buildout"; diff --git a/nixpkgs/pkgs/development/python-modules/bumps/default.nix b/nixpkgs/pkgs/development/python-modules/bumps/default.nix index 05f082c747bd..7e94bd55b28f 100644 --- a/nixpkgs/pkgs/development/python-modules/bumps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bumps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six}: +{ lib, buildPythonPackage, fetchPypi, six}: buildPythonPackage rec { pname = "bumps"; diff --git a/nixpkgs/pkgs/development/python-modules/bunch/default.nix b/nixpkgs/pkgs/development/python-modules/bunch/default.nix index ce77085e4f7f..2758ff5b4185 100644 --- a/nixpkgs/pkgs/development/python-modules/bunch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bunch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "bunch"; diff --git a/nixpkgs/pkgs/development/python-modules/bwapy/default.nix b/nixpkgs/pkgs/development/python-modules/bwapy/default.nix index c736eb577d44..f6c926cf419a 100644 --- a/nixpkgs/pkgs/development/python-modules/bwapy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bwapy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonOlder , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix b/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix index 53b13ddb5685..ba9b9022ac80 100644 --- a/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/nixpkgs/pkgs/development/python-modules/cached-property/default.nix b/nixpkgs/pkgs/development/python-modules/cached-property/default.nix index d25e2e963dc3..72bf870c37b5 100644 --- a/nixpkgs/pkgs/development/python-modules/cached-property/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cached-property/default.nix @@ -1,28 +1,25 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pytest +, fetchPypi +, pytestCheckHook , freezegun }: buildPythonPackage rec { pname = "cached-property"; - version = "1.5.1"; + version = "1.5.2"; - # conftest.py is missing in PyPI tarball - src = fetchFromGitHub { - owner = "pydanny"; - repo = pname; - rev = version; - sha256 = "0xh0pwmiikx0il9nnfyf034ydmlw6992s0d209agd9j5d3s2k5q6"; + src = fetchPypi { + inherit pname version; + sha256 = "9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130"; }; - checkInputs = [ pytest freezegun ]; + checkInputs = [ pytestCheckHook freezegun ]; - # https://github.com/pydanny/cached-property/issues/131 - checkPhase = '' - py.test -k "not test_threads_ttl_expiry" - ''; + disabledTests = [ + # https://github.com/pydanny/cached-property/issues/131 + "test_threads_ttl_expiry" + ]; meta = { description = "A decorator for caching properties in classes"; diff --git a/nixpkgs/pkgs/development/python-modules/cachelib/default.nix b/nixpkgs/pkgs/development/python-modules/cachelib/default.nix index 503b546116ef..154c67bb379f 100644 --- a/nixpkgs/pkgs/development/python-modules/cachelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cachelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cachelib"; diff --git a/nixpkgs/pkgs/development/python-modules/cachetools/default.nix b/nixpkgs/pkgs/development/python-modules/cachetools/default.nix index 6fd3f637875d..120fd5df124b 100644 --- a/nixpkgs/pkgs/development/python-modules/cachetools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cachetools/default.nix @@ -1,17 +1,28 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "cachetools"; - version = "4.1.1"; + version = "4.2.1"; - src = fetchPypi { - inherit pname version; - sha256 = "bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20"; + src = fetchFromGitHub { + owner = "tkem"; + repo = pname; + rev = "v${version}"; + sha256 = "1b662ph8m2d05d2vi3izgnr6v7h9zfvscfsaaw8nhdmmm15ivfa6"; }; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cachetools" ]; + meta = with lib; { description = "Extensible memoizing collections and decorators"; homepage = "https://github.com/tkem/cachetools"; - license = licenses.mit; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix b/nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix index bb5629cf4e51..3e1a67f8282b 100644 --- a/nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix +++ b/nixpkgs/pkgs/development/python-modules/cairosvg/1_x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig +{ lib, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig , cssselect2, defusedxml, pillow, tinycss2 }: # CairoSVG 2.x dropped support for Python 2 so offer CairoSVG 1.x as an diff --git a/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix index 9d1c54651c20..53f3ebc0c088 100644 --- a/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch +{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch , cairocffi, cssselect2, defusedxml, pillow, tinycss2 , pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: diff --git a/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix b/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix index 6e487b58cff7..8ffacc1a99de 100644 --- a/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix @@ -13,19 +13,19 @@ , xlrd , XlsxWriter , pyyaml -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "canmatrix"; - version = "0.9.1"; + version = "0.9.3"; # uses fetchFromGitHub as PyPi release misses test/ dir src = fetchFromGitHub { owner = "ebroecker"; repo = pname; rev = version; - sha256 = "129lcchq45h8wqjvvn0rwpbmih4m0igass2cx7a21z94li97hcia"; + sha256 = "sha256-9FupG1VmROgsxYhsafQYPPqG0xEOAYYK8QDOIBNzE0Y="; }; propagatedBuildInputs = [ @@ -48,14 +48,11 @@ buildPythonPackage rec { --replace "version = versioneer.get_version()" "version = \"${version}\"" ''; - checkInputs = [ - pytest - ]; - + checkInputs = [ pytestCheckHook ]; # long_envvar_name_imports requires stable key value pair ordering - checkPhase = '' - pytest -s src/canmatrix -k 'not long_envvar_name_imports' - ''; + pytestFlagsArray = [ "-s src/canmatrix" ]; + disabledTests = [ "long_envvar_name_imports" ]; + pythonImportsCheck = [ "canmatrix" ]; meta = with lib; { homepage = "https://github.com/ebroecker/canmatrix"; diff --git a/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix b/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix index 96af6f4bf78f..4a4f56f5abf5 100644 --- a/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , frozendict, simplejson, six, isPy27 }: diff --git a/nixpkgs/pkgs/development/python-modules/canopen/default.nix b/nixpkgs/pkgs/development/python-modules/canopen/default.nix index e6f09645379c..8925c1cc8a41 100644 --- a/nixpkgs/pkgs/development/python-modules/canopen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/canopen/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchPypi -, nose +, setuptools-scm , can -, canmatrix }: +, canmatrix +, pytestCheckHook +}: buildPythonPackage rec { pname = "canopen"; @@ -14,17 +16,25 @@ buildPythonPackage rec { sha256 = "15d49f1f71e9989dde6e3b75fb8445c76bd223064dfc0ac629fe9ecb0e21fba9"; }; - propagatedBuildInputs = - [ can - canmatrix - ]; + nativeBuildInputs = [ + setuptools-scm + ]; - checkInputs = [ nose ]; + propagatedBuildInputs = [ + can + canmatrix + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "canopen" ]; meta = with lib; { homepage = "https://github.com/christiansandberg/canopen/"; description = "CANopen stack implementation"; - license = licenses.lgpl3; + license = licenses.mit; maintainers = with maintainers; [ sorki ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/capturer/default.nix b/nixpkgs/pkgs/development/python-modules/capturer/default.nix index 821561c05554..0e8732f69a8f 100644 --- a/nixpkgs/pkgs/development/python-modules/capturer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/capturer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytest, pytestcov }: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytestcov }: buildPythonPackage rec { pname = "capturer"; @@ -13,10 +13,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ humanfriendly ]; - checkPhase = '' - PATH=$PATH:$out/bin pytest . - ''; - checkInputs = [ pytest ]; + # hangs on darwin + doCheck = !stdenv.isDarwin; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Easily capture stdout/stderr of the current process and subprocesses"; diff --git a/nixpkgs/pkgs/development/python-modules/carbon/default.nix b/nixpkgs/pkgs/development/python-modules/carbon/default.nix index e0a31829b05f..b651a654d5ec 100644 --- a/nixpkgs/pkgs/development/python-modules/carbon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/carbon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , twisted, whisper, txamqp, cachetools, urllib3 }: diff --git a/nixpkgs/pkgs/development/python-modules/carrot/default.nix b/nixpkgs/pkgs/development/python-modules/carrot/default.nix index c2262decd314..a772535ad82b 100644 --- a/nixpkgs/pkgs/development/python-modules/carrot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/carrot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, amqplib, anyjson }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix index d1b795a9ef43..7e26181cf552 100644 --- a/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.16.0"; + version = "0.16.2"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1983p8pkbdj6yaclkdng7fn0pmlbz1yc75a4a847ppw47075ryph"; + sha256 = "0jan4xikyi1p92rsir8camc6ify81wnd9l57v1pgmjf5fgb5r2w8"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/case/default.nix b/nixpkgs/pkgs/development/python-modules/case/default.nix index 5d1a7696516a..3f95d9e22afc 100644 --- a/nixpkgs/pkgs/development/python-modules/case/default.nix +++ b/nixpkgs/pkgs/development/python-modules/case/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six, nose, unittest2, mock }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix b/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix index 32cf844cf00c..55468ba0fdf7 100644 --- a/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,47 +1,85 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder , cython , eventlet , futures +, iana-etc +, geomet , libev , mock , nose -, pytest +, pytestCheckHook , pytz , pyyaml , scales , six , sure +, gremlinpython +, gevent +, twisted +, libredirect }: buildPythonPackage rec { pname = "cassandra-driver"; version = "3.24.0"; - src = fetchPypi { - inherit pname version; - sha256 = "83ec8d9a5827ee44bb1c0601a63696a8a9086beaf0151c8255556299246081bd"; + # pypi tarball doesn't include tests + src = fetchFromGitHub { + owner = "datastax"; + repo = "python-driver"; + rev = version; + sha256 = "1rr69hly5q810xpn8rkzxwzlq55wxxp7kwki9vfri3gh674d2wip"; }; nativeBuildInputs = [ cython ]; buildInputs = [ libev ]; - propagatedBuildInputs = [ six ] + propagatedBuildInputs = [ six geomet ] ++ lib.optionals (pythonOlder "3.4") [ futures ]; - checkInputs = [ eventlet mock nose pytest pytz pyyaml sure ]; - - # ignore test files which try to do socket.getprotocolname('tcp') - # as it fails in sandbox mode due to lack of a /etc/protocols file - checkPhase = '' - pytest tests/unit \ - --ignore=tests/unit/io/test_libevreactor.py \ - --ignore=tests/unit/io/test_eventletreactor.py \ - --ignore=tests/unit/io/test_asyncorereactor.py + # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, + # also /etc/resolv.conf is referenced by some tests + preCheck = (lib.optionalString stdenv.isLinux '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + export LD_PRELOAD=${libredirect}/lib/libredirect.so + '') + '' + # increase tolerance for time-based test + substituteInPlace tests/unit/io/utils.py --replace 'delta=.15' 'delta=.3' + ''; + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD ''; + checkInputs = [ + pytestCheckHook + eventlet + mock + nose + pytz + pyyaml + sure + scales + gremlinpython + gevent + twisted + ]; + + pytestFlagsArray = [ + "tests/unit" + # requires puresasl + "--ignore=tests/unit/advanced/test_auth.py" + ]; + disabledTests = [ + # doesn't seem to be intended to be run directly + "_PoolTests" + # attempts to make connection to localhost + "test_connection_initialization" + ]; + meta = with lib; { description = "A Python client driver for Apache Cassandra"; homepage = "http://datastax.github.io/python-driver"; license = licenses.asl20; - broken = true; # geomet doesn't exist + maintainers = with maintainers; [ turion ris ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/casttube/default.nix b/nixpkgs/pkgs/development/python-modules/casttube/default.nix index 85b1147c13a5..9d29a0137436 100644 --- a/nixpkgs/pkgs/development/python-modules/casttube/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casttube/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "casttube"; diff --git a/nixpkgs/pkgs/development/python-modules/catalogue/default.nix b/nixpkgs/pkgs/development/python-modules/catalogue/default.nix index c4cd89cab68a..d07b7f29dc39 100644 --- a/nixpkgs/pkgs/development/python-modules/catalogue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/catalogue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -26,6 +26,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/catalogue"; changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cbor/default.nix b/nixpkgs/pkgs/development/python-modules/cbor/default.nix index f081511265fd..cc3d8914ad2f 100644 --- a/nixpkgs/pkgs/development/python-modules/cbor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cbor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cbor"; diff --git a/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix b/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix index 96e75405ee3c..e231624e40f8 100644 --- a/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: buildPythonPackage rec { pname = "CCColUtils"; diff --git a/nixpkgs/pkgs/development/python-modules/cement/default.nix b/nixpkgs/pkgs/development/python-modules/cement/default.nix index 9133389f0ce9..f021ea16b620 100644 --- a/nixpkgs/pkgs/development/python-modules/cement/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cement/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "cement"; diff --git a/nixpkgs/pkgs/development/python-modules/cerberus/default.nix b/nixpkgs/pkgs/development/python-modules/cerberus/default.nix index 08b7527c54c1..cdf6519d325f 100644 --- a/nixpkgs/pkgs/development/python-modules/cerberus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cerberus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: buildPythonPackage rec { pname = "Cerberus"; diff --git a/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/nixpkgs/pkgs/development/python-modules/certbot/default.nix index cb842f1455f1..129ef932bdc5 100644 --- a/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-IGXiIOLP/Uq6HdXAschp1jFYq52ohRK4VLtkjF4Tb44="; + sha256 = "sha256-lMQkVc2UzC5GqEy88rcaJ74CaT3+YWveNDCXql/McRM="; }; sourceRoot = "source/${pname}"; diff --git a/nixpkgs/pkgs/development/python-modules/certipy/default.nix b/nixpkgs/pkgs/development/python-modules/certipy/default.nix index 049e3ffdb5d9..a3cde807076f 100644 --- a/nixpkgs/pkgs/development/python-modules/certipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certipy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyopenssl diff --git a/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/nixpkgs/pkgs/development/python-modules/cftime/default.nix index 78dcecfb6a93..1f52c04e9a97 100644 --- a/nixpkgs/pkgs/development/python-modules/cftime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cftime/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.3.1"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "77fd86e69b234d41fa8634d627e9e9ee0501c2a8a95268c2b524d38e0a33f090"; + sha256 = "7c55540bc164746c3c4f86a07c9c7b9ed4dfb0b0d988348ec63cec065c58766d"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix b/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix index 2000a4e0a3bc..8b3a6afa9b36 100644 --- a/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, pep8, nose }: buildPythonPackage rec { version = "0.8"; diff --git a/nixpkgs/pkgs/development/python-modules/chai/default.nix b/nixpkgs/pkgs/development/python-modules/chai/default.nix index 3400b33635a8..9f9d48d90171 100644 --- a/nixpkgs/pkgs/development/python-modules/chai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "chai"; diff --git a/nixpkgs/pkgs/development/python-modules/chainer/default.nix b/nixpkgs/pkgs/development/python-modules/chainer/default.nix index 0c3b7a946fcd..9dd656efa88b 100644 --- a/nixpkgs/pkgs/development/python-modules/chainer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chainer/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy3k -, filelock, protobuf, numpy, pytest, mock, typing-extensions +, filelock, protobuf, numpy, pytestCheckHook, mock, typing-extensions , cupy, cudaSupport ? false }: buildPythonPackage rec { pname = "chainer"; - version = "6.5.0"; + version = "7.7.0"; disabled = !isPy3k; # python2.7 abandoned upstream # no tests in Pypi tarball @@ -13,16 +13,11 @@ buildPythonPackage rec { owner = "chainer"; repo = "chainer"; rev = "v${version}"; - sha256 = "0ha9fbl6sa3fbnsz3y1pg335iiskdbxw838m5j06zgzy156zna1x"; + sha256 = "0m97k5bv4pcp5rvbczvrr2vxddwzw2h42cm021f5y779jx5ghclh"; }; - # remove on 7.0 or 6.6 release - postPatch = '' - sed -i '/typing/d' setup.py - ''; - checkInputs = [ - pytest + pytestCheckHook mock ]; @@ -33,10 +28,13 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals cudaSupport [ cupy ]; - # avoid gpu tests - checkPhase = '' - pytest tests/chainer_tests/utils_tests -k 'not gpu and not cupy' - ''; + pytestFlagsArray = [ "tests/chainer_tests/utils_tests" ]; + + disabledTests = [ + "gpu" + "cupy" + "ideep" + ]; meta = with lib; { description = "A flexible framework of neural networks for deep learning"; diff --git a/nixpkgs/pkgs/development/python-modules/chainmap/default.nix b/nixpkgs/pkgs/development/python-modules/chainmap/default.nix index 3858fc44f234..4619bff2b046 100644 --- a/nixpkgs/pkgs/development/python-modules/chainmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chainmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "chainmap"; diff --git a/nixpkgs/pkgs/development/python-modules/chameleon/default.nix b/nixpkgs/pkgs/development/python-modules/chameleon/default.nix index a2ffcb9a0236..fccfec53512e 100644 --- a/nixpkgs/pkgs/development/python-modules/chameleon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chameleon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix b/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix index 3f341f5527ae..1e267aa51269 100644 --- a/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , aioredis , asgiref , buildPythonPackage diff --git a/nixpkgs/pkgs/development/python-modules/channels/default.nix b/nixpkgs/pkgs/development/python-modules/channels/default.nix index c2836ef4faa0..0f5e708d0913 100644 --- a/nixpkgs/pkgs/development/python-modules/channels/default.nix +++ b/nixpkgs/pkgs/development/python-modules/channels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, asgiref, django, daphne }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/chardet/default.nix b/nixpkgs/pkgs/development/python-modules/chardet/default.nix index bbc41df0cd82..65381d40268f 100644 --- a/nixpkgs/pkgs/development/python-modules/chardet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chardet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi, fetchpatch , pytest, pytestrunner, hypothesis }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix b/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix index 8a2c74882066..95bb9660d4cf 100644 --- a/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }: +{ lib, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }: buildPythonPackage rec { pname = "check-manifest"; diff --git a/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index c9d3094d5951..e5c7c23e2e43 100644 --- a/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k +{ lib +, stdenv +, fetchPypi +, buildPythonPackage +, isPy3k , jaraco_functools , jaraco_text , more-itertools @@ -33,7 +37,8 @@ buildPythonPackage rec { # install_requires jaraco_functools - more-itertools six + more-itertools + six ]; checkInputs = [ @@ -49,10 +54,6 @@ buildPythonPackage rec { trustme ]; - # avoid attempting to use 3 packages not available on nixpkgs - # (jaraco.apt, jaraco.context, yg.lockfile) - pytestFlagsArray = [ "--ignore=cheroot/test/test_wsgi.py" ]; - # Disable doctest plugin because times out # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out @@ -64,7 +65,7 @@ buildPythonPackage rec { rm pytest.ini ''; - disabledTests= [ + disabledTests = [ "tls" # touches network "peercreds_unix_sock" # test urls no longer allowed ] ++ lib.optionals stdenv.isDarwin [ @@ -72,6 +73,12 @@ buildPythonPackage rec { "bind_addr_unix" ]; + disabledTestFiles = [ + # avoid attempting to use 3 packages not available on nixpkgs + # (jaraco.apt, jaraco.context, yg.lockfile) + "cheroot/test/test_wsgi.py" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/python-modules/cjson/default.nix b/nixpkgs/pkgs/development/python-modules/cjson/default.nix index ce70a2f459da..d34534e3eb80 100644 --- a/nixpkgs/pkgs/development/python-modules/cjson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: buildPythonPackage rec { pname = "python-cjson"; diff --git a/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix b/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix index dd72f5705e70..eaf89948e8f2 100644 --- a/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -1,9 +1,8 @@ -{ stdenv +{ lib , buildPythonPackage , click , ecdsa , hidapi -, lib , fetchPypi , pytest , pyaes diff --git a/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/nixpkgs/pkgs/development/python-modules/claripy/default.nix new file mode 100644 index 000000000000..1812ddff9520 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, cachetools +, decorator +, fetchFromGitHub +, future +, nose +, pysmt +, pythonOlder +, pytestCheckHook +, z3 +}: + +buildPythonPackage rec { + pname = "claripy"; + version = "9.0.5739"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "1aym01f99zwb9w8qwy8gz631ka7g6akzdld0m4ykc5ip0rq70mki"; + }; + + # Use upstream z3 implementation + postPatch = '' + substituteInPlace setup.py --replace "z3-solver>=4.8.5.0" "" + ''; + + propagatedBuildInputs = [ + cachetools + decorator + future + pysmt + z3 + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "claripy" ]; + + meta = with lib; { + description = "Python abstraction layer for constraint solvers"; + homepage = "https://github.com/angr/claripy"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/clf/default.nix b/nixpkgs/pkgs/development/python-modules/clf/default.nix index f4168d689d44..978d08051f7d 100644 --- a/nixpkgs/pkgs/development/python-modules/clf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , docopt, requests, pygments }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/cliapp/default.nix b/nixpkgs/pkgs/development/python-modules/cliapp/default.nix index 4b7611c092e2..e410a37fcb42 100644 --- a/nixpkgs/pkgs/development/python-modules/cliapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cliapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , sphinx diff --git a/nixpkgs/pkgs/development/python-modules/click-completion/default.nix b/nixpkgs/pkgs/development/python-modules/click-completion/default.nix index 61a154286325..19fdac37615a 100644 --- a/nixpkgs/pkgs/development/python-modules/click-completion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-completion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, +{ lib, buildPythonPackage, fetchPypi, isPy3k, click, jinja2, shellingham, six }: diff --git a/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix b/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix index 8d3c3ba3e240..c4574072b4ca 100644 --- a/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, click }: diff --git a/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix b/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix index dbe4e33ca84c..b17dc1a0c111 100644 --- a/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , click, pytest }: diff --git a/nixpkgs/pkgs/development/python-modules/click-log/default.nix b/nixpkgs/pkgs/development/python-modules/click-log/default.nix index 4aa63dd45378..3145d4775e39 100644 --- a/nixpkgs/pkgs/development/python-modules/click-log/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-log/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, click }: +{ lib, buildPythonPackage, fetchPypi, click }: buildPythonPackage rec { pname = "click-log"; diff --git a/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix index c2b25341e17c..31ae00a348df 100644 --- a/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, click, pytest }: diff --git a/nixpkgs/pkgs/development/python-modules/click-repl/default.nix b/nixpkgs/pkgs/development/python-modules/click-repl/default.nix index 23adb12da658..ee8773999ff0 100644 --- a/nixpkgs/pkgs/development/python-modules/click-repl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-repl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, click, prompt_toolkit }: +{ lib, buildPythonPackage, fetchPypi, click, prompt_toolkit }: buildPythonPackage rec { pname = "click-repl"; diff --git a/nixpkgs/pkgs/development/python-modules/clickclick/default.nix b/nixpkgs/pkgs/development/python-modules/clickclick/default.nix index e211b955ac84..d829f43dc0d1 100644 --- a/nixpkgs/pkgs/development/python-modules/clickclick/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clickclick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: buildPythonPackage rec { pname = "clickclick"; diff --git a/nixpkgs/pkgs/development/python-modules/cligj/default.nix b/nixpkgs/pkgs/development/python-modules/cligj/default.nix index f9d953d8536e..b44f4e0ec170 100644 --- a/nixpkgs/pkgs/development/python-modules/cligj/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cligj/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , click, pytest, glibcLocales }: diff --git a/nixpkgs/pkgs/development/python-modules/clint/default.nix b/nixpkgs/pkgs/development/python-modules/clint/default.nix index 133fc0de55c6..66e2d5f52f38 100644 --- a/nixpkgs/pkgs/development/python-modules/clint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/clize/default.nix b/nixpkgs/pkgs/development/python-modules/clize/default.nix index c9c3f5c905ce..1418db69a393 100644 --- a/nixpkgs/pkgs/development/python-modules/clize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dateutil diff --git a/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix b/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix index 75f5ba0b449e..18782fb50bb1 100644 --- a/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/closure-linter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix b/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix index e5b4a63a564e..f525b6e7f1df 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, mock }: buildPythonPackage rec { pname = "cloudpickle"; diff --git a/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix b/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix index faa1affcd060..591d1aac2e6a 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudscraper/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.52"; + version = "1.2.56"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "07j2nhzimzhcskj2wpxpvpb3dhpci19daw02r2ckkjiq3zifhm6v"; + sha256 = "84c5910023dd393619b2b793fdb154392c5c8887b55e4bcac3ad2646f1cfe212"; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python module to bypass Cloudflare's anti-bot page"; - homepage = https://github.com/venomous/cloudscraper; + homepage = "https://github.com/venomous/cloudscraper"; license = licenses.mit; maintainers = with maintainers; [ kini ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/clustershell/default.nix b/nixpkgs/pkgs/development/python-modules/clustershell/default.nix index a0e744f9919d..d247cecdfa63 100644 --- a/nixpkgs/pkgs/development/python-modules/clustershell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clustershell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh +{ lib, buildPythonPackage, fetchPypi, pyyaml, openssh , nose, bc, hostname, coreutils, bash, gnused }: diff --git a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix index bafdb9cb95da..a6b49d32bcb9 100644 --- a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "e59fa932418603af4e046a96c8985812b05af8a73bfd9d7a386cd1b02c6ab687"; + sha256 = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62"; }; LC_ALL="en_US.UTF-8"; diff --git a/nixpkgs/pkgs/development/python-modules/cmdline/default.nix b/nixpkgs/pkgs/development/python-modules/cmdline/default.nix index 4249ed7164b9..71273ed1a226 100644 --- a/nixpkgs/pkgs/development/python-modules/cmdline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cmdline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, pyyaml }: buildPythonPackage rec { pname = "cmdline"; diff --git a/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix b/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix index 5bb4ef79a20c..28d78203b6d4 100644 --- a/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , cliapp diff --git a/nixpkgs/pkgs/development/python-modules/cmsis-svd/default.nix b/nixpkgs/pkgs/development/python-modules/cmsis-svd/default.nix new file mode 100644 index 000000000000..cdfdd05e5217 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cmsis-svd/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub, six }: + +buildPythonPackage rec { + pname = "cmsis-svd"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "posborne"; + repo = pname; + rev = "python-${version}"; + sha256 = "01f2z01gqgx0risqnbrlaqj49fmly30zbwsf7rr465ggnl2c04r0"; + }; + + preConfigure = '' + cd python + ''; + + propagatedBuildInputs = [ six ]; + + pythonImportsCheck = [ "cmsis_svd" ]; + + meta = with lib; { + description = "CMSIS SVD parser"; + homepage = "https://github.com/posborne/cmsis-svd"; + maintainers = with maintainers; [ dump_stack ]; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/coconut/default.nix b/nixpkgs/pkgs/development/python-modules/coconut/default.nix index b75a82b6c2b2..55eadddaa1d6 100644 --- a/nixpkgs/pkgs/development/python-modules/coconut/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coconut/default.nix @@ -1,17 +1,15 @@ -{ - lib, - buildPythonApplication, - fetchFromGitHub, - fetchpatch, - - cpyparsing, - ipykernel, - mypy, - pygments, - pytest, - prompt_toolkit, - tkinter, - watchdog +{ lib +, buildPythonApplication +, fetchFromGitHub +, fetchpatch +, cpyparsing +, ipykernel +, mypy +, pygments +, pytestCheckHook +, prompt_toolkit +, tkinter +, watchdog }: buildPythonApplication rec { @@ -33,15 +31,26 @@ buildPythonApplication rec { url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch"; sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q"; }) + (fetchpatch { + name = "support-python-3.9.patch"; + url = "https://github.com/evhub/coconut/commit/5c724b4dd92fb62c614d8192e3cac3dd1d475790.patch"; + sha256 = "04xmzyfmyv6gr2l2z6pdxlllwzcmwxvahxzqyxglr36hfl33ad71"; + }) + ]; + + checkInputs = [ + pytestCheckHook + tkinter ]; - checkInputs = [ pytest tkinter ]; # Currently most tests do not work on Hydra due to external fetches. - checkPhase = '' - pytest tests/constants_test.py - pytest tests/main_test.py::TestShell::test_compile_to_file - pytest tests/main_test.py::TestShell::test_convenience - ''; + pytestFlagsArray = [ + "tests/constants_test.py" + "tests/main_test.py::TestShell::test_compile_to_file" + "tests/main_test.py::TestShell::test_convenience" + ]; + + pythonImportsCheck = [ "coconut" ]; meta = with lib; { homepage = "http://coconut-lang.org/"; diff --git a/nixpkgs/pkgs/development/python-modules/cocotb/default.nix b/nixpkgs/pkgs/development/python-modules/cocotb/default.nix index e95900d17b52..ec5cbe827768 100644 --- a/nixpkgs/pkgs/development/python-modules/cocotb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cocotb/default.nix @@ -25,9 +25,6 @@ buildPythonPackage rec { do substituteInPlace $f --replace 'shell which' 'shell command -v' done - - # This can perhaps be removed in the next update after 1.3.2? - substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" "" ''; checkInputs = [ swig verilog ]; @@ -36,8 +33,7 @@ buildPythonPackage rec { # test expected failures actually pass because of a fix in our icarus version # https://github.com/cocotb/cocotb/issues/1952 substituteInPlace tests/test_cases/test_discovery/test_discovery.py \ - --replace 'def access_single_bit' $'def foo(x): pass\ndef foo' \ - --replace 'def access_single_bit_assignment' $'def foo(x): pass\ndef foo' + --replace 'def access_single_bit' $'def foo(x): pass\ndef foo' export PATH=$out/bin:$PATH make test @@ -48,5 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/cocotb/cocotb"; license = licenses.bsd3; maintainers = with maintainers; [ matthuszagh ]; + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/python-modules/codespell/default.nix b/nixpkgs/pkgs/development/python-modules/codespell/default.nix index 7efb08c2c67b..e1aa8252d13b 100644 --- a/nixpkgs/pkgs/development/python-modules/codespell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/codespell/default.nix @@ -1,31 +1,31 @@ -{ lib, buildPythonApplication, fetchPypi, pytest, chardet }: +{ lib, buildPythonApplication, fetchFromGitHub, pytestCheckHook, pytest-cov, pytest-dependency, aspell-python, aspellDicts, chardet }: buildPythonApplication rec { pname = "codespell"; version = "2.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "dd9983e096b9f7ba89dd2d2466d1fc37231d060f19066331b9571341363c77b8"; + src = fetchFromGitHub { + owner = "codespell-project"; + repo = "codespell"; + rev = "v${version}"; + sha256 = "187g26s3wzjmvdx9vjabbnajpbg0s9klixyv6baymmgz9lrcv4ln"; }; - # no tests in pypi tarball - doCheck = false; - checkInputs = [ pytest chardet ]; - checkPhase = '' - # We don't want to be affected by the presence of these - rm -r codespell_lib setup.cfg - # test_command assumes too much about the execution environment - pytest --pyargs codespell_lib.tests -k "not test_command" + checkInputs = [ aspell-python chardet pytestCheckHook pytest-cov pytest-dependency ]; + + preCheck = '' + export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell" ''; + # tries to run not rully installed script + disabledTests = [ "test_command" ]; + pythonImportsCheck = [ "codespell_lib" ]; - meta = { + meta = with lib; { description = "Fix common misspellings in source code"; homepage = "https://github.com/codespell-project/codespell"; - license = with lib.licenses; [ gpl2 cc-by-sa-30 ]; - maintainers = with lib.maintainers; [ johnazoidberg ]; - platforms = lib.platforms.all; + license = with licenses; [ gpl2Only cc-by-sa-30 ]; + maintainers = with maintainers; [ johnazoidberg SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cogapp/default.nix b/nixpkgs/pkgs/development/python-modules/cogapp/default.nix index 019faeaebc30..c996c23d9ae8 100644 --- a/nixpkgs/pkgs/development/python-modules/cogapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cogapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cogapp"; diff --git a/nixpkgs/pkgs/development/python-modules/coilmq/default.nix b/nixpkgs/pkgs/development/python-modules/coilmq/default.nix index bc0b6af146af..b21ea193cbfa 100644 --- a/nixpkgs/pkgs/development/python-modules/coilmq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coilmq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , stompclient, python-daemon, redis, pid, pytest, six, click, coverage , sqlalchemy }: diff --git a/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix index a5b29af1c31a..a3fa33f327c5 100644 --- a/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/nixpkgs/pkgs/development/python-modules/colorama/default.nix b/nixpkgs/pkgs/development/python-modules/colorama/default.nix index 6778c6acadb8..1d472035b2f2 100644 --- a/nixpkgs/pkgs/development/python-modules/colorama/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colorama/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "colorama"; diff --git a/nixpkgs/pkgs/development/python-modules/colorcet/default.nix b/nixpkgs/pkgs/development/python-modules/colorcet/default.nix index 303d244fff33..6198e4e1b281 100644 --- a/nixpkgs/pkgs/development/python-modules/colorcet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colorcet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , param diff --git a/nixpkgs/pkgs/development/python-modules/colorclass/default.nix b/nixpkgs/pkgs/development/python-modules/colorclass/default.nix index 08da356e222e..50a052ec1f94 100644 --- a/nixpkgs/pkgs/development/python-modules/colorclass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colorclass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "colorclass"; diff --git a/nixpkgs/pkgs/development/python-modules/colored/default.nix b/nixpkgs/pkgs/development/python-modules/colored/default.nix index 5caa0cad2f6f..502f31aa9b8e 100644 --- a/nixpkgs/pkgs/development/python-modules/colored/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colored/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix b/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix index 48d13ab49dd2..caa783bb8238 100644 --- a/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix @@ -8,7 +8,6 @@ , pytest , mock , util-linux -, isPy38 }: buildPythonPackage rec { @@ -24,7 +23,7 @@ buildPythonPackage rec { # capturer is broken on darwin / py38, so we skip the test until a fix for # https://github.com/xolox/python-capturer/issues/10 is released. - doCheck = !(isPy38 && stdenv.isDarwin); + doCheck = !stdenv.isDarwin; checkPhase = '' PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \ and not test_auto_install" diff --git a/nixpkgs/pkgs/development/python-modules/colour/default.nix b/nixpkgs/pkgs/development/python-modules/colour/default.nix index 6a6ad9d4946a..f7419666f535 100644 --- a/nixpkgs/pkgs/development/python-modules/colour/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colour/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, d2to1 }: +{ lib, buildPythonPackage, fetchPypi, d2to1 }: buildPythonPackage rec { pname = "colour"; diff --git a/nixpkgs/pkgs/development/python-modules/configobj/default.nix b/nixpkgs/pkgs/development/python-modules/configobj/default.nix index d0988689275e..746c5f35f256 100644 --- a/nixpkgs/pkgs/development/python-modules/configobj/default.nix +++ b/nixpkgs/pkgs/development/python-modules/configobj/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , fetchFromGitHub , six , mock, pytest diff --git a/nixpkgs/pkgs/development/python-modules/configshell/default.nix b/nixpkgs/pkgs/development/python-modules/configshell/default.nix index ba3700962bf6..a41d077f22df 100644 --- a/nixpkgs/pkgs/development/python-modules/configshell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/configshell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: +{ lib, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: buildPythonPackage rec { pname = "configshell"; diff --git a/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix b/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix index f3e8b1c943b1..589753cd1cb5 100644 --- a/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.6.0"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "9ac812006000887f76c95b8a33a9f0b65845bf072fbc54a42a1acffd34e41120"; + sha256 = "8a9caabdb02e87cd65c7f10f689ba3f1a15f8774de455e96fa5fc56eecfee63c"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; diff --git a/nixpkgs/pkgs/development/python-modules/constantly/default.nix b/nixpkgs/pkgs/development/python-modules/constantly/default.nix index 189573699b91..e3a9c642f478 100644 --- a/nixpkgs/pkgs/development/python-modules/constantly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/constantly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "constantly"; diff --git a/nixpkgs/pkgs/development/python-modules/consul/default.nix b/nixpkgs/pkgs/development/python-modules/consul/default.nix index 3978b14484ac..a3b92ee72554 100644 --- a/nixpkgs/pkgs/development/python-modules/consul/default.nix +++ b/nixpkgs/pkgs/development/python-modules/consul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests, six, pytest }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/contexter/default.nix b/nixpkgs/pkgs/development/python-modules/contexter/default.nix index d8b74d4fedba..9937d4b47526 100644 --- a/nixpkgs/pkgs/development/python-modules/contexter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/contexter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "contexter"; diff --git a/nixpkgs/pkgs/development/python-modules/convertdate/default.nix b/nixpkgs/pkgs/development/python-modules/convertdate/default.nix index f28923002f70..f285a74e5449 100644 --- a/nixpkgs/pkgs/development/python-modules/convertdate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/convertdate/default.nix @@ -1,18 +1,31 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pymeeus +, pytz +, pytestCheckHook +}: buildPythonPackage rec { pname = "convertdate"; - version = "2.2.1"; + version = "2.3.0"; # Tests are not available in the PyPI tarball so use GitHub instead. src = fetchFromGitHub { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5"; + sha256 = "17j188zlp46zmq8qyy4z4f9v25l3zibkwzj8wp4fxqgimjnfj2nr"; }; - propagatedBuildInputs = [ pymeeus pytz ]; + propagatedBuildInputs = [ + pymeeus + pytz + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/fitnr/convertdate"; diff --git a/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix b/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix index f9a4fe982082..c5ee4d8617d0 100644 --- a/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy +{ lib, buildPythonPackage, fetchPypi, isPyPy , pytest, pytestcov, pytest-mock, freezegun , jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests , python-slugify }: diff --git a/nixpkgs/pkgs/development/python-modules/cookies/default.nix b/nixpkgs/pkgs/development/python-modules/cookies/default.nix index 59d2214f758e..a4e35dac346a 100644 --- a/nixpkgs/pkgs/development/python-modules/cookies/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cookies/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cookies"; diff --git a/nixpkgs/pkgs/development/python-modules/coreapi/default.nix b/nixpkgs/pkgs/development/python-modules/coreapi/default.nix index 8ac69a457396..8b957fee4f6e 100644 --- a/nixpkgs/pkgs/development/python-modules/coreapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coreapi/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchFromGitHub, buildPythonPackage, django, diff --git a/nixpkgs/pkgs/development/python-modules/coreschema/default.nix b/nixpkgs/pkgs/development/python-modules/coreschema/default.nix index 73167dea8a7d..65bdee5a8da9 100644 --- a/nixpkgs/pkgs/development/python-modules/coreschema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coreschema/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchFromGitHub, buildPythonPackage, jinja2, diff --git a/nixpkgs/pkgs/development/python-modules/cornice/default.nix b/nixpkgs/pkgs/development/python-modules/cornice/default.nix index 10c559201931..6c488a271e25 100644 --- a/nixpkgs/pkgs/development/python-modules/cornice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cornice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyramid diff --git a/nixpkgs/pkgs/development/python-modules/cov-core/default.nix b/nixpkgs/pkgs/development/python-modules/cov-core/default.nix index 44461a8ca9fb..ce3b08fbc9f4 100644 --- a/nixpkgs/pkgs/development/python-modules/cov-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cov-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, coverage }: +{ lib, buildPythonPackage, fetchPypi, coverage }: buildPythonPackage rec { pname = "cov-core"; diff --git a/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix b/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix index b51499de449c..7602132c24ae 100644 --- a/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , ply -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/crate/default.nix b/nixpkgs/pkgs/development/python-modules/crate/default.nix index 37e49210009a..a37160a01acf 100644 --- a/nixpkgs/pkgs/development/python-modules/crate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/crate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , urllib3 diff --git a/nixpkgs/pkgs/development/python-modules/crayons/default.nix b/nixpkgs/pkgs/development/python-modules/crayons/default.nix index c93bf71687fb..53caec665964 100644 --- a/nixpkgs/pkgs/development/python-modules/crayons/default.nix +++ b/nixpkgs/pkgs/development/python-modules/crayons/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, colorama }: +{ lib, fetchPypi, buildPythonPackage, colorama }: buildPythonPackage rec { pname = "crayons"; diff --git a/nixpkgs/pkgs/development/python-modules/crc16/default.nix b/nixpkgs/pkgs/development/python-modules/crc16/default.nix index 1e3c9cbbf4ff..ebf86a3571c6 100644 --- a/nixpkgs/pkgs/development/python-modules/crc16/default.nix +++ b/nixpkgs/pkgs/development/python-modules/crc16/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "crc16"; diff --git a/nixpkgs/pkgs/development/python-modules/crccheck/default.nix b/nixpkgs/pkgs/development/python-modules/crccheck/default.nix index 8dc038012852..1762d60dfde5 100644 --- a/nixpkgs/pkgs/development/python-modules/crccheck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/crccheck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , nose }: let diff --git a/nixpkgs/pkgs/development/python-modules/crcmod/default.nix b/nixpkgs/pkgs/development/python-modules/crcmod/default.nix index 488b723d89fd..082369baf73a 100644 --- a/nixpkgs/pkgs/development/python-modules/crcmod/default.nix +++ b/nixpkgs/pkgs/development/python-modules/crcmod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "crcmod"; diff --git a/nixpkgs/pkgs/development/python-modules/credstash/default.nix b/nixpkgs/pkgs/development/python-modules/credstash/default.nix index ca5e1fe334a0..0267aee76100 100644 --- a/nixpkgs/pkgs/development/python-modules/credstash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }: buildPythonPackage rec { pname = "credstash"; diff --git a/nixpkgs/pkgs/development/python-modules/criticality-score/default.nix b/nixpkgs/pkgs/development/python-modules/criticality-score/default.nix new file mode 100644 index 000000000000..6b3348472a42 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/criticality-score/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, PyGithub, python-gitlab }: + +buildPythonPackage rec { + pname = "criticality_score"; + version = "1.0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i811a27i87z3j1rw0dwrnw8v0ckbd918ms6shjawhs4cnb1c6x8"; + }; + + propagatedBuildInputs = [ PyGithub python-gitlab ]; + + doCheck = false; + + pythonImportsCheck = [ "criticality_score" ]; + + meta = with lib; { + description = "Python tool for computing the Open Source Project Criticality Score."; + homepage = "https://github.com/ossf/criticality_score"; + license = licenses.asl20; + maintainers = with maintainers; [ wamserma ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix b/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix index dc97e96e4f5d..dccfddaea1ae 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast , coverage, nose, pbkdf2 }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix index 936db1081b6a..95f2effc045a 100644 --- a/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix @@ -6,6 +6,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; + patchPhase = '' + substituteInPlace setup.py --replace 'version="0.1.11",' 'version="${version}",' + ''; + src = fetchFromGitHub { owner = "crytic"; repo = "crytic-compile"; @@ -21,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction layer for smart contract build systems"; homepage = "https://github.com/crytic/crytic-compile"; - license = licenses.agpl3; - maintainers = with maintainers; [ SuperSandro2000 ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 arturcygan ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/csrmesh/default.nix b/nixpkgs/pkgs/development/python-modules/csrmesh/default.nix new file mode 100644 index 000000000000..142756341567 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/csrmesh/default.nix @@ -0,0 +1,32 @@ +{ lib +, bluepy +, buildPythonPackage +, fetchPypi +, pycryptodomex +}: + +buildPythonPackage rec { + pname = "csrmesh"; + version = "0.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03lzam54ypcfvqvikh3gsrivvlidmz1ifdq15xv8c5i3n5b178ag"; + }; + + propagatedBuildInputs = [ + bluepy + pycryptodomex + ]; + + # Project has no test + doCheck = false; + pythonImportsCheck = [ "csrmesh" ]; + + meta = with lib; { + description = "Python implementation of the CSRMesh bridge protocol"; + homepage = "https://github.com/nkaminski/csrmesh"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cssmin/default.nix b/nixpkgs/pkgs/development/python-modules/cssmin/default.nix index a6f6f3c956ae..929640a7c1e8 100644 --- a/nixpkgs/pkgs/development/python-modules/cssmin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cssmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cssmin"; diff --git a/nixpkgs/pkgs/development/python-modules/cssselect/default.nix b/nixpkgs/pkgs/development/python-modules/cssselect/default.nix index fe13fa9582ea..04b6dc36afab 100644 --- a/nixpkgs/pkgs/development/python-modules/cssselect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cssselect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cssselect"; diff --git a/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/nixpkgs/pkgs/development/python-modules/cssutils/default.nix index ea3ac6236e90..a12fbf48c820 100644 --- a/nixpkgs/pkgs/development/python-modules/cssutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cssutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mock }: +{ lib, buildPythonPackage, fetchPypi, mock }: buildPythonPackage rec { pname = "cssutils"; diff --git a/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/nixpkgs/pkgs/development/python-modules/cupy/default.nix index 09685d392d6a..5c4978a388f2 100644 --- a/nixpkgs/pkgs/development/python-modules/cupy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cupy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , fetchPypi, isPy3k, linuxPackages , fastrlock, numpy, six, wheel, pytest, mock, setuptools , cudatoolkit, cudnn, nccl @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "8.3.0"; + version = "8.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "db699fddfde7806445908cf6454c6f4985e7a9563b40405ddf97845d808c5f12"; + sha256 = "58d19af6b2e83388d4f0f6ca4226bae4b947920d2ca4951c2eddc8bc78abf66b"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/curtsies/default.nix b/nixpkgs/pkgs/development/python-modules/curtsies/default.nix index 4c4c7dbe231a..62f1435df30e 100644 --- a/nixpkgs/pkgs/development/python-modules/curtsies/default.nix +++ b/nixpkgs/pkgs/development/python-modules/curtsies/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: buildPythonPackage rec { pname = "curtsies"; diff --git a/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix b/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix index e42f4021a6f2..7698b5d65710 100644 --- a/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix +++ b/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "curve25519-donna"; diff --git a/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix b/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix index bafa75072f7a..9270effcaa91 100644 --- a/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index 58d06e60d39c..1f5a2edc9895 100644 --- a/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.7"; + version = "1.1.8"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "330eb76e8369c360b68d9231c6eb350848e373b5952134f9bfebaed1a4c4211f"; + sha256 = "444068d4eda9ffcd43578895174489d4cef36b28ba7ae8a96ab9ef9571d2b4ff"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix index 14a585617c64..1c3ee6892990 100644 --- a/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: buildPythonPackage rec { pname = "cx_Freeze"; diff --git a/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix index 89946964544e..c81443e09908 100644 --- a/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, odpic }: +{ lib, buildPythonPackage, fetchPypi, odpic }: buildPythonPackage rec { pname = "cx_Oracle"; diff --git a/nixpkgs/pkgs/development/python-modules/cymem/default.nix b/nixpkgs/pkgs/development/python-modules/cymem/default.nix index d805ba5de1f9..c2de6d82a5bc 100644 --- a/nixpkgs/pkgs/development/python-modules/cymem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cymem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , cython diff --git a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index 8a0adb3d6c96..a7115d1e940d 100644 --- a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix b/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix index 0e72ecaa8252..4e862d260927 100644 --- a/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix @@ -22,9 +22,8 @@ buildPythonPackage rec { checkInputs = [ nose ]; propagatedBuildInputs = [ toolz ]; - # Failing test https://github.com/pytoolz/cytoolz/issues/122 checkPhase = '' - NOSE_EXCLUDE=test_introspect_builtin_modules nosetests -v $out/${python.sitePackages} + nosetests -v $out/${python.sitePackages} ''; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/daemonize/default.nix b/nixpkgs/pkgs/development/python-modules/daemonize/default.nix index 30d4f1bd7146..26f23b7156dd 100644 --- a/nixpkgs/pkgs/development/python-modules/daemonize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/daemonize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/darcsver/default.nix b/nixpkgs/pkgs/development/python-modules/darcsver/default.nix index 6484d84253b5..c46337981bd7 100644 --- a/nixpkgs/pkgs/development/python-modules/darcsver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/darcsver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, mock }: buildPythonPackage rec { pname = "darcsver"; diff --git a/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix b/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix index 9d5e650207bc..2782342c1b51 100644 --- a/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.13.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "f92025b12931539cdda2173f2b4cd077119cbabbf3ddf62333f6302fd0d8a3ac"; + sha256 = "b61cb37322de91b4feb0d4d823694cbba8686f6459db774b53d553135350c71e"; }; # No tests in archive diff --git a/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix b/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix index 69eb4de2a237..3d2905446771 100644 --- a/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_html_components"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "2c662e640528c890aaa0fa23d48e51c4d13ce69a97841d856ddcaaf2c6a47be3"; + sha256 = "83eaa39667b7c3e6cbefa360743e6e536d913269ea15db14308ad022c78bc301"; }; # No tests in archive diff --git a/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix b/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix index 8977d49489cb..5c8f524e423a 100644 --- a/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.8.3"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "f7ab2b922f4f0850bae0e9793cec99f8a1a241e5f7f5786e367ddd9e41d2b170"; + sha256 = "3c5519a781beb2261ee73b2d193bef6f212697636f204acd7d58cd986ba88e30"; }; # No tests in archive diff --git a/nixpkgs/pkgs/development/python-modules/dash-table/default.nix b/nixpkgs/pkgs/development/python-modules/dash-table/default.nix index c313aea6c062..8374d8694ac9 100644 --- a/nixpkgs/pkgs/development/python-modules/dash-table/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.11.0"; + version = "4.11.2"; src = fetchPypi { inherit pname version; - sha256 = "3170504a8626a9676b016c5ab456ab8c1fb1ea0206dcc2eddb8c4c6589216304"; + sha256 = "90fbdd12eaaf657aa80d429263de4bbeef982649eb5981ebeb2410d67c1d20eb"; }; # No tests in archive diff --git a/nixpkgs/pkgs/development/python-modules/dash/default.nix b/nixpkgs/pkgs/development/python-modules/dash/default.nix index f6f00553d930..89ff61f6c5e9 100644 --- a/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.17.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "1fbnhpmkxavv6yirmhx7659q1y9bqynwjd1g6cscv1mfv9m59l60"; + sha256 = "067ipkp186h26j7whfid8hjf6cwjmw2b5jp6fvvg280j7q9bjsa9"; }; propagatedBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest tests/unit/test_{configs,fingerprint,import,resources}.py \ + pytest tests/unit/test_{configs,fingerprint,resources}.py \ tests/unit/dash/ ''; diff --git a/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix index 1db03b66ffb0..86bc2da1565c 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cloudpickle diff --git a/nixpkgs/pkgs/development/python-modules/dask-image/default.nix b/nixpkgs/pkgs/development/python-modules/dask-image/default.nix index eac503c2f855..a3cc7b6afda0 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-image/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-image/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix index be27399b71f6..f4f5c03858ae 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dask diff --git a/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix index 4d3aa8e79a05..737def7b9ac3 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.8.0"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "5f93e8560217ebbc5a2254eaf705e9cad8e1c82012567c658e26464a74fbab76"; + sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix b/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix index f2d8737b38e9..1bec4c828728 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dask diff --git a/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix b/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix index c60f628d72eb..4e64b8c9f0c5 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , xgboost diff --git a/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix b/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix index 30001b781d28..483c565536d5 100644 --- a/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , click , requests , tabulate diff --git a/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index 299fa8240340..a97d9bc0c985 100644 --- a/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "7.3.7"; + version = "7.3.8"; src = fetchPypi { inherit pname version; - sha256 = "35ead50a0550e65a7d6fd78e2c8e54095b53514fba85180768a2dbcdd3f2cf0b"; + sha256 = "0c0f036cf30e00fdc47c983875c72d16a3073ae9be9bcf39371514280f00a82d"; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix index a88995937d83..c276e9d000b2 100644 --- a/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy36 }: +{ lib, buildPythonPackage, fetchPypi, isPy36 }: buildPythonPackage rec { pname = "dataclasses"; diff --git a/nixpkgs/pkgs/development/python-modules/datadiff/default.nix b/nixpkgs/pkgs/development/python-modules/datadiff/default.nix index 680462352275..4124457586cc 100644 --- a/nixpkgs/pkgs/development/python-modules/datadiff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datadiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix b/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix index f3eab1d1d4e2..551b10962224 100644 --- a/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , xmltodict diff --git a/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/nixpkgs/pkgs/development/python-modules/datasette/default.nix index 2e0039b23179..1d919de6ee80 100644 --- a/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datasette/default.nix @@ -27,13 +27,13 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.53"; + version = "0.54.1"; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; rev = version; - sha256 = "1rsgxkvav1qy2ia2csm1jvabd8klh3ly8719979gdlx2il1cjjkz"; + sha256 = "sha256-Ixh56X9dI/FIJPXHXXGnFiYj3qeBmvW5L1FF7/0ofUQ="; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/nixpkgs/pkgs/development/python-modules/datashader/default.nix index c49e2e30b809..534cc816def7 100644 --- a/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -76,11 +76,6 @@ buildPythonPackage rec { nbconvert ]; - postConfigure = '' - substituteInPlace setup.py \ - --replace "'numba >=0.37.0,<0.49'" "'numba'" - ''; - # dask doesn't do well with large core counts checkPhase = '' pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array' diff --git a/nixpkgs/pkgs/development/python-modules/dateutil/default.nix b/nixpkgs/pkgs/development/python-modules/dateutil/default.nix index a6aca68ef293..dcad0c3698a7 100644 --- a/nixpkgs/pkgs/development/python-modules/dateutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dateutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: buildPythonPackage rec { pname = "python-dateutil"; version = "2.8.1"; diff --git a/nixpkgs/pkgs/development/python-modules/datrie/default.nix b/nixpkgs/pkgs/development/python-modules/datrie/default.nix index c7f74730c161..d8bbc96fcc48 100644 --- a/nixpkgs/pkgs/development/python-modules/datrie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datrie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi, fetchpatch , cython, pytest, pytestrunner, hypothesis }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/dbf/default.nix b/nixpkgs/pkgs/development/python-modules/dbf/default.nix index b9c264a20150..18560734bd85 100644 --- a/nixpkgs/pkgs/development/python-modules/dbf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: +{ lib, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: buildPythonPackage rec { pname = "dbf"; diff --git a/nixpkgs/pkgs/development/python-modules/dbfread/default.nix b/nixpkgs/pkgs/development/python-modules/dbfread/default.nix index 9f78f3fdde1b..1708a75fc10e 100644 --- a/nixpkgs/pkgs/development/python-modules/dbfread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbfread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "dbfread"; diff --git a/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix b/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix index 76385ac8023a..d7cf79f9d07c 100644 --- a/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , python diff --git a/nixpkgs/pkgs/development/python-modules/dbutils/default.nix b/nixpkgs/pkgs/development/python-modules/dbutils/default.nix index 42ae779e0d21..848e5038af8d 100644 --- a/nixpkgs/pkgs/development/python-modules/dbutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { version = "2.0"; diff --git a/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix b/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix index a6669d0e30df..ee554a6e2bd7 100644 --- a/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonAtLeast diff --git a/nixpkgs/pkgs/development/python-modules/deap/default.nix b/nixpkgs/pkgs/development/python-modules/deap/default.nix index 21dc9d3832c8..f260727b87a6 100644 --- a/nixpkgs/pkgs/development/python-modules/deap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }: +{ lib, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }: buildPythonPackage rec { pname = "deap"; diff --git a/nixpkgs/pkgs/development/python-modules/deform/default.nix b/nixpkgs/pkgs/development/python-modules/deform/default.nix index bc84df26a278..5698dcbe491b 100644 --- a/nixpkgs/pkgs/development/python-modules/deform/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deform/default.nix @@ -11,11 +11,6 @@ buildPythonPackage rec { sha256 = "1e912937650c1dbb830079dd9c039950762a230223a567740fbf1b23f1090367"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "iso8601<=0.1.11" iso8601 - ''; - propagatedBuildInputs = [ chameleon colander diff --git a/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix b/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix index a271371e22fc..4426fe65bf5e 100644 --- a/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deluge-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "deluge-client"; diff --git a/nixpkgs/pkgs/development/python-modules/demjson/default.nix b/nixpkgs/pkgs/development/python-modules/demjson/default.nix index fc70562938ef..25e2692af3ba 100644 --- a/nixpkgs/pkgs/development/python-modules/demjson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/demjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, python, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "demjson"; diff --git a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix index 0c2e2055ff9f..5ed5a3eb152c 100644 --- a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: let testPath = @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "4.5.4"; + version = "4.10.3"; src = fetchPypi { inherit pname version; - sha256 = "99e65335cb84d543ebb47e76edadc695d062e5c25cc474698f50ed5e2aaa9002"; + sha256 = "93db83fac85bcb861469c0db1af11f4bc874aa2f9380151189a05d38c21afd60"; }; propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/deprecated/default.nix b/nixpkgs/pkgs/development/python-modules/deprecated/default.nix index a64ed0b9d992..0374bebe4f95 100644 --- a/nixpkgs/pkgs/development/python-modules/deprecated/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deprecated/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, +{ lib, fetchPypi, buildPythonPackage, wrapt, pytest, tox }: buildPythonPackage rec { pname = "Deprecated"; - version = "1.2.10"; + version = "1.2.11"; src = fetchPypi { inherit pname version; - sha256 = "0x3zkmykcyjn8k57g8lcf89fxw8q7hvvcj6xkwb0f2zrnmpscnsj"; + sha256 = "471ec32b2755172046e28102cd46c481f21c6036a0ec027521eba8521aa4ef35"; }; propagatedBuildInputs = [ wrapt ]; diff --git a/nixpkgs/pkgs/development/python-modules/derpconf/default.nix b/nixpkgs/pkgs/development/python-modules/derpconf/default.nix index f9b8f5dec7c0..cc7b6870ad82 100644 --- a/nixpkgs/pkgs/development/python-modules/derpconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/derpconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "derpconf"; diff --git a/nixpkgs/pkgs/development/python-modules/descartes/default.nix b/nixpkgs/pkgs/development/python-modules/descartes/default.nix index 5280ff2417aa..b10526ff0fd5 100644 --- a/nixpkgs/pkgs/development/python-modules/descartes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/descartes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, matplotlib, shapely }: diff --git a/nixpkgs/pkgs/development/python-modules/deskcon/default.nix b/nixpkgs/pkgs/development/python-modules/deskcon/default.nix index 01918445b342..43d5a955027c 100644 --- a/nixpkgs/pkgs/development/python-modules/deskcon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deskcon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pyopenssl , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix b/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix index 9672cca46b05..03b1f4fa28ee 100644 --- a/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix +++ b/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , inflect , jinja2 , jinja2_pluralize diff --git a/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix b/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix index ad653c6313c6..d5f1445a6771 100644 --- a/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix +++ b/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pyserial, srp, lib }: +{ buildPythonPackage, fetchPypi, isPy27, pyserial, srp, lib }: buildPythonPackage rec { pname = "digi-xbee"; diff --git a/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix b/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix index 5e3ac1e1fcde..e522ac4b6c9d 100644 --- a/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, oauthlib }: +{ lib, buildPythonPackage, fetchPypi, requests, oauthlib }: buildPythonPackage rec { pname = "discogs-client"; diff --git a/nixpkgs/pkgs/development/python-modules/distlib/default.nix b/nixpkgs/pkgs/development/python-modules/distlib/default.nix index 403834a3731c..12e05b58c4c4 100644 --- a/nixpkgs/pkgs/development/python-modules/distlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "distlib"; diff --git a/nixpkgs/pkgs/development/python-modules/distorm3/default.nix b/nixpkgs/pkgs/development/python-modules/distorm3/default.nix index e9b8e66d4c99..d798414c1974 100644 --- a/nixpkgs/pkgs/development/python-modules/distorm3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distorm3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "distorm3"; diff --git a/nixpkgs/pkgs/development/python-modules/distro/default.nix b/nixpkgs/pkgs/development/python-modules/distro/default.nix index 81bcccd8bd6c..16d26e741aa9 100644 --- a/nixpkgs/pkgs/development/python-modules/distro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "distro"; diff --git a/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix b/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix index 882a39957993..c2fbcdfe46c9 100644 --- a/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix index f8dd9dca202c..ee2d8e2f21e8 100644 --- a/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python }: buildPythonPackage rec { - version = "1.0.1"; + version = "1.0.2"; pname = "dj-email-url"; src = fetchPypi { inherit pname version; - sha256 = "32dc567c5cc3d4106710ec36dd645c8c1b20e2d8f588a17ab88bcc23e347d00a"; + sha256 = "838fd4ded9deba53ae757debef431e25fa7fca31d3948b3c4808ccdc84fab2b7"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix index 321bec8149d1..b216c8e62a1e 100644 --- a/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix b/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix index fafd7ab9a63f..143e76cf0d87 100644 --- a/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib +{ lib, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib , django, python3-openid, mock, coverage }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix b/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix index 892cf179c370..6f1d81c9287a 100644 --- a/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, buildPythonPackage, fetchFromGitHub, six, @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "anymail"; repo = pname; rev = "v${version}"; - sha256 = "1v8ayd3nh7pna9lg0pzwgwmvmzzh2g1kxsy7i6mka0hi52g1xvz5"; + sha256 = "0zd4w707az36pp8wimlz6sfxwy9w190qp93brl78pva3rhnx5p97"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix b/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix index d0dacd659a15..2271be1d16f4 100644 --- a/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi, isPy27 , ldap , django diff --git a/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix index 103bfb29578d..dee64ebd6ee4 100644 --- a/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix @@ -1,29 +1,29 @@ -{ lib, stdenv +{ lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { - version = "3.1.2"; + version = "3.2.2"; pname = "django-cache-url"; - src = fetchPypi { - inherit pname version; - sha256 = "d0ee0d6c5daab92787bff47a4a6f5a6cf97c3c80d81a990820b2af16e12ad65a"; + src = fetchFromGitHub { + owner = "epicserve"; + repo = "django-cache-url"; + rev = "v${version}"; + sha256 = "0fxma2w6zl3cfl6wnynmlmp8snks67ffz4jcq4qmdc65xv1l204l"; }; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest tests + postPatch = '' + # disable coverage tests + sed -i '/--cov/d' setup.cfg ''; - # tests not included with pypi release - doCheck = false; + checkInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = "https://github.com/ghickman/django-cache-url"; + homepage = "https://github.com/epicserve/django-cache-url"; description = "Use Cache URLs in your Django application"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix b/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix index 39f65275feed..83dbbc5d1974 100644 --- a/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, django +{ lib, buildPythonPackage, fetchPypi, django , redis, async-timeout, hiredis }: diff --git a/nixpkgs/pkgs/development/python-modules/django-compat/default.nix b/nixpkgs/pkgs/development/python-modules/django-compat/default.nix index ef18bfe77ec9..d33a4be2817f 100644 --- a/nixpkgs/pkgs/development/python-modules/django-compat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-compat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, buildPythonPackage, fetchFromGitHub, python, django, six }: diff --git a/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix index bf1835071f88..b6b736e92383 100644 --- a/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django-discover-runner diff --git a/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix b/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix index 313ae32f04e3..1bc9153d0063 100644 --- a/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix @@ -1,22 +1,30 @@ -{ lib, - fetchPypi, - django, - buildPythonPackage +{ lib +, fetchFromGitHub +, buildPythonPackage +, django +, pytest-django +, pytestCheckHook }: buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.6.0"; + version = "3.7.0"; - src = fetchPypi { - inherit pname version; - sha256 = "5665fc1b1aabf1b678885cf6f8f8bd7da36ef0a978375e767d491b48d3055d8f"; + src = fetchFromGitHub { + owner = "adamchainz"; + repo = "django-cors-headers"; + rev = version; + sha256 = "1wc8cs1gpg9v98bq5qwnd4pcv043za50wd63gwkm86lbvjxyxynz"; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ + django + ]; - # pypi release does not include tests - doCheck = false; + checkInputs = [ + pytest-django + pytestCheckHook + ]; meta = with lib; { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; diff --git a/nixpkgs/pkgs/development/python-modules/django-csp/default.nix b/nixpkgs/pkgs/development/python-modules/django-csp/default.nix index d87e39b8e3f7..1f7b28114054 100644 --- a/nixpkgs/pkgs/development/python-modules/django-csp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-csp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, django }: +{ lib, fetchPypi, buildPythonPackage, django }: buildPythonPackage rec { pname = "django-csp"; diff --git a/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix b/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix index 63d51d41fc93..8d07148ce182 100644 --- a/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 7288896c4fea..7e5105807cfb 100644 --- a/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , django, persisting-theory, six }: diff --git a/nixpkgs/pkgs/development/python-modules/django-filter/default.nix b/nixpkgs/pkgs/development/python-modules/django-filter/default.nix index e4ca546bbc28..00c260946cce 100644 --- a/nixpkgs/pkgs/development/python-modules/django-filter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-filter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix b/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix index 083126066039..458723601dd7 100644 --- a/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-gravatar2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "django-gravatar2"; diff --git a/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix b/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix index 54056547f48a..ee5a47d3787c 100644 --- a/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, buildPythonPackage, fetchFromGitHub, python, django_hijack, django_nose }: buildPythonPackage rec { pname = "django-hijack-admin"; diff --git a/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix index bd6f870de66e..fd9c30a4bc7c 100644 --- a/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, buildPythonPackage, fetchFromGitHub, python, django, django_compat, django_nose }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix b/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix index 59e9782f0501..7bba272c155d 100644 --- a/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: +{ lib, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: buildPythonPackage rec { pname = "django-logentry-admin"; diff --git a/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index 92765c687ae6..9e3cf0dad99f 100644 --- a/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , django-gravatar2, django_compressor, django-allauth, mailmanclient , django, mock }: diff --git a/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix b/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix index c599e28d2062..b4d90da08808 100644 --- a/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest, django }: +{ lib, fetchFromGitHub, buildPythonPackage, pytest, django }: buildPythonPackage rec { pname = "django-maintenance-mode"; diff --git a/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 6e16af5bc8f9..e7cb4814cb48 100644 --- a/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , django, requests, oauthlib }: diff --git a/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix b/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix index 4fed9bf470b2..8790067e4af0 100644 --- a/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib +{ lib, buildPythonPackage, fetchPypi, requests, requests_oauthlib , django, python3-openid }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix b/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix index b3b71231b75b..4b8d79a2917e 100644 --- a/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }: +{ lib, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }: buildPythonPackage rec { pname = "django-polymorphic"; diff --git a/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix index f2bd574919aa..141a46f53154 100644 --- a/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , django , netaddr diff --git a/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/nixpkgs/pkgs/development/python-modules/django-q/default.nix index 2eb3b19f554b..16b1e0bcc59f 100644 --- a/nixpkgs/pkgs/development/python-modules/django-q/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-q/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow +{ lib, buildPythonPackage, fetchPypi, django-picklefield, arrow , blessed, django, future }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix b/nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix index d517563590fb..df5fc4b205b1 100644 --- a/nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-ranged-response/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchPypi, buildPythonPackage, django }: +{ lib, fetchurl, fetchPypi, buildPythonPackage, django }: buildPythonPackage rec { pname = "django-ranged-response"; diff --git a/nixpkgs/pkgs/development/python-modules/django-raster/default.nix b/nixpkgs/pkgs/development/python-modules/django-raster/default.nix index 173452ebe484..609388a311c8 100644 --- a/nixpkgs/pkgs/development/python-modules/django-raster/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-raster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, +{ lib, buildPythonPackage, fetchPypi, isPy3k, numpy, django_colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: diff --git a/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix b/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix index faad550d4391..4ff2b7ba8539 100644 --- a/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix @@ -1,30 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, - django, nose, pillow, sampledata, six, versiontools +{ lib +, buildPythonPackage +, fetchFromGitHub +, versiontools +, django +, sampledata +, nose +, pillow +, six }: buildPythonPackage rec { pname = "django-sampledatahelper"; version = "0.5"; - meta = { - description = "Helper class for generate sample data for django apps development"; - homepage = "https://github.com/kaleidos/django-sampledatahelper"; - license = lib.licenses.bsd3; + # no tests on PyPI + src = fetchFromGitHub { + owner = "kaleidos"; + repo = "django-sampledatahelper"; + rev = "8576f352ec26a3650f4386a6e1285b723f6aec23"; # no tag + sha256 = "1fx3ql4b9791594zkary19n20x5ra1m1n3pjaya9di1qy64csac4"; }; - src = fetchPypi { - inherit pname version; - sha256 = "3fbc5533f1055f9d1944097f6271e8b18fcf4ed5cc582b518616445145300015"; - }; + nativeBuildInputs = [ versiontools ]; - buildInputs = [ django nose pillow sampledata six versiontools ]; propagatedBuildInputs = [ django sampledata ]; - # HACK To prevent collision with pythonPackages.sampledata - preBuild = '' - rm tests/* + checkInputs = [ nose pillow six ]; + + checkPhase = '' + DJANGO_SETTINGS_MODULE=tests.settings NOSE_EXCLUDE=test_calling_command nosetests -v ''; - # ERROR: test_image_from_directory (tests.tests.TestImageHelpers) - doCheck = false; + meta = { + description = "Helper class for generate sample data for django apps development"; + homepage = "https://github.com/kaleidos/django-sampledatahelper"; + license = lib.licenses.bsd3; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-storages/default.nix b/nixpkgs/pkgs/development/python-modules/django-storages/default.nix index 869c3bf74eef..6efba78d4ca5 100644 --- a/nixpkgs/pkgs/development/python-modules/django-storages/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-storages/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , django }: diff --git a/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix index 39912f474204..4307fc69d457 100644 --- a/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix b/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix index e3e094ab706a..3e849b487739 100644 --- a/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "django-webpack-loader"; diff --git a/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix b/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix index 8529df09bb76..853e12327d32 100644 --- a/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, python, lib, stdenv, django }: +{ buildPythonPackage, fetchFromGitHub, python, lib, django }: buildPythonPackage rec { pname = "django-widget-tweaks"; diff --git a/nixpkgs/pkgs/development/python-modules/django/2.nix b/nixpkgs/pkgs/development/python-modules/django/2.nix index eac48593de20..06ec880e328d 100644 --- a/nixpkgs/pkgs/development/python-modules/django/2.nix +++ b/nixpkgs/pkgs/development/python-modules/django/2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.17"; + version = "2.2.18"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861"; + sha256 = "1d0b91343i9n0qz8xia1fbm4s3q8wi98nyc9a3acncm0w3sr9jf9"; }; patches = lib.optional withGdal diff --git a/nixpkgs/pkgs/development/python-modules/django/3.nix b/nixpkgs/pkgs/development/python-modules/django/3.nix index 2444146e8374..7b447eb8d787 100644 --- a/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7"; + sha256 = "c6c0462b8b361f8691171af1fb87eceb4442da28477e12200c40420176206ba7"; }; patches = lib.optional withGdal diff --git a/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix b/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix index c9c9913d7644..5da9ed0ca26d 100644 --- a/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_appconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: +{ lib, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: buildPythonPackage rec { pname = "django-appconf"; version = "1.0.3"; diff --git a/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix b/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix index e0a297e53c0c..2ef8639c17e6 100644 --- a/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix b/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix index 468327139e64..5de127a97221 100644 --- a/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix b/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix index f00804364899..edf5faa5af40 100644 --- a/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, rcssmin, rjsmin, django_appconf }: buildPythonPackage rec { pname = "django_compressor"; diff --git a/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix b/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix index a8872967df4d..a452db3cf281 100644 --- a/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/nixpkgs/pkgs/development/python-modules/django_environ/default.nix b/nixpkgs/pkgs/development/python-modules/django_environ/default.nix index fa2618fa1a71..3f01a2b294a1 100644 --- a/nixpkgs/pkgs/development/python-modules/django_environ/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_environ/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix b/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix index dba92efb2d94..816442d6e2a8 100644 --- a/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix b/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix index 60023660ea56..957944f01d38 100644 --- a/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , django_environ, mock, django , pytest, pytestrunner, pytest-django }: diff --git a/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix b/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix index 500fe2e2fbce..fdd4bd03b705 100644 --- a/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytz diff --git a/nixpkgs/pkgs/development/python-modules/django_nose/default.nix b/nixpkgs/pkgs/development/python-modules/django_nose/default.nix index 7f2f9efcfc5b..2506f6aba44a 100644 --- a/nixpkgs/pkgs/development/python-modules/django_nose/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_nose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/django_redis/default.nix b/nixpkgs/pkgs/development/python-modules/django_redis/default.nix index 434dea7f0f21..56e4e845f08c 100644 --- a/nixpkgs/pkgs/development/python-modules/django_redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, +{ lib, fetchPypi, buildPythonPackage, mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; diff --git a/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix index 16574770ff9e..6de1ce64328b 100644 --- a/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "3.0.8"; + version = "3.0.9"; src = fetchPypi { inherit pname version; - sha256 = "49e9930f90322dc6a2754dd26144285cfcc1c5bd0c1c39ca95d5602c5054ae32"; + sha256 = "a5af55f086a3f9c38be2f049c251e06005b9ed48ba7a109473736b1fc95a066f"; }; # tests assume the availability of a mysql/postgresql database diff --git a/nixpkgs/pkgs/development/python-modules/django_silk/default.nix b/nixpkgs/pkgs/development/python-modules/django_silk/default.nix index 66475b35d2a3..653bcdc55512 100644 --- a/nixpkgs/pkgs/development/python-modules/django_silk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_silk/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python +, pythonAtLeast , fetchFromGitHub +, fetchpatch , django , pygments , simplejson @@ -23,15 +25,23 @@ buildPythonPackage rec { pname = "django-silk"; - version = "4.0.1"; + version = "4.1.0"; # pypi tarball doesn't include test project src = fetchFromGitHub { owner = "jazzband"; repo = "django-silk"; rev = version; - sha256 = "0yy9rzxvwlp2xvnw76r9hnqajlp417snam92xpb6ay0hxwslwqyb"; + sha256 = "1km3hmx1sir0c5gqr2p1h2938slhxp2hzf10cb80q98mas8spjkn"; }; + + patches = lib.optional (pythonAtLeast "3.9") (fetchpatch { + # should be able to remove after 4.1.1 + name = "python-3.9-support.patch"; + url = "https://github.com/jazzband/django-silk/commit/134089e4cad7bd3b76fb0f70c423082cb7d2b34a.patch"; + sha256 = "09c1xd9y33h3ibiv5w9af9d79c909rgc1g5sxpd4y232h5id3c8r"; + }); + # "test_time_taken" tests aren't suitable for reproducible execution, but django's # test runner doesn't have an easy way to ignore tests - so instead prevent it from picking # them up as tests diff --git a/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix b/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix index e715dde7c41e..b51f0421fd95 100644 --- a/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix b/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix index e734a5f7ae8e..88536b210d2a 100644 --- a/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix index ce92fab3e965..66a57625b4a9 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, django, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, django, isPy27 }: buildPythonPackage rec { version = "3.12.2"; diff --git a/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix b/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix index e7a80d91d24c..aaaf5708a593 100644 --- a/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, openssl, buildPythonPackage +{ lib, fetchPypi, openssl, buildPythonPackage , pytest, dnspython, pynacl, authres, python }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix b/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix index 627f8eedaeb1..f465ac200d42 100644 --- a/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, bazel_0_26 , buildBazelPackage , buildPythonPackage , git @@ -19,6 +20,8 @@ let # first build all binaries and generate setup.py using bazel bazel-build = buildBazelPackage { + bazel = bazel_0_26; + name = "dm-sonnet-bazel-${version}"; src = fetchFromGitHub { @@ -36,14 +39,9 @@ let bazelTarget = ":install"; fetchAttrs = { - sha256 = "1dka5nap3d28n18pn3wp5xsi4x3z02h1j8rcjdvi3y6dbqjwdw0v"; + sha256 = "09dzxs2v5wpiaxrz7qj257q1fbx0gxwbk0jyx58n81m5kys7yj9k"; }; - bazelFlags = [ - # https://github.com/deepmind/sonnet/issues/134 - "--incompatible_disable_deprecated_attr_params=false" - ]; - buildAttrs = { preBuild = '' patchShebangs . diff --git a/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix b/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix index 543f4994020c..c022d62bfa84 100644 --- a/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "docker-pycreds"; diff --git a/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix index 74e363d18b97..45fe856f6f0d 100644 --- a/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { version = "1.1.0"; diff --git a/nixpkgs/pkgs/development/python-modules/dockerpty/default.nix b/nixpkgs/pkgs/development/python-modules/dockerpty/default.nix index b6267b87c1bd..775767e6fecf 100644 --- a/nixpkgs/pkgs/development/python-modules/dockerpty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dockerpty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "dockerpty"; diff --git a/nixpkgs/pkgs/development/python-modules/docopt/default.nix b/nixpkgs/pkgs/development/python-modules/docopt/default.nix index 2dc4bb38cf14..68df40a3cbf2 100644 --- a/nixpkgs/pkgs/development/python-modules/docopt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/docopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "docopt"; diff --git a/nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix index 12d15799ecc6..533dbed29b34 100644 --- a/nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "doctest-ignore-unicode"; diff --git a/nixpkgs/pkgs/development/python-modules/docutils/default.nix b/nixpkgs/pkgs/development/python-modules/docutils/default.nix index e24a00564be8..bae0acc1d45d 100644 --- a/nixpkgs/pkgs/development/python-modules/docutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/docutils/default.nix @@ -29,9 +29,10 @@ buildPythonPackage rec { done ''; - meta = { + meta = with lib; { description = "Python Documentation Utilities"; homepage = "http://docutils.sourceforge.net/"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + license = with licenses; [ publicDomain bsd2 psfl gpl3Plus ]; + maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix b/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix index 5dba1b91bc17..4b53045e249e 100644 --- a/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "1.1.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "40147b19696f387415a7efaaa4cf8ea0b5d31bdd1b53e5187e75d48ddfee9f0e"; + sha256 = "2134464672a3deb7ef1366a8691726686d8c62540e4208f1a40c9aaa1a0b6a45"; }; # Disable concurrency tests that often fail, diff --git a/nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix b/nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix index f6eabc378b3b..8ef37282250d 100644 --- a/nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dogpile.core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "dogpile.core"; diff --git a/nixpkgs/pkgs/development/python-modules/doit/default.nix b/nixpkgs/pkgs/development/python-modules/doit/default.nix index 36cd0b0ee185..4ceb8e71f648 100644 --- a/nixpkgs/pkgs/development/python-modules/doit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/doit/default.nix @@ -25,6 +25,9 @@ buildPythonPackage rec { ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; + # hangs on darwin + doCheck = !stdenv.isDarwin; + checkInputs = [ mock pytestCheckHook ]; disabledTests = [ diff --git a/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix b/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix index 2626f420676a..2154f33bb8ba 100644 --- a/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python , buildPythonPackage , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/dpath/default.nix b/nixpkgs/pkgs/development/python-modules/dpath/default.nix index 505bd7bb456c..9db726a12a19 100644 --- a/nixpkgs/pkgs/development/python-modules/dpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dpath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27 +{ lib, fetchPypi, buildPythonPackage, isPy27 , mock, pytestCheckHook, nose, hypothesis }: diff --git a/nixpkgs/pkgs/development/python-modules/dpkt/default.nix b/nixpkgs/pkgs/development/python-modules/dpkt/default.nix index 177b260e8044..52f4f42661d9 100644 --- a/nixpkgs/pkgs/development/python-modules/dpkt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dpkt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "dpkt"; diff --git a/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix b/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix new file mode 100644 index 000000000000..d265838526da --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, django +, djangorestframework +, pytest +, pytest-cov +, pytest-django +, ipdb +, python +}: + +buildPythonPackage rec { + pname = "drf-nested-routers"; + version = "0.92.5"; + + src = fetchFromGitHub { + owner = "alanjds"; + repo = "drf-nested-routers"; + rev = "v${version}"; + sha256 = "1l1jza8xz6xcm3gwxh1k6pc8fs95cq3v751gxj497y1a83d26j8i"; + }; + + propagatedBuildInputs = [ django djangorestframework setuptools ]; + checkInputs = [ pytest pytest-cov pytest-django ipdb ]; + + checkPhase = '' + ${python.interpreter} runtests.py --nolint + ''; + + meta = with lib; { + homepage = "https://github.com/alanjds/drf-nested-routers"; + description = "Provides routers and fields to create nested resources in the Django Rest Framework"; + license = licenses.asl20; + maintainers = with maintainers; [ felschr ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix index dd92d51d6c6b..d69ece809bb9 100644 --- a/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, buildPythonPackage, fetchPypi, inflection, diff --git a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index 22e66d0a4a43..ca0283b2cbdc 100644 --- a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytestrunner, requests, urllib3, mock, setuptools }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/dtopt/default.nix b/nixpkgs/pkgs/development/python-modules/dtopt/default.nix index 84631c217089..a5d4675f9930 100644 --- a/nixpkgs/pkgs/development/python-modules/dtopt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dtopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/duecredit/default.nix b/nixpkgs/pkgs/development/python-modules/duecredit/default.nix index 28aaf8ee47c9..ba51405e5e91 100644 --- a/nixpkgs/pkgs/development/python-modules/duecredit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/duecredit/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "duecredit"; - version = "0.8.0"; + version = "0.8.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1yxd8579pakrfhq0hls0iy37nxllsm8y33na220g08znibrp7ix0"; + sha256 = "43b3f01ab5fb2bf2ecc27d3fcf92b873c6b288f44becef3e2e87c96cb89d7b01"; }; # bin/duecredit requires setuptools at runtime diff --git a/nixpkgs/pkgs/development/python-modules/dufte/default.nix b/nixpkgs/pkgs/development/python-modules/dufte/default.nix index d8435afa3f97..d1c9680cb7b9 100644 --- a/nixpkgs/pkgs/development/python-modules/dufte/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dufte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k @@ -6,17 +6,18 @@ , importlib-metadata , matplotlib , numpy +, exdown , pytestCheckHook }: buildPythonPackage rec { pname = "dufte"; - version = "0.2.9"; + version = "0.2.12"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0nkaczipbsm8c14j9svxry2wigmn5iharibb6b8g062sjaph8x17"; + sha256 = "0ag1d7h1wijkc7v2vpgkbqjlnpiwd4nh8zhxiby0989bpmlp3jr3"; }; format = "pyproject"; @@ -32,7 +33,8 @@ buildPythonPackage rec { mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc ''; - checkInputs = [ pytestCheckHook ]; + + checkInputs = [ exdown pytestCheckHook ]; pythonImportsCheck = [ "dufte" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index 5d4ac94f7fa0..4cc3f34929b7 100644 --- a/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, urllib3, certifi -, gevent, geventhttpclient, mock, fastimport -, git, glibcLocales }: +{ lib +, stdenv +, buildPythonPackage +, certifi +, fastimport +, fetchPypi +, gevent +, geventhttpclient +, git +, glibcLocales +, mock +, urllib3 +}: buildPythonPackage rec { - version = "0.20.15"; + version = "0.20.18"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "1248942fr12av2rkzpm2fq0qn6rajvv2lcgq65h8kby27qvp65zv"; + sha256 = "sha256-ATE4f5uZrsxprJhlWzkx8q1D2lPTpj4FD6Om1iYKxVQ="; }; LC_ALL = "en_US.UTF-8"; @@ -21,6 +30,8 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; + pythonImportsCheck = [ "dulwich" ]; + meta = with lib; { description = "Simple Python implementation of the Git file formats and protocols"; longDescription = '' @@ -29,7 +40,7 @@ buildPythonPackage rec { ''; homepage = "https://www.dulwich.io/"; changelog = "https://github.com/dulwich/dulwich/blob/dulwich-${version}/NEWS"; - license = with licenses; [ asl20 gpl2Plus]; + license = with licenses; [ asl20 gpl2Plus ]; maintainers = with maintainers; [ koral ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dyn/default.nix b/nixpkgs/pkgs/development/python-modules/dyn/default.nix index b5fa28f2de6b..7cddb324f3a1 100644 --- a/nixpkgs/pkgs/development/python-modules/dyn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dyn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock +{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, mock , pytest_xdist, covCore, glibcLocales }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/dynd/default.nix b/nixpkgs/pkgs/development/python-modules/dynd/default.nix index f23d19510ee7..9323255cc27c 100644 --- a/nixpkgs/pkgs/development/python-modules/dynd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dynd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPyPy , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/easygui/default.nix b/nixpkgs/pkgs/development/python-modules/easygui/default.nix index 441d839d36f6..322e6461e5d4 100644 --- a/nixpkgs/pkgs/development/python-modules/easygui/default.nix +++ b/nixpkgs/pkgs/development/python-modules/easygui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "easygui"; diff --git a/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix b/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix index fc86edf5d4d0..c98a8b572d45 100644 --- a/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix +++ b/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "EasyProcess"; diff --git a/nixpkgs/pkgs/development/python-modules/easysnmp/default.nix b/nixpkgs/pkgs/development/python-modules/easysnmp/default.nix index d5c69d4c7e9d..11b13d8325a0 100644 --- a/nixpkgs/pkgs/development/python-modules/easysnmp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/easysnmp/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , pythonAtLeast , fetchFromGitHub diff --git a/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix b/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix index 2a17f84bb3b4..3c8921856876 100644 --- a/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/ed25519/default.nix b/nixpkgs/pkgs/development/python-modules/ed25519/default.nix index 183d7cc3ca55..47692075d3bc 100644 --- a/nixpkgs/pkgs/development/python-modules/ed25519/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ed25519/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "ed25519"; diff --git a/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix b/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix index 727c3003db5c..4329db98c2bd 100644 --- a/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , cmake diff --git a/nixpkgs/pkgs/development/python-modules/edward/default.nix b/nixpkgs/pkgs/development/python-modules/edward/default.nix index c1171043356a..ac2d5023cc97 100644 --- a/nixpkgs/pkgs/development/python-modules/edward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/edward/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast , Keras, numpy, scipy, six, tensorflow }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/eggdeps/default.nix b/nixpkgs/pkgs/development/python-modules/eggdeps/default.nix index ae339368ff5d..02c2c6444493 100644 --- a/nixpkgs/pkgs/development/python-modules/eggdeps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eggdeps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 67e277b57ac4..a2f2ff038db0 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index 4929d1f51a48..9161525c2bc6 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -2,7 +2,7 @@ , fetchPypi , urllib3, requests , nosexcover, mock -, lib, stdenv +, lib }: buildPythonPackage (rec { diff --git a/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index bbab0bfe6e4f..a5a639484ec1 100644 --- a/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "2.1.1"; + version = "2.1.3"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1h910v8f0648nqnk40bxgdim3623m07yg4xdfwcips2h55d19rk2"; + sha256 = "062l1dqbaz1pab3qz6x5zmja8m8gw1bxgfl4kx91gdh0zsiakg8j"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/nixpkgs/pkgs/development/python-modules/eliot/default.nix b/nixpkgs/pkgs/development/python-modules/eliot/default.nix index 472834c5c725..152561b69cee 100644 --- a/nixpkgs/pkgs/development/python-modules/eliot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eliot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/emcee/default.nix b/nixpkgs/pkgs/development/python-modules/emcee/default.nix index 12974a9422d6..a4f2bece3497 100644 --- a/nixpkgs/pkgs/development/python-modules/emcee/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emcee/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , numpy }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/nixpkgs/pkgs/development/python-modules/emoji/default.nix index d15185e14479..ce2beb235116 100644 --- a/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "emoji"; - version = "0.6.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e42da4f8d648f8ef10691bc246f682a1ec6b18373abfd9be10ec0b398823bd11"; + sha256 = "18siknldyqvxvjf0nv18m0a1c26ahkg7vmhkij1qayanb0h46vs9"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/emv/default.nix b/nixpkgs/pkgs/development/python-modules/emv/default.nix index 26d40d8d2052..f68729a42b62 100644 --- a/nixpkgs/pkgs/development/python-modules/emv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , click, enum-compat, pyscard, pycountry, terminaltables , pytestCheckHook, pythonOlder }: diff --git a/nixpkgs/pkgs/development/python-modules/enum/default.nix b/nixpkgs/pkgs/development/python-modules/enum/default.nix index ad266623c78b..db827601d5de 100644 --- a/nixpkgs/pkgs/development/python-modules/enum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/enum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/enum34/default.nix b/nixpkgs/pkgs/development/python-modules/enum34/default.nix index 5e26853098fb..91f54dc99cbf 100644 --- a/nixpkgs/pkgs/development/python-modules/enum34/default.nix +++ b/nixpkgs/pkgs/development/python-modules/enum34/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/nixpkgs/pkgs/development/python-modules/epc/default.nix b/nixpkgs/pkgs/development/python-modules/epc/default.nix index d74595431639..3950afa578e9 100644 --- a/nixpkgs/pkgs/development/python-modules/epc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/epc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sexpdata diff --git a/nixpkgs/pkgs/development/python-modules/ephem/default.nix b/nixpkgs/pkgs/development/python-modules/ephem/default.nix index 4d6e59409266..c0d77c297481 100644 --- a/nixpkgs/pkgs/development/python-modules/ephem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ephem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , glibcLocales, pytest }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix b/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix index 5ba9490d945a..e407ca35e89b 100644 --- a/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , lxml diff --git a/nixpkgs/pkgs/development/python-modules/etcd/default.nix b/nixpkgs/pkgs/development/python-modules/etcd/default.nix index 338992259a14..0c2fd0c2952d 100644 --- a/nixpkgs/pkgs/development/python-modules/etcd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/etcd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , simplejson diff --git a/nixpkgs/pkgs/development/python-modules/eve/default.nix b/nixpkgs/pkgs/development/python-modules/eve/default.nix index b931db188e3e..4d5c6173cd79 100644 --- a/nixpkgs/pkgs/development/python-modules/eve/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eve/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , flask diff --git a/nixpkgs/pkgs/development/python-modules/eventlib/default.nix b/nixpkgs/pkgs/development/python-modules/eventlib/default.nix index 1b2b44d65f70..4d4bff85842a 100644 --- a/nixpkgs/pkgs/development/python-modules/eventlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eventlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchdarcs diff --git a/nixpkgs/pkgs/development/python-modules/evernote/default.nix b/nixpkgs/pkgs/development/python-modules/evernote/default.nix index 70c7fad963af..8c6e4b6c7c27 100644 --- a/nixpkgs/pkgs/development/python-modules/evernote/default.nix +++ b/nixpkgs/pkgs/development/python-modules/evernote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index e380ca613cfd..706e4d8137fe 100644 --- a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, lxml, tzlocal, python-dateutil, pygments, requests-kerberos, defusedxml, cached-property, isodate, requests_ntlm, dnspython, diff --git a/nixpkgs/pkgs/development/python-modules/exdown/default.nix b/nixpkgs/pkgs/development/python-modules/exdown/default.nix new file mode 100644 index 000000000000..17cab3fe55fb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/exdown/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, importlib-metadata }: + +buildPythonPackage rec { + pname = "exdown"; + version = "0.7.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-vnSso3vmPIjX7JX+NwoxguwqwPHocJACeh5H0ClPcUI="; + }; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + + pythonImportsCheck = [ "exdown" ]; + + meta = with lib; { + description = "Extract code blocks from markdown"; + homepage = "https://github.com/nschloe/exdown"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/execnet/default.nix b/nixpkgs/pkgs/development/python-modules/execnet/default.nix index 0a22ab4b0516..ec4bcca9f86a 100644 --- a/nixpkgs/pkgs/development/python-modules/execnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/execnet/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , isPyPy , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/exifread/default.nix b/nixpkgs/pkgs/development/python-modules/exifread/default.nix index e86a681a8e39..e26f616f8db9 100644 --- a/nixpkgs/pkgs/development/python-modules/exifread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/exifread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/eyed3/default.nix b/nixpkgs/pkgs/development/python-modules/eyed3/default.nix index 08faf5c2ba84..3dfd810f99cb 100644 --- a/nixpkgs/pkgs/development/python-modules/eyed3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eyed3/default.nix @@ -1,11 +1,10 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder , python , isPyPy , six -, lib , filetype , deprecation , dataclasses diff --git a/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix b/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix index 6dfefe092040..3fd30062b0d9 100644 --- a/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: +{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { version = "0.12"; diff --git a/nixpkgs/pkgs/development/python-modules/face/default.nix b/nixpkgs/pkgs/development/python-modules/face/default.nix index 89e7156fa524..db1810ca056d 100644 --- a/nixpkgs/pkgs/development/python-modules/face/default.nix +++ b/nixpkgs/pkgs/development/python-modules/face/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, boltons, pytest }: +{ lib, buildPythonPackage, fetchPypi, boltons, pytest }: buildPythonPackage rec { pname = "face"; diff --git a/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix b/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix index 1896bdfac592..6b2c6411aa1f 100644 --- a/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix +++ b/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy -, face_recognition_models, lib, stdenv, flake8, pytest, glibcLocales +, face_recognition_models, lib, flake8, pytest, glibcLocales }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix b/nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix index d5838438b7d9..6ec2634029b3 100644 --- a/nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix +++ b/nixpkgs/pkgs/development/python-modules/face_recognition_models/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, fetchPypi, setuptools }: +{ buildPythonPackage, lib, fetchPypi, setuptools }: buildPythonPackage rec { pname = "face_recognition_models"; diff --git a/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix b/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix index a953632f9fd7..845e27dcc447 100644 --- a/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix @@ -1,30 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, django , faker -, python -, ipaddress +, fetchPypi +, flask +, flask_sqlalchemy +, mongoengine +, pytestCheckHook +, sqlalchemy }: buildPythonPackage rec { pname = "factory_boy"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "ded73e49135c24bd4d3f45bf1eb168f8d290090f5cf4566b8df3698317dc9c08"; + sha256 = "0nsw2mdjk8sqds3qsix4cf19ws6i0fak79349pw2581ryc7w0720"; }; - propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; + propagatedBuildInputs = [ faker ]; - # tests not included with pypi release - doCheck = false; + checkInputs = [ + django + flask + flask_sqlalchemy + mongoengine + pytestCheckHook + sqlalchemy + ]; + + # Checks for MongoDB requires an a running DB + disabledTests = [ "MongoEngineTestCase" ]; + pythonImportsCheck = [ "factory" ]; meta = with lib; { - description = "A Python package to create factories for complex objects"; - homepage = "https://github.com/rbarrois/factory_boy"; - license = licenses.mit; + description = "Python package to create factories for complex objects"; + homepage = "https://github.com/rbarrois/factory_boy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix b/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix index be26ab98af62..9b207a81c3c7 100644 --- a/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, six, pytest }: +{ lib, fetchPypi, buildPythonPackage, six, pytest }: buildPythonPackage rec { pname = "fake-useragent"; diff --git a/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix b/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix index 82af8d04e077..2e561a163ab5 100644 --- a/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/falcon/default.nix b/nixpkgs/pkgs/development/python-modules/falcon/default.nix index 8d1aa02026c1..eb6cbfa242e1 100644 --- a/nixpkgs/pkgs/development/python-modules/falcon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/falcon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , coverage diff --git a/nixpkgs/pkgs/development/python-modules/fasteners/default.nix b/nixpkgs/pkgs/development/python-modules/fasteners/default.nix index 57ad69c0be41..55b9d3b3023f 100644 --- a/nixpkgs/pkgs/development/python-modules/fasteners/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fasteners/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix b/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix index eb86784ddc7b..7671feb359f8 100644 --- a/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fastentrypoints"; diff --git a/nixpkgs/pkgs/development/python-modules/fastimport/default.nix b/nixpkgs/pkgs/development/python-modules/fastimport/default.nix index 55aad9d71ea5..383a0e4fbd58 100644 --- a/nixpkgs/pkgs/development/python-modules/fastimport/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastimport/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchPypi}: +{ lib, buildPythonPackage, python, fetchPypi}: buildPythonPackage rec { pname = "fastimport"; diff --git a/nixpkgs/pkgs/development/python-modules/fastpair/default.nix b/nixpkgs/pkgs/development/python-modules/fastpair/default.nix index 82964070d03b..9a3f8c53b1d3 100644 --- a/nixpkgs/pkgs/development/python-modules/fastpair/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: +{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: buildPythonPackage { pname = "fastpair"; diff --git a/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix b/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix index e033dc42d457..e154471d7a88 100644 --- a/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage +{ lib, fetchFromGitHub, buildPythonPackage , openssl, pytest, cffi, six }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix b/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix index 25cc2b8792f7..9b43c05989f6 100644 --- a/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix b/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix index 7aedbbdd8f7c..0821778d024f 100644 --- a/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fastrlock"; diff --git a/nixpkgs/pkgs/development/python-modules/fasttext/default.nix b/nixpkgs/pkgs/development/python-modules/fasttext/default.nix index bf3bd987564a..f3bddec76bd3 100644 --- a/nixpkgs/pkgs/development/python-modules/fasttext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fasttext/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: +{lib, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: buildPythonPackage rec { inherit (pkgs.fasttext) pname version src; diff --git a/nixpkgs/pkgs/development/python-modules/fdint/default.nix b/nixpkgs/pkgs/development/python-modules/fdint/default.nix index 4de0d18ca8b7..413416c99a25 100644 --- a/nixpkgs/pkgs/development/python-modules/fdint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fdint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/nixpkgs/pkgs/development/python-modules/feedgen/default.nix b/nixpkgs/pkgs/development/python-modules/feedgen/default.nix index 509ffaed9d71..59ca95a0338a 100644 --- a/nixpkgs/pkgs/development/python-modules/feedgen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }: +{ lib, buildPythonPackage, fetchPypi, dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; diff --git a/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix b/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix index 8508cc637f22..d5eb1306b398 100644 --- a/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: +{ lib, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: buildPythonPackage rec { pname = "feedgenerator"; diff --git a/nixpkgs/pkgs/development/python-modules/feedparser/5.nix b/nixpkgs/pkgs/development/python-modules/feedparser/5.nix index a79048c55254..58cdad9884e9 100644 --- a/nixpkgs/pkgs/development/python-modules/feedparser/5.nix +++ b/nixpkgs/pkgs/development/python-modules/feedparser/5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/feedparser/default.nix b/nixpkgs/pkgs/development/python-modules/feedparser/default.nix index 7b48fe6f73e5..38e9761952d6 100644 --- a/nixpkgs/pkgs/development/python-modules/feedparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/feedparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix b/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix index df132211d4f9..0cc1eae5ac20 100644 --- a/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/nixpkgs/pkgs/development/python-modules/filebytes/default.nix b/nixpkgs/pkgs/development/python-modules/filebytes/default.nix index bfac6a0e6b23..5b6d6284ced5 100644 --- a/nixpkgs/pkgs/development/python-modules/filebytes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filebytes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/filelock/default.nix b/nixpkgs/pkgs/development/python-modules/filelock/default.nix index 77ddec306fc2..97073bb6b03b 100644 --- a/nixpkgs/pkgs/development/python-modules/filelock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filelock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "filelock"; diff --git a/nixpkgs/pkgs/development/python-modules/filterpy/default.nix b/nixpkgs/pkgs/development/python-modules/filterpy/default.nix index 53059ce43d05..9740117b9b92 100644 --- a/nixpkgs/pkgs/development/python-modules/filterpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filterpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/nixpkgs/pkgs/development/python-modules/fints/default.nix b/nixpkgs/pkgs/development/python-modules/fints/default.nix index 8e02dac58508..c4dfc04046b7 100644 --- a/nixpkgs/pkgs/development/python-modules/fints/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fints/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , bleach , mt-940 , pytest diff --git a/nixpkgs/pkgs/development/python-modules/fire/default.nix b/nixpkgs/pkgs/development/python-modules/fire/default.nix index 6a2cc594360d..bf3be8a69072 100644 --- a/nixpkgs/pkgs/development/python-modules/fire/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fire/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock , python-Levenshtein, pytest, termcolor, isPy27, enum34 }: buildPythonPackage rec { pname = "fire"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "google"; repo = "python-fire"; rev = "v${version}"; - sha256 = "0s5r6l39ck2scks54hmwwdf4lcihqqnqzjfx9lz2b67vxkajpwmc"; + sha256 = "1caz6j2kdhj0kccrnqri6b4g2d6wzkkx8y9vxyvm7axvrwkv2vyn"; }; propagatedBuildInputs = [ six termcolor ] ++ lib.optional isPy27 enum34; diff --git a/nixpkgs/pkgs/development/python-modules/first/default.nix b/nixpkgs/pkgs/development/python-modules/first/default.nix index a5bdf847eff2..491fcd398053 100644 --- a/nixpkgs/pkgs/development/python-modules/first/default.nix +++ b/nixpkgs/pkgs/development/python-modules/first/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "first"; diff --git a/nixpkgs/pkgs/development/python-modules/fixerio/default.nix b/nixpkgs/pkgs/development/python-modules/fixerio/default.nix index 786681df1c83..8605d0f65da0 100644 --- a/nixpkgs/pkgs/development/python-modules/fixerio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fixerio/default.nix @@ -4,23 +4,20 @@ , requests , pytestCheckHook , httpretty +, responses }: buildPythonPackage rec { pname = "fixerio"; - version = "0.1.1"; + version = "1.0.0-alpha"; src = fetchFromGitHub { owner = "amatellanes"; repo = pname; rev = "v${version}"; - sha256 = "1k9ss5jc7sbpkjd2774vbmvljny0wm2lrc8155ha8yk2048jsaxk"; + sha256 = "009h1mys175xdyznn5bl980vly40544s4ph1zcgqwg2i2ic93gvb"; }; - postPatch = '' - substituteInPlace setup.py --replace "requests==2.10.0" "requests" - ''; - propagatedBuildInputs = [ requests ]; @@ -28,6 +25,17 @@ buildPythonPackage rec { checkInputs = [ httpretty pytestCheckHook + responses + ]; + + disabledTests = [ + # tests require network access + "test_returns_historical_rates_for_symbols_passed_if_both" + "test_returns_historical_rates_for_symbols_passed_in_constructor" + "test_returns_historical_rates_for_symbols_passed_in_method" + "test_returns_latest_rates_for_symbols_passed_in_constructor" + "test_returns_latest_rates_for_symbols_passed_in_method" + "test_returns_latest_rates_for_symbols_passed_in_method_if_both" ]; pythonImportsCheck = [ "fixerio" ]; diff --git a/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/nixpkgs/pkgs/development/python-modules/flake8/default.nix index 9e53ed28ff34..6f1d8181a583 100644 --- a/nixpkgs/pkgs/development/python-modules/flake8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flake8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , mock, pytest, pytestrunner , configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata }: diff --git a/nixpkgs/pkgs/development/python-modules/flaky/default.nix b/nixpkgs/pkgs/development/python-modules/flaky/default.nix index 02b0641a34e2..fe068211dfbf 100644 --- a/nixpkgs/pkgs/development/python-modules/flaky/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flaky/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index 60dc18a98779..6e98f6e80ac5 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -5,6 +5,7 @@ , apispec , colorama , click +, email_validator , flask , flask-babel , flask_login @@ -19,18 +20,17 @@ , python-dateutil , prison , pyjwt -, pyyaml , sqlalchemy-utils }: buildPythonPackage rec { pname = "flask-appbuilder"; - version = "2.3.0"; + version = "3.1.1"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "04bsswi7daaqda01a83rd1f2gq6asii520f9arjf7bsy24pmbprc"; + sha256 = "076b020b0ba125339a2e710e74eab52648cde2b18599f7cb0fa1eada9bbb648c"; }; checkInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { apispec colorama click + email_validator flask flask-babel flask_login @@ -56,21 +57,18 @@ buildPythonPackage rec { prison pyjwt sqlalchemy-utils - pyyaml ]; postPatch = '' substituteInPlace setup.py \ - --replace "apispec[yaml]>=1.1.1, <2" "apispec" \ - --replace "jsonschema>=3.0.1, <4" "jsonschema" \ - --replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \ - --replace "PyJWT>=1.7.1" "PyJWT" \ - --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \ - --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" \ + --replace "apispec[yaml]>=3.3, <4" "apispec" \ --replace "Flask-Login>=0.3, <0.5" "Flask-Login" \ - --replace "Flask-Babel>=1, <2" "Flask-Babel" + --replace "Flask-Babel>=1, <2" "Flask-Babel" \ + --replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \ + --replace "prison>=0.1.3, <1.0.0" "prison" ''; + # majority of tests require network access or mongo doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix b/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix index da6176e6781f..602564d16268 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/flask-common/default.nix b/nixpkgs/pkgs/development/python-modules/flask-common/default.nix index 7dbf507f2205..cba8e9e8efd4 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , crayons, flask, flask-caching, gunicorn, maya, meinheld, whitenoise }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix b/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix index 9491ca8be779..1e133df2b2bb 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, flask +{ lib, fetchPypi, buildPythonPackage, flask , brotli }: diff --git a/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix b/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix index 731e8b106ab7..25c054b231bb 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , nose, flask, six, packaging }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix b/nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix index 6986cd75be69..3a9daa577d4d 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-elastic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , flask, elasticsearch }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix index cf8a70b05330..580cd1f89f7b 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: +{ lib, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: buildPythonPackage rec { pname = "Flask-JWT-Extended"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix b/nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix index 1673ca24e6e0..08aa2efb8f2c 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch , flask, flask_wtf, flask_testing, ldap , mock, nose }: diff --git a/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix b/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix index 38d42da1c8a7..d22096f91494 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, flask, limits }: +{ lib, fetchPypi, buildPythonPackage, flask, limits }: buildPythonPackage rec { pname = "Flask-Limiter"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-login/default.nix b/nixpkgs/pkgs/development/python-modules/flask-login/default.nix index 919e353eb8e0..9d54849e92d9 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-login/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-login/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast , flask, blinker, nose, mock, semantic-version }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix index 4d50ade30e1c..dfa1a0fbd01b 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.5.3"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "a69d508c2e09d289f6e55a417b3b8c7bfe70e640f53d2d9deb0d056a384f37ee"; + sha256 = "8626af845e6071ef80c70b0dc16d373f761c981f0ad61bb143a529cab649e725"; }; checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales; diff --git a/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix b/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix index 0d618e2b55df..214c89e1d4b2 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.7.1"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "949b93d0535d1223b91ac0048586bd878aaebf4044c54c1dc3068acc9bdf441f"; + sha256 = "31133c29c718aed95276425f7795d0a32b8d45a992ddd359c69600f22f869254"; }; propagatedBuildInputs = [ flask ]; diff --git a/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index 550f6520e7db..18e483292885 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix b/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix index 92d2f90848cb..f6b6fd81528f 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , flask diff --git a/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 16b8c9c7fc79..1bac82fb44f6 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: +{ lib, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: buildPythonPackage rec { pname = "Flask-SQLAlchemy"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix b/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix index 79650e7c1755..d238ba5acb75 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flask }: +{ lib, buildPythonPackage, fetchPypi, flask }: buildPythonPackage rec { pname = "flask-swagger-ui"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix b/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix index 20624c318620..66c45b855223 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-swagger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , flask, pyyaml }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix b/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix index 15e7b2c1875d..e30abdb7cb44 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flask }: +{ lib, buildPythonPackage, fetchFromGitHub, flask }: buildPythonPackage rec { pname = "Flask-Versioned"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix b/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix index eadc7842a013..00af0ce61e9a 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, flask, wtforms, nose }: +{ lib, fetchPypi, buildPythonPackage, flask, wtforms, nose }: buildPythonPackage rec { pname = "Flask-WTF"; diff --git a/nixpkgs/pkgs/development/python-modules/flask/default.nix b/nixpkgs/pkgs/development/python-modules/flask/default.nix index d121b4e32c8b..27f436c3c53c 100644 --- a/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , itsdangerous, click, werkzeug, jinja2, pytest }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix b/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix index eef31359f504..d15950bba9a4 100644 --- a/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , flask diff --git a/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix b/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix index 1a6591040a2e..9fd36fab2941 100644 --- a/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/flup/default.nix b/nixpkgs/pkgs/development/python-modules/flup/default.nix index 52ac5da27aa1..fa19d9bdf7a5 100644 --- a/nixpkgs/pkgs/development/python-modules/flup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/nixpkgs/pkgs/development/python-modules/flux-led/default.nix index ddec811e21ce..64eafed6c198 100644 --- a/nixpkgs/pkgs/development/python-modules/flux-led/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flux-led/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , aiohttp, zigpy , pytest, isPy27 }: diff --git a/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index cd91eb08be0e..75f4908b63bc 100644 --- a/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.18.2"; + version = "4.19.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0h750gvwpsp7fpmgfwkx93gkaf0m1s698g6r7n4xlaji563nlkiv"; + sha256 = "16jz3g4jzfdc43hs33b59vzd9m233qgflvy3ycdynifqk16lqsp2"; }; # all dependencies are optional, but diff --git a/nixpkgs/pkgs/development/python-modules/foolscap/default.nix b/nixpkgs/pkgs/development/python-modules/foolscap/default.nix index 396bef6d009e..e0d38a5a1313 100644 --- a/nixpkgs/pkgs/development/python-modules/foolscap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/foolscap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix b/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix index 64713d96adea..1bb3b17e9df3 100644 --- a/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/foxdot/default.nix b/nixpkgs/pkgs/development/python-modules/foxdot/default.nix index d60c1e89900a..072129e6ea5a 100644 --- a/nixpkgs/pkgs/development/python-modules/foxdot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/foxdot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, tkinter, supercollider }: +{ lib, buildPythonPackage, fetchPypi, tkinter, supercollider }: buildPythonPackage rec { pname = "FoxDot"; diff --git a/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix b/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix index 9dc88596f267..09ce8bbd11b1 100644 --- a/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix +++ b/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/freezegun/default.nix b/nixpkgs/pkgs/development/python-modules/freezegun/default.nix index f1b1d9738d72..4c5a87e8266b 100644 --- a/nixpkgs/pkgs/development/python-modules/freezegun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/freezegun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonOlder , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix index 571fba1a8acd..b8312d1c8ec5 100644 --- a/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytestCheckHook, requests }: +{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, pytestCheckHook, requests }: buildPythonPackage rec { pname = "fritzconnection"; diff --git a/nixpkgs/pkgs/development/python-modules/frozendict/default.nix b/nixpkgs/pkgs/development/python-modules/frozendict/default.nix index dd0c99298265..e172f3815b7e 100644 --- a/nixpkgs/pkgs/development/python-modules/frozendict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/frozendict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "frozendict"; diff --git a/nixpkgs/pkgs/development/python-modules/ftfy/default.nix b/nixpkgs/pkgs/development/python-modules/ftfy/default.nix index 63342c7045d0..dbc363172288 100644 --- a/nixpkgs/pkgs/development/python-modules/ftfy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ftfy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/fudge/default.nix b/nixpkgs/pkgs/development/python-modules/fudge/default.nix index 3f53b66d1efa..ba97b2e8f47a 100644 --- a/nixpkgs/pkgs/development/python-modules/fudge/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fudge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix b/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix index 773ed1dccd67..19e2dd146d20 100644 --- a/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix b/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix index 1464baa57df2..8a7335accda4 100644 --- a/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , isPyPy, isPy3k, unittest2 }: diff --git a/nixpkgs/pkgs/development/python-modules/functools32/default.nix b/nixpkgs/pkgs/development/python-modules/functools32/default.nix index cec9da423958..be907e963c10 100644 --- a/nixpkgs/pkgs/development/python-modules/functools32/default.nix +++ b/nixpkgs/pkgs/development/python-modules/functools32/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/funcy/default.nix b/nixpkgs/pkgs/development/python-modules/funcy/default.nix index 3db08cf22bbd..515f0925cafa 100644 --- a/nixpkgs/pkgs/development/python-modules/funcy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/funcy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/furl/default.nix b/nixpkgs/pkgs/development/python-modules/furl/default.nix index b7592885007e..72089da11e10 100644 --- a/nixpkgs/pkgs/development/python-modules/furl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/furl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }: +{ lib, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }: buildPythonPackage rec { pname = "furl"; diff --git a/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix b/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix index a130fab0d7eb..14f2cb584ea8 100644 --- a/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, fuse }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, fuse }: buildPythonPackage rec { pname = "fuse-python"; diff --git a/nixpkgs/pkgs/development/python-modules/fusepy/default.nix b/nixpkgs/pkgs/development/python-modules/fusepy/default.nix index 858d3e13ea0c..45b708630427 100644 --- a/nixpkgs/pkgs/development/python-modules/fusepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fusepy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix b/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix index c2d16a559842..0bcf8efc359e 100644 --- a/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: +{ lib, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: buildPythonPackage rec { pname = "fuzzywuzzy"; diff --git a/nixpkgs/pkgs/development/python-modules/gast/default.nix b/nixpkgs/pkgs/development/python-modules/gast/default.nix index e4dbe43ef8d7..38334d5cc6b4 100644 --- a/nixpkgs/pkgs/development/python-modules/gast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, astunparse }: +{ lib, fetchPypi, buildPythonPackage, astunparse }: buildPythonPackage rec { pname = "gast"; diff --git a/nixpkgs/pkgs/development/python-modules/gateone/default.nix b/nixpkgs/pkgs/development/python-modules/gateone/default.nix index 981cbbb7e8c3..5c45e875e5da 100644 --- a/nixpkgs/pkgs/development/python-modules/gateone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gateone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , tornado , futures diff --git a/nixpkgs/pkgs/development/python-modules/gcovr/default.nix b/nixpkgs/pkgs/development/python-modules/gcovr/default.nix index bedb7f3a3755..1332777189b1 100644 --- a/nixpkgs/pkgs/development/python-modules/gcovr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gcovr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , jinja2 diff --git a/nixpkgs/pkgs/development/python-modules/gdata/default.nix b/nixpkgs/pkgs/development/python-modules/gdata/default.nix index bf9c01c250ab..94430d0d9411 100644 --- a/nixpkgs/pkgs/development/python-modules/gdata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix b/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix index aab5efea97de..6060dc3a5bb8 100644 --- a/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/geeknote/default.nix b/nixpkgs/pkgs/development/python-modules/geeknote/default.nix index 4eb209a8af7f..6c4165481841 100644 --- a/nixpkgs/pkgs/development/python-modules/geeknote/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geeknote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/genanki/default.nix b/nixpkgs/pkgs/development/python-modules/genanki/default.nix index f43fdabf09e5..3f217afd8bb0 100644 --- a/nixpkgs/pkgs/development/python-modules/genanki/default.nix +++ b/nixpkgs/pkgs/development/python-modules/genanki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner }: diff --git a/nixpkgs/pkgs/development/python-modules/genshi/default.nix b/nixpkgs/pkgs/development/python-modules/genshi/default.nix index 9a6e4508e30e..c476960bbf83 100644 --- a/nixpkgs/pkgs/development/python-modules/genshi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/genshi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix b/nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix index 8f486cc29efb..a848eff41a65 100644 --- a/nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/genzshcomp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index 56f9346668f6..b629d48c61f6 100644 --- a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sqlalchemy diff --git a/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix b/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix index 98c1ee417e43..5167b9866049 100644 --- a/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/geomet/default.nix b/nixpkgs/pkgs/development/python-modules/geomet/default.nix new file mode 100644 index 000000000000..a4df450098df --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/geomet/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, click +, six +}: + +buildPythonPackage rec { + pname = "geomet"; + version = "0.2.1"; + + # pypi tarball doesn't include tests + src = fetchFromGitHub { + owner = "geomet"; + repo = "geomet"; + rev = version; + sha256 = "0fdi26glsmrsyqk86rnsfcqw79svn2b0ikdv89pq98ihrpwhn85y"; + }; + + patches = [ + (fetchpatch { + name = "python-3.8-support.patch"; + url = "https://github.com/geomet/geomet/commit/dc4cb4a856d3ad814b57b4b7487d86d9e0f0fad4.patch"; + sha256 = "1f1cdfqyp3z01jdjvax77219l3gc75glywqrisqpd2k0m0g7fwh3"; + }) + ]; + + propagatedBuildInputs = [ click six ]; + + meta = with lib; { + homepage = "https://github.com/geomet/geomet"; + license = licenses.asl20; + description = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary), and vice versa."; + maintainers = with maintainers; [ turion ris ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/geopy/2.nix b/nixpkgs/pkgs/development/python-modules/geopy/2.nix index ae4e07e25479..48df43e22173 100644 --- a/nixpkgs/pkgs/development/python-modules/geopy/2.nix +++ b/nixpkgs/pkgs/development/python-modules/geopy/2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix index 88d1089d5a31..4a25e0d7e148 100644 --- a/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , versiontools diff --git a/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix index 431a0c09a30c..7ff62a378ca9 100644 --- a/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/gevent/default.nix b/nixpkgs/pkgs/development/python-modules/gevent/default.nix index 0fcf6cdfaaa9..3fe9e648ce32 100644 --- a/nixpkgs/pkgs/development/python-modules/gevent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gevent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet +{ lib, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet , zope_interface }: diff --git a/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix index fafbef12bd3a..c82da3c8a98e 100644 --- a/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix b/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix index a9582648117a..efbdc2f59f9a 100644 --- a/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , zope_testrunner, six, chardet}: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/gipc/default.nix b/nixpkgs/pkgs/development/python-modules/gipc/default.nix index a48547f29099..8df2808328fb 100644 --- a/nixpkgs/pkgs/development/python-modules/gipc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , gevent diff --git a/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix b/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix index 5922377ab3a1..d41874cff3b5 100644 --- a/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll , python, util-linux, pygit2, gitMinimal, git-annex, cacert }: diff --git a/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix b/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix index adb9de4dbc0d..2d7da28535cf 100644 --- a/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/git-sweep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , GitPython @@ -15,6 +15,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ GitPython ]; + # no tests + doCheck = false; + + pythonImportsCheck = [ "gitsweep" ]; + meta = with lib; { description = "A command-line tool that helps you clean up Git branches"; homepage = "https://github.com/arc90/git-sweep"; diff --git a/nixpkgs/pkgs/development/python-modules/globre/default.nix b/nixpkgs/pkgs/development/python-modules/globre/default.nix index 21d2983ab015..5debd1d0ab65 100644 --- a/nixpkgs/pkgs/development/python-modules/globre/default.nix +++ b/nixpkgs/pkgs/development/python-modules/globre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , pythonAtLeast , buildPythonPackage , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 20d47dfe7e94..0c2d74a90e11 100644 --- a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -1,35 +1,37 @@ { lib , buildPythonPackage -, flake8 -, nose2 -, mock +, fetchFromGitHub , requests , pyjwt -, fetchPypi +, pytestCheckHook +, responses }: buildPythonPackage rec { pname = "globus-sdk"; - version = "1.10.0"; + version = "2.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "b33021b58edacc16bf2ba8453efbb26a8b04242ee3f4d62dcdaa3c6e199f136f"; + src = fetchFromGitHub { + owner = "globus"; + repo = "globus-sdk-python"; + rev = version; + sha256 = "1kqnr50iwcq9nx40lblbqzf327cdcbkrir6vh70067hk33rq0gm9"; }; - checkPhase = '' - py.test tests - ''; + propagatedBuildInputs = [ + requests + pyjwt + ]; - # No tests in archive - doCheck = false; + checkInputs = [ + pytestCheckHook + responses + ]; - checkInputs = [ flake8 nose2 mock ]; - - propagatedBuildInputs = [ requests pyjwt ]; + pythonImportsCheck = [ "globus_sdk" ]; meta = with lib; { - description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; + description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; homepage = "https://github.com/globus/globus-sdk-python"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; diff --git a/nixpkgs/pkgs/development/python-modules/glom/default.nix b/nixpkgs/pkgs/development/python-modules/glom/default.nix index 2acc87a17ac4..89f0de474901 100644 --- a/nixpkgs/pkgs/development/python-modules/glom/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , boltons diff --git a/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix b/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix index 808b918681bb..204415d75315 100644 --- a/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , fetchpatch diff --git a/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix index 821e0ba0afa9..1797f1d4264d 100644 --- a/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , validictory diff --git a/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix b/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix index 71116c37041b..6f3ae30e8cde 100644 --- a/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/gnutls/default.nix b/nixpkgs/pkgs/development/python-modules/gnutls/default.nix index addbee81bd3f..3c68a1713a0a 100644 --- a/nixpkgs/pkgs/development/python-modules/gnutls/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gnutls/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/goobook/default.nix b/nixpkgs/pkgs/development/python-modules/goobook/default.nix index c587c928e7e7..83175b6c86a5 100644 --- a/nixpkgs/pkgs/development/python-modules/goobook/default.nix +++ b/nixpkgs/pkgs/development/python-modules/goobook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , docutils, installShellFiles , google_api_python_client, simplejson, oauth2client, setuptools, xdg }: diff --git a/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix index 6715590dc329..74d74d51c49d 100644 --- a/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.24.1"; + version = "1.25.1"; src = fetchPypi { inherit pname version; - sha256 = "0sflnpgsvk2h1cr1m3mgxx6pzz55xw7sk4y4qdimhs5jdm2fw78g"; + sha256 = "0e152ec37b8481d1be1258d95844a5a7031cd3d83d7c7046d9e9b2d807042440"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix b/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix index 7cc7f4858826..321837f56aec 100644 --- a/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index 9120f93a3bdd..22b02552cd75 100644 --- a/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchpatch , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index 8f04fb7451d2..aec3b51acb5e 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index 302ce8ceaed3..83fe052a5422 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 4ec12a8fa2fb..8f67fed79d7a 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 5eab2c730f7d..2cada2e0b0f6 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -1,9 +1,10 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook , freezegun , google-cloud-core +, google-cloud-storage , google-cloud-testutils , google-resumable-media , grpcio @@ -11,16 +12,17 @@ , mock , pandas , proto-plus +, psutil , pyarrow }: buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.6.2"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1c940bf190a681d80b6f6cd7541924ad411de5f0585b2c8c5e420ab750e2024d"; + sha256 = "29721972f5e539e486fbdc722ddf849ad86acd092680d16c271430dc16023544"; }; propagatedBuildInputs = [ @@ -36,6 +38,8 @@ buildPythonPackage rec { ipython mock pandas + psutil + google-cloud-storage pytestCheckHook ]; @@ -44,6 +48,12 @@ buildPythonPackage rec { rm -r google ''; + disabledTests = [ + # requires credentials + "test_bigquery_magic" + "TestBigQuery" + ]; + pythonImportsCheck = [ "google.cloud.bigquery" "google.cloud.bigquery_v2" diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 9632dc902d15..93cbc22b7cd8 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 6d91bed83ae7..1cf94d220e69 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix index 72709c62ceca..44764a4edb1c 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 1b7a570fed21..095e01fbbd76 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix index 84f98550b9a3..4c8c79c7ddae 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index 9076c1298040..47f0522e1a6c 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "09rnzpdlycr1wv8agcfx05v1prn35ylphsbr07486zqdkh5wjk8p"; + sha256 = "193c2c012639f0c063999e0b899f92d70763be605d5528f3d1da93d6734a1aa8"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix index 0636da60e9af..fa4c8c6c52df 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index b3181f8fcded..bbd51326e0f2 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook @@ -19,6 +19,11 @@ buildPythonPackage rec { sha256 = "2fd6fe25343f7017c22e2733a0358c64b3171edc1669d0c8a1e1f07f86a048c4"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'google-cloud-logging>=1.14.0, <2.1' 'google-cloud-logging>=1.14.0' + ''; + propagatedBuildInputs = [ google-cloud-logging libcst proto-plus ]; checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index f0c235ca0c98..30ef0af76a1a 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , aiounittest diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index f96940f4e67f..243c2b86c1ee 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak"; + sha256 = "d34604508e3e87b9161ccd5ff29474867ac91ffb8d29e1a2fc9ff0e26d934b73"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix index 2b28f84a3158..f9be06a827e9 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "08spn5g0s386x21dgwb46na8aknbwq5d1sn8bh6kayk9fjfbxwla"; + sha256 = "768ccd567b87bf0030f9458d796cc0a846c40825fa2896b77e9cc7a4af30ba2b"; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 6675767a2445..94dd7c1ba8ff 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix index 7186ecd6f355..c43c51d97f74 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix index 58d03f206fc7..ab31a8ee4ed4 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.0.2"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0s09vs4rnq4637j8zw7grv3f4j7njqprm744b1knzldj91rg0vmi"; + sha256 = "8932ac382eee6af85cd08400a77586dd3139fbf40b61db757c4c492490899741"; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 8dc665fe2103..f8fc079aa3e4 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 46a28b1ffd1d..3bc5f185e494 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1rfdbkxbndi00wx9dx733ihp3hmcsk6k23pcjni0ki7m0c4acl5w"; + sha256 = "b19f0556c252b805a52c976e3317c53d91e36f56dc8d28192eea190627faf343"; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index 4dcf7fd3d318..86fbc360d73c 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 11baf3d73f3d..8a265182fba4 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 81fa97f152bb..0a3285566f19 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 242198a21971..184044594d52 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index 382476af0ca3..c4849dd2f559 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 @@ -21,11 +21,6 @@ buildPythonPackage rec { sha256 = "060c53bc6f541660a2fe868fd83a695207d4e7b050e04fe103d1e77634b813c7"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"proto-plus == 1.11.0"' '"proto-plus"' - ''; - propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ]; checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 3359cfdd743a..c57329eebcc3 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix index cf869d5c8eff..84706a8b5a91 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.35.0"; + version = "1.35.1"; src = fetchPypi { inherit pname version; - sha256 = "17kal75wmyjpva7g04cb9yg7qbyrgwfn575z4gqijd4gz2r0sp2m"; + sha256 = "dc076b6af6da991252416639cb93831f8e50c8328d5ac3fb8e03e40cd8de2290"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index e30986af6106..5911bfe61562 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix index 3f6792fa77b7..2380e9183b73 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, google-auth, six }: +{ lib, buildPythonPackage, fetchPypi, google-auth, six }: buildPythonPackage rec { pname = "google-cloud-testutils"; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index a7228a42999b..3c84c21344a9 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index 1252c99bf486..486a71c7a97e 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index 32d402e1cf03..2b0ac55fa2eb 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 43fed1fe27fa..26e3320a5ccb 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index 57a51f96e65e..b69229123809 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0qbwhapmn5ia853c4nfnz1qiksngvr8j0xxjasrykwhxcsd7s1ka"; + sha256 = "2bae8b4aca9aa38ad7459102cc5743c506adf9060ad2b3b15cff1e8021085017"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 20614f5b5d86..ac91ab85bd64 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix b/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix index 7e5b786b4fba..898971629ae0 100644 --- a/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc diff --git a/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix b/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix index c971119833e6..007d4eb2cea7 100644 --- a/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/nixpkgs/pkgs/development/python-modules/gorilla/default.nix b/nixpkgs/pkgs/development/python-modules/gorilla/default.nix index bf4212edc510..42da45416470 100644 --- a/nixpkgs/pkgs/development/python-modules/gorilla/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gorilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi}: +{ lib, buildPythonPackage, fetchPypi}: buildPythonPackage rec { pname = "gorilla"; diff --git a/nixpkgs/pkgs/development/python-modules/gpapi/default.nix b/nixpkgs/pkgs/development/python-modules/gpapi/default.nix index 788473b5ab8f..6ed9f48dd61c 100644 --- a/nixpkgs/pkgs/development/python-modules/gpapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gpapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , requests , protobuf , pycryptodome diff --git a/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix b/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix index 0dd68918aed6..31ac03347cb2 100644 --- a/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , pkg-config , libgphoto2 }: diff --git a/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix b/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix index ecd52ad848c9..28f244bc354c 100644 --- a/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient +{ buildPythonPackage, lib, libffi, isPy3k, pyasn1, clint, ndg-httpsclient , protobuf, requests, args, gpapi, pyaxmlparser, fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix b/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix index 2c4dfcd81395..1ad50642e2b9 100644 --- a/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cffi diff --git a/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix b/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix index 22e6743582c2..85b6efabaa8c 100644 --- a/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools +{ lib, buildPythonPackage, fetchFromGitHub, setuptools , numpy, scipy, gpy, emcee, nose }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix b/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix new file mode 100644 index 000000000000..cf0ffb6bb417 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix @@ -0,0 +1,46 @@ +{ buildPythonPackage +, fetchFromGitHub +, hyperopt +, lib +, mock +, numpy +, poetry +, prometheus_client +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gradient-utils"; + version = "0.3.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Paperspace"; + repo = pname; + rev = "v${version}"; + sha256 = "083hnkv19mhvdc8nx28f1nph50c903gxh9g9q8531abv0w8m0744"; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \ + --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' + ''; + + nativeBuildInputs = [ poetry ]; + checkInputs = [ mock pytestCheckHook ]; + propagatedBuildInputs = [ hyperopt prometheus_client numpy ]; + + preCheck = "export HOSTNAME=myhost-experimentId"; + disabledTests = [ + "test_add_metrics_pushes_metrics" # requires a working prometheus push gateway + ]; + + meta = with lib; { + description = "Gradient ML SDK"; + homepage = "https://github.com/Paperspace/gradient-utils"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gradient/default.nix b/nixpkgs/pkgs/development/python-modules/gradient/default.nix new file mode 100644 index 000000000000..14df3b882bba --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gradient/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchPypi, buildPythonPackage +, attrs, boto3, requests, gradient_statsd, terminaltables +, click-completion , click-didyoumean, click-help-colors +, colorama, requests_toolbelt, gradient-utils, halo, progressbar2 +, marshmallow, pyyaml, websocket_client +}: + +buildPythonPackage rec { + pname = "gradient"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "15s21945hg342195ig7nchap5mdnsw931iis92pr7hy8ff0rks3n"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'attrs<=' 'attrs>=' \ + --replace 'colorama==' 'colorama>=' \ + --replace 'PyYAML==' 'PyYAML>=' \ + --replace 'marshmallow<' 'marshmallow>=' + ''; + + propagatedBuildInputs = [ attrs boto3 requests gradient_statsd terminaltables + click-completion click-didyoumean click-help-colors requests_toolbelt + colorama gradient-utils halo marshmallow progressbar2 pyyaml websocket_client + ]; + + # tries to use /homeless-shelter to mimic container usage, etc + doCheck = false; + + meta = with lib; { + description = "The command line interface for Gradient"; + homepage = "https://github.com/Paperspace/gradient-cli"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix b/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix deleted file mode 100644 index adaafd8eadbe..000000000000 --- a/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage -, hyperopt -}: - -buildPythonPackage rec { - pname = "gradient_sdk"; - version = "0.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "Q9oeYjjgJf2lhxW1ypsweQAPpMglmW9PxgzMsgTqJkY="; - }; - - propagatedBuildInputs = [ hyperopt ]; - - pythonImportsCheck = [ "gradient_sdk" ]; - - meta = with lib; { - description = "Gradient ML SDK"; - homepage = "https://github.com/Paperspace/gradient-sdk"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ freezeboy ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix b/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix index 607737d99ae0..ada005d14f8e 100644 --- a/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , boto3, requests, datadog, configparser, python }: diff --git a/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/nixpkgs/pkgs/development/python-modules/graphene/default.nix index 301ffca03477..bf7d08cdce36 100644 --- a/nixpkgs/pkgs/development/python-modules/graphene/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphene/default.nix @@ -5,6 +5,7 @@ , iso8601 , graphql-core , graphql-relay +, promise , pytestCheckHook , pytest-asyncio , pytest-benchmark @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; checkInputs = [ + promise pytestCheckHook pytest-asyncio pytest-benchmark @@ -39,6 +41,8 @@ buildPythonPackage rec { snapshottest ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + pythonImportsCheck = [ "graphene" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix b/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix index 0bced13cd112..17ac91329163 100644 --- a/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix b/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix index 06b66ccbc145..20522d283045 100644 --- a/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , tornado_5, pyyaml, funcparserlib , nixosTests }: diff --git a/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix b/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix index 9e48f66c13d1..5c29a1135a9b 100644 --- a/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix @@ -1,10 +1,11 @@ { buildPythonPackage , fetchFromGitHub , lib +, pythonOlder , coveralls , promise -, pytest +, pytestCheckHook , pytest-benchmark , pytest-mock , rx @@ -13,36 +14,21 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.2"; + version = "3.1.3"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "0kvbj9dwpx8mjfj86kqx54dbz9k72ki147ssyj0ca2syvb8jm3wb"; + sha256 = "0qy1i6vffwad74ymdsh1qjf5b6ph4z0vyxzkkc6yppwczhzmi1ps"; }; - propagatedBuildInputs = [ - promise - rx - six - ]; - checkInputs = [ - coveralls - pytest pytest-benchmark - pytest-mock + pytestCheckHook ]; - checkPhase = "pytest"; - - configurePhase = '' - substituteInPlace setup.py \ - --replace 'pytest-mock==1.2' 'pytest-mock==1.13.0' \ - --replace 'pytest-benchmark==3.0.0' 'pytest-benchmark==3.2.2' - ''; - meta = with lib; { description = "Port of graphql-js to Python"; homepage = "https://github.com/graphql-python/graphql-core"; diff --git a/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix b/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix index 7b2dd7e3fedd..ae7ddb0c76b4 100644 --- a/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/greatfet/default.nix b/nixpkgs/pkgs/development/python-modules/greatfet/default.nix index b4048c922dae..7859d2f4c087 100644 --- a/nixpkgs/pkgs/development/python-modules/greatfet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/greatfet/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }: -buildPythonPackage { +buildPythonPackage rec { pname = "GreatFET"; version = "2019.5.1.dev0"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "greatfet"; - rev = "a927f21d59ccface00635146103a807c1d2b0ad8"; + rev = "v${version}"; sha256 = "054vkx4xkbhxhh5grjbs9kw3pjkv1zapp91ysrqr0c8mg1pc7zxv"; }; diff --git a/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix b/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix new file mode 100644 index 000000000000..97d169283b23 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder +, pytestCheckHook, pyhamcrest, pytestrunner, pytest +, six, isodate, tornado, aenum, radish-bdd, mock +}: + +buildPythonPackage rec { + pname = "gremlinpython"; + version = "3.4.8"; + + # pypi tarball doesn't include tests + src = fetchFromGitHub { + owner = "apache"; + repo = "tinkerpop"; + rev = version; + sha256 = "0kcyhfxz7z4f8i64gig8q1q9dhy24cprbh63vwsdiwryg74q4chl"; + }; + sourceRoot = "source/gremlin-python/src/main/jython"; + postPatch = '' + substituteInPlace setup.py \ + --replace 'tornado>=4.4.1,<6.0' 'tornado' \ + --replace 'PyHamcrest>=1.9.0,<2.0.0' 'PyHamcrest' \ + --replace 'radish-bdd==0.8.6' 'radish-bdd' \ + --replace 'mock>=3.0.5,<4.0.0' 'mock' \ + --replace 'pytest>=4.6.4,<5.0.0' 'pytest' + ''; + + nativeBuildInputs = [ pytestrunner ]; # simply to placate requirements + propagatedBuildInputs = [ six isodate tornado aenum ]; + + checkInputs = [ pytestCheckHook pyhamcrest radish-bdd mock ]; + + # disable custom pytest report generation + preCheck = '' + substituteInPlace setup.cfg --replace 'addopts' '#addopts' + ''; + + # many tests expect a running tinkerpop server + pytestFlagsArray = [ + "--ignore=tests/driver/test_client.py" + "--ignore=tests/driver/test_driver_remote_connection.py" + "--ignore=tests/driver/test_driver_remote_connection_threaded.py" + "--ignore=tests/process/test_dsl.py" + "--ignore=tests/structure/io/test_functionalityio.py" + # disabledTests doesn't quite allow us to be precise enough for this + "-k 'not (TestFunctionalGraphSONIO and (test_timestamp or test_datetime or test_uuid))'" + ]; + + meta = with lib; { + description = "Gremlin-Python implements Gremlin, the graph traversal language of Apache TinkerPop, within the Python language"; + homepage = "https://tinkerpop.apache.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ turion ris ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/grequests/default.nix b/nixpkgs/pkgs/development/python-modules/grequests/default.nix index 5ce5df8cdea2..50c95df7dc91 100644 --- a/nixpkgs/pkgs/development/python-modules/grequests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grequests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/nixpkgs/pkgs/development/python-modules/grip/default.nix b/nixpkgs/pkgs/development/python-modules/grip/default.nix index 019cd798d640..dafa692493e3 100644 --- a/nixpkgs/pkgs/development/python-modules/grip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchpatch # Python bits: diff --git a/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix index dd9527006dad..7291cd4b65e0 100644 --- a/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpcio diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix index 1b631c0973ed..656e147ac50a 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpcio diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index 629c51071abd..8ac1cd6f0d6c 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.34.1"; + version = "1.35.0"; src = fetchPypi { inherit pname version; - sha256 = "b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08"; + sha256 = "9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix b/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix index 0512a4906a27..8d19acdc70de 100644 --- a/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix +++ b/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 7cf2a8c8df11..0370f80b4a40 100644 --- a/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix index 9ff8434cc9aa..ea89f7214c63 100644 --- a/nixpkgs/pkgs/development/python-modules/gst-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, stdenv + , pkg-config , python3 , pygobject3 diff --git a/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix index 3af8e97ba71b..bb31baa78880 100644 --- a/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, fetchFromGitHub, makeWrapper , glibcLocales, gobject-introspection, gtk3, libsoup, libsecret , buildPythonPackage, python , pygobject3, freezegun, mock diff --git a/nixpkgs/pkgs/development/python-modules/gtts/default.nix b/nixpkgs/pkgs/development/python-modules/gtts/default.nix index 0fc9d43dc2ce..f3e8162b7147 100644 --- a/nixpkgs/pkgs/development/python-modules/gtts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gtts/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "v${version}"; - sha256 = "1a984691kfin1n896p5l7y8ggjzx19ynih2cw040smfms0azhp4w"; + sha256 = "052l7gk1v0zckraavyba1bc2cqvmrbffwxxjsklgnslbdcg5h514"; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library and CLI tool to interface with Google Translate text-to-speech API"; homepage = "https://gtts.readthedocs.io"; + changelog = "https://gtts.readthedocs.io/en/latest/changelog.html"; license = licenses.mit; maintainers = with maintainers; [ unode ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/guestfs/default.nix b/nixpkgs/pkgs/development/python-modules/guestfs/default.nix index 23a2545525a3..0f1d2ddf05cc 100644 --- a/nixpkgs/pkgs/development/python-modules/guestfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/guestfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }: +{ lib, buildPythonPackage, fetchurl, libguestfs, qemu }: buildPythonPackage rec { pname = "guestfs"; diff --git a/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix b/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix index c1091fa980c9..7d43ce95a7e3 100644 --- a/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix +++ b/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , coverage , mock , pytest diff --git a/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix b/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix index 983335f4395b..3f3eceee3780 100644 --- a/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , coverage , mock , pytest diff --git a/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix index f70625b86fe2..6f765bd98d6b 100644 --- a/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, sphinx, fetchPypi }: +{ lib, buildPythonPackage, sphinx, fetchPypi }: buildPythonPackage rec { pname = "guzzle_sphinx_theme"; diff --git a/nixpkgs/pkgs/development/python-modules/gym/default.nix b/nixpkgs/pkgs/development/python-modules/gym/default.nix index d826fc33324f..263bdfa2f478 100644 --- a/nixpkgs/pkgs/development/python-modules/gym/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gym/default.nix @@ -12,13 +12,6 @@ buildPythonPackage rec { sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pyglet>=1.2.0,<=1.3.2" "pyglet" \ - --replace "cloudpickle>=1.2.0,<1.4.0" "cloudpickle~=1.2" - ''; - # cloudpickle range has been expanded in package but not yet released - propagatedBuildInputs = [ numpy requests six pyglet scipy cloudpickle ]; diff --git a/nixpkgs/pkgs/development/python-modules/h2/default.nix b/nixpkgs/pkgs/development/python-modules/h2/default.nix index 6dad775732c0..ba681658e9a2 100644 --- a/nixpkgs/pkgs/development/python-modules/h2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/h2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , enum34, hpack, hyperframe, pytestCheckHook, hypothesis }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/h3/default.nix b/nixpkgs/pkgs/development/python-modules/h3/default.nix index 46b774a25c1e..e66a3f5e9fcb 100644 --- a/nixpkgs/pkgs/development/python-modules/h3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/h3/default.nix @@ -1,35 +1,69 @@ -{ lib, stdenv +{ autoPatchelfHook , buildPythonPackage , cmake -, fetchPypi +, cython +, fetchFromGitHub , h3 -, python +, lib +, numpy +, pytestCheckHook +, scikit-build +, stdenv }: buildPythonPackage rec { pname = "h3"; - version = "3.7.0"; + version = "3.7.1"; - src = fetchPypi { - inherit pname version; - sha256 = "cd27fc8ecd9183f93934079b7c986401f499030ff2e2171eace9de462fab561d"; + # pypi version does not include tests + src = fetchFromGitHub { + owner = "uber"; + repo = "h3-py"; + rev = "v${version}"; + sha256 = "sha256-MIVV3kZGsIsaJ/ccJOK3+j1VwkUsZGHS5d1sGOBa1Ec="; }; - patches = [ - ./disable-custom-install.patch - ./hardcode-h3-path.patch + dontConfigure = true; + + checkInputs = [ pytestCheckHook ]; + + nativeBuildInputs = [ + scikit-build cmake cython + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # On Linux the .so files ends up referring to libh3.so instead of the full + # Nix store path. I'm not sure why this is happening! On Darwin it works + # fine. + autoPatchelfHook ]; - preBuild = '' - substituteInPlace h3/h3.py \ - --subst-var-by libh3_path ${h3}/lib/libh3${stdenv.hostPlatform.extensions.sharedLibrary} - ''; + # This is not needed per-se, it's only added for autoPatchelfHook to work + # correctly. See the note above ^^ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ h3 ]; + + propagatedBuildInputs = [ numpy ]; + + # The following prePatch replaces the h3lib compilation with using the h3 packaged in nixpkgs. + # + # - Remove the h3lib submodule. + # - Patch CMakeLists to avoid building h3lib, and use h3 instead. + prePatch = + let + cmakeCommands = '' + include_directories(${h3}/include/h3) + link_directories(${h3}/lib) + ''; + in '' + rm -r src/h3lib + substituteInPlace CMakeLists.txt --replace "add_subdirectory(src/h3lib)" "${cmakeCommands}" + ''; + + # Extra check to make sure we can import it from Python + pythonImportsCheck = [ "h3" ]; meta = with lib; { homepage = "https://github.com/uber/h3-py"; - description = "This library provides Python bindings for the H3 Core Library."; + description = "Hierarchical hexagonal geospatial indexing system"; license = licenses.asl20; - platforms = platforms.unix ++ platforms.darwin; maintainers = [ maintainers.kalbasit ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/h3/disable-custom-install.patch b/nixpkgs/pkgs/development/python-modules/h3/disable-custom-install.patch deleted file mode 100644 index 981e3b6e2fc6..000000000000 --- a/nixpkgs/pkgs/development/python-modules/h3/disable-custom-install.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/setup.py b/setup.py -index 8e1c220..45297b6 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,20 +25,6 @@ class CustomBuildExtCommand(build_ext): - install_h3(h3_version) - - --# Tested with wheel v0.29.0 --class BinaryDistribution(Distribution): -- def __init__(self, attrs=None): -- Distribution.__init__(self, attrs) -- # The values used for the name and sources in the Extension below are -- # not important, because we override the build_ext command above. -- # The normal C extension building logic is never invoked, and is -- # replaced with our own custom logic. However, ext_modules cannot be -- # empty, because this signals to other parts of distutils that our -- # package contains C extensions and thus needs to be built for -- # different platforms separately. -- self.ext_modules = [Extension('h3c', [])] -- -- - long_description = open('README.rst').read() - - setup( -@@ -52,14 +38,10 @@ setup( - url='https://github.com/uber/h3-py.git', - packages=find_packages(exclude=['tests', 'tests.*']), - install_requires=[], -- cmdclass={ -- 'build_ext': CustomBuildExtCommand, -- }, - package_data={ - 'h-py': - ['out/*.dylib' if platform.system() == 'Darwin' else ( - 'out/*.dll' if platform.system() == 'Windows' else - 'out/*.so.*')] - }, -- license='Apache License 2.0', -- distclass=BinaryDistribution) -+ license='Apache License 2.0') diff --git a/nixpkgs/pkgs/development/python-modules/h3/hardcode-h3-path.patch b/nixpkgs/pkgs/development/python-modules/h3/hardcode-h3-path.patch deleted file mode 100644 index 87549f298d74..000000000000 --- a/nixpkgs/pkgs/development/python-modules/h3/hardcode-h3-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/h3/h3.py b/h3/h3.py -index 18cf168..2cc7812 100644 ---- a/h3/h3.py -+++ b/h3/h3.py -@@ -34,13 +34,7 @@ from ctypes import ( - POINTER, - ) - --_dirname = os.path.dirname(__file__) --libh3_path = ('{}/{}'.format(_dirname, 'out/libh3.1.dylib') -- if platform.system() == 'Darwin' else ( -- '{}/{}'.format(_dirname, 'out/h3.dll') if platform.system() == 'Windows' else -- '{}/{}'.format(_dirname, 'out/libh3.so.1'))) -- --libh3 = cdll.LoadLibrary(libh3_path) -+libh3 = cdll.LoadLibrary('@libh3_path@') - - # Type of an H3 index - H3Index = c_ulonglong diff --git a/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix b/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix index 653c4483ce82..84810fd2b532 100644 --- a/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , ffmpeg_3, async-timeout }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/halo/default.nix b/nixpkgs/pkgs/development/python-modules/halo/default.nix new file mode 100644 index 000000000000..e167371b42a4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/halo/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, colorama +, fetchPypi +, isPy27 +, lib +, log-symbols +, pytestCheckHook +, six +, spinners +, termcolor }: + +buildPythonPackage rec { + pname = "halo"; + version = "0.0.31"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1mn97h370ggbc9vi6x8r6akd5q8i512y6kid2nvm67g93r9a6rvv"; + }; + + propagatedBuildInputs = [ colorama log-symbols termcolor six spinners ]; + + # Tests are not included in the PyPI distribution and the git repo does not have tagged releases + doCheck = false; + pythonImportsCheck = [ "halo" ]; + + meta = with lib; { + description = "Beautiful Spinners for Terminal, IPython and Jupyter."; + homepage = "https://github.com/manrajgrover/halo"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/handout/default.nix b/nixpkgs/pkgs/development/python-modules/handout/default.nix index b2b7b4b3d142..316c9a6edcac 100644 --- a/nixpkgs/pkgs/development/python-modules/handout/default.nix +++ b/nixpkgs/pkgs/development/python-modules/handout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , imageio, imageio-ffmpeg }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix b/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix index d375effd1609..daa181a9cfc5 100644 --- a/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.6"; + version = "0.2.8"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-kRTgHFRnhjLM2DhKNy9HDKIsRk+w0AKP+o0hy8w+3ys="; + sha256 = "sha256-DuVpo+g5VS7bkj/DZi0vNOAPjPkzfIA5I2BD5KJ/rNQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix index a0b7d50b560d..7afb4eefa060 100644 --- a/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix b/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix index 003805f939c6..c457da918862 100644 --- a/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonAtLeast, setuptools +{ lib, buildPythonPackage, fetchPypi, isPy3k, pythonAtLeast, setuptools , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix b/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix index 56e9811396e6..5dd94e5de2ea 100644 --- a/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: +{ lib, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: buildPythonPackage rec { pname = "hcs_utils"; diff --git a/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix b/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix index 3b65e10bfcec..f1b0d13e56e5 100644 --- a/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/heapdict/default.nix b/nixpkgs/pkgs/development/python-modules/heapdict/default.nix index 4cd695925f28..61cbe39a256a 100644 --- a/nixpkgs/pkgs/development/python-modules/heapdict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/heapdict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "HeapDict"; diff --git a/nixpkgs/pkgs/development/python-modules/helper/default.nix b/nixpkgs/pkgs/development/python-modules/helper/default.nix index 4c7ff0c3878f..1697c7270397 100644 --- a/nixpkgs/pkgs/development/python-modules/helper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/helper/default.nix @@ -1,19 +1,35 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyyaml +, pytestCheckHook +, mock +}: buildPythonPackage rec { pname = "helper"; - version = "2.4.2"; + version = "2.5.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0p56dvjpaz9wnr0ik2wmvgqjf9ji180bhjky7q272l5dan94lgd6"; + src = fetchFromGitHub { + owner = "gmr"; + repo = pname; + rev = version; + sha256 = "0zypjv8rncvrsgl200v7d3bn08gs48dwqvgamfqv71h07cj6zngp"; }; - checkInputs = [ mock ]; - propagatedBuildInputs = [ pyyaml ]; + propagatedBuildInputs = [ + pyyaml + ]; - # No tests in the pypi tarball - doCheck = false; + checkInputs = [ + pytestCheckHook + mock + ]; + + pythonImportsCheck = [ + "helper" + "helper.config" + ]; meta = with lib; { description = "Development library for quickly writing configurable applications and daemons"; diff --git a/nixpkgs/pkgs/development/python-modules/hetzner/default.nix b/nixpkgs/pkgs/development/python-modules/hetzner/default.nix index 3b938dfc237c..9b89567d8ef5 100644 --- a/nixpkgs/pkgs/development/python-modules/hetzner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hetzner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix index ce2918188241..4e65f5b91721 100644 --- a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/hglib/default.nix b/nixpkgs/pkgs/development/python-modules/hglib/default.nix index afac7983584c..a6ed6b935ad1 100644 --- a/nixpkgs/pkgs/development/python-modules/hglib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hglib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }: buildPythonPackage rec { pname = "python-hglib"; diff --git a/nixpkgs/pkgs/development/python-modules/hgsvn/default.nix b/nixpkgs/pkgs/development/python-modules/hgsvn/default.nix index 2ee6024cd475..b8b6d43b5480 100644 --- a/nixpkgs/pkgs/development/python-modules/hgsvn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hgsvn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix b/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix index 418059c51658..d7fa9af5efae 100644 --- a/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, sphinx }: +{ lib, fetchPypi, buildPythonPackage, isPy27, sphinx }: buildPythonPackage rec { pname = "hieroglyph"; diff --git a/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix b/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix new file mode 100644 index 000000000000..07f3956c54d6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "hijri-converter"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "08gv6ypn2zd0i8yrv24m448xkic492qrgxj349slp1achhg9p7ln"; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar"; + homepage = "https://github.com/dralshehri/hijri-converter"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hiredis/default.nix b/nixpkgs/pkgs/development/python-modules/hiredis/default.nix index e9d5677f8beb..ef10d195671d 100644 --- a/nixpkgs/pkgs/development/python-modules/hiredis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hiredis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , redis diff --git a/nixpkgs/pkgs/development/python-modules/hiro/default.nix b/nixpkgs/pkgs/development/python-modules/hiro/default.nix index 3ff672a22db6..00b560609641 100644 --- a/nixpkgs/pkgs/development/python-modules/hiro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hiro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, mock }: +{ lib, buildPythonPackage, fetchPypi, six, mock }: buildPythonPackage rec { pname = "hiro"; version = "0.5.1"; diff --git a/nixpkgs/pkgs/development/python-modules/hjson/default.nix b/nixpkgs/pkgs/development/python-modules/hjson/default.nix index 3393ad186918..096edbe5252e 100644 --- a/nixpkgs/pkgs/development/python-modules/hjson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonImportsCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/hkdf/default.nix b/nixpkgs/pkgs/development/python-modules/hkdf/default.nix index 966ce7001fbb..43e7a8f4ce35 100644 --- a/nixpkgs/pkgs/development/python-modules/hkdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hkdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix b/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix index 3f601eacc429..8d2afcf5e722 100644 --- a/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - sha256 = "0f5cb598a7494b9703c6188246dc89e529d46cbb6700eca70cc895085f0b3cc3"; + sha256 = "14fb4ad3fb7529785844a25fae5d32272619fb5973cc02c8784018055470ca01"; }; buildInputs = [ setuptools_scm cython ]; diff --git a/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix b/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix index 79a2e83508aa..cfbf63a5869d 100644 --- a/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hocr-tools/default.nix @@ -3,7 +3,7 @@ , lxml , pillow , reportlab -, lib, stdenv +, lib }: buildPythonPackage rec { pname = "hocr-tools"; diff --git a/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/nixpkgs/pkgs/development/python-modules/holidays/default.nix index b5e0062d115a..3ac51ac050fb 100644 --- a/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -1,27 +1,48 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , convertdate , dateutil +, hijri-converter , korean-lunar-calendar , six +, python +, flake8 }: buildPythonPackage rec { pname = "holidays"; - version = "0.10.3"; + version = "0.10.5.2"; src = fetchPypi { inherit pname version; - sha256 = "839281f2b1ae7ac576da7951472482f6e714818296853107ea861fa60f5013cc"; + sha256 = "0g4hqbb94cwxlcwsjzrzxzlann1ks2r4mgnfzqz74a2rg1nih5zd"; }; + postPatch = '' + # ignore too long line issues + # https://github.com/dr-prodigy/python-holidays/issues/423 + substituteInPlace tests.py \ + --replace "flake8.get_style_guide(ignore=[" "flake8.get_style_guide(ignore=['E501', " + ''; + + propagatedBuildInputs = [ convertdate dateutil + hijri-converter korean-lunar-calendar six ]; + + checkInputs = [ + flake8 + ]; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + pythonImportsCheck = [ "holidays" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/nixpkgs/pkgs/development/python-modules/howdoi/default.nix index cc6003fa952c..e6323c951ee9 100644 --- a/nixpkgs/pkgs/development/python-modules/howdoi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/howdoi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "2.0.8"; + version = "2.0.10"; src = fetchPypi { inherit pname version; - sha256 = "9b7cabab87cd614e26b408653bc8937ec27b79ca2fde6b9457da55d2541f75fb"; + sha256 = "e561e3c5d4f39ab1f86e9f24bb0b2803ee6e312de61e90907f739aa638f35215"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/hpack/default.nix b/nixpkgs/pkgs/development/python-modules/hpack/default.nix index 9b6f724cd318..a5140a216cfd 100644 --- a/nixpkgs/pkgs/development/python-modules/hpack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix b/nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix index fba71dc3f109..d38ceec7e131 100644 --- a/nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hsaudiotag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix b/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix index 52919e489837..66ea895960c9 100644 --- a/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/html2text/2018.nix b/nixpkgs/pkgs/development/python-modules/html2text/2018.nix index 73540359ee1a..06d0c14c7e43 100644 --- a/nixpkgs/pkgs/development/python-modules/html2text/2018.nix +++ b/nixpkgs/pkgs/development/python-modules/html2text/2018.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/html2text/default.nix b/nixpkgs/pkgs/development/python-modules/html2text/default.nix index dd23ad6c619d..51b92c8a4f69 100644 --- a/nixpkgs/pkgs/development/python-modules/html2text/default.nix +++ b/nixpkgs/pkgs/development/python-modules/html2text/default.nix @@ -1,5 +1,8 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { @@ -14,15 +17,13 @@ buildPythonPackage rec { sha256 = "1y924clp2hiqg3a9437z808p29mqcx537j5fmz71plx8qrcm5jf9"; }; - # python setup.py test is broken, use pytest - checkInputs = [ pytest ]; - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "html2text" ]; meta = with lib; { description = "Turn HTML into equivalent Markdown-structured text"; homepage = "https://github.com/Alir3z4/html2text/"; - license = licenses.gpl3; + license = licenses.gpl3Only; }; } diff --git a/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix b/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix index 0ceeda045827..d20f0a9abfdb 100644 --- a/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }: +{ lib, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }: buildPythonPackage rec { pname = "html5-parser"; diff --git a/nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix b/nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix index ef660fc0b924..e844c99693a2 100644 --- a/nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/htmllaundry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi, nose , six diff --git a/nixpkgs/pkgs/development/python-modules/httmock/default.nix b/nixpkgs/pkgs/development/python-modules/httmock/default.nix index 117c7f5e132f..cbf6b95ccd36 100644 --- a/nixpkgs/pkgs/development/python-modules/httmock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httmock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, buildPythonPackage, fetchFromGitHub, requests }: buildPythonPackage rec { pname = "httmock"; diff --git a/nixpkgs/pkgs/development/python-modules/http_signature/default.nix b/nixpkgs/pkgs/development/python-modules/http_signature/default.nix index 145eea751b9b..9169f1e41266 100644 --- a/nixpkgs/pkgs/development/python-modules/http_signature/default.nix +++ b/nixpkgs/pkgs/development/python-modules/http_signature/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/httpauth/default.nix b/nixpkgs/pkgs/development/python-modules/httpauth/default.nix index b7867e22f175..a7d4240db143 100644 --- a/nixpkgs/pkgs/development/python-modules/httpauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/nixpkgs/pkgs/development/python-modules/httpbin/default.nix index cbaf89c3ca61..2e711141fcba 100644 --- a/nixpkgs/pkgs/development/python-modules/httpbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpbin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/nixpkgs/pkgs/development/python-modules/humanize/default.nix index 09e94f6275dd..b6f78e5cf8fd 100644 --- a/nixpkgs/pkgs/development/python-modules/humanize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/humanize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/nixpkgs/pkgs/development/python-modules/hvac/default.nix index 9ce859c9b760..f7eb29484142 100644 --- a/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.6"; + version = "0.10.7"; src = fetchPypi { inherit pname version; - sha256 = "b0561dbdfecc6a6d7b0cc226d75a800ae9bbc93313a6ad526a1adc97be51eada"; + sha256 = "6ee2ba6002f11151472fa873b6637d902fc6045a2193aea08b39ae8147c230ba"; }; propagatedBuildInputs = [ requests six ]; @@ -14,6 +14,8 @@ buildPythonPackage rec { # Requires running a Vault server doCheck = false; + pythonImportsCheck = [ "hvac" ]; + meta = with lib; { description = "HashiCorp Vault API client"; homepage = "https://github.com/ianunruh/hvac"; diff --git a/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix b/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix index 7316a6fc971d..c01876d3f64c 100644 --- a/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "hydra-check"; - version = "1.1.1"; + version = "1.2.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "nix-community"; - repo = "hydra-check"; + repo = pname; rev = version; - sha256 = "1dmsscsib8ckp496gsfqxmq8d35zs71n99xmziq9iprvy7n5clq2"; + sha256 = "EegoQ8qTrFGFYbCDsbAOE4Afg9haLjYdC0Cux/yvSk8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix b/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix index a74198f38321..6cdee9948b91 100644 --- a/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { pname = "hyperframe"; diff --git a/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix b/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix index ba4aeef402ec..d407ff95a010 100644 --- a/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , cloudpickle, numpy, future, networkx , six, tqdm, scipy, pymongo }: diff --git a/nixpkgs/pkgs/development/python-modules/i3-py/default.nix b/nixpkgs/pkgs/development/python-modules/i3-py/default.nix index 4dea7526b7e7..312c1bb45c70 100644 --- a/nixpkgs/pkgs/development/python-modules/i3-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/i3-py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix b/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix index c27d41354112..37d5ccd8786f 100644 --- a/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , xorgserver, pytest, pytest-xvfb, i3, python, xlib, xdpyinfo , makeFontsConf, coreutils }: diff --git a/nixpkgs/pkgs/development/python-modules/icalendar/default.nix b/nixpkgs/pkgs/development/python-modules/icalendar/default.nix index 4499d5d62f4f..8e75a945d10c 100644 --- a/nixpkgs/pkgs/development/python-modules/icalendar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/icalendar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/nixpkgs/pkgs/development/python-modules/icecream/default.nix b/nixpkgs/pkgs/development/python-modules/icecream/default.nix index eba5a70577f7..b75d0d5d4325 100644 --- a/nixpkgs/pkgs/development/python-modules/icecream/default.nix +++ b/nixpkgs/pkgs/development/python-modules/icecream/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "16kpixl43nrn093cvkmxiq2dzd9xc73zwzkmwp0rs7x01nji8kj3"; + sha256 = "c2e7b74c1c12caa2cfde050f2e636493ee77a9fb4a494b5593418ab359924a24"; }; propagatedBuildInputs = [ asttokens colorama executing pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/icmplib/default.nix b/nixpkgs/pkgs/development/python-modules/icmplib/default.nix index b89df0bd2ce0..89f49d9cf624 100644 --- a/nixpkgs/pkgs/development/python-modules/icmplib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/icmplib/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "icmplib"; - version = "2.0.1"; + version = "2.0.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ValentinBELYN"; repo = pname; rev = "v${version}"; - sha256 = "0vps4iz87f8l0z3va92srsx5v19nnd65c22hvbgvhag3vhqsxg7h"; + sha256 = "0djsbksgml2h18w6509w59s88730w1xaxdxzws12alq4m5v4hirr"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ics/default.nix b/nixpkgs/pkgs/development/python-modules/ics/default.nix index c186020fee1e..011909d6b805 100644 --- a/nixpkgs/pkgs/development/python-modules/ics/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ics/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , tatsu, arrow , pytestCheckHook, pytest-flakes }: diff --git a/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix b/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix index 47997dbdc265..35bafd67fa97 100644 --- a/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ipaddress diff --git a/nixpkgs/pkgs/development/python-modules/ifconfig-parser/default.nix b/nixpkgs/pkgs/development/python-modules/ifconfig-parser/default.nix index bdfd3767f8c4..be4e2026bf10 100644 --- a/nixpkgs/pkgs/development/python-modules/ifconfig-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ifconfig-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "ifconfig-parser"; diff --git a/nixpkgs/pkgs/development/python-modules/ijson/default.nix b/nixpkgs/pkgs/development/python-modules/ijson/default.nix index a82a20ca7c8a..8ccc7eb4e0c0 100644 --- a/nixpkgs/pkgs/development/python-modules/ijson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ijson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ijson"; diff --git a/nixpkgs/pkgs/development/python-modules/image-match/default.nix b/nixpkgs/pkgs/development/python-modules/image-match/default.nix index 5c1953d6ac3f..7464f3c89972 100644 --- a/nixpkgs/pkgs/development/python-modules/image-match/default.nix +++ b/nixpkgs/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: +{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: buildPythonPackage { pname = "image-match"; diff --git a/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix b/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix index 65c1cfd020a8..8d2b7fd8da88 100644 --- a/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix @@ -2,7 +2,7 @@ , fetchPypi , numpy , scikitimage -, lib, stdenv +, lib , opencv3 }: diff --git a/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/nixpkgs/pkgs/development/python-modules/imageio/default.nix index 71f7eae9c32f..67920dc7b7d8 100644 --- a/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy27 , pathlib diff --git a/nixpkgs/pkgs/development/python-modules/imagesize/default.nix b/nixpkgs/pkgs/development/python-modules/imagesize/default.nix index cd48f54ee8f4..42cf6b50764d 100644 --- a/nixpkgs/pkgs/development/python-modules/imagesize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imagesize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix new file mode 100644 index 000000000000..107febe4041b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "imap-tools"; + version = "0.37.0"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "ikvk"; + repo = "imap_tools"; + rev = "v${version}"; + sha256 = "1501lk3fjxqmzxffahbj33y795gwl96yqvk3fs86cchm6vz2gnkk"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # tests require a network connection + "test_action" + "test_folders" + "test_connectio" + "test_attributes" + "test_live" + ]; + + pythonImportsCheck = [ "imap_tools" ]; + + meta = with lib; { + description = "Work with email and mailbox by IMAP"; + homepage = "https://github.com/ikvk/imap_tools"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/imapclient/default.nix b/nixpkgs/pkgs/development/python-modules/imapclient/default.nix index c091f53b8d4f..27667f860ff1 100644 --- a/nixpkgs/pkgs/development/python-modules/imapclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imapclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , mock diff --git a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix index fe21096d635d..96ba16b1cd1a 100644 --- a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: +{ lib, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: buildPythonPackage rec { pname = "imbalanced-learn"; diff --git a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index 4253ed30e415..e0c2adb8e8bb 100644 --- a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 +, fetchpatch , pandas , pytestCheckHook , scikitlearn @@ -15,6 +16,16 @@ buildPythonPackage rec { sha256 = "da59de0d1c0fa66f62054dd9a0a295a182563aa1abbb3bf9224a3678fcfe8fa4"; }; + patches = [ + # Fix compatibility with scikit-learn 0.24. This patch will be included in releases of + # imbalanced-learn after 0.7.0 + (fetchpatch { + url = "https://github.com/scikit-learn-contrib/imbalanced-learn/commit/dc4051fe0011c68d900be05971b71016d4ad9e90.patch"; + sha256 = "1rv61k9wv4q37a0v943clr8fflcg9ly530smgndgkjlxkyzw6swh"; + excludes = ["doc/conf.py" "build_tools/*" "azure-pipelines.yml"]; + }) + ]; + propagatedBuildInputs = [ scikitlearn ]; checkInputs = [ pytestCheckHook pandas ]; preCheck = '' @@ -32,5 +43,6 @@ buildPythonPackage rec { description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; license = licenses.mit; + maintainers = [ maintainers.rmcgibbo ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index 7e9a6b5daa88..eb8605c45ddc 100644 --- a/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -15,6 +15,9 @@ buildPythonPackage rec { pillow ]; + # no tests exectuted + doCheck = false; + meta = with lib; { description = "Convert images to PDF via direct JPEG inclusion"; homepage = "https://gitlab.mister-muffin.de/josch/img2pdf"; diff --git a/nixpkgs/pkgs/development/python-modules/imgaug/default.nix b/nixpkgs/pkgs/development/python-modules/imgaug/default.nix index 9ca8531dbbce..343c7869a6c1 100644 --- a/nixpkgs/pkgs/development/python-modules/imgaug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imgaug/default.nix @@ -9,7 +9,7 @@ , scipy , shapely , six -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/imgsize/default.nix b/nixpkgs/pkgs/development/python-modules/imgsize/default.nix index d1a69c043d0f..a8f50cd8f326 100644 --- a/nixpkgs/pkgs/development/python-modules/imgsize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imgsize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/importmagic/default.nix b/nixpkgs/pkgs/development/python-modules/importmagic/default.nix index 3a6a3c9ef8d7..54308d632b27 100644 --- a/nixpkgs/pkgs/development/python-modules/importmagic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/importmagic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/imread/default.nix b/nixpkgs/pkgs/development/python-modules/imread/default.nix index 65ae47ed87b0..3d09e6a43971 100644 --- a/nixpkgs/pkgs/development/python-modules/imread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/imutils/default.nix b/nixpkgs/pkgs/development/python-modules/imutils/default.nix index 33c2ae0001c2..53294680df9e 100644 --- a/nixpkgs/pkgs/development/python-modules/imutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imutils/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , opencv3 }: buildPythonPackage rec { - version = "0.5.3"; + version = "0.5.4"; pname = "imutils"; src = fetchPypi { inherit pname version; - sha256 = "857af6169d90e4a0a814130b9b107f5d611150ce440107e1c1233521c6fb1e2b"; + sha256 = "03827a9fca8b5c540305c0844a62591cf35a0caec199cb0f2f0a4a0fb15d8f24"; }; propagatedBuildInputs = [ opencv3 ]; @@ -18,6 +18,14 @@ buildPythonPackage rec { # no tests doCheck = false; + pythonImportsCheck = [ + "imutils" + "imutils.video" + "imutils.io" + "imutils.feature" + "imutils.face_utils" + ]; + meta = with lib; { homepage = "https://github.com/jrosebr1/imutils"; description = "A series of convenience functions to make basic image processing functions"; diff --git a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index bc2f39ad2178..56436cdd0eb9 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.13.0"; + version = "1.14.0"; disabled = pythonOlder "3.6"; # requires python version >=3.6 @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0g7jhjnag8jx8zbjh6xlqds42alpj87a4dpqc37xqa4ir55m3c2q"; + sha256 = "1qq727gwz5migr3xlqxj57qxv1y52g7xpkdgggz2wz739w5czffd"; }; # makes test not reproducible diff --git a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index 2d0fd5a93adb..69fe83b8779b 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix b/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix index 32374453375d..c8403cf64463 100644 --- a/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , influxdb, graphite_api, memcached }: diff --git a/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix b/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix index 4baa891a7790..b250dfc6c7f6 100644 --- a/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , html5lib , six diff --git a/nixpkgs/pkgs/development/python-modules/inifile/default.nix b/nixpkgs/pkgs/development/python-modules/inifile/default.nix index 9bd24a4d7889..c94c12ab0a8f 100644 --- a/nixpkgs/pkgs/development/python-modules/inifile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/inifile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/iniparse/default.nix b/nixpkgs/pkgs/development/python-modules/iniparse/default.nix index c515b7865b15..e4473c0bd1c1 100644 --- a/nixpkgs/pkgs/development/python-modules/iniparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/iniparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/inquirer/default.nix b/nixpkgs/pkgs/development/python-modules/inquirer/default.nix index c434a3f52bce..e55fd8f39d55 100644 --- a/nixpkgs/pkgs/development/python-modules/inquirer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/inquirer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: +{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: buildPythonPackage rec { pname = "inquirer"; diff --git a/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix b/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix index 879c90c40a42..ca91ad954a44 100644 --- a/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "1.9.6"; + version = "1.9.9"; src = fetchPypi { inherit pname version; - sha256 = "0e9b24577086283280a5089b3e65086640b4e42d61ca4af913639f45b02b9e4c"; + sha256 = "a1614cbf35499d833e07699ddfd344764f86959fd5535aa9ce1203f57a77f970"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix b/nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix index b4e1dfaff181..62e021afdbbb 100644 --- a/nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/interruptingcow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "interruptingcow"; version = "0.8"; diff --git a/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix b/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix index 27a5fa3650e8..dca73a93e8f4 100644 --- a/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , python, pytest, sortedcontainers }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix b/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix index 427681fedb86..b29ee9179287 100644 --- a/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/ipaddress/default.nix b/nixpkgs/pkgs/development/python-modules/ipaddress/default.nix index f2e479aff96e..06211470daa4 100644 --- a/nixpkgs/pkgs/development/python-modules/ipaddress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipaddress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/nixpkgs/pkgs/development/python-modules/ipdb/default.nix b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix index b21907f75ff5..7b8c877371cd 100644 --- a/nixpkgs/pkgs/development/python-modules/ipdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ipython diff --git a/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix b/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix index 057d82cbebc3..9788fd8a5440 100644 --- a/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix b/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix index 3deb0c6cb80c..c97eafb6054c 100644 --- a/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipfsapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/iptools/default.nix b/nixpkgs/pkgs/development/python-modules/iptools/default.nix index 431c05bb3881..3f2b854b6e7f 100644 --- a/nixpkgs/pkgs/development/python-modules/iptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/iptools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix index 3b03a15b9a4d..4957b5d31315 100644 --- a/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.5"; + version = "3.10.6"; src = fetchPypi { inherit pname version; - sha256 = "cb3b400b37a73cf4a0bc698be2ea414e78ff117867baed9313aa8c97596e1b98"; + sha256 = "b324c7c8689741bba6d71d1369d49780a24fe946b11a3c005d56e09bf705cd19"; }; checkInputs = [ @@ -22,6 +22,8 @@ buildPythonPackage rec { # requires network connection doCheck = false; + pythonImportsCheck = [ "isbnlib" ]; + meta = with lib; { description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; homepage = "https://github.com/xlcnd/isbnlib"; diff --git a/nixpkgs/pkgs/development/python-modules/iso3166/default.nix b/nixpkgs/pkgs/development/python-modules/iso3166/default.nix index acf6d3c9331d..61ec91075b5a 100644 --- a/nixpkgs/pkgs/development/python-modules/iso3166/default.nix +++ b/nixpkgs/pkgs/development/python-modules/iso3166/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ lib, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage { pname = "iso3166"; diff --git a/nixpkgs/pkgs/development/python-modules/isodate/default.nix b/nixpkgs/pkgs/development/python-modules/isodate/default.nix index d2098a83c95e..19a643d216ac 100644 --- a/nixpkgs/pkgs/development/python-modules/isodate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/isodate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix b/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix index e89786d4e18d..d1669a1ed5bf 100644 --- a/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix +++ b/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/itypes/default.nix b/nixpkgs/pkgs/development/python-modules/itypes/default.nix index 417d1a20b3bf..1b6845472404 100644 --- a/nixpkgs/pkgs/development/python-modules/itypes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/itypes/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchFromGitHub, buildPythonPackage, pytest, diff --git a/nixpkgs/pkgs/development/python-modules/j2cli/default.nix b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix index 14cf18ae694f..c83b1c77e2cc 100644 --- a/nixpkgs/pkgs/development/python-modules/j2cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , jinja2 @@ -26,7 +26,7 @@ buildPythonPackage rec { J2Cli is a command-line tool for templating in shell-scripts, leveraging the Jinja2 library. ''; - maintainers = with maintainers; [ rushmorem ]; + maintainers = with maintainers; [ rushmorem SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix b/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix index 4c625d944859..d00ccd06c8d6 100644 --- a/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: buildPythonPackage rec { pname = "jabberbot"; diff --git a/nixpkgs/pkgs/development/python-modules/javaobj-py3/default.nix b/nixpkgs/pkgs/development/python-modules/javaobj-py3/default.nix index fae3c2f3958f..421b63a6640c 100644 --- a/nixpkgs/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/javaobj-py3/default.nix @@ -2,27 +2,30 @@ , fetchPypi , isPy27 , lib +, numpy }: buildPythonPackage rec { pname = "javaobj-py3"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "419ff99543469e68149f875abb0db5251cecd350c03d2bfb4c94a5796f1cbc14"; + sha256 = "sha256-7Tsf/P058WVynLU1h8ygKrC/pMMyyDepLV/+au9cgBA="; }; + propagatedBuildInputs = [ numpy ]; + # Tests assume network connectivity doCheck = false; - meta = { + pythonImportsCheck = [ "javaobj" ]; + + meta = with lib; { description = "Module for serializing and de-serializing Java objects"; homepage = "https://github.com/tcalmant/python-javaobj"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - kamadorueda - ]; + license = licenses.asl20; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jc/default.nix b/nixpkgs/pkgs/development/python-modules/jc/default.nix index 6f120fa6ea2e..e1318b51aefe 100644 --- a/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , ruamel_yaml @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.14.1"; + version = "1.14.3"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "1vzzz7dlg6apxhcl0qkfdpp2v9d0q6jyafpfmklkcbjs31zvwcsw"; + sha256 = "sha256-6ofw74onFECJYYSuZlOVcNVAVuJaJKV4pkaJ4cTrvPk="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix b/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix index d4aa49c3ca3c..90f7c310faa8 100644 --- a/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "jdatetime"; diff --git a/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/nixpkgs/pkgs/development/python-modules/jedi/default.nix index 6e833a774604..305b9f6c6b6b 100644 --- a/nixpkgs/pkgs/development/python-modules/jedi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jedi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; diff --git a/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix b/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix index 0a6d0c365a04..db196403822a 100644 --- a/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, inflect }: +{ lib, buildPythonPackage, fetchPypi, jinja2, inflect }: buildPythonPackage rec { pname = "jinja2_pluralize"; diff --git a/nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix b/nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix index 7887fe96f75e..4268413fd3f5 100644 --- a/nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jinja2_time/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , arrow diff --git a/nixpkgs/pkgs/development/python-modules/jmespath/default.nix b/nixpkgs/pkgs/development/python-modules/jmespath/default.nix index 3b31700de0eb..3f74ae8d810e 100644 --- a/nixpkgs/pkgs/development/python-modules/jmespath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jmespath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ply diff --git a/nixpkgs/pkgs/development/python-modules/josepy/default.nix b/nixpkgs/pkgs/development/python-modules/josepy/default.nix index 8c1fe0a7d366..b6e6f47b64b1 100644 --- a/nixpkgs/pkgs/development/python-modules/josepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/josepy/default.nix @@ -4,17 +4,24 @@ , setuptools , pyopenssl , cryptography +, mock +, pytestCheckHook }: buildPythonPackage rec { pname = "josepy"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "502a36f86efe2a6d09bf7018bca9fd8f8f24d8090a966aa037dbc844459ff9c8"; + sha256 = "0aab1c3ceffe045e7fd5bcfe7685e27e9d2758518d9ba7116b5de34087e70bf5"; }; + postPatch = '' + # remove coverage flags + sed -i '/addopts/d' pytest.ini + ''; + propagatedBuildInputs = [ pyopenssl cryptography @@ -22,8 +29,10 @@ buildPythonPackage rec { setuptools ]; - # too many unpackaged check requirements - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ]; meta = with lib; { description = "JOSE protocol implementation in Python"; diff --git a/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix b/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix index c5c9cdf15056..6f9ceb96e3f5 100644 --- a/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , six diff --git a/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix b/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix index 07ee609d6534..6b7faf9a312d 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }: +{ lib, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }: buildPythonPackage rec { pname = "jsonfield"; diff --git a/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix b/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix index 4fc558fd394e..3ca8dc01a4b2 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonmerge"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "2004a421890311176136fb911c339c4bab45984808814feaed6a328c6e211ba2"; + sha256 = "a86bfc44f32f6a28b749743df8960a4ce1930666b3b73882513825f845cb9558"; }; propagatedBuildInputs = [ jsonschema ]; diff --git a/nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix index 81a6eb3fb27b..d2b177c742ab 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonpath_rw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/jsonref/default.nix b/nixpkgs/pkgs/development/python-modules/jsonref/default.nix index b901d811a230..3154f63f3181 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonref/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonref/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, mock }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix index 0b77db5df4e6..00f0d748bbb0 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , aiohttp, jsonrpc-base }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix index cc4bd1b2f686..db47a2240fb6 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "jsonrpc-base"; diff --git a/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix index d14d382f013c..bf8960ad27d9 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , aiohttp, jsonrpc-base, pep8 , pytestCheckHook , pytest-asyncio diff --git a/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix b/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix index feced9442257..7b08572d2319 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , six diff --git a/nixpkgs/pkgs/development/python-modules/jug/default.nix b/nixpkgs/pkgs/development/python-modules/jug/default.nix index eff6accaa024..7646c007818c 100644 --- a/nixpkgs/pkgs/development/python-modules/jug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi, fetchpatch , nose, numpy , bottle, pyyaml, redis, six , zlib diff --git a/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix b/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix index d9234d836b0f..60ec37dbde97 100644 --- a/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix index f01605513cb6..027ae2e40c8d 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast , docker , escapism , jinja2 @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.11.0"; + version = "2021.1.0"; pname = "jupyter-repo2docker"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "7fc2edf0cda1e46f2e7553bfb84a47e6d141b8dac393268ef01ee3504ca6ad94"; + sha256 = "3e3e671407ef2a7f7695338dc6ce2ca9cc75683ffc7a543829cf119564aca802"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-telemetry/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-telemetry/default.nix index 0f0c0d346e6a..9dddd8ec5684 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-telemetry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-telemetry/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/jupyter/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter/default.nix index 03d28bbf55d6..818623c2513b 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , notebook diff --git a/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 71fba8a12225..bd3e073a7724 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -28,6 +28,9 @@ buildPythonPackage rec { --replace "/bin/bash" "${bash}/bin/bash" ''; + # no tests + doCheck = false; + meta = with lib; { description = "JupyterHub Spawner using systemd for resource isolation"; homepage = "https://github.com/jupyterhub/systemdspawner"; diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index bfbd1cc89e08..3d9b5b9f831b 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , notebook diff --git a/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix b/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix index 24a02f7f696a..5b789f5eda8c 100644 --- a/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix index 5164004e8ea5..5a50d9e9c0a6 100644 --- a/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , kaa-base diff --git a/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix b/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix index b147b30c2ce3..d8f37f563d4a 100644 --- a/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: +{ lib, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { version = "2.0.2"; diff --git a/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix b/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix index 866042b6942c..1050ae88e430 100644 --- a/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kaitaistruct"; diff --git a/nixpkgs/pkgs/development/python-modules/kajiki/default.nix b/nixpkgs/pkgs/development/python-modules/kajiki/default.nix index 2a45404919c0..471ee4416b62 100644 --- a/nixpkgs/pkgs/development/python-modules/kajiki/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kajiki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , Babel diff --git a/nixpkgs/pkgs/development/python-modules/kaptan/default.nix b/nixpkgs/pkgs/development/python-modules/kaptan/default.nix index dea22059f096..c5f00393839e 100644 --- a/nixpkgs/pkgs/development/python-modules/kaptan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kaptan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyyaml diff --git a/nixpkgs/pkgs/development/python-modules/kazoo/default.nix b/nixpkgs/pkgs/development/python-modules/kazoo/default.nix index d8743776578e..31b65023371e 100644 --- a/nixpkgs/pkgs/development/python-modules/kazoo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kazoo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/keep/default.nix b/nixpkgs/pkgs/development/python-modules/keep/default.nix index 22ae853c043c..5a70dcb4676d 100644 --- a/nixpkgs/pkgs/development/python-modules/keep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , PyGithub diff --git a/nixpkgs/pkgs/development/python-modules/keepalive/default.nix b/nixpkgs/pkgs/development/python-modules/keepalive/default.nix index 7a488edf895d..b6daec6ca200 100644 --- a/nixpkgs/pkgs/development/python-modules/keepalive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keepalive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/keepkey/default.nix b/nixpkgs/pkgs/development/python-modules/keepkey/default.nix index 437a0193c61d..6b4568cd748d 100644 --- a/nixpkgs/pkgs/development/python-modules/keepkey/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keepkey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest +{ lib, fetchFromGitHub, buildPythonPackage, pytest , ecdsa , mnemonic, protobuf, hidapi, trezor }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix b/nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix index b9189cf4e167..27ef7d8dbf48 100644 --- a/nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keepkey_agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , keepkey diff --git a/nixpkgs/pkgs/development/python-modules/keras/default.nix b/nixpkgs/pkgs/development/python-modules/keras/default.nix index 7274d3d17a69..e90dd1a806aa 100644 --- a/nixpkgs/pkgs/development/python-modules/keras/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keras/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytestcov, pytest_xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing diff --git a/nixpkgs/pkgs/development/python-modules/kerberos/default.nix b/nixpkgs/pkgs/development/python-modules/kerberos/default.nix index 985339caed53..7a9ce3aab448 100644 --- a/nixpkgs/pkgs/development/python-modules/kerberos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kerberos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , kerberos diff --git a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix index bc20ff4e3740..5b53d201a0b6 100644 --- a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six , pytest, backports_unittest-mock, keyring, setuptools_scm, toml }: diff --git a/nixpkgs/pkgs/development/python-modules/keystone-engine/default.nix b/nixpkgs/pkgs/development/python-modules/keystone-engine/default.nix new file mode 100644 index 000000000000..ed9f3a6bb702 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/keystone-engine/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, keystone }: + +buildPythonPackage rec { + pname = "keystone-engine"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig"; + }; + + preConfigure = '' + substituteInPlace setup.py --replace \ + "libkeystone" "${keystone}/lib/libkeystone" + ''; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "keystone" ]; + + meta = with lib; { + description = "Lightweight multi-platform, multi-architecture assembler framework"; + homepage = "https://www.keystone-engine.org"; + maintainers = with maintainers; [ dump_stack ]; + license = licenses.gpl2Only; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/kitchen/default.nix b/nixpkgs/pkgs/development/python-modules/kitchen/default.nix index 1a14b974114e..0b6f41d2c199 100644 --- a/nixpkgs/pkgs/development/python-modules/kitchen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kitchen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kitchen"; version = "1.2.6"; diff --git a/nixpkgs/pkgs/development/python-modules/knack/default.nix b/nixpkgs/pkgs/development/python-modules/knack/default.nix index dd45e9672313..c08bdab4cf34 100644 --- a/nixpkgs/pkgs/development/python-modules/knack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/knack/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , argcomplete diff --git a/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix index 8ad94d955aec..a1b22a727ad8 100644 --- a/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index 172180781968..f2cb598a6c9b 100644 --- a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: diff --git a/nixpkgs/pkgs/development/python-modules/larch/default.nix b/nixpkgs/pkgs/development/python-modules/larch/default.nix index 7708bc0dbc02..630430b8270b 100644 --- a/nixpkgs/pkgs/development/python-modules/larch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/larch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , sphinx diff --git a/nixpkgs/pkgs/development/python-modules/lasagne/default.nix b/nixpkgs/pkgs/development/python-modules/lasagne/default.nix index 5bddf5cbe6f2..5db149708ff3 100644 --- a/nixpkgs/pkgs/development/python-modules/lasagne/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lasagne/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/nixpkgs/pkgs/development/python-modules/lazr/config.nix b/nixpkgs/pkgs/development/python-modules/lazr/config.nix index d8a895c8357b..b10ad25972b5 100644 --- a/nixpkgs/pkgs/development/python-modules/lazr/config.nix +++ b/nixpkgs/pkgs/development/python-modules/lazr/config.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "lazr.config"; - version = "2.2.2"; + version = "2.2.3"; propagatedBuildInputs = [ lazr_delegates ]; src = fetchPypi { inherit pname version; - sha256 = "cdb9a70dac4a76ca1ff3528d9eafe5414c6c69c1b92e7e84d3477ae85f6bb787"; + sha256 = "b74a73f8b63e6dc6732fc1f3d88e2f236596ddf089ef6e1794ece060e8cfabe1"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix b/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix index 63784b4005bb..82a784cfe3c6 100644 --- a/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix b/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix index 1bc52b3a65c8..60eba0577b03 100644 --- a/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest , pytest_xdist , six }: diff --git a/nixpkgs/pkgs/development/python-modules/ldap3/default.nix b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix index e1accc4d177e..71af0d294a2d 100644 --- a/nixpkgs/pkgs/development/python-modules/ldap3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pyasn1 }: +{ lib, fetchPypi, buildPythonPackage, pyasn1 }: buildPythonPackage rec { pname = "ldap3"; diff --git a/nixpkgs/pkgs/development/python-modules/le/default.nix b/nixpkgs/pkgs/development/python-modules/le/default.nix index 6415b255c716..d42527ae97a9 100644 --- a/nixpkgs/pkgs/development/python-modules/le/default.nix +++ b/nixpkgs/pkgs/development/python-modules/le/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/leather/default.nix b/nixpkgs/pkgs/development/python-modules/leather/default.nix index 99c1f080a031..197e88e8e8b2 100644 --- a/nixpkgs/pkgs/development/python-modules/leather/default.nix +++ b/nixpkgs/pkgs/development/python-modules/leather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, six }: +{ lib, fetchPypi, buildPythonPackage, six }: buildPythonPackage rec { pname = "leather"; diff --git a/nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix b/nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix index 4fc935799c31..8a0ace126458 100644 --- a/nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ledger_agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ledgerblue diff --git a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix index f853dfbf01f9..fe94753f1a62 100644 --- a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, hidapi +{ lib, fetchPypi, buildPythonPackage, hidapi , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex , websocket_client }: diff --git a/nixpkgs/pkgs/development/python-modules/libagent/default.nix b/nixpkgs/pkgs/development/python-modules/libagent/default.nix index debe88f2f6cc..47be977755cd 100644 --- a/nixpkgs/pkgs/development/python-modules/libagent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libagent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, +{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, python-daemon, pymsgbox }: diff --git a/nixpkgs/pkgs/development/python-modules/libais/default.nix b/nixpkgs/pkgs/development/python-modules/libais/default.nix index eb1ce861dd26..33710c6682dc 100644 --- a/nixpkgs/pkgs/development/python-modules/libais/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libais/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/libarcus/default.nix b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix index 5a5116de5478..6e5d8f771e8b 100644 --- a/nixpkgs/pkgs/development/python-modules/libarcus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub +{ lib, buildPythonPackage, python, fetchFromGitHub , cmake, sip, protobuf, pythonOlder }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix b/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix index fc45622a671d..38ca9b26360c 100644 --- a/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libasyncns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl +{ lib, buildPythonPackage, fetchurl , libasyncns, pkg-config }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix index bda0553b8eee..0449f6099581 100644 --- a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.3.0"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "2e3e4d02f9b3197f9119e737bc704fba52f34459d4bc96d8ad8f183d600747ba"; + sha256 = "d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; @@ -28,9 +28,12 @@ buildPythonPackage rec { # requires a certificates file doCheck = false; + pythonImportsCheck = [ "libcloud" ]; + meta = with lib; { description = "A unified interface to many cloud providers"; - homepage = "http://incubator.apache.org/libcloud/"; + homepage = "https://libcloud.apache.org/"; + changelog = "https://github.com/apache/libcloud/blob/v${version}/CHANGES.rst"; license = licenses.asl20; }; diff --git a/nixpkgs/pkgs/development/python-modules/libkeepass/default.nix b/nixpkgs/pkgs/development/python-modules/libkeepass/default.nix index cfc687e37c14..aa922db9c102 100644 --- a/nixpkgs/pkgs/development/python-modules/libkeepass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libkeepass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , lxml, pycryptodome, colorama }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/liblarch/default.nix b/nixpkgs/pkgs/development/python-modules/liblarch/default.nix index b824dec172ed..5ff8d25d54b5 100644 --- a/nixpkgs/pkgs/development/python-modules/liblarch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/liblarch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , python diff --git a/nixpkgs/pkgs/development/python-modules/libmr/default.nix b/nixpkgs/pkgs/development/python-modules/libmr/default.nix index a0ef924e56e6..d775cc7b245b 100644 --- a/nixpkgs/pkgs/development/python-modules/libmr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libmr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib, buildPythonPackage, fetchPypi, numpy, cython }: buildPythonPackage rec { pname = "libmr"; diff --git a/nixpkgs/pkgs/development/python-modules/libpurecool/default.nix b/nixpkgs/pkgs/development/python-modules/libpurecool/default.nix new file mode 100644 index 000000000000..aa523d9a98bf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/libpurecool/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, netifaces +, paho-mqtt +, pycryptodome +, requests +, six +, zeroconf +}: + +buildPythonPackage rec { + pname = "libpurecool"; + version = "0.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kwbinbg0i4fca1bpx6jwa1fiw71vg0xa89jhq4pmnl5cn9c8kqx"; + }; + + # Remove vendorized zeroconf, https://github.com/etheralm/libpurecool/issues/33 + postPatch = '' + rm libpurecool/zeroconf.py + substituteInPlace libpurecool/dyson_pure_cool_link.py \ + --replace "from .zeroconf import ServiceBrowser, Zeroconf" "from zeroconf import ServiceBrowser, Zeroconf" + ''; + + propagatedBuildInputs = [ + netifaces + paho-mqtt + pycryptodome + requests + six + zeroconf + ]; + + # Tests are only present in repo, https://github.com/etheralm/libpurecool/issues/36 + doCheck = false; + pythonImportsCheck = [ "libpurecool" ]; + + meta = with lib; { + description = "Python library for Dyson devices"; + homepage = "http://libpurecool.readthedocs.io"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/nixpkgs/pkgs/development/python-modules/librosa/default.nix index 777eed4ddb33..ce8f2a73fa7f 100644 --- a/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , joblib diff --git a/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix b/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix index 559289987e6c..7ef22e3f6ee5 100644 --- a/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: +{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: buildPythonPackage rec { pname = "libsavitar"; diff --git a/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix index 40f1b2f8e9ca..77dcdcaef025 100644 --- a/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix @@ -1,30 +1,40 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, stdenv -, lib -, pythonOlder +, enum-compat , requests -, enum34 +, websocket_client +, zeroconf +, pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "libsoundtouch"; - version = "0.4.0"; + version = "0.8.0"; src = fetchFromGitHub { - owner = "CharlesBlonde"; - repo = "libsoundtouch"; - rev = "875074b7a23734021974345b3dc297918e453aa2"; - sha256 = "1psd556j4x77hjxahxxgdgnq2mcd769whvnf0gmwf3jy2svfkqlg"; + owner = "CharlesBlonde"; + repo = "libsoundtouch"; + rev = version; + sha256 = "1wl2w5xfdkrv0qzsz084z2k6sycfyq62mqqgciycha3dywf2fvva"; }; - postPatch = lib.optionalString (! (pythonOlder "3.4")) '' - substituteInPlace setup.py --replace "'enum34>=1.1.6'" "" - ''; + propagatedBuildInputs = [ + requests + enum-compat + websocket_client + zeroconf + ]; - propagatedBuildInputs = [ requests enum34 ]; + checkInputs = [ + pytestCheckHook + ]; - doCheck = false; + disabledTests = [ + # mock data order mismatch + "test_select_content_item" + "test_snapshot_restore" + ]; meta = with lib; { description = "Bose Soundtouch Python library"; diff --git a/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix b/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix index 72e62514a526..c3d8ec9526ff 100644 --- a/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index df9728eb334b..e019951f6ff1 100644 --- a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "libtmux"; diff --git a/nixpkgs/pkgs/development/python-modules/libversion/default.nix b/nixpkgs/pkgs/development/python-modules/libversion/default.nix index d54a176f6862..2edc9211d928 100644 --- a/nixpkgs/pkgs/development/python-modules/libversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libversion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }: buildPythonPackage rec { pname = "libversion"; diff --git a/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix b/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix index 1134d4f1c57b..9cbd042c55ae 100644 --- a/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix +++ b/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }: +{ lib, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; @@ -18,6 +18,10 @@ buildPythonPackage rec { nosetests ''; + passthru = { + inherit libvirt; + }; + meta = with lib; { homepage = "http://www.libvirt.org/"; description = "libvirt Python bindings"; diff --git a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index d29cf5a7a85f..98b8a7c9e558 100644 --- a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }: +{ lib, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; - version = "6.8.0"; + version = "7.0.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-A3eRfzQAfubyPefDlq5bAiFJ/G90D2JKdJO2Em0wE00="; + sha256 = "0vdvpqiypxis8wny7q39qps050zi13l66pnpa47040q6bar0d4xw"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/python-modules/lightblue/default.nix b/nixpkgs/pkgs/development/python-modules/lightblue/default.nix index 3e85a3cfaa04..feb271812443 100644 --- a/nixpkgs/pkgs/development/python-modules/lightblue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lightblue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/lightning/default.nix b/nixpkgs/pkgs/development/python-modules/lightning/default.nix index 782bd41413eb..f6d21f95dbfc 100644 --- a/nixpkgs/pkgs/development/python-modules/lightning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lightning/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/limits/default.nix b/nixpkgs/pkgs/development/python-modules/limits/default.nix index e1cd31867de4..fc6982440d63 100644 --- a/nixpkgs/pkgs/development/python-modules/limits/default.nix +++ b/nixpkgs/pkgs/development/python-modules/limits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, six }: +{ lib, fetchPypi, buildPythonPackage, six }: buildPythonPackage rec { pname = "limits"; diff --git a/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index c92e014e9898..86a505d4448c 100644 --- a/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2020.12.05"; + version = "2021.01.15"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "c4310ea12d1ac39984a96c40a12fab92aefc3d77a615f89ef542b10497ae56fa"; + sha256 = "5d7109fc779c44070e3c57186eae59b133014835d5fe15b262fa9438d7599c81"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/linecache2/default.nix b/nixpkgs/pkgs/development/python-modules/linecache2/default.nix index 3945ec5001cd..3c2238b0875d 100644 --- a/nixpkgs/pkgs/development/python-modules/linecache2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/linecache2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/nixpkgs/pkgs/development/python-modules/linode-api/default.nix b/nixpkgs/pkgs/development/python-modules/linode-api/default.nix index 61624a64d66a..7df182d94fed 100644 --- a/nixpkgs/pkgs/development/python-modules/linode-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/linode-api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, +{ buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/nixpkgs/pkgs/development/python-modules/linode/default.nix b/nixpkgs/pkgs/development/python-modules/linode/default.nix index 611b91bb9309..3433c0e5717c 100644 --- a/nixpkgs/pkgs/development/python-modules/linode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/linode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix b/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix index e6202441da64..7d968c191441 100644 --- a/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for the Linux eventfd/signalfd/timerfd/inotify syscalls"; homepage = "https://github.com/FrankAbelbeck/linuxfd"; - license = with lib.licenses; [ lgpl3 ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ lgpl3Plus ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix b/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix index bbf1b966bf1e..2951ab7a427b 100644 --- a/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix b/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix index d76eb736ac73..5f17a7006177 100644 --- a/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix +++ b/nixpkgs/pkgs/development/python-modules/livestreamer-curses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix b/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix index 7ae9124bb82c..184a215c407a 100644 --- a/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pkgs , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/lmdb/default.nix b/nixpkgs/pkgs/development/python-modules/lmdb/default.nix index 20020b97ef23..f3e7a86a2aae 100644 --- a/nixpkgs/pkgs/development/python-modules/lmdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lmdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix b/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix index 3a1beba29d40..bb27c29173b1 100644 --- a/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, lib, stdenv }: +{ buildPythonPackage, fetchPypi, isPy3k, lib }: buildPythonPackage rec { pname = "lmtpd"; diff --git a/nixpkgs/pkgs/development/python-modules/localzone/default.nix b/nixpkgs/pkgs/development/python-modules/localzone/default.nix index 8690b1e4c91e..0960a824817a 100644 --- a/nixpkgs/pkgs/development/python-modules/localzone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/localzone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , dnspython diff --git a/nixpkgs/pkgs/development/python-modules/locket/default.nix b/nixpkgs/pkgs/development/python-modules/locket/default.nix index 45985a17d3e9..e0be7d8f9440 100644 --- a/nixpkgs/pkgs/development/python-modules/locket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/locket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "locket"; diff --git a/nixpkgs/pkgs/development/python-modules/log-symbols/default.nix b/nixpkgs/pkgs/development/python-modules/log-symbols/default.nix new file mode 100644 index 000000000000..f8cdce634ac9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/log-symbols/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, colorama +, fetchPypi +, isPy27 +, pytestCheckHook +, lib }: + +buildPythonPackage rec { + pname = "log_symbols"; + version = "0.0.14"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0mh5d0igw33libfmbsr1ri1p1y644p36nwaa2w6kzrd8w5pvq2yg"; + }; + + propagatedBuildInputs = [ colorama ]; + + # Tests are not included in the PyPI distribution and the git repo does not have tagged releases + doCheck = false; + pythonImportsCheck = [ "log_symbols" ]; + + meta = with lib; { + description = "Colored Symbols for Various Log Levels."; + homepage = "https://github.com/manrajgrover/py-log-symbols"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/logilab/common.nix b/nixpkgs/pkgs/development/python-modules/logilab/common.nix index b7ba746d79ee..a1cb1b248ae3 100644 --- a/nixpkgs/pkgs/development/python-modules/logilab/common.nix +++ b/nixpkgs/pkgs/development/python-modules/logilab/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: +{ lib, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: buildPythonPackage rec { pname = "logilab-common"; diff --git a/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix index 9a071b5cf5f9..bbc65a51c3c3 100644 --- a/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix +++ b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, logilab_common, six }: +{ lib, buildPythonPackage, fetchPypi, logilab_common, six }: buildPythonPackage rec { pname = "logilab-constraint"; diff --git a/nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix b/nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix index 15cea1d7baaa..dac5862324ab 100644 --- a/nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/logilab_astng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , logilab_common diff --git a/nixpkgs/pkgs/development/python-modules/logutils/default.nix b/nixpkgs/pkgs/development/python-modules/logutils/default.nix index d49667d7cc8a..0a49262647e9 100644 --- a/nixpkgs/pkgs/development/python-modules/logutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/logutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/lpod/default.nix b/nixpkgs/pkgs/development/python-modules/lpod/default.nix index 67b48cecd62c..9c719d234f89 100644 --- a/nixpkgs/pkgs/development/python-modules/lpod/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lpod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , lxml diff --git a/nixpkgs/pkgs/development/python-modules/lsi/default.nix b/nixpkgs/pkgs/development/python-modules/lsi/default.nix index 0fca2f7b372f..b570a62d9e34 100644 --- a/nixpkgs/pkgs/development/python-modules/lsi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lsi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/lxc/default.nix b/nixpkgs/pkgs/development/python-modules/lxc/default.nix index a20db9dd5034..4534e0a01ef3 100644 --- a/nixpkgs/pkgs/development/python-modules/lxc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lxc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix b/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix index 585c38ab33ec..a5ea55c39cf5 100644 --- a/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: +{ lib, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: buildPythonPackage rec { pname = "lyricwikia"; version = "0.1.11"; diff --git a/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix b/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix index af07be47dcdc..8e214540b12d 100644 --- a/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchpatch , buildPythonPackage , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/m2r/default.nix b/nixpkgs/pkgs/development/python-modules/m2r/default.nix index 149e4d6ed562..35331c14b08a 100644 --- a/nixpkgs/pkgs/development/python-modules/m2r/default.nix +++ b/nixpkgs/pkgs/development/python-modules/m2r/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, mistune, docutils } : buildPythonPackage rec { pname = "m2r"; diff --git a/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 14ae268c03a0..dfd16c04a6f8 100644 --- a/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }: +{ lib, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }: buildPythonPackage rec { version = "0.4.1"; diff --git a/nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix b/nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix index 08991edce4aa..da735d9d048d 100644 --- a/nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mailcap-fix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy36 diff --git a/nixpkgs/pkgs/development/python-modules/mailchimp/default.nix b/nixpkgs/pkgs/development/python-modules/mailchimp/default.nix index 0032caa7a0a5..91563b7fe7ef 100644 --- a/nixpkgs/pkgs/development/python-modules/mailchimp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mailchimp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , docopt diff --git a/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix index 8ab80e337179..1d3b69f6bf24 100644 --- a/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mailman, mock }: +{ lib, buildPythonPackage, fetchPypi, mailman, mock }: buildPythonPackage rec { pname = "mailman-hyperkitty"; diff --git a/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix b/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix index 84c97eb16e2e..e2043b0d6d4d 100644 --- a/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, withTwitter ? false}: +{ lib, python3Packages, withTwitter ? false}: python3Packages.buildPythonApplication rec { pname = "mailman-rss"; diff --git a/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix b/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix index 280ee95b8301..0c981a6789d4 100644 --- a/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }: buildPythonPackage rec { pname = "mailmanclient"; - version = "3.3.1"; + version = "3.3.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0pjgzpvhdb6ql8asb20xr8d01m646zpghmcp9fmscks0n1k4di4g"; + sha256 = "4082ac0c66d7f7bee15751fe2564098b971177c0013e66d0c8ceee1ebdcb5592"; }; propagatedBuildInputs = [ six httplib2 requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/manticore/default.nix b/nixpkgs/pkgs/development/python-modules/manticore/default.nix index f9ca3afc4b15..9e0938fb1486 100644 --- a/nixpkgs/pkgs/development/python-modules/manticore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/manticore/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { ] ++ lib.optionals (!stdenv.isLinux) [ "--ignore=tests/native" "--ignore=tests/other/test_locking.py" + "--ignore=tests/other/test_state_introspection.py" ]; disabledTests = [ # failing tests diff --git a/nixpkgs/pkgs/development/python-modules/manuel/default.nix b/nixpkgs/pkgs/development/python-modules/manuel/default.nix index 59243783ecf9..2f14ed863c3e 100644 --- a/nixpkgs/pkgs/development/python-modules/manuel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/manuel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix index 54d0ade40f35..28a6e9c0c5c4 100644 --- a/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mapsplotlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix index b7d91cc16f52..99f3afc31f61 100644 --- a/nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/nixpkgs/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/marisa/default.nix b/nixpkgs/pkgs/development/python-modules/marisa/default.nix index a30f7062df0a..93a4ccb959f7 100644 --- a/nixpkgs/pkgs/development/python-modules/marisa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marisa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig +{ lib, buildPythonPackage, fetchFromGitHub, marisa, swig , isPy3k }: diff --git a/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix b/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix index e248bfe60cc4..e95cbe3c4c10 100644 --- a/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix +++ b/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/nixpkgs/pkgs/development/python-modules/markdown2/default.nix b/nixpkgs/pkgs/development/python-modules/markdown2/default.nix index 2f929012df89..b40254f08987 100644 --- a/nixpkgs/pkgs/development/python-modules/markdown2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/markdown2/default.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchFromGitHub, python, pygments }: buildPythonPackage rec { pname = "markdown2"; - version = "2.3.6"; + version = "2.4.0"; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "08a124043aa0ad36ba2136239547d5011a2b770278abb11a5609611e0040ea05"; + # PyPI does not contain tests, so using GitHub instead. + src = fetchFromGitHub { + owner = "trentm"; + repo = "python-markdown2"; + rev = version; + sha256 = "sha256:03qmf087phpj0h9hx111k4r5pkm48dhb61mqhp1v75gd09k0z79z"; }; + checkInputs = [ pygments ]; + + checkPhase = '' + ${python.interpreter} ./test/test.py + ''; + meta = with lib; { description = "A fast and complete Python implementation of Markdown"; homepage = "https://github.com/trentm/python-markdown2"; diff --git a/nixpkgs/pkgs/development/python-modules/markerlib/default.nix b/nixpkgs/pkgs/development/python-modules/markerlib/default.nix index d039198b3938..7762a970fb1e 100644 --- a/nixpkgs/pkgs/development/python-modules/markerlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/markerlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix b/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix index 6a6e06cd3177..ae0878c7a972 100644 --- a/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 4bf670082b61..ba10c89e1405 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -1,23 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, - marshmallow, sqlalchemy +{ lib +, buildPythonPackage +, fetchPypi +, marshmallow +, sqlalchemy +, pytest-lazy-fixture +, pytestCheckHook }: buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.24.1"; - - meta = { - homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; - description = "SQLAlchemy integration with marshmallow "; - license = lib.licenses.mit; - }; + version = "0.24.2"; src = fetchPypi { inherit pname version; - sha256 = "d051cf013c075c43e1ee5c4b01f8fab6dd6b140dab6825be45875f674a0d289c"; + sha256 = "ee3ead3b83de6608c6850ff60515691b0dc556ca226680f8a82b9f785cdb71b1"; }; - propagatedBuildInputs = [ marshmallow sqlalchemy ]; + propagatedBuildInputs = [ + marshmallow + sqlalchemy + ]; + + checkInputs = [ + pytest-lazy-fixture + pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; + description = "SQLAlchemy integration with marshmallow "; + license = licenses.mit; + }; - doCheck = false; } diff --git a/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix b/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix index 34c99a1ebe1c..b8439a0c23d4 100644 --- a/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 2d890115a51d..d46b505991f3 100644 --- a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.8.9"; + version = "0.8.12"; src = fetchPypi { inherit pname version; - sha256 = "13669a0150370c96cabcff859fb4d17f4a539dc7c707ff0c99c00612e24f5447"; + sha256 = "471684d40cbc2f7db345f2f809553b221a34d1c81e04bcdcb08a2832f140db1e"; }; propagatedBuildInputs = [ @@ -26,6 +26,8 @@ buildPythonPackage rec { # no tests available doCheck = false; + pythonImportsCheck = [ "mautrix" ]; + meta = with lib; { homepage = "https://github.com/tulir/mautrix-python"; description = "A Python 3 asyncio Matrix framework."; diff --git a/nixpkgs/pkgs/development/python-modules/maya/default.nix b/nixpkgs/pkgs/development/python-modules/maya/default.nix index 9cd1019a0301..4a751a188c24 100644 --- a/nixpkgs/pkgs/development/python-modules/maya/default.nix +++ b/nixpkgs/pkgs/development/python-modules/maya/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage +{ lib, fetchPypi, fetchpatch, buildPythonPackage , dateparser, humanize, pendulum, ruamel_yaml, tzlocal }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/mccabe/default.nix b/nixpkgs/pkgs/development/python-modules/mccabe/default.nix index 2886a436a00d..03343aec16e8 100644 --- a/nixpkgs/pkgs/development/python-modules/mccabe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mccabe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner }: buildPythonPackage rec { pname = "mccabe"; diff --git a/nixpkgs/pkgs/development/python-modules/mdp/default.nix b/nixpkgs/pkgs/development/python-modules/mdp/default.nix index 5313cd8e89aa..55a440e68089 100644 --- a/nixpkgs/pkgs/development/python-modules/mdp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, future, numpy }: +{ lib, buildPythonPackage, fetchPypi, pytest, future, numpy }: buildPythonPackage rec { pname = "MDP"; diff --git a/nixpkgs/pkgs/development/python-modules/mechanize/default.nix b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix index e2d2269a43c0..7eb119fa9559 100644 --- a/nixpkgs/pkgs/development/python-modules/mechanize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , html5lib diff --git a/nixpkgs/pkgs/development/python-modules/meinheld/default.nix b/nixpkgs/pkgs/development/python-modules/meinheld/default.nix index ce7f23168007..9cf02e4c8867 100644 --- a/nixpkgs/pkgs/development/python-modules/meinheld/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meinheld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, greenlet }: +{ lib, fetchPypi, buildPythonPackage, greenlet }: buildPythonPackage rec { pname = "meinheld"; diff --git a/nixpkgs/pkgs/development/python-modules/meld3/default.nix b/nixpkgs/pkgs/development/python-modules/meld3/default.nix index 8871bfdda463..a751dbeac3fc 100644 --- a/nixpkgs/pkgs/development/python-modules/meld3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meld3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/meliae/default.nix b/nixpkgs/pkgs/development/python-modules/meliae/default.nix index d602e3d94fdc..4c6aa746448e 100644 --- a/nixpkgs/pkgs/development/python-modules/meliae/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meliae/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/nixpkgs/pkgs/development/python-modules/memcached/default.nix b/nixpkgs/pkgs/development/python-modules/memcached/default.nix index b75bd31361de..02f4bc3aa44b 100644 --- a/nixpkgs/pkgs/development/python-modules/memcached/default.nix +++ b/nixpkgs/pkgs/development/python-modules/memcached/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix b/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix index 28ff6b7c5e31..994863dbbc06 100644 --- a/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python }: diff --git a/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix b/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix index bcbca3475485..cdd19beb68d9 100644 --- a/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, isPy27, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "mergedeep"; diff --git a/nixpkgs/pkgs/development/python-modules/mesa/default.nix b/nixpkgs/pkgs/development/python-modules/mesa/default.nix index 5b97f972dad1..aaf13a76530d 100644 --- a/nixpkgs/pkgs/development/python-modules/mesa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mesa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , cookiecutter, networkx , pandas, tornado, tqdm , pytest }: diff --git a/nixpkgs/pkgs/development/python-modules/metaphone/default.nix b/nixpkgs/pkgs/development/python-modules/metaphone/default.nix index 1c8557f15c41..d6b0c30c504c 100644 --- a/nixpkgs/pkgs/development/python-modules/metaphone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/metaphone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, nose }: buildPythonPackage rec { pname = "metaphone"; diff --git a/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix b/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix index 86deecb5d4f2..c157cd2a6be8 100644 --- a/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/micawber/default.nix b/nixpkgs/pkgs/development/python-modules/micawber/default.nix index 9d31dd378ac4..73f50d32a5f4 100644 --- a/nixpkgs/pkgs/development/python-modules/micawber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/micawber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4 }: +{ lib, buildPythonPackage, fetchPypi, beautifulsoup4 }: buildPythonPackage rec { pname = "micawber"; diff --git a/nixpkgs/pkgs/development/python-modules/midiutil/default.nix b/nixpkgs/pkgs/development/python-modules/midiutil/default.nix index 5ac8d917d75d..d1cae8c78041 100644 --- a/nixpkgs/pkgs/development/python-modules/midiutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/midiutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "MIDIUtil"; diff --git a/nixpkgs/pkgs/development/python-modules/milc/default.nix b/nixpkgs/pkgs/development/python-modules/milc/default.nix index dc824d565474..998f0a58b2ba 100644 --- a/nixpkgs/pkgs/development/python-modules/milc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/milc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , appdirs diff --git a/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix b/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix index 51ee529e234b..481f302d66af 100644 --- a/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.8"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "16bbyihap2ygsi7xg58rwdn14ms1j0jy2kxbdljpg39s9q1rz6ps"; + sha256 = "sha256-woYs8EYUfALCtqHUCVfF5z1v1UIc9D8Iep9n4NrNIlg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/minimock/default.nix b/nixpkgs/pkgs/development/python-modules/minimock/default.nix index f154eabb744c..faa836b71d7b 100644 --- a/nixpkgs/pkgs/development/python-modules/minimock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/minimock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , nose diff --git a/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix b/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix index 7178405ab74c..fe7a9f69691a 100644 --- a/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/miniupnpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "miniupnpc"; diff --git a/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 89cc8f991466..5ffde397337c 100644 --- a/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , alembic , click , cloudpickle diff --git a/nixpkgs/pkgs/development/python-modules/mlrose/default.nix b/nixpkgs/pkgs/development/python-modules/mlrose/default.nix index c3c7c55f292d..40e3b6ce0953 100644 --- a/nixpkgs/pkgs/development/python-modules/mlrose/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mlrose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: +{ lib, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: buildPythonPackage rec { pname = "mlrose"; diff --git a/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix index 94af156d9afb..35f55bb27930 100644 --- a/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/mmh3/default.nix b/nixpkgs/pkgs/development/python-modules/mmh3/default.nix index 8ac241880039..cd2b01d05782 100644 --- a/nixpkgs/pkgs/development/python-modules/mmh3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mmh3/default.nix @@ -18,6 +18,5 @@ buildPythonPackage rec { description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions"; homepage = "https://pypi.org/project/mmh3/"; license = licenses.cc0; - maintainers = [ maintainers.danieldk ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mmpython/default.nix b/nixpkgs/pkgs/development/python-modules/mmpython/default.nix index e40fc197a5bf..64c270ca0722 100644 --- a/nixpkgs/pkgs/development/python-modules/mmpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mmpython/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix b/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix index 2811d0ecda54..8d47db636964 100644 --- a/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix @@ -1,20 +1,28 @@ -{ lib, fetchPypi, buildPythonPackage, pbkdf2 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "mnemonic"; version = "0.19"; - src = fetchPypi { - inherit pname version; - sha256 = "4e37eb02b2cbd56a0079cabe58a6da93e60e3e4d6e757a586d9f23d96abea931"; + src = fetchFromGitHub { + owner = "trezor"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "0rs3szdikkgypiwn43ad3lwh7zvpccw39j5ggkziq6v7pnw3isaq"; }; - propagatedBuildInputs = [ pbkdf2 ]; + checkInputs = [ pytestCheckHook ]; - meta = { - description = "Implementation of Bitcoin BIP-0039"; + pythonImportsCheck = [ "mnemonic" ]; + + meta = with lib; { + description = "Reference implementation of BIP-0039"; homepage = "https://github.com/trezor/python-mnemonic"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ np ]; + license = licenses.mit; + maintainers = with maintainers; [ np prusnak ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mockito/default.nix b/nixpkgs/pkgs/development/python-modules/mockito/default.nix index d7ca86b8ea30..69cdf7b56b09 100644 --- a/nixpkgs/pkgs/development/python-modules/mockito/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mockito/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { version = "1.2.2"; diff --git a/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix b/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix index a7862ef5c678..202589b7435c 100644 --- a/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/nixpkgs/pkgs/development/python-modules/mongodict/default.nix b/nixpkgs/pkgs/development/python-modules/mongodict/default.nix index 467093e84ceb..c2fbd6a7ad1b 100644 --- a/nixpkgs/pkgs/development/python-modules/mongodict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mongodict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pymongo diff --git a/nixpkgs/pkgs/development/python-modules/moretools/default.nix b/nixpkgs/pkgs/development/python-modules/moretools/default.nix index d39f67a73113..5a96682accdb 100644 --- a/nixpkgs/pkgs/development/python-modules/moretools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/moretools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six, pathpy, zetup, pytest , decorator }: diff --git a/nixpkgs/pkgs/development/python-modules/moviepy/default.nix b/nixpkgs/pkgs/development/python-modules/moviepy/default.nix index 8bc984a52879..4cd1fec3d8b2 100644 --- a/nixpkgs/pkgs/development/python-modules/moviepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/moviepy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/nixpkgs/pkgs/development/python-modules/mox/default.nix b/nixpkgs/pkgs/development/python-modules/mox/default.nix index 94d4791224df..380dbe594a5a 100644 --- a/nixpkgs/pkgs/development/python-modules/mox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/nixpkgs/pkgs/development/python-modules/mox3/default.nix b/nixpkgs/pkgs/development/python-modules/mox3/default.nix index 77a02ae8a733..1883c9c8c011 100644 --- a/nixpkgs/pkgs/development/python-modules/mox3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mox3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/mozsvc/default.nix b/nixpkgs/pkgs/development/python-modules/mozsvc/default.nix index 55afb1773fe3..0caa347edacf 100644 --- a/nixpkgs/pkgs/development/python-modules/mozsvc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mozsvc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyramid diff --git a/nixpkgs/pkgs/development/python-modules/mpd/default.nix b/nixpkgs/pkgs/development/python-modules/mpd/default.nix index 212e6b5f13c4..b535144fac91 100644 --- a/nixpkgs/pkgs/development/python-modules/mpd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/mpd2/default.nix b/nixpkgs/pkgs/development/python-modules/mpd2/default.nix index 7fdf64c0e4b7..8d17d8b3b0cf 100644 --- a/nixpkgs/pkgs/development/python-modules/mpd2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mpd2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-mpd2"; - version = "3.0.3"; + version = "3.0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1ikvn2qv6cnbjscpbk6hhsqg34h832mxgg6hp1mf4d8d6nwdx4sn"; + sha256 = "1r8saq1460yfa0sxfrvxqs2r453wz2xchlc9gzbpqznr49786rvs"; }; buildInputs = [ mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/mpmath/default.nix b/nixpkgs/pkgs/development/python-modules/mpmath/default.nix index 86d55b34f044..42de3d2da9a8 100644 --- a/nixpkgs/pkgs/development/python-modules/mpmath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mpmath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://mpmath.org/"; + homepage = "https://mpmath.org/"; description = "A pure-Python library for multiprecision floating arithmetic"; license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; diff --git a/nixpkgs/pkgs/development/python-modules/mrbob/default.nix b/nixpkgs/pkgs/development/python-modules/mrbob/default.nix index 64d0ce13a86d..8921719a3ae2 100644 --- a/nixpkgs/pkgs/development/python-modules/mrbob/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mrbob/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six +{ buildPythonPackage, lib, glibcLocales, mock, nose, isPy3k, jinja2, six , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix index 56bfa06a628a..8b50e04d4289 100644 --- a/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/nixpkgs/pkgs/development/python-modules/msldap/default.nix b/nixpkgs/pkgs/development/python-modules/msldap/default.nix index ea2ae26c96bc..d068380a7a2f 100644 --- a/nixpkgs/pkgs/development/python-modules/msldap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msldap/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.24"; + version = "0.3.25"; src = fetchPypi { inherit pname version; - sha256 = "0q9bhw0lfw9iykjdsqz62ipy3ihfz6kprzw5sc7v1678l2pvs84j"; + sha256 = "b5ef61c4f05493cfe78b3f955878a3d0a71950eead5ebb484282f07456a47bea"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/msrplib/default.nix b/nixpkgs/pkgs/development/python-modules/msrplib/default.nix index 16c4cc0f43ae..e615b3e34e2c 100644 --- a/nixpkgs/pkgs/development/python-modules/msrplib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msrplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchdarcs , eventlib diff --git a/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix b/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix index f76cde9bec53..cb539e4dd90f 100644 --- a/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/multidict/default.nix b/nixpkgs/pkgs/development/python-modules/multidict/default.nix index 43cbbbc6b777..555011a314d9 100644 --- a/nixpkgs/pkgs/development/python-modules/multidict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/multidict/default.nix @@ -1,25 +1,22 @@ { lib , fetchPypi , buildPythonPackage -, pytest, pytestrunner, pytestcov +, pytestCheckHook, pytestrunner, pytestcov , isPy3k -, isPy38 }: buildPythonPackage rec { pname = "multidict"; - version = "5.0.2"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e5bf89fe57f702a046c7ec718fe330ed50efd4bcf74722940db2eb0919cddb1c"; + sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"; }; - checkInputs = [ pytest pytestrunner pytestcov ]; + checkInputs = [ pytestCheckHook pytestrunner pytestcov ]; disabled = !isPy3k; - # pickle files needed for 3.8 https://github.com/aio-libs/multidict/pull/363 - doCheck = !isPy38; meta = with lib; { description = "Multidict implementation"; diff --git a/nixpkgs/pkgs/development/python-modules/munch/default.nix b/nixpkgs/pkgs/development/python-modules/munch/default.nix index 2ff2ce4cefb9..f6ca7c1d6905 100644 --- a/nixpkgs/pkgs/development/python-modules/munch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/munch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/munkres/default.nix b/nixpkgs/pkgs/development/python-modules/munkres/default.nix index cb88b666cfa0..ffb4f8774906 100644 --- a/nixpkgs/pkgs/development/python-modules/munkres/default.nix +++ b/nixpkgs/pkgs/development/python-modules/munkres/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix b/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix index 68aa29a6edeb..c2a7eb193377 100644 --- a/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix b/nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix index 02ec38157117..e5f5eff6b284 100644 --- a/nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/musicbrainzngs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/mutag/default.nix b/nixpkgs/pkgs/development/python-modules/mutag/default.nix index 45725c0fabb7..ee190008f592 100644 --- a/nixpkgs/pkgs/development/python-modules/mutag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mutag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/muttils/default.nix b/nixpkgs/pkgs/development/python-modules/muttils/default.nix index 1d6b5ce8df44..98f96d132123 100644 --- a/nixpkgs/pkgs/development/python-modules/muttils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/muttils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/mwclient/default.nix b/nixpkgs/pkgs/development/python-modules/mwclient/default.nix index ac9373b574ac..2eed1eefeec8 100644 --- a/nixpkgs/pkgs/development/python-modules/mwclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mwclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , requests, requests_oauthlib, six , pytest, pytestcache, pytestcov, responses, mock }: diff --git a/nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix b/nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix index 0a81fd58d7ee..b9b18eaf9e5f 100644 --- a/nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mwlib-ext/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix b/nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix index d27de2ed45cc..fdb70726eb6e 100644 --- a/nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mwlib-rl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mwlib diff --git a/nixpkgs/pkgs/development/python-modules/mwlib/default.nix b/nixpkgs/pkgs/development/python-modules/mwlib/default.nix index e9defe3ee148..d9edb2ef3ba5 100644 --- a/nixpkgs/pkgs/development/python-modules/mwlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mwlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix b/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix index 0546688b867e..56aa46615162 100644 --- a/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix index f444ba039c20..69178edb6919 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonApplication, protobuf }: +{ lib, fetchPypi, buildPythonApplication, protobuf }: buildPythonApplication rec { pname = "mypy-protobuf"; diff --git a/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix b/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix index 21a3ee21dbd9..5992a6815d8e 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }: +{ lib, fetchPypi, buildPythonPackage, typing, pythonOlder }: buildPythonPackage rec { pname = "mypy-extensions"; diff --git a/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix b/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix index 9d91543b7ff3..b7a0f39990ea 100644 --- a/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, libmysqlclient }: +{ lib, buildPythonPackage, fetchPypi, libmysqlclient }: buildPythonPackage rec { pname = "mysqlclient"; diff --git a/nixpkgs/pkgs/development/python-modules/namebench/default.nix b/nixpkgs/pkgs/development/python-modules/namebench/default.nix index eefdcce79901..b7b542b8a7a9 100644 --- a/nixpkgs/pkgs/development/python-modules/namebench/default.nix +++ b/nixpkgs/pkgs/development/python-modules/namebench/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/nameparser/default.nix b/nixpkgs/pkgs/development/python-modules/nameparser/default.nix index 0c8e442affcf..0d7b53f03cbe 100644 --- a/nixpkgs/pkgs/development/python-modules/nameparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nameparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix b/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix index f6131cd53095..8712c582bedc 100644 --- a/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "nanoleaf"; diff --git a/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix b/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix index 4cf33fb2074c..765941457d4a 100644 --- a/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }: +{ lib, buildPythonPackage, fetchFromGitHub, nanomsg }: buildPythonPackage { pname = "nanomsg-python"; diff --git a/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index d846511eb3f4..c320415e0754 100644 --- a/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, +{ lib, buildPythonPackage, fetchPypi, pythonOlder, async_generator, traitlets, nbformat, nest-asyncio, jupyter_client, pytest, xmltodict, nbconvert, ipywidgets , doCheck ? true diff --git a/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix b/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix index 4e443a377eda..42d9ae3cf389 100644 --- a/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, nbconvert, pytest, requests, responses }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, nbconvert +, pytestCheckHook +, requests +, responses +}: buildPythonPackage rec { pname = "nbconflux"; @@ -14,11 +22,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ nbconvert requests ]; - checkInputs = [ pytest responses ]; + checkInputs = [ pytestCheckHook responses ]; - checkPhase = '' - pytest tests - ''; + JUPYTER_PATH="${nbconvert}/share/jupyter"; + disabledTests = [ + "test_post_to_confluence" + "test_optional_components" + ]; meta = with lib; { description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert"; diff --git a/nixpkgs/pkgs/development/python-modules/nbdime/default.nix b/nixpkgs/pkgs/development/python-modules/nbdime/default.nix index 1de21f3511a4..299cfc87024c 100644 --- a/nixpkgs/pkgs/development/python-modules/nbdime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbdime/default.nix @@ -12,7 +12,7 @@ , tabulate , nbformat , jsonschema -, pytest +, pytestCheckHook , colorama , pygments , tornado @@ -40,7 +40,16 @@ buildPythonPackage rec { jsonschema mock tabulate - pytest + pytestCheckHook + ]; + + disabledTests = [ + "test_apply_filter_no_repo" + "test_diff_api_checkpoint" + "test_filter_cmd_invalid_filter" + "test_inline_merge" + "test_interrogate_filter_no_repo" + "test_merge_input_strategy_inline_source_conflict" ]; nativeBuildInputs = [ setuptools_scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index fb5eb6cbf7c9..979b357607e5 100644 --- a/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "369c16fe93af14c878d61fb3e81d838196fb35b27deade2cd7b95efe1fe56ea0"; + sha256 = "19lf036h0d9ryqasrh91myhn3dq5zcw4rik9jy6sayq7l6irmm94"; }; propagatedBuildInputs = [ @@ -29,9 +29,13 @@ buildPythonPackage rec { traitlets ]; - checkPhase = '' - ${python.interpreter} -m nbsphinx - ''; + # The package has not tests + doCheck = false; + + JUPYTER_PATH = "${nbconvert}/share/jupyter"; + pythonImportsCheck = [ + "nbsphinx" + ]; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index 28946bd1a6e7..531232bf8e6e 100644 --- a/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: +{ lib, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: let pname = "nbxmpp"; @@ -15,8 +15,7 @@ in buildPythonPackage { }; buildInputs = [ precis-i18n ]; - checkInputs = [ gobject-introspection libsoup pygobject3 ]; - propagatedBuildInputs = [ idna pyopenssl ]; + propagatedBuildInputs = [ gobject-introspection idna libsoup pygobject3 pyopenssl ]; meta = with lib; { homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; diff --git a/nixpkgs/pkgs/development/python-modules/ncclient/default.nix b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix index f933587dcad1..ba3b9e4b0873 100644 --- a/nixpkgs/pkgs/development/python-modules/ncclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , paramiko diff --git a/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix b/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix index 7768614a5d12..0082b8e8db23 100644 --- a/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyopenssl diff --git a/nixpkgs/pkgs/development/python-modules/netaddr/default.nix b/nixpkgs/pkgs/development/python-modules/netaddr/default.nix index 7f4aab9c3714..3f7f78a374cb 100644 --- a/nixpkgs/pkgs/development/python-modules/netaddr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netaddr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix index 456124b19bd3..60f7dbe6c239 100644 --- a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, pytest +{ lib, buildPythonPackage, fetchPypi, isPyPy, pytest , numpy, zlib, netcdf, hdf5, curl, libjpeg, cython, cftime }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/netdisco/default.nix b/nixpkgs/pkgs/development/python-modules/netdisco/default.nix index e546ac6cd579..489b6bddf562 100644 --- a/nixpkgs/pkgs/development/python-modules/netdisco/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netdisco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: buildPythonPackage rec { pname = "netdisco"; diff --git a/nixpkgs/pkgs/development/python-modules/netifaces/default.nix b/nixpkgs/pkgs/development/python-modules/netifaces/default.nix index 07dc63c2181f..b7b28c678ee3 100644 --- a/nixpkgs/pkgs/development/python-modules/netifaces/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netifaces/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: @@ -12,6 +12,10 @@ buildPythonPackage rec { sha256 = "2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3"; }; + doCheck = false; # no tests implemented + + pythonImportsCheck = [ "netifaces" ]; + meta = with lib; { homepage = "https://alastairs-place.net/projects/netifaces/"; description = "Portable access to network interfaces from Python"; diff --git a/nixpkgs/pkgs/development/python-modules/neuronpy/default.nix b/nixpkgs/pkgs/development/python-modules/neuronpy/default.nix index b81398f918cd..2d388dfa4c27 100644 --- a/nixpkgs/pkgs/development/python-modules/neuronpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/neuronpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/nixpkgs/pkgs/development/python-modules/nevow/default.nix b/nixpkgs/pkgs/development/python-modules/nevow/default.nix index 356754fdeac8..b608ae58fc70 100644 --- a/nixpkgs/pkgs/development/python-modules/nevow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nevow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }: +{ lib, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }: buildPythonPackage rec { pname = "Nevow"; diff --git a/nixpkgs/pkgs/development/python-modules/nimfa/default.nix b/nixpkgs/pkgs/development/python-modules/nimfa/default.nix index dc889440aa41..eb04e0c4d89d 100644 --- a/nixpkgs/pkgs/development/python-modules/nimfa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nimfa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/nine/default.nix b/nixpkgs/pkgs/development/python-modules/nine/default.nix index 1747332ed5a2..e2ca5c6f27dd 100644 --- a/nixpkgs/pkgs/development/python-modules/nine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/nipy/default.nix b/nixpkgs/pkgs/development/python-modules/nipy/default.nix index cb7871aed610..6229baef32a3 100644 --- a/nixpkgs/pkgs/development/python-modules/nipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nipy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix b/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix index 4edd31d6a25f..acebe5d758f7 100644 --- a/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix b/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix index 55f70f74db94..cb7d57f75307 100644 --- a/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "nmigen-boards"; - version = "unstable-2020-02-06"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.1.dev92+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev173+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen-boards"; - rev = "f37fe0295035db5f1bf82ed086b2eb349ab3a530"; - sha256 = "16112ahil100anfwggj64nyrj3pf7mngwrjyqyhf2ggxx9ir24cc"; + rev = "a35d870a994c2919116b2c06166dc127febb1512"; + sha256 = "1flbcyb2xz174dgqv2964qra80xj2vbzbqwjb27shvxm6knj9ikf"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -26,6 +26,9 @@ buildPythonPackage rec { export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" ''; + # no tests + doCheck = false; + meta = with lib; { description = "Board and connector definitions for nMigen"; homepage = "https://github.com/nmigen/nmigen-boards"; diff --git a/nixpkgs/pkgs/development/python-modules/nmigen-soc/default.nix b/nixpkgs/pkgs/development/python-modules/nmigen-soc/default.nix index 4c15e65e62b2..b987557d5f68 100644 --- a/nixpkgs/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nmigen-soc/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "nmigen-soc"; - version = "unstable-2020-02-08"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.1.dev24+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev43+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen-soc"; - rev = "f1b009c7e075bca461d10ec963a7eaa3bf4dfc14"; - sha256 = "04kjaq9qp6ac3h0r1wlb4jyz56bb52l1rikmz1x7azvnr10xhrad"; + rev = "ecfad4d9abacf903a525f0a252c38844eda0d2dd"; + sha256 = "0afmnfs1ms7p1r4c1nc0sfvlcq36zjwaim7775v5i2vajcn3020c"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/nmigen/default.nix b/nixpkgs/pkgs/development/python-modules/nmigen/default.nix index 4a2327bf9288..1e38a087bce4 100644 --- a/nixpkgs/pkgs/development/python-modules/nmigen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nmigen/default.nix @@ -6,6 +6,8 @@ , setuptools_scm , pyvcd , jinja2 +, importlib-resources +, importlib-metadata # for tests , pytestCheckHook @@ -16,21 +18,27 @@ buildPythonPackage rec { pname = "nmigen"; - version = "unstable-2020-04-02"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}"; + realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen"; - rev = "c79caead33fff14e2dec42b7e21d571a02526876"; - sha256 = "sha256-3+mxHyg0a92/BfyePtKT5Hsk+ra+fQzTjCJ2Ech44/s="; + rev = "f7c2b9419f9de450be76a0e9cf681931295df65f"; + sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1"; }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ setuptools pyvcd jinja2 ]; + propagatedBuildInputs = [ + setuptools + pyvcd + jinja2 + ] ++ + lib.optional (pythonOlder "3.9") importlib-resources ++ + lib.optional (pythonOlder "3.8") importlib-metadata; checkInputs = [ pytestCheckHook yosys symbiyosys yices ]; @@ -38,13 +46,6 @@ buildPythonPackage rec { export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" ''; - # Fail b/c can't find sby (symbiyosys) executable, which should be on path. - disabledTests = [ - "test_distance" - "test_reversible" - "FIFOFormalCase" - ]; - meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; homepage = "https://nmigen.info/nmigen"; diff --git a/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix b/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix index ffa761f206e3..a9cb021a8413 100644 --- a/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "bl1b0R3jP5PSJUXZ7SOguY+EDyzawNdJ0vqkYXrcd3I="; + sha256 = "86e2dae49e34de7c31b65b486c8f9aa58b66dc2e8ee9b34c390c6c58885c85a0"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/node-semver/default.nix b/nixpkgs/pkgs/development/python-modules/node-semver/default.nix index 5ba62fb9210e..535ff621de5c 100644 --- a/nixpkgs/pkgs/development/python-modules/node-semver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/node-semver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "0.7.0"; diff --git a/nixpkgs/pkgs/development/python-modules/noise/default.nix b/nixpkgs/pkgs/development/python-modules/noise/default.nix index 98f336c49866..ebd0178602ca 100644 --- a/nixpkgs/pkgs/development/python-modules/noise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/noise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "noise"; diff --git a/nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix b/nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix index 185270176acb..b75dcc526c5f 100644 --- a/nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nose-cover3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix b/nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix index 4f90ee4be8b4..f4959ec7be78 100644 --- a/nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nose-cprof/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/nose-focus/default.nix b/nixpkgs/pkgs/development/python-modules/nose-focus/default.nix index 8e31867d85c0..2805dc4545af 100644 --- a/nixpkgs/pkgs/development/python-modules/nose-focus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nose-focus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti +{ lib, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti , nose-pattern-exclude, which }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix b/nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix index 2bd63f3295d4..16fb264b39ae 100644 --- a/nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nose-of-yeti/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }: +{ lib, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }: buildPythonPackage rec { pname = "nose-of-yeti"; diff --git a/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix index 05a7102f1ae7..a550dc5aee15 100644 --- a/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "nose-pattern-exclude"; diff --git a/nixpkgs/pkgs/development/python-modules/nose/default.nix b/nixpkgs/pkgs/development/python-modules/nose/default.nix index 2805b7c2ea19..456bbfd9aedd 100644 --- a/nixpkgs/pkgs/development/python-modules/nose/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/nose2/default.nix b/nixpkgs/pkgs/development/python-modules/nose2/default.nix index b815e223d82d..004991e1ce9d 100644 --- a/nixpkgs/pkgs/development/python-modules/nose2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nose2/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi +, python , six , pythonOlder , coverage @@ -8,20 +9,21 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.9.2"; + version = "0.10.0"; # Requires mock 2.0.0 if python < 3.6, but NixPkgs has mock 3.0.5. disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0pmbb6nk31yhgh4zkcblzxsznml7f7pf5q1ihgrwvbxv4mwzfql7"; + sha256 = "886ba617a96de0130c54b24479bd5c2d74d5c940d40f3809c3a275511a0c4a60"; }; propagatedBuildInputs = [ six coverage ]; - # AttributeError: 'module' object has no attribute 'collector' - doCheck = false; + checkPhase = '' + ${python.interpreter} -m unittest + ''; meta = with lib; { description = "nose2 is the next generation of nicer testing for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix b/nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix index b920bb40736c..bef7058bc3fe 100644 --- a/nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nose_progressive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/nosejs/default.nix b/nixpkgs/pkgs/development/python-modules/nosejs/default.nix index c165e87ff2ee..f80953bd2d71 100644 --- a/nixpkgs/pkgs/development/python-modules/nosejs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nosejs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/nosexcover/default.nix b/nixpkgs/pkgs/development/python-modules/nosexcover/default.nix index 36747a50aae7..f60ed65448d7 100644 --- a/nixpkgs/pkgs/development/python-modules/nosexcover/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nosexcover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , coverage diff --git a/nixpkgs/pkgs/development/python-modules/notmuch/2.nix b/nixpkgs/pkgs/development/python-modules/notmuch/2.nix index 970928e03f40..bde039836ffa 100644 --- a/nixpkgs/pkgs/development/python-modules/notmuch/2.nix +++ b/nixpkgs/pkgs/development/python-modules/notmuch/2.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , notmuch , python diff --git a/nixpkgs/pkgs/development/python-modules/notmuch/default.nix b/nixpkgs/pkgs/development/python-modules/notmuch/default.nix index 609d4c78d5d7..90695b84c660 100644 --- a/nixpkgs/pkgs/development/python-modules/notmuch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notmuch/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , notmuch , python diff --git a/nixpkgs/pkgs/development/python-modules/npyscreen/default.nix b/nixpkgs/pkgs/development/python-modules/npyscreen/default.nix new file mode 100644 index 000000000000..1e93d54b3a29 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/npyscreen/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "npyscreen"; + version = "4.10.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vhjwn0dan3zmffvh80dxb4x67jysvvf1imp6pk4dsfslpwy0bk2"; + }; + + # Tests are outdated + doCheck = false; + + meta = with lib; { + description = "Framework for developing console applications using Python and curses"; + homepage = "http://www.npcole.com/npyscreen/"; + maintainers = with maintainers; [ dump_stack ]; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ntplib/default.nix b/nixpkgs/pkgs/development/python-modules/ntplib/default.nix index 266482a8ff28..be8a370f3f3a 100644 --- a/nixpkgs/pkgs/development/python-modules/ntplib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ntplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix b/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix index 0c71b065a32d..8e2f630fdba6 100644 --- a/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/nixpkgs/pkgs/development/python-modules/nunavut/default.nix index 8b2943ba363a..63b5214b27ba 100644 --- a/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -1,13 +1,18 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi, pydsdl }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pydsdl +}: buildPythonPackage rec { pname = "nunavut"; - version = "0.6.2"; + version = "1.0.1"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "48b6802722d78542ca5d7bbc0d6aa9b0a31e1be0070c47b41527f227eb6a1443"; + sha256 = "1gvs3fx2l15y5ffqsxxjfa4p1ydaqbq7qp5nsgb8jbz871358jxm"; }; propagatedBuildInputs = [ @@ -19,7 +24,10 @@ export HOME=$TMPDIR ''; - # repo doesn't contain tests, ensure imports aren't broken + # No tests in pypy package and no git tags yet for release versions, see + # https://github.com/UAVCAN/nunavut/issues/182 + doCheck = false; + pythonImportsCheck = [ "nunavut" ]; diff --git a/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix index 832e281a9a1e..17537be82b49 100644 --- a/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix b/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix index 4676fdef0cdc..c8147d9d9a4e 100644 --- a/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +{ lib, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils , blockdiag, setuptools }: diff --git a/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix b/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix index 4057ba1de8ad..38920dc55429 100644 --- a/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/oath/default.nix b/nixpkgs/pkgs/development/python-modules/oath/default.nix index 158cf0368406..fd12a830472b 100644 --- a/nixpkgs/pkgs/development/python-modules/oath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/oauth/default.nix b/nixpkgs/pkgs/development/python-modules/oauth/default.nix index 0e53eaec7c0e..c74de8d6bd6e 100644 --- a/nixpkgs/pkgs/development/python-modules/oauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/oauth2/default.nix b/nixpkgs/pkgs/development/python-modules/oauth2/default.nix index 70b2e94e37ca..d9c0ae505f71 100644 --- a/nixpkgs/pkgs/development/python-modules/oauth2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oauth2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , httplib2 diff --git a/nixpkgs/pkgs/development/python-modules/oauthlib/3.1.nix b/nixpkgs/pkgs/development/python-modules/oauthlib/3.1.nix index 40501733e4c7..10757812037a 100644 --- a/nixpkgs/pkgs/development/python-modules/oauthlib/3.1.nix +++ b/nixpkgs/pkgs/development/python-modules/oauthlib/3.1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix index df65547a256d..5c4cbc78adb7 100644 --- a/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , mock diff --git a/nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix b/nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix index 1dec57cafb44..b5736851fbb6 100644 --- a/nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/obfsproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , pyptlib diff --git a/nixpkgs/pkgs/development/python-modules/objgraph/default.nix b/nixpkgs/pkgs/development/python-modules/objgraph/default.nix index 8bb119bcb4bf..c79b11252be0 100644 --- a/nixpkgs/pkgs/development/python-modules/objgraph/default.nix +++ b/nixpkgs/pkgs/development/python-modules/objgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/offtrac/default.nix b/nixpkgs/pkgs/development/python-modules/offtrac/default.nix index edec161a133b..1ae555ffa15a 100644 --- a/nixpkgs/pkgs/development/python-modules/offtrac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/offtrac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/ofxclient/default.nix b/nixpkgs/pkgs/development/python-modules/ofxclient/default.nix index 5ef7060b7f66..72e2be7c78bd 100644 --- a/nixpkgs/pkgs/development/python-modules/ofxclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ofxclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, ofxhome, ofxparse, beautifulsoup4, lxml, keyring }: diff --git a/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix b/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix index d9a28da18060..72ca65ed1711 100644 --- a/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { version = "0.3.3"; diff --git a/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix b/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix index 235875eec7ce..d018a924d898 100644 --- a/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix b/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix index 8f280d1cfd45..a32b0b232949 100644 --- a/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , nose diff --git a/nixpkgs/pkgs/development/python-modules/olefile/default.nix b/nixpkgs/pkgs/development/python-modules/olefile/default.nix index 96c0a0b51bef..d2c39e54ef48 100644 --- a/nixpkgs/pkgs/development/python-modules/olefile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/olefile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "olefile"; version = "0.46"; diff --git a/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix b/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix index 99b9cccc7de6..ad9da46243b0 100644 --- a/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix b/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix index 067db3a69fef..087706784323 100644 --- a/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , docopt, netifaces }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/openant/default.nix b/nixpkgs/pkgs/development/python-modules/openant/default.nix index 374b7cb059d1..71f699e0552a 100644 --- a/nixpkgs/pkgs/development/python-modules/openant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openant/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyusb diff --git a/nixpkgs/pkgs/development/python-modules/openbabel-bindings/default.nix b/nixpkgs/pkgs/development/python-modules/openbabel-bindings/default.nix index 18a6a8dd032c..6488b8fad2fb 100644 --- a/nixpkgs/pkgs/development/python-modules/openbabel-bindings/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openbabel-bindings/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, openbabel, python, buildPythonPackage }: +{ lib, openbabel, python, buildPythonPackage }: buildPythonPackage rec { pname = "openbabel"; diff --git a/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix b/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix index 7d373c13a8a5..ce6ccee9793c 100644 --- a/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openidc-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "openidc-client"; diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/common.nix b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix index 843380ebf21d..2ed723944dda 100644 --- a/nixpkgs/pkgs/development/python-modules/openrazer/common.nix +++ b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub }: rec { version = "2.9.0"; diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix b/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix index 6c22d3bae5d0..8b1ff86fcab3 100644 --- a/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix +++ b/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix @@ -11,12 +11,11 @@ , pygobject3 , pyudev , setproctitle -, stdenv , wrapGAppsHook }: let - common = import ./common.nix { inherit stdenv lib fetchFromGitHub; }; + common = import ./common.nix { inherit lib fetchFromGitHub; }; in buildPythonApplication (common // rec { pname = "openrazer_daemon"; diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix b/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix index 52fe63318a3e..fb83d64c5020 100644 --- a/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix +++ b/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix @@ -3,12 +3,11 @@ , dbus-python , fetchFromGitHub , numpy -, stdenv , openrazer-daemon }: let - common = import ./common.nix { inherit stdenv lib fetchFromGitHub; }; + common = import ./common.nix { inherit lib fetchFromGitHub; }; in buildPythonPackage (common // rec { pname = "openrazer"; diff --git a/nixpkgs/pkgs/development/python-modules/ordereddict/default.nix b/nixpkgs/pkgs/development/python-modules/ordereddict/default.nix index e2931840a66a..6ef006405853 100644 --- a/nixpkgs/pkgs/development/python-modules/ordereddict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ordereddict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix b/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix index 1cd0f648bd3e..7c37cc7aa5aa 100644 --- a/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }: +{ lib, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }: buildPythonPackage rec { pname = "orderedmultidict"; diff --git a/nixpkgs/pkgs/development/python-modules/orderedset/default.nix b/nixpkgs/pkgs/development/python-modules/orderedset/default.nix index aced6cf08536..db9c265ef3ef 100644 --- a/nixpkgs/pkgs/development/python-modules/orderedset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/orderedset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "orderedset"; diff --git a/nixpkgs/pkgs/development/python-modules/osc/default.nix b/nixpkgs/pkgs/development/python-modules/osc/default.nix index dad78727f2d1..ac7e401bf6cc 100644 --- a/nixpkgs/pkgs/development/python-modules/osc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber +{ lib, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber , m2crypto, rpm, chardet }: diff --git a/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/nixpkgs/pkgs/development/python-modules/osmnx/default.nix index c624e262cf96..e1c22ddbfa3c 100755 --- a/nixpkgs/pkgs/development/python-modules/osmnx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osmnx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy +{ lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy , pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix b/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix index 981feb388083..ccb15aec01b3 100644 --- a/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , beautifulsoup4 , geojson , lxml @@ -13,14 +13,17 @@ buildPythonPackage rec { pname = "osmpythontools"; - version = "0.2.8"; + version = "0.2.9"; - src = fetchPypi { - pname = "OSMPythonTools"; - inherit version; - sha256 = "8a33adbd266127e342d12da755075fae08f398032a6f0909b5e86bef13960a85"; + src = fetchFromGitHub { + owner = "mocnik-science"; + repo = "osm-python-tools"; + rev = "v${version}"; + sha256 = "1qpj03fgn8rmrg9a9vk7bw32k9hdy15g5p2q3a6q52ykpb78jdz5"; }; + patches = [ ./remove-test-only-dependencies.patch ]; + propagatedBuildInputs = [ beautifulsoup4 geojson @@ -32,7 +35,7 @@ buildPythonPackage rec { xarray ]; - # no tests included + # tests touch network doCheck = false; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/osmpythontools/remove-test-only-dependencies.patch b/nixpkgs/pkgs/development/python-modules/osmpythontools/remove-test-only-dependencies.patch new file mode 100644 index 000000000000..c12a96622ebd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/osmpythontools/remove-test-only-dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 801d081..6d93128 100644 +--- a/setup.py ++++ b/setup.py +@@ -19,8 +19,6 @@ setup( + 'matplotlib', + 'numpy', + 'pandas', +- 'pytest', +- 'pytest-sugar', + 'ujson', + 'xarray', + ], diff --git a/nixpkgs/pkgs/development/python-modules/packaging/2.nix b/nixpkgs/pkgs/development/python-modules/packaging/2.nix index 5d841eb4fb13..a9b4e159469d 100644 --- a/nixpkgs/pkgs/development/python-modules/packaging/2.nix +++ b/nixpkgs/pkgs/development/python-modules/packaging/2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyparsing diff --git a/nixpkgs/pkgs/development/python-modules/packaging/default.nix b/nixpkgs/pkgs/development/python-modules/packaging/default.nix index 973e516f5a90..689c2e4516d7 100644 --- a/nixpkgs/pkgs/development/python-modules/packaging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/packaging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyparsing diff --git a/nixpkgs/pkgs/development/python-modules/pagelabels/default.nix b/nixpkgs/pkgs/development/python-modules/pagelabels/default.nix index 5daa60f475d3..c17f0ad60dd5 100644 --- a/nixpkgs/pkgs/development/python-modules/pagelabels/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pagelabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pdfrw }: +{ lib, buildPythonPackage, fetchPypi, pdfrw }: buildPythonPackage rec { pname = "pagelabels"; diff --git a/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix b/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix index ebe2c8b5854d..8390cceb2fcf 100644 --- a/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/palettable/default.nix b/nixpkgs/pkgs/development/python-modules/palettable/default.nix index d61973aa3bfa..dce72bb74bb5 100644 --- a/nixpkgs/pkgs/development/python-modules/palettable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/palettable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "palettable"; diff --git a/nixpkgs/pkgs/development/python-modules/pamqp/default.nix b/nixpkgs/pkgs/development/python-modules/pamqp/default.nix index 2e8e4500f247..6df8b5491c9a 100644 --- a/nixpkgs/pkgs/development/python-modules/pamqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pamqp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix b/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix index c4bf9c140df3..ea0ba44e99da 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix b/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix index d31bc2657c93..8ca57440b3f7 100644 --- a/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/panflute/default.nix b/nixpkgs/pkgs/development/python-modules/panflute/default.nix new file mode 100644 index 000000000000..da08b858b1b9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/panflute/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchPypi +, click +, pyyaml +, buildPythonPackage +, isPy3k +}: + +buildPythonPackage rec{ + version = "2.0.5"; + pname = "panflute"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1ssmqcyr91f0gpl49lz6a9jkl17l06h6qcik24rlmva28ii6aszz"; + }; + + propagatedBuildInputs = [ click pyyaml ]; + + meta = with lib; { + description = "A Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions"; + homepage = "http://scorreia.com/software/panflute"; + license = licenses.bsd3; + maintainers = with maintainers; [ synthetica ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/paperspace/default.nix b/nixpkgs/pkgs/development/python-modules/paperspace/default.nix deleted file mode 100644 index 4553b253819f..000000000000 --- a/nixpkgs/pkgs/development/python-modules/paperspace/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage -, boto3, requests, gradient_statsd, terminaltables -, click-completion , click-didyoumean, click-help-colors -, colorama, requests_toolbelt, gradient_sdk, progressbar2 -}: - -buildPythonPackage rec { - pname = "paperspace"; - version = "0.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "7959305128fea6da8ca0cdc528783a89859dacb9b54bf8eb89fd04a518872191"; - }; - - propagatedBuildInputs = [ boto3 requests gradient_statsd terminaltables - click-completion click-didyoumean click-help-colors requests_toolbelt - colorama gradient_sdk progressbar2 - ]; - - # tries to use /homeless-shelter to mimic container usage, etc - doCheck = false; - - meta = with lib; { - description = "Python API for Paperspace Cloud"; - homepage = "https://paperspace.com"; - license = licenses.isc; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/papis/default.nix b/nixpkgs/pkgs/development/python-modules/papis/default.nix index 93eafff6c93b..b05a525d91ad 100644 --- a/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, xdg_utils +{ lib, buildPythonPackage, fetchFromGitHub, xdg-utils , requests, filetype, pyparsing, configparser, arxiv2bib , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , click, python-slugify, habanero, isbnlib, typing-extensions @@ -40,13 +40,12 @@ buildPythonPackage rec { --replace "python-slugify>=1.2.6,<4" "python-slugify" ''; - # pytest seems to hang with python3.8 - doCheck = !stdenv.isDarwin && pythonOlder "3.8"; + doCheck = !stdenv.isDarwin; checkInputs = ([ pytest pytestcov ]) ++ [ - xdg_utils + xdg-utils ]; # most of the downloader tests and 4 other tests require a network connection diff --git a/nixpkgs/pkgs/development/python-modules/parameterized/default.nix b/nixpkgs/pkgs/development/python-modules/parameterized/default.nix index 16925bd1286b..207a6a38bd5a 100644 --- a/nixpkgs/pkgs/development/python-modules/parameterized/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parameterized/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }: +{ lib, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }: buildPythonPackage rec { pname = "parameterized"; diff --git a/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/nixpkgs/pkgs/development/python-modules/paramiko/default.nix index 41951f1d8932..c2237f68524f 100644 --- a/nixpkgs/pkgs/development/python-modules/paramiko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paramiko/default.nix @@ -1,7 +1,6 @@ { pkgs , buildPythonPackage , fetchPypi -, fetchpatch , cryptography , bcrypt , invoke @@ -14,20 +13,13 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.7.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f"; + sha256 = "7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035"; }; - patches = [ - # fix RSA key loading with cryptography 3.1, remove >2.7.1 - (fetchpatch { - url = "https://github.com/paramiko/paramiko/commit/81064206bf3cec2ca4372257ff138481e1227b91.patch"; - sha256 = "01b87ffgyvd6rilp1w1kf7lk29z706ch39nwl21ifklqpjhmazww"; - }) - ]; checkInputs = [ invoke pytest mock pytest-relaxed ]; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; diff --git a/nixpkgs/pkgs/development/python-modules/paramz/default.nix b/nixpkgs/pkgs/development/python-modules/paramz/default.nix index 65cc79745caa..99065aa19944 100644 --- a/nixpkgs/pkgs/development/python-modules/paramz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paramz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: +{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: buildPythonPackage rec { pname = "paramz"; diff --git a/nixpkgs/pkgs/development/python-modules/parse-type/default.nix b/nixpkgs/pkgs/development/python-modules/parse-type/default.nix index d338a351e54b..decb15ff5e6c 100644 --- a/nixpkgs/pkgs/development/python-modules/parse-type/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parse-type/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi +{ lib, fetchPypi , buildPythonPackage, pythonOlder , pytest, pytestrunner , parse, six, enum34 diff --git a/nixpkgs/pkgs/development/python-modules/parse/default.nix b/nixpkgs/pkgs/development/python-modules/parse/default.nix index d72e607bc410..c5c0c1d7ae6d 100644 --- a/nixpkgs/pkgs/development/python-modules/parse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi +{ lib, fetchPypi , buildPythonPackage, python }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix b/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix index 1f98940fff06..77196a7c0e99 100644 --- a/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix b/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix index d41953246db9..557e632f2eda 100644 --- a/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/paste/default.nix b/nixpkgs/pkgs/development/python-modules/paste/default.nix index a29deed503ed..533a4dc3a308 100644 --- a/nixpkgs/pkgs/development/python-modules/paste/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paste/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix b/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix index 950b232fa7e4..672708b0fd9d 100644 --- a/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestrunner diff --git a/nixpkgs/pkgs/development/python-modules/pastescript/default.nix b/nixpkgs/pkgs/development/python-modules/pastescript/default.nix index 57dbb7b9352e..a526d3833938 100644 --- a/nixpkgs/pkgs/development/python-modules/pastescript/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pastescript/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/patator/default.nix b/nixpkgs/pkgs/development/python-modules/patator/default.nix index 96ed85d7bcee..2f0a9b9b62b7 100644 --- a/nixpkgs/pkgs/development/python-modules/patator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/patator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy27, fetchPypi +{ lib, buildPythonPackage, isPy27, fetchPypi , paramiko, pycurl, ajpy, impacket, pyopenssl, cx_oracle, mysqlclient , psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1, pysqlcipher3 }: diff --git a/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix b/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix index 981dc067fe7e..126155722f4f 100644 --- a/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/patch-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/patch/default.nix b/nixpkgs/pkgs/development/python-modules/patch/default.nix index 8d7e78c6c27c..ed11b3a4b52f 100644 --- a/nixpkgs/pkgs/development/python-modules/patch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/patch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchzip }: diff --git a/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix b/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix index 9512b0eb0b88..bd71ffad0f2c 100644 --- a/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix +++ b/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest diff --git a/nixpkgs/pkgs/development/python-modules/pathos/default.nix b/nixpkgs/pkgs/development/python-modules/pathos/default.nix index 778070906022..fd6bd238d1e0 100644 --- a/nixpkgs/pkgs/development/python-modules/pathos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dill diff --git a/nixpkgs/pkgs/development/python-modules/pathtools/default.nix b/nixpkgs/pkgs/development/python-modules/pathtools/default.nix index 57fff82a81d7..86c2aeb88dc0 100644 --- a/nixpkgs/pkgs/development/python-modules/pathtools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/patool/default.nix b/nixpkgs/pkgs/development/python-modules/patool/default.nix index 1420597a1f32..2fa07d32ccb1 100644 --- a/nixpkgs/pkgs/development/python-modules/patool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/patool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, unzip, cabextract, zip, zopfli, lzip, zpaq, gnutar, gnugrep, diffutils, file, gzip, bzip2, xz}: diff --git a/nixpkgs/pkgs/development/python-modules/paver/default.nix b/nixpkgs/pkgs/development/python-modules/paver/default.nix index 5d01df22b6d5..8721ef3dd601 100644 --- a/nixpkgs/pkgs/development/python-modules/paver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix b/nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix index 18a2b9b95a3a..8f489ca24b9c 100644 --- a/nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pbkdf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pbkdf2"; diff --git a/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 6a12eea1b00c..bd6432db534f 100644 --- a/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder +{ lib, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder , buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build, pythonAtLeast }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pcpp/default.nix b/nixpkgs/pkgs/development/python-modules/pcpp/default.nix index aea7ff0fcdaf..704e979c2caa 100644 --- a/nixpkgs/pkgs/development/python-modules/pcpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pcpp/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , fetchFromGitHub -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix index adc43ef4c2ed..4eddc028a251 100644 --- a/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pillow, poppler_utils }: +{ lib, buildPythonPackage, fetchPypi, pillow, poppler_utils }: buildPythonPackage rec { pname = "pdf2image"; diff --git a/nixpkgs/pkgs/development/python-modules/pdfkit/default.nix b/nixpkgs/pkgs/development/python-modules/pdfkit/default.nix index 10bc09e8ca92..431f7f09796b 100644 --- a/nixpkgs/pkgs/development/python-modules/pdfkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdfkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix b/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix index 9a659eebe330..96ba66869055 100644 --- a/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: buildPythonPackage rec { pname = "pdfminer_six"; diff --git a/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix b/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix index 0a21ed1e4999..00cfea5cc9b0 100644 --- a/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pypdf2 }: +{ lib, buildPythonPackage, fetchPypi, pypdf2 }: buildPythonPackage rec { pname = "pdftools.pdfposter"; diff --git a/nixpkgs/pkgs/development/python-modules/pdfrw/default.nix b/nixpkgs/pkgs/development/python-modules/pdfrw/default.nix index 49abb3751c91..5cc619ef6a47 100644 --- a/nixpkgs/pkgs/development/python-modules/pdfrw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdfrw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pdfrw"; diff --git a/nixpkgs/pkgs/development/python-modules/pdfx/default.nix b/nixpkgs/pkgs/development/python-modules/pdfx/default.nix index 97dee7e75705..a8c110fdba70 100644 --- a/nixpkgs/pkgs/development/python-modules/pdfx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdfx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }: buildPythonPackage rec { pname = "pdfx"; diff --git a/nixpkgs/pkgs/development/python-modules/pebble/default.nix b/nixpkgs/pkgs/development/python-modules/pebble/default.nix new file mode 100644 index 000000000000..68aa1ba97075 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pebble/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, isPy27, fetchPypi, pytestCheckHook }: + +buildPythonPackage rec { + pname = "pebble"; + version = "4.6.0"; + disabled = isPy27; + + src = fetchPypi { + pname = "Pebble"; + inherit version; + sha256 = "0a595f7mrf89xlck9b2x83bqybc9zd9jxkl0sa5cf19vax18rg8h"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "API to manage threads and processes within an application"; + homepage = "https://github.com/noxdafox/pebble"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/nixpkgs/pkgs/development/python-modules/pecan/default.nix index ed0c89b7802b..a66c4077c3c9 100644 --- a/nixpkgs/pkgs/development/python-modules/pecan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pecan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/pelican/default.nix b/nixpkgs/pkgs/development/python-modules/pelican/default.nix index 0b103b780c08..1ae27b5ecf87 100644 --- a/nixpkgs/pkgs/development/python-modules/pelican/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pelican/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , glibcLocales, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.5.0"; + version = "4.5.4"; disabled = isPy27; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "getpelican"; repo = "pelican"; rev = version; - sha256 = "0p8p84fcpkr19d54dhxvldd8ijbg334wmrmkr99pnbrdl1gf64qi"; + sha256 = "08l8kk3c7ca1znxmgdmfgzn28dzjcziwflzq80fn9zigqj0y7fi8"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -27,6 +27,8 @@ buildPythonPackage rec { # Exclude custom locale test, which files were removed above to fix the source checksum checkPhase = '' nosetests -s \ + --exclude=test_basic_generation_works \ + --exclude=test_custom_generation_works \ --exclude=test_custom_locale_generation_works \ --exclude=test_log_filter \ pelican diff --git a/nixpkgs/pkgs/development/python-modules/pep257/default.nix b/nixpkgs/pkgs/development/python-modules/pep257/default.nix index 296b55eec125..e9cba70e6317 100644 --- a/nixpkgs/pkgs/development/python-modules/pep257/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pep257/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, pytest, mock }: +{ lib, buildPythonPackage, fetchurl, pytest, mock }: buildPythonPackage rec { pname = "pep257"; version = "0.7.0"; diff --git a/nixpkgs/pkgs/development/python-modules/pep8/default.nix b/nixpkgs/pkgs/development/python-modules/pep8/default.nix index 8ef3bfea0f5d..cc0e546b957c 100644 --- a/nixpkgs/pkgs/development/python-modules/pep8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pep8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/peppercorn/default.nix b/nixpkgs/pkgs/development/python-modules/peppercorn/default.nix index 6caf61b0cd0d..310cc565b21f 100644 --- a/nixpkgs/pkgs/development/python-modules/peppercorn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peppercorn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix b/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix index 86bae927d9ff..6859b6264a8f 100644 --- a/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix +++ b/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose }: diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index 1d7de0088a84..e65f62c8ff7b 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/nixpkgs/pkgs/development/python-modules/pexif/default.nix b/nixpkgs/pkgs/development/python-modules/pexif/default.nix index 326dde176ae6..a31d80eed052 100644 --- a/nixpkgs/pkgs/development/python-modules/pexif/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pexif/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix b/nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix index d84bb2014b80..e53817b3911b 100644 --- a/nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix +++ b/nixpkgs/pkgs/development/python-modules/pg8000/1_12.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytz diff --git a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index 8f63e00e7997..9f9bb1702a90 100644 --- a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , scramp diff --git a/nixpkgs/pkgs/development/python-modules/pgpdump/default.nix b/nixpkgs/pkgs/development/python-modules/pgpdump/default.nix index d795cc3678f7..e952ced742c6 100644 --- a/nixpkgs/pkgs/development/python-modules/pgpdump/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pgpdump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix b/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix index 796a38198814..476921da632f 100644 --- a/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }: +{ lib, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }: buildPythonPackage rec { pname = "pgspecial"; diff --git a/nixpkgs/pkgs/development/python-modules/phe/default.nix b/nixpkgs/pkgs/development/python-modules/phe/default.nix index 5a00a4ccb099..86a5ec848ace 100644 --- a/nixpkgs/pkgs/development/python-modules/phe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } : +{ lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } : let pname = "phe"; diff --git a/nixpkgs/pkgs/development/python-modules/phonopy/default.nix b/nixpkgs/pkgs/development/python-modules/phonopy/default.nix index 03e0c54caab7..e68516fb07f7 100644 --- a/nixpkgs/pkgs/development/python-modules/phonopy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonopy/default.nix @@ -1,19 +1,26 @@ -{ lib, stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, pyyaml +, matplotlib +, h5py +, spglib +, pytestCheckHook +}: buildPythonPackage rec { pname = "phonopy"; - version = "2.8.1"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "28864b04adb900597705f1367a100da869af835088bdd13f1693c4382259f128"; + sha256 = "1jaizhkb59ixknvc75nrhfq51bh75912q8ay36bxpf4g5hzyhw3a"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; checkInputs = [ pytestCheckHook ]; - # flakey due to floating point inaccuracy - disabledTests = [ "test_NaCl" ]; # prevent pytest from importing local directory preCheck = '' diff --git a/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix b/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix index 9ed84e86371c..94538dc6e74d 100644 --- a/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: buildPythonPackage rec { pname = "phx-class-registry"; diff --git a/nixpkgs/pkgs/development/python-modules/pickleshare/default.nix b/nixpkgs/pkgs/development/python-modules/pickleshare/default.nix index 2151e13b960d..34798cc3ee5e 100644 --- a/nixpkgs/pkgs/development/python-modules/pickleshare/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pickleshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pathpy diff --git a/nixpkgs/pkgs/development/python-modules/pid/default.nix b/nixpkgs/pkgs/development/python-modules/pid/default.nix index 95aca29da5d1..f4ce57b3a20d 100644 --- a/nixpkgs/pkgs/development/python-modules/pid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/piep/default.nix b/nixpkgs/pkgs/development/python-modules/piep/default.nix index c4fd24d070e6..aacd9e314cb3 100644 --- a/nixpkgs/pkgs/development/python-modules/piep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/piep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/pika-pool/default.nix b/nixpkgs/pkgs/development/python-modules/pika-pool/default.nix index a36fcdf18bb5..051fdef8fe7d 100644 --- a/nixpkgs/pkgs/development/python-modules/pika-pool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pika-pool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pika }: diff --git a/nixpkgs/pkgs/development/python-modules/pika/default.nix b/nixpkgs/pkgs/development/python-modules/pika/default.nix index ec8310bdb55f..c1bfe5297d71 100644 --- a/nixpkgs/pkgs/development/python-modules/pika/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pika/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index ff2a2ce4c5e7..8ed27ea962ed 100644 --- a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -1,4 +1,5 @@ -{ attrs +{ lib +, attrs , buildPythonPackage , defusedxml , fetchPypi @@ -6,29 +7,28 @@ , isPy3k , lxml , pillow +, psutil , pybind11 -, pytestCheckHook +, pytest-cov , pytest-helpers-namespace , pytest-timeout -, pytest_xdist -, pytestrunner +, pytest-xdist +, pytestCheckHook , python-dateutil , python-xmp-toolkit -, python3 , qpdf +, setuptools-scm , setuptools-scm-git-archive -, setuptools_scm -, lib, stdenv }: buildPythonPackage rec { pname = "pikepdf"; - version = "2.2.0"; + version = "2.5.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "74300a32c41b3d578772f6933f23a88b19f74484185e71e5225ce2f7ea5aea78"; + sha256 = "sha256-j8PpeyTa+9SxrAV8jxRMGEZ85V00KhqMQmiIkOrVjvM="; }; buildInputs = [ @@ -38,36 +38,34 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm-git-archive - setuptools_scm + setuptools-scm ]; checkInputs = [ attrs hypothesis - pillow - pytestCheckHook pytest-helpers-namespace pytest-timeout - pytest_xdist - pytestrunner + pytest-xdist + psutil + pytest-cov + pytestCheckHook python-dateutil python-xmp-toolkit ]; - propagatedBuildInputs = [ defusedxml lxml ]; - - postPatch = '' - sed -i \ - -e 's/^pytest .*/pytest/g' \ - -e 's/^attrs .*/attrs/g' \ - -e 's/^hypothesis .*/hypothesis/g' \ - requirements/test.txt - ''; + propagatedBuildInputs = [ + defusedxml + lxml + pillow + ]; preBuild = '' HOME=$TMPDIR ''; + pythonImportsCheck = [ "pikepdf" ]; + meta = with lib; { homepage = "https://github.com/pikepdf/pikepdf"; description = "Read and write PDFs with Python, powered by qpdf"; diff --git a/nixpkgs/pkgs/development/python-modules/pilkit/default.nix b/nixpkgs/pkgs/development/python-modules/pilkit/default.nix index 4a3c682c1229..bc21d6bf465e 100644 --- a/nixpkgs/pkgs/development/python-modules/pilkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pilkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix b/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix index 9e23f69d19c5..c022fdb988d5 100644 --- a/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/nixpkgs/pkgs/development/python-modules/pims/default.nix b/nixpkgs/pkgs/development/python-modules/pims/default.nix index d2a5641acff5..bfe4e2b9ea03 100644 --- a/nixpkgs/pkgs/development/python-modules/pims/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pims/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , slicerator diff --git a/nixpkgs/pkgs/development/python-modules/pivy/default.nix b/nixpkgs/pkgs/development/python-modules/pivy/default.nix index aae90d2f8b49..312c87ae5444 100644 --- a/nixpkgs/pkgs/development/python-modules/pivy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pivy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: +{ lib, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: buildPythonPackage rec { pname = "pivy"; diff --git a/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix b/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix new file mode 100644 index 000000000000..d7473a05bcca --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchgit, poetry-core, pytestCheckHook, pytest-benchmark, pytest-mypy, pillow }: + +buildPythonPackage rec { + pname = "pixelmatch"; + version = "0.2.2"; + format = "pyproject"; + + # test fixtures are stored in LFS + src = fetchgit { + url = "https://github.com/whtsky/pixelmatch-py"; + rev = "v${version}"; + sha256 = "1dsix507dxqik9wvgzscvf2pifbg7gx74krrsalqbfcmm7d1i7xl"; + fetchLFS = true; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + pytest-benchmark + pytest-mypy + pillow + ]; + + pytestFlagsArray = [ + "--mypy" + "--benchmark-disable" + ]; + + meta = with lib; { + description = "A pixel-level image comparison library."; + homepage = "https://github.com/whtsky/pixelmatch-py"; + license = licenses.isc; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pkce/default.nix b/nixpkgs/pkgs/development/python-modules/pkce/default.nix new file mode 100644 index 000000000000..5dc77a2661ba --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pkce/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pkce"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "RomeoDespres"; + repo = pname; + rev = version; + sha256 = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pkce" ]; + + meta = with lib; { + description = "Python module to work with PKCE"; + homepage = "https://github.com/RomeoDespres/pkce"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix b/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix index dbf487c5d3aa..5216ab17879d 100644 --- a/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pkginfo"; diff --git a/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix b/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix index 8e3e301793aa..d59fe56203aa 100644 --- a/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pkuseg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k @@ -31,6 +31,5 @@ buildPythonPackage rec { description = "Toolkit for multi-domain Chinese word segmentation"; homepage = "https://github.com/lancopku/pkuseg-python"; license = licenses.unfree; - maintainers = with maintainers; [ danieldk ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/plac/default.nix b/nixpkgs/pkgs/development/python-modules/plac/default.nix index 9e2c66d9d1ed..9261133bc925 100644 --- a/nixpkgs/pkgs/development/python-modules/plac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index b9a4fb34bf65..5251ff1de0ec 100644 --- a/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -1,25 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests -, tqdm, websocket_client, pytest, pillow, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, tqdm +, websocket_client +, isPy27 +}: buildPythonPackage rec { pname = "PlexAPI"; - version = "4.1.2"; + version = "4.3.1"; disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1l955q1q6lljq3bmyiayr33gzxrlw16xdwgjdaflznvyg16fcjkk"; + sha256 = "sha256-gRXNOGd9YGcGysKbAtiNwi5NxPvv39F6PEXBjiYbVq4="; }; - propagatedBuildInputs = [ requests tqdm websocket_client ]; + propagatedBuildInputs = [ + requests + tqdm + websocket_client + ]; - checkInputs = [ pytest pillow ]; + # Tests require a running Plex instance + doCheck = false; + pythonImportsCheck = [ "plexapi" ]; meta = with lib; { - homepage = "https://github.com/pkkid/python-plexapi"; description = "Python bindings for the Plex API"; + homepage = "https://github.com/pkkid/python-plexapi"; license = licenses.bsd3; maintainers = with maintainers; [ colemickens ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/plexauth/default.nix b/nixpkgs/pkgs/development/python-modules/plexauth/default.nix index 91407a907a44..c7c9c2ba5dbd 100644 --- a/nixpkgs/pkgs/development/python-modules/plexauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plexauth/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "plexauth"; - version = "0.0.5"; + version = "0.0.6"; disabled = isPy27; src = fetchFromGitHub { owner = "jjlawren"; repo = "python-plexauth"; rev = "v${version}"; - sha256 = "1wbrn22iywl4ccz64r3w3f17k0r7vi2cqkqd2mrdkx5xqhscn9hz"; + sha256 = "1wy6syz3cgfw28zvigh2br4jabg8rzpi5l0bhfb6vjjc7aam13ag"; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix b/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix index 956ea1b720ae..697717eeca61 100644 --- a/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "1.0.0"; diff --git a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix new file mode 100644 index 000000000000..f4be0e5140b5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, async-timeout +, crcmod +, defusedxml +, pyserial +, pytz +, python-dateutil +, semver +, jsonpickle +, mypy +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "plugwise"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = pname; + repo = "python-plugwise"; + rev = version; + sha256 = "1gviyy31l1j8z0if2id3m13r43kw4mcgd8921813yfhmf174piq4"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + crcmod + defusedxml + pyserial + pytz + python-dateutil + semver + ]; + + checkInputs = [ + jsonpickle + mypy + pytest-aiohttp + pytest-asyncio + pytest-cov + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "plugwise" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Python module for Plugwise Smiles, Stretch and USB stick"; + longDescription = '' + XKNX is an asynchronous Python library for reading and writing KNX/IP + packets. It provides support for KNX/IP routing and tunneling devices. + ''; + homepage = "https://github.com/plugwise/python-plugwise"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/plyvel/default.nix b/nixpkgs/pkgs/development/python-modules/plyvel/default.nix index d8537d68158a..aa247c8e4261 100644 --- a/nixpkgs/pkgs/development/python-modules/plyvel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plyvel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/pocket/default.nix b/nixpkgs/pkgs/development/python-modules/pocket/default.nix index 3599d3dec55d..e5a2d464bde8 100644 --- a/nixpkgs/pkgs/development/python-modules/pocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pocket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/nixpkgs/pkgs/development/python-modules/polib/default.nix b/nixpkgs/pkgs/development/python-modules/polib/default.nix index f7c4e1139a86..00353ac0cca2 100644 --- a/nixpkgs/pkgs/development/python-modules/polib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/polib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "polib"; diff --git a/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix index 7595730eb31b..8f260ad8ccb9 100644 --- a/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: +{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: buildPythonPackage rec { pname = "pomegranate"; diff --git a/nixpkgs/pkgs/development/python-modules/pony/default.nix b/nixpkgs/pkgs/development/python-modules/pony/default.nix index 7a734927ee1e..03330c4cfec7 100644 --- a/nixpkgs/pkgs/development/python-modules/pony/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pony/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, buildPythonPackage, fetchPypi }: +{ lib, python, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pony"; diff --git a/nixpkgs/pkgs/development/python-modules/pooch/default.nix b/nixpkgs/pkgs/development/python-modules/pooch/default.nix index 282239d9890b..de0ba145828c 100644 --- a/nixpkgs/pkgs/development/python-modules/pooch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pooch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy27 , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix b/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix index 4aaaea406774..e94a234dc1a3 100644 --- a/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch +{ buildPythonPackage, fetchPypi, lib, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch , substituteAll }: diff --git a/nixpkgs/pkgs/development/python-modules/portend/default.nix b/nixpkgs/pkgs/development/python-modules/portend/default.nix index 10b30d05fa3e..1408f7ca905f 100644 --- a/nixpkgs/pkgs/development/python-modules/portend/default.nix +++ b/nixpkgs/pkgs/development/python-modules/portend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, setuptools_scm, tempora, pytest-black, pytestcov }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix b/nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix index 2fb6128dc1b1..59f4b4b707f2 100644 --- a/nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/posix_ipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/potr/default.nix b/nixpkgs/pkgs/development/python-modules/potr/default.nix index 9f2774b9a607..671010bb9009 100644 --- a/nixpkgs/pkgs/development/python-modules/potr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/potr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pycrypto }: +{ lib, fetchPypi, buildPythonPackage, pycrypto }: buildPythonPackage rec { pname = "python-potr"; diff --git a/nixpkgs/pkgs/development/python-modules/power/default.nix b/nixpkgs/pkgs/development/python-modules/power/default.nix index d1998faf6b64..8f72553092ec 100644 --- a/nixpkgs/pkgs/development/python-modules/power/default.nix +++ b/nixpkgs/pkgs/development/python-modules/power/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/nixpkgs/pkgs/development/python-modules/powerline/default.nix index 5834dd760369..1ad17d0459dd 100644 --- a/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -8,6 +8,7 @@ , pygit2 , pyuv , i3ipc +, stdenv }: # TODO: bzr support is missing because nixpkgs switched to `breezy` @@ -29,8 +30,7 @@ buildPythonPackage rec { hglib pygit2 pyuv - i3ipc - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ i3ipc ]; # tests are travis-specific doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pox/default.nix b/nixpkgs/pkgs/development/python-modules/pox/default.nix index e7013154f998..24591824e07d 100644 --- a/nixpkgs/pkgs/development/python-modules/pox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/poyo/default.nix b/nixpkgs/pkgs/development/python-modules/poyo/default.nix index d600e46c6b42..b7963258f338 100644 --- a/nixpkgs/pkgs/development/python-modules/poyo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poyo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/ppscore/default.nix b/nixpkgs/pkgs/development/python-modules/ppscore/default.nix index 00542c6e90e1..ad3a393a00d1 100644 --- a/nixpkgs/pkgs/development/python-modules/ppscore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ppscore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/praw/6.3.nix b/nixpkgs/pkgs/development/python-modules/praw/6.3.nix index 00182eda0379..3fc485c00ec2 100644 --- a/nixpkgs/pkgs/development/python-modules/praw/6.3.nix +++ b/nixpkgs/pkgs/development/python-modules/praw/6.3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , betamax , betamax-serializers , betamax-matchers diff --git a/nixpkgs/pkgs/development/python-modules/praw/default.nix b/nixpkgs/pkgs/development/python-modules/praw/default.nix index 61b869e87fb2..5ca1d3d83c91 100644 --- a/nixpkgs/pkgs/development/python-modules/praw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/praw/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub , betamax , betamax-serializers , betamax-matchers , mock -, six -, pytestrunner , prawcore -, pytest +, pytestCheckHook , requests-toolbelt , update_checker , websocket_client @@ -14,19 +14,15 @@ buildPythonPackage rec { pname = "praw"; - version = "7.1.0"; + version = "7.1.4"; src = fetchFromGitHub { owner = "praw-dev"; - repo = "praw"; + repo = pname; rev = "v${version}"; - sha256 = "07wyn2pa80ps55kk66rvf4daqyn3y5lzxhx6qh1lpn3p2bacbw9h"; + sha256 = "sha256-onxag3kmswqqSycbwW+orofrukry0pCaRSxVRq2u53A="; }; - nativeBuildInputs = [ - pytestrunner - ]; - propagatedBuildInputs = [ mock prawcore @@ -38,16 +34,16 @@ buildPythonPackage rec { betamax betamax-serializers betamax-matchers - mock - pytest + pytestCheckHook requests-toolbelt - six ]; + pythonImportsCheck = [ "praw" ]; + meta = with lib; { description = "Python Reddit API wrapper"; homepage = "https://praw.readthedocs.org/"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix index 533c31d87ce2..2b6eff885f9e 100644 --- a/nixpkgs/pkgs/development/python-modules/prawcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , requests , testfixtures, mock, requests_toolbelt , betamax, betamax-serializers, betamax-matchers, pytest diff --git a/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix b/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix index 199a6804ea98..3773a724e938 100644 --- a/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix +++ b/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix @@ -1,15 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k }: buildPythonPackage rec { pname = "precis-i18n"; - version = "1.0.0"; + version = "1.0.2"; disabled = !isPy3k; - src = fetchPypi { - pname = "precis_i18n"; - inherit version; - sha256 = "0gjhvwd8aifx94rl1ag08vlmndyx2q3fkyqb0c4i46x3p2bc2yi2"; + src = fetchFromGitHub { + owner = "byllyfish"; + repo = "precis_i18n"; + rev = "v${version}"; + hash = "sha256:1r9pah1kgik6valf15ac7ybw0szr92cq84kwjvm6mq3z46j1pmkr"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/preggy/default.nix b/nixpkgs/pkgs/development/python-modules/preggy/default.nix index a2144f303be7..44be123335f9 100644 --- a/nixpkgs/pkgs/development/python-modules/preggy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/preggy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }: +{ lib, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }: buildPythonPackage rec { pname = "preggy"; diff --git a/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/nixpkgs/pkgs/development/python-modules/preshed/default.nix index 5d75c95d770b..767d5b867f0e 100644 --- a/nixpkgs/pkgs/development/python-modules/preshed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/preshed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , murmurhash diff --git a/nixpkgs/pkgs/development/python-modules/pretend/default.nix b/nixpkgs/pkgs/development/python-modules/pretend/default.nix index 4fe726591e60..87e0e6613b1d 100644 --- a/nixpkgs/pkgs/development/python-modules/pretend/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pretend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pretend"; diff --git a/nixpkgs/pkgs/development/python-modules/prettytable/1.nix b/nixpkgs/pkgs/development/python-modules/prettytable/1.nix index 5b7457af9bf7..0bd18f0721fc 100644 --- a/nixpkgs/pkgs/development/python-modules/prettytable/1.nix +++ b/nixpkgs/pkgs/development/python-modules/prettytable/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix index 5a15cfd24eb0..5463403dec7b 100644 --- a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/nixpkgs/pkgs/development/python-modules/primer3/default.nix b/nixpkgs/pkgs/development/python-modules/primer3/default.nix index e8aa83ed94d9..0f1a2ac66fef 100644 --- a/nixpkgs/pkgs/development/python-modules/primer3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/primer3/default.nix @@ -1,7 +1,9 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , cython +, gcc , click }: @@ -16,7 +18,8 @@ buildPythonPackage rec { sha256 = "1glybwp9w2m1ydvaphr41gj31d8fvlh40s35galfbjqa563si72g"; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ cython ] + ++ lib.optionals stdenv.isDarwin [ gcc ]; # pytestCheckHook leads to a circular import issue checkInputs = [ click ]; diff --git a/nixpkgs/pkgs/development/python-modules/proboscis/default.nix b/nixpkgs/pkgs/development/python-modules/proboscis/default.nix index 00905136716f..a2a1d04ebe0e 100644 --- a/nixpkgs/pkgs/development/python-modules/proboscis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/proboscis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "proboscis"; diff --git a/nixpkgs/pkgs/development/python-modules/process-tests/default.nix b/nixpkgs/pkgs/development/python-modules/process-tests/default.nix index 4b83205d723e..abf175b55312 100644 --- a/nixpkgs/pkgs/development/python-modules/process-tests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/process-tests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/proglog/default.nix b/nixpkgs/pkgs/development/python-modules/proglog/default.nix index 3f8c11043811..9839ea9dd233 100644 --- a/nixpkgs/pkgs/development/python-modules/proglog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/proglog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, tqdm }: +{ lib, fetchPypi, buildPythonPackage, tqdm }: buildPythonPackage rec { pname = "proglog"; diff --git a/nixpkgs/pkgs/development/python-modules/progress/default.nix b/nixpkgs/pkgs/development/python-modules/progress/default.nix index 2c5dbc1386e8..fcc1a7a92293 100644 --- a/nixpkgs/pkgs/development/python-modules/progress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/progressbar/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar/default.nix index a1fdddd95db8..68967ecf6533 100644 --- a/nixpkgs/pkgs/development/python-modules/progressbar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progressbar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "progressbar"; diff --git a/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix index cc3029ade64e..b5c488c0838c 100644 --- a/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python , buildPythonPackage , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/progressbar231/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar231/default.nix index f8980647482c..d421efde8aa1 100644 --- a/nixpkgs/pkgs/development/python-modules/progressbar231/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progressbar231/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "progressbar231"; diff --git a/nixpkgs/pkgs/development/python-modules/progressbar33/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar33/default.nix index 0b53b83f5cca..a483a6001f00 100644 --- a/nixpkgs/pkgs/development/python-modules/progressbar33/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progressbar33/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "progressbar33"; diff --git a/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix new file mode 100644 index 000000000000..dc35aea6cd11 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, prometheus_client +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "prometheus-flask-exporter"; + version = "0.18.1"; + + src = fetchFromGitHub { + owner = "rycus86"; + repo = "prometheus_flask_exporter"; + rev = version; + sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370"; + }; + + propagatedBuildInputs = [ flask prometheus_client ]; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests/" ]; + + meta = with lib; { + description = "Prometheus exporter for Flask applications"; + homepage = "https://github.com/rycus86/prometheus_flask_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ lbpdt ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix index 1cd732b19aea..cc9444098def 100644 --- a/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/prov/default.nix b/nixpkgs/pkgs/development/python-modules/prov/default.nix index 9ab4cbf72bdf..acee0f09b848 100644 --- a/nixpkgs/pkgs/development/python-modules/prov/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prov/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , lxml diff --git a/nixpkgs/pkgs/development/python-modules/ptable/default.nix b/nixpkgs/pkgs/development/python-modules/ptable/default.nix index ffa9bdacd2d1..ae2ad58a1acb 100644 --- a/nixpkgs/pkgs/development/python-modules/ptable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ptable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, nose }: buildPythonPackage { pname = "ptable"; diff --git a/nixpkgs/pkgs/development/python-modules/ptest/default.nix b/nixpkgs/pkgs/development/python-modules/ptest/default.nix index c19780a4411c..2a4180a4cbed 100644 --- a/nixpkgs/pkgs/development/python-modules/ptest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ptest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/ptpython/default.nix b/nixpkgs/pkgs/development/python-modules/ptpython/default.nix index fd7b92692fc6..2758c3a582ff 100644 --- a/nixpkgs/pkgs/development/python-modules/ptpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ptpython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi +{ lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi , pygments, importlib-metadata, isPy3k }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix index abac4fb3baa0..997bc31c8656 100644 --- a/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "publicsuffix"; diff --git a/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix index 2d9bc73baa3f..30a02ec2f0dd 100644 --- a/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, buildPythonPackage, fetchFromGitHub, requests }: buildPythonPackage rec { pname = "publicsuffix2"; diff --git a/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/nixpkgs/pkgs/development/python-modules/pudb/default.nix index 0ee2a8470b5e..db48fbf1e480 100644 --- a/nixpkgs/pkgs/development/python-modules/pudb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pudb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pygments diff --git a/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix b/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix index 9679cc593df0..636cbaff71cc 100644 --- a/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pure-pcapy3"; diff --git a/nixpkgs/pkgs/development/python-modules/purepng/default.nix b/nixpkgs/pkgs/development/python-modules/purepng/default.nix index 715b2ca69029..3615935b88ec 100644 --- a/nixpkgs/pkgs/development/python-modules/purepng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/purepng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchFromGitHub diff --git a/nixpkgs/pkgs/development/python-modules/pushover/default.nix b/nixpkgs/pkgs/development/python-modules/pushover/default.nix index 1093f125a969..1ef14af135f2 100644 --- a/nixpkgs/pkgs/development/python-modules/pushover/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pushover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix index 006246e58366..3a93b36cb2b7 100644 --- a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six , pytestCheckHook, flaky, mock, pytest-mock, requests }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pweave/default.nix b/nixpkgs/pkgs/development/python-modules/pweave/default.nix index fe74fcece1c0..1b8e1a3cc6f1 100644 --- a/nixpkgs/pkgs/development/python-modules/pweave/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pweave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix index 77f7859c6d47..a24e1d5db13e 100644 --- a/nixpkgs/pkgs/development/python-modules/pwntools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , debugger , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/pxml/default.nix b/nixpkgs/pkgs/development/python-modules/pxml/default.nix index 57614089e66e..21dc2f4abc4d 100644 --- a/nixpkgs/pkgs/development/python-modules/pxml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pxml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , pythonAtLeast , isPy27 , buildPythonPackage diff --git a/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix b/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix new file mode 100644 index 000000000000..c41da62cf4c5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-runner +, pytestCheckHook +, pythonOlder +, morphys +, six +, varint +}: + +buildPythonPackage rec { + pname = "py-multicodec"; + version = "0.2.1"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "multiformats"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4="; + }; + + # Error when not substituting: + # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. + postPatch = '' + substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" + ''; + + nativeBuildInputs = [ + pytest-runner + ]; + + propagatedBuildInputs = [ + varint + six + morphys + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "multicodec" ]; + + meta = with lib; { + description = "Compact self-describing codecs"; + homepage = "https://github.com/multiformats/py-multicodec"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix b/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix index 1f8ecad00135..73307c75b8b8 100644 --- a/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix @@ -1,54 +1,48 @@ { base58 , buildPythonPackage , fetchFromGitHub -, isPy27 , lib , morphys -, pytest -, pytestcov -, pytestrunner +, pytest-runner +, pytestCheckHook +, pythonOlder , six -, variants , varint }: buildPythonPackage rec { pname = "py-multihash"; - version = "1.0.0"; + version = "2.0.1"; + disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "multiformats"; repo = pname; rev = "v${version}"; - sha256 = "07qglrbgcb8sr9msqw2v7dqj9s4rs6nyvhdnx02i5w6xx5ibzi3z"; + sha256 = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA="; }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ base58 morphys six - variants varint ]; checkInputs = [ - pytest - pytestcov + pytestCheckHook ]; pythonImportsCheck = [ "multihash" ]; - disabled = isPy27; - meta = with lib; { description = "Self describing hashes - for future proofing"; homepage = "https://github.com/multiformats/py-multihash"; license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; - broken = true; # no longer compatible with base58, no updates in 5 years. Added 2020-11-05 }; } diff --git a/nixpkgs/pkgs/development/python-modules/py-radix/default.nix b/nixpkgs/pkgs/development/python-modules/py-radix/default.nix index fa057ae99254..18fff5ec97f6 100644 --- a/nixpkgs/pkgs/development/python-modules/py-radix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-radix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , coverage diff --git a/nixpkgs/pkgs/development/python-modules/py/default.nix b/nixpkgs/pkgs/development/python-modules/py/default.nix index 4d2b77bb1f2a..aa12deabb37e 100644 --- a/nixpkgs/pkgs/development/python-modules/py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm }: buildPythonPackage rec { pname = "py"; diff --git a/nixpkgs/pkgs/development/python-modules/py3dns/default.nix b/nixpkgs/pkgs/development/python-modules/py3dns/default.nix index 1f7aeaf1e118..12297b9a6f78 100644 --- a/nixpkgs/pkgs/development/python-modules/py3dns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3dns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 71314a08eebc..bd0f179dc850 100644 --- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/nixpkgs/pkgs/development/python-modules/py4j/default.nix b/nixpkgs/pkgs/development/python-modules/py4j/default.nix index 588d7a32d22f..8eb1649fcc5e 100644 --- a/nixpkgs/pkgs/development/python-modules/py4j/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py4j/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv }: +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { pname = "py4j"; diff --git a/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix b/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix index f53cc45b9fe7..c214b375ff38 100644 --- a/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyGithub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , cryptography , deprecated diff --git a/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix b/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix index af86ce3821eb..b5ae4193f18c 100644 --- a/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , openssl diff --git a/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix b/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix index d424b2144292..5bebb1d5bc7e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix b/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix new file mode 100644 index 000000000000..51497e8875b7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, poetry +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyairnow"; + version = "1.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "asymworks"; + repo = pname; + rev = "v${version}"; + sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-aiohttp + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyairnow" ]; + + meta = with lib; { + description = "Python wrapper for EPA AirNow Air Quality API"; + homepage = "https://github.com/asymworks/pyairnow"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix b/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix index 2e9aa97f1f23..882182a3a1ef 100644 --- a/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix @@ -1,21 +1,21 @@ { lib +, aiohttp +, aresponses +, asynctest , buildPythonPackage -, pythonOlder , fetchFromGitHub -, poetry -, aiohttp , numpy +, poetry-core , pysmb -, aresponses -, asynctest , pytest-aiohttp , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyairvisual"; - version = "5.0.5"; + version = "5.0.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,10 +24,10 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "0jjvng3py5g97gvx6rdbk5zxbn5rw8gq1ki4qi4vfsypchxbpz2q"; + sha256 = "sha256-7u8AwIr1Ah/7zCfXFwj/C/CaD/B3uLRkZ8Gf6d18Xp0="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp diff --git a/nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix b/nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix index 075103e9e40f..680a8f6f8307 100644 --- a/nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyalgotrade/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , matplotlib diff --git a/nixpkgs/pkgs/development/python-modules/pyamf/default.nix b/nixpkgs/pkgs/development/python-modules/pyamf/default.nix index f0cf111a87ad..cebb1cc3f0ba 100644 --- a/nixpkgs/pkgs/development/python-modules/pyamf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyamf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, defusedxml }: buildPythonPackage rec { pname = "PyAMF"; diff --git a/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix b/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix index 9c9c18a886e9..332a4161fe78 100644 --- a/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index 780c8c2df854..b9c84c484dfe 100644 --- a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -34,6 +34,13 @@ buildPythonPackage rec { export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; + # Deselect a single test because pyarrow prints a 2-line error message where + # only a single line is expected. The additional line of output comes from + # the glog library which is an optional dependency of arrow-cpp that is + # enabled in nixpkgs. + # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 + pytestFlagsArray = [ "--deselect=pyarrow/tests/test_memory.py::test_env_var" ]; + dontUseSetuptoolsCheck = true; preCheck = '' mv pyarrow/tests tests diff --git a/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix index 2be2e8b9c11a..4bb515e17aa6 100644 --- a/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyasn1 diff --git a/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix index 9b269f79c86a..a0037d646835 100644 --- a/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, }: +{ lib, buildPythonPackage, fetchPypi, }: buildPythonPackage rec { pname = "pyasn1"; diff --git a/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index 187f94dbd778..2fca74b33aa9 100644 --- a/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , aiohttp , aiozeroconf , asynctest @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "06qj6r9kcal2nimg8rpjfid8rnlz43l7hn0v9v1mpayjmv2fl8sp"; + sha256 = "1lahv6f97fizgh5b2w5yz9455l8ygn99rslhiygkgjywi2flx3p3"; }; nativeBuildInputs = [ pytestrunner]; diff --git a/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix b/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix index d88dc7009b73..e937b8759f69 100644 --- a/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix b/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix index 63e180b11b2b..e77c6dda8402 100644 --- a/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }: +{ buildPythonPackage, lib, lxml, click, fetchFromGitHub, pytest, isPy3k }: buildPythonPackage rec { version = "0.3.24"; diff --git a/nixpkgs/pkgs/development/python-modules/pybase64/default.nix b/nixpkgs/pkgs/development/python-modules/pybase64/default.nix index e462d53fea88..aa65d7ccadfe 100644 --- a/nixpkgs/pkgs/development/python-modules/pybase64/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybase64/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, lib, stdenv, fetchPypi, six, pytest }: +{ buildPythonPackage, isPy3k, lib, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "pybase64"; diff --git a/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix b/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix index 4b6f7f1682ff..9e8174f9b7f7 100644 --- a/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; version = "0.21.0"; diff --git a/nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix b/nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix index dee6aea559a5..77e47eb98364 100644 --- a/nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyblosxom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , pygments diff --git a/nixpkgs/pkgs/development/python-modules/pybluez/default.nix b/nixpkgs/pkgs/development/python-modules/pybluez/default.nix index a02861c68cda..1cd7d91ef259 100644 --- a/nixpkgs/pkgs/development/python-modules/pybluez/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybluez/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix b/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix index eacbd81055c5..7517de597544 100644 --- a/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests, mock }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix b/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix index 1353af406ca4..af9f18aad2c6 100644 --- a/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix b/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix index 6fc9d2af1cbc..1f7ccde2576b 100644 --- a/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie +{ lib, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie , sqlite, buildPythonPackage, cython }: diff --git a/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix b/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix index ab9088cf1e5f..7e8954e04d0c 100644 --- a/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , capnproto , cython diff --git a/nixpkgs/pkgs/development/python-modules/pycarddav/default.nix b/nixpkgs/pkgs/development/python-modules/pycarddav/default.nix index 7885cf65b83b..b3479695a890 100644 --- a/nixpkgs/pkgs/development/python-modules/pycarddav/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycarddav/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pycares/default.nix b/nixpkgs/pkgs/development/python-modules/pycares/default.nix index 8404063ac1f8..9b3ec94babcf 100644 --- a/nixpkgs/pkgs/development/python-modules/pycares/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycares/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/pychart/default.nix b/nixpkgs/pkgs/development/python-modules/pychart/default.nix index 2c2399fca92e..f020361474a1 100644 --- a/nixpkgs/pkgs/development/python-modules/pychart/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pychart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "pychart"; diff --git a/nixpkgs/pkgs/development/python-modules/pychef/default.nix b/nixpkgs/pkgs/development/python-modules/pychef/default.nix index 1702cde840cf..ddd7dec820db 100644 --- a/nixpkgs/pkgs/development/python-modules/pychef/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pychef/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index fecf3f09ca7c..9eefaa5f364f 100644 --- a/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "7.7.2"; + version = "8.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1w7jayb0z529bh1ybb16pfm0m08qqi4px1q0qwlvcxlcrd2v3m5a"; + sha256 = "0dlxgh57j25cvk2pqr2dj4lv6yn0pix2rcl2kzqsg2405rdjks91"; }; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix b/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix index e89389547096..27a2a1d80844 100644 --- a/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , setuptools_scm diff --git a/nixpkgs/pkgs/development/python-modules/pycm/default.nix b/nixpkgs/pkgs/development/python-modules/pycm/default.nix index ada4eeeb556c..8e0a9e3b152e 100644 --- a/nixpkgs/pkgs/development/python-modules/pycm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: buildPythonPackage rec { pname = "pycm"; diff --git a/nixpkgs/pkgs/development/python-modules/pycoin/default.nix b/nixpkgs/pkgs/development/python-modules/pycoin/default.nix index a21c8f6f549d..d42cfcadfee5 100644 --- a/nixpkgs/pkgs/development/python-modules/pycoin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycoin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , gnupg diff --git a/nixpkgs/pkgs/development/python-modules/pycollada/default.nix b/nixpkgs/pkgs/development/python-modules/pycollada/default.nix index 4b177012f4ed..e8e0809c0222 100644 --- a/nixpkgs/pkgs/development/python-modules/pycollada/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }: +{ lib, fetchPypi, buildPythonPackage, numpy, dateutil }: buildPythonPackage rec { pname = "pycollada"; diff --git a/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix b/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix index 0b511e024dc0..2a90bef72567 100644 --- a/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, pyparsing, decorator, six, future }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pycountry/default.nix b/nixpkgs/pkgs/development/python-modules/pycountry/default.nix index b402e9092406..525a56107118 100644 --- a/nixpkgs/pkgs/development/python-modules/pycountry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycountry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , diff --git a/nixpkgs/pkgs/development/python-modules/pycparser/default.nix b/nixpkgs/pkgs/development/python-modules/pycparser/default.nix index a246ce53a1e0..5fe7cab1cdb2 100644 --- a/nixpkgs/pkgs/development/python-modules/pycparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python }: +{ lib, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "pycparser"; diff --git a/nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix b/nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix index 0f17d9e59a80..7079cde0d597 100644 --- a/nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycryptopp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/nixpkgs/pkgs/development/python-modules/pydenticon/default.nix b/nixpkgs/pkgs/development/python-modules/pydenticon/default.nix index 763cfb9b8456..44913e1de476 100644 --- a/nixpkgs/pkgs/development/python-modules/pydenticon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydenticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/nixpkgs/pkgs/development/python-modules/pydicom/default.nix b/nixpkgs/pkgs/development/python-modules/pydicom/default.nix index 08c5f099d28c..be3cddc7c14a 100644 --- a/nixpkgs/pkgs/development/python-modules/pydicom/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydicom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix b/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix index d132fad73138..d949b16d1057 100644 --- a/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/pydns/default.nix b/nixpkgs/pkgs/development/python-modules/pydns/default.nix index a93820bfaef2..a6fb07c15206 100644 --- a/nixpkgs/pkgs/development/python-modules/pydns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix b/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix index 655adecd5c89..08029d35df5b 100644 --- a/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix @@ -2,25 +2,24 @@ buildPythonPackage rec { pname = "pydsdl"; - version = "1.4.2"; + version = "1.9.4"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchFromGitHub { owner = "UAVCAN"; repo = pname; rev = version; - sha256 = "03kbpzdrjzj5vpgz5rhc110pm1axdn3ynv88b42zq6iyab4k8k1x"; + sha256 = "1hmmc4sg6dckbx2ghcjpi74yprapa6lkxxzy0h446mvyngp0kwfv"; }; - propagatedBuildInputs = [ - ]; - # allow for writable directory for darwin preBuild = '' export HOME=$TMPDIR ''; - # repo doesn't contain tests, ensure imports aren't broken + # repo doesn't contain tests + doCheck = false; + pythonImportsCheck = [ "pydsdl" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix b/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix index 10ade4fa2cab..83820629552f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyechonest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "pyechonest"; diff --git a/nixpkgs/pkgs/development/python-modules/pyedimax/default.nix b/nixpkgs/pkgs/development/python-modules/pyedimax/default.nix new file mode 100644 index 000000000000..03229b30bddd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyedimax/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "pyedimax"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1i3gr5vygqh2ryg67sl13aaql7nvf3nbybrg54628r4g7911b5rk"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyedimax" ]; + + meta = with lib; { + description = "Python library for interfacing with the Edimax smart plugs"; + homepage = "https://github.com/andreipop2005/pyedimax"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyee/default.nix b/nixpkgs/pkgs/development/python-modules/pyee/default.nix index 712db3e87123..7e388b93971b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyee/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyee/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, stdenv, isPy27 }: +{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, isPy27 }: buildPythonPackage rec { pname = "pyee"; diff --git a/nixpkgs/pkgs/development/python-modules/pyemd/default.nix b/nixpkgs/pkgs/development/python-modules/pyemd/default.nix index 4e7594fbab5b..c7b277a60989 100644 --- a/nixpkgs/pkgs/development/python-modules/pyemd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib, buildPythonPackage, fetchPypi, numpy, cython }: buildPythonPackage rec { pname = "pyemd"; diff --git a/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix b/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix index 373885073949..b3a376616d3b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyexcelerator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pyext/default.nix b/nixpkgs/pkgs/development/python-modules/pyext/default.nix index befbd3c2de1d..eb88bf785860 100644 --- a/nixpkgs/pkgs/development/python-modules/pyext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyext/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage { pname = "pyext"; diff --git a/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix b/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix index a17388b34b5c..d7c77e763e76 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfantom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit }: diff --git a/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix b/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix index ff66dc8f8675..155254a6af35 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix b/nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix index a4fe9ec9dfe6..e9671e03cb3b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfiglet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "0.8.post1"; diff --git a/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix index 2ff88a78a4e7..cf1b88781837 100644 --- a/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: buildPythonPackage rec { pname = "pyflakes"; diff --git a/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix b/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix index 7c5dfecd269b..b7b4b3cdbcbb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix @@ -1,20 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder , requests -, nose, mock }: +, nose +, mock +}: buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.4.2"; + version = "0.6.0"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "0ncyv8svw0fhs01ijjkb1gcinb3jpyjvv9xw1bhnf4ri7b27g6ww"; + src = fetchFromGitHub { + owner = "hthiery"; + repo = "python-fritzhome"; + rev = version; + sha256 = "1wzys84hxrjcg86fcn7f7i2i6979qwcpny2afk5rvwljh8f7bli5"; }; - propagatedBuildInputs = [ - requests - ]; + propagatedBuildInputs = [ requests ]; checkInputs = [ mock @@ -25,6 +30,8 @@ buildPythonPackage rec { nosetests --with-coverage ''; + pythonImportsCheck = [ "pyfritzhome" ]; + meta = with lib; { description = "Python Library to access AVM FRITZ!Box homeautomation"; homepage = "https://github.com/hthiery/python-fritzhome"; diff --git a/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix index 5d0d72eb4959..b3aa456c4a9d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/nixpkgs/pkgs/development/python-modules/pyfttt/default.nix b/nixpkgs/pkgs/development/python-modules/pyfttt/default.nix index 8648ad4f876d..c8b52fce409a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfttt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfttt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pygal/default.nix b/nixpkgs/pkgs/development/python-modules/pygal/default.nix index 6855c9e4f02c..ec4cff2de615 100644 --- a/nixpkgs/pkgs/development/python-modules/pygal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix b/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix index afca3dd7bc19..00965b4a1495 100644 --- a/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, isPy27 +{ lib, buildPythonPackage, fetchurl, isPy27 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix b/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix index a1a6b0222b83..7e06b27a23f6 100644 --- a/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, castxml, fetchFromGitHub, buildPythonPackage, +{ lib, castxml, fetchFromGitHub, buildPythonPackage, llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; diff --git a/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix b/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix index b3d1fb3d26df..c1be042dc7d9 100644 --- a/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix @@ -7,15 +7,13 @@ buildPythonPackage rec { pname = "pygdbmi"; - version = "0.9.0.2"; + version = "0.10.0.0"; src = fetchFromGitHub { - #inherit pname version; - #inherit pname version; owner = "cs01"; repo = "pygdbmi"; rev = version; - sha256 = "01isx7912dbalmc3xsafk1a1n6bzzfrjn2363djcq0v57rqii53d"; + sha256 = "0a6b3zyxwdcb671c6lrwxm8fhvsbjh0m8hf1r18m9dha86laimjr"; }; checkInputs = [ gdb ]; diff --git a/nixpkgs/pkgs/development/python-modules/pygeoip/default.nix b/nixpkgs/pkgs/development/python-modules/pygeoip/default.nix index 7aa16ac1e9a8..b9b588d669ae 100644 --- a/nixpkgs/pkgs/development/python-modules/pygeoip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygeoip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix b/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix index 2e5d6271c66a..152e9463b0e2 100644 --- a/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pygments diff --git a/nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix index 31a6b043494d..0a88e34005cd 100644 --- a/nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygments-markdown-lexer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pygments diff --git a/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix b/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix index 416410ab3ce7..29be02751bb2 100644 --- a/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, isPyPy +{ lib, buildPythonPackage, fetchurl, isPyPy , gpgme }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix index f239647bafa5..e9b66a95771b 100644 --- a/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz +{ lib, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz , pkg-config, doctest-ignore-unicode, mock, nose }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pygreat/default.nix b/nixpkgs/pkgs/development/python-modules/pygreat/default.nix index 20a96d1f8f2c..92526b465b17 100644 --- a/nixpkgs/pkgs/development/python-modules/pygreat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygreat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: buildPythonPackage { pname = "pygreat"; diff --git a/nixpkgs/pkgs/development/python-modules/pygrok/default.nix b/nixpkgs/pkgs/development/python-modules/pygrok/default.nix index 8f694a117fe5..56d8b05af9a5 100644 --- a/nixpkgs/pkgs/development/python-modules/pygrok/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, regex, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, regex, pytest }: buildPythonPackage rec { pname = "pygrok"; diff --git a/nixpkgs/pkgs/development/python-modules/pyhamcrest/1.nix b/nixpkgs/pkgs/development/python-modules/pyhamcrest/1.nix index 5df52d9b658c..4c2ec4df6810 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhamcrest/1.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhamcrest/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, pytest , six }: diff --git a/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix b/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix index a66e26b1319a..fd6ba2f2df98 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, pytest , six }: diff --git a/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix b/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix index 502d648b4007..65d3f60da047 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi }: +{ lib, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pyhomematic"; diff --git a/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix b/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix index 6e808a010585..039d6259f36d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix @@ -1,40 +1,46 @@ { lib , buildPythonPackage -, fetchPypi -, requests +, fetchFromGitHub +, certifi +, click , keyring , keyrings-alt -, click +, pytz +, requests , six , tzlocal -, certifi -, bitstring -, unittest2 +, pytest-mock +, pytestCheckHook , future }: buildPythonPackage rec { pname = "pyicloud"; - version = "0.9.7"; + version = "0.10.2"; - src = fetchPypi { - inherit pname version; - sha256 = "dcebb32e474bc28aa77b944a0a64949ef3b5b852cbef6256fbc95347a04e777c"; + src = fetchFromGitHub { + owner = "picklepete"; + repo = pname; + rev = version; + sha256 = "0bxbhvimwbj2jm8dg7sil8yvln17xgjhvpwr4m783vwfcf76kdmy"; }; propagatedBuildInputs = [ - requests + certifi + click + future keyring keyrings-alt - click + pytz + requests six tzlocal - certifi - bitstring - future ]; - checkInputs = [ unittest2 ]; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; postPatch = '' sed -i \ diff --git a/nixpkgs/pkgs/development/python-modules/pyicu/default.nix b/nixpkgs/pkgs/development/python-modules/pyicu/default.nix index 3512e33c81d7..e152002cdd15 100644 --- a/nixpkgs/pkgs/development/python-modules/pyicu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyicu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/pyinotify/default.nix b/nixpkgs/pkgs/development/python-modules/pyinotify/default.nix index 92c2f5bb6717..e5714ec18001 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinotify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinotify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix b/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix index a52a0bb40010..1d4f4cfa7847 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinputevent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/pyipp/default.nix b/nixpkgs/pkgs/development/python-modules/pyipp/default.nix index ed5a5f4576ab..dfef79a4dcae 100644 --- a/nixpkgs/pkgs/development/python-modules/pyipp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyipp/default.nix @@ -6,7 +6,7 @@ , fetchFromGitHub , pytest-asyncio , pytestCheckHook -, pytestcov +, pytest-cov , yarl }: @@ -30,24 +30,10 @@ buildPythonPackage rec { checkInputs = [ aresponses pytest-asyncio - pytestcov + pytest-cov pytestCheckHook ]; - # Some tests are failing due to encoding issues - # https://github.com/ctalkington/python-ipp/issues/121 - disabledTests = [ - "test_internal_session" - "test_request_port" - "est_http_error426" - "test_unexpected_response" - "test_printer" - "test_raw" - "test_ipp_request" - "test_request_tls" - "test_ipp_error_0x0503" - ]; - pythonImportsCheck = [ "pyipp" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix b/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix index 762e39fe4b14..f231f98df85d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix @@ -3,7 +3,7 @@ , aiohttp , aresponses , fetchFromGitHub -, poetry +, poetry-core , pytest-aiohttp , pytest-asyncio , pytestCheckHook @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,10 +21,10 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "1yjsbq4p040a35n8g2l0wgnv83wkjirv4rj73s2mjzn3cxf395bz"; + sha256 = "089lah23939m523jmjkaw2li0fikp2nswxznfvzwnr6wjpp3m9as"; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; diff --git a/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix b/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix index f37ddb2483e1..3161548f8b58 100644 --- a/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }: +{ lib, buildPythonPackage, fetchPypi, numpy, nose, openmp }: buildPythonPackage rec { pname = "pykdtree"; diff --git a/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix b/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix index 07a32a25a0c6..13d7a4fd2483 100644 --- a/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, krb5 }: +{ lib, fetchPypi, buildPythonPackage, krb5 }: buildPythonPackage rec { pname = "pykerberos"; diff --git a/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix b/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix index bc10295e232a..8b1eefdafedc 100644 --- a/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykickstart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , urlgrabber diff --git a/nixpkgs/pkgs/development/python-modules/pylast/default.nix b/nixpkgs/pkgs/development/python-modules/pylast/default.nix index 707554be5599..26812ff9151a 100644 --- a/nixpkgs/pkgs/development/python-modules/pylast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six +{ lib, buildPythonPackage, fetchPypi, isPy3k, certifi, six , setuptools_scm }: diff --git a/nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix b/nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix index 25989d0353e0..2cabb78544eb 100644 --- a/nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylibconfig2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyparsing }: +{ lib, buildPythonPackage, fetchPypi, pyparsing }: buildPythonPackage rec { pname = "pylibconfig2"; version = "0.2.5"; diff --git a/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix b/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix index 454f08fd10ed..64f8e62c2862 100644 --- a/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix b/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix index 8bb62c091348..9fb8401bdc47 100644 --- a/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, libmemcached, zlib, cyrus_sasl }: +{ buildPythonPackage, fetchPypi, lib, libmemcached, zlib, cyrus_sasl }: buildPythonPackage rec { version = "1.6.1"; diff --git a/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix b/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix new file mode 100644 index 000000000000..287e8c338a81 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, mock +, psutil +, six +, future +}: + +let + mock' = mock.overridePythonAttrs (old: rec { + version = "2.0.0"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i"; + }; + }); +in buildPythonPackage rec { + pname = "pylink-square"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "square"; + repo = "pylink"; + rev = "v${version}"; + sha256 = "1q5sm1017pcqcgwhsliiiv1wh609lrjdlc8f5ihlschk1d0qidpd"; + }; + + buildInputs = [ mock' ]; + propagatedBuildInputs = [ psutil six future ]; + + preCheck = '' + # For an unknown reason, `pylink --version` output is different + # inside the nix build environment across different python versions + substituteInPlace tests/unit/test_main.py --replace \ + "expected = 'pylink %s' % pylink.__version__" \ + "return" + ''; + + pythonImportsCheck = [ "pylink" ]; + + meta = with lib; { + description = "Python interface for the SEGGER J-Link"; + homepage = "https://github.com/Square/pylink"; + maintainers = with maintainers; [ dump_stack ]; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pylxd/default.nix b/nixpkgs/pkgs/development/python-modules/pylxd/default.nix new file mode 100644 index 000000000000..5d373ada09b5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pylxd/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, pbr, dateutil, ws4py, requests-unixsocket, requests-toolbelt, mock }: + +buildPythonPackage rec { + pname = "pylxd"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1db88l55q974fm9z5gllx3i8bkj0jzi25xrr5cs6id3bfy4zp8a7"; + }; + + propagatedBuildInputs = [ + pbr + dateutil + ws4py + requests-unixsocket + requests-toolbelt + ]; + + # tests require an old version of requests-mock that we do not have a package for + doCheck = false; + pythonImportsCheck = [ "pylxd" ]; + + meta = with lib; { + description = "A Python library for interacting with the LXD REST API"; + homepage = "https://pylxd.readthedocs.io/en/latest/"; + license = licenses.asl20; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pymaging/default.nix b/nixpkgs/pkgs/development/python-modules/pymaging/default.nix index 3b35ce3e7166..8869924bddba 100644 --- a/nixpkgs/pkgs/development/python-modules/pymaging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymaging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix b/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix index 64ea5b4ff5b0..6d12ddd40062 100644 --- a/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pymaging diff --git a/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix index 84fcdbef6a3f..bae7a5613239 100644 --- a/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , enum34 , glibcLocales , matplotlib diff --git a/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix b/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix index 96fb9d6f6943..13e80a38e4b5 100644 --- a/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "PyMeeus"; diff --git a/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix b/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix index b44ff9fef491..f66a6ef702b0 100644 --- a/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/nixpkgs/pkgs/development/python-modules/pymetar/default.nix b/nixpkgs/pkgs/development/python-modules/pymetar/default.nix index 84139091ae49..72a17f27dca9 100644 --- a/nixpkgs/pkgs/development/python-modules/pymetar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymetar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, buildPythonPackage, isPy3k, fetchPypi }: +{ lib, python, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pymetar"; diff --git a/nixpkgs/pkgs/development/python-modules/pymetno/default.nix b/nixpkgs/pkgs/development/python-modules/pymetno/default.nix index 2b10e2f164fb..b3d91c595d80 100644 --- a/nixpkgs/pkgs/development/python-modules/pymetno/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymetno/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , aiohttp diff --git a/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix b/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix index d69c0011ac53..84ab3dcab1bf 100644 --- a/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymsgbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, tkinter }: +{ lib, fetchPypi, buildPythonPackage, tkinter }: buildPythonPackage rec { pname = "PyMsgBox"; diff --git a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index 8ce7d5a19c6f..501f829dc142 100644 --- a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: +{ lib, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "pymupdf"; version = "1.18.0"; diff --git a/nixpkgs/pkgs/development/python-modules/pymyq/default.nix b/nixpkgs/pkgs/development/python-modules/pymyq/default.nix index 2500909d534e..e93d0b602b4d 100644 --- a/nixpkgs/pkgs/development/python-modules/pymyq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymyq/default.nix @@ -1,26 +1,26 @@ { lib -, aiodns , aiohttp -, async-timeout +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub +, pkce }: buildPythonPackage rec { pname = "pymyq"; - version = "2.0.14"; + version = "3.0.3"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "18825b9c6qk4zcvva79hpg6098z4zqxyapnqmjsli23npw0zh67w"; + sha256 = "1wrfnbz87ns2ginyvljna0axl35s0xfaiqwzapxm8ira40ax5wrl"; }; propagatedBuildInputs = [ - aiodns aiohttp - async-timeout + beautifulsoup4 + pkce ]; # Project has no tests diff --git a/nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix b/nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix index 6009b03e5086..49b5a49193de 100644 --- a/nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymysqlsa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pymysql diff --git a/nixpkgs/pkgs/development/python-modules/pynac/default.nix b/nixpkgs/pkgs/development/python-modules/pynac/default.nix index 656825a36bbb..a6df8cb036d4 100644 --- a/nixpkgs/pkgs/development/python-modules/pynac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/nixpkgs/pkgs/development/python-modules/pynacl/default.nix b/nixpkgs/pkgs/development/python-modules/pynacl/default.nix index be69bf3d8023..37cf0a9ef10a 100644 --- a/nixpkgs/pkgs/development/python-modules/pynacl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynacl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix b/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix index 6214f3db42b2..7ca72293382d 100644 --- a/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake +{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake , pythonOlder, libnest2d, sip, clipper }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pynisher/default.nix b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix index 0ecac704e1e8..28e9922e1720 100644 --- a/nixpkgs/pkgs/development/python-modules/pynisher/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, psutil, docutils }: +{ lib, buildPythonPackage, fetchPypi, psutil, docutils }: buildPythonPackage rec { pname = "pynisher"; diff --git a/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix b/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix new file mode 100644 index 000000000000..aab8f4e743a2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, nose +, scikitlearn +, scipy +, numba +, llvmlite +, joblib +}: + +buildPythonPackage rec { + pname = "pynndescent"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "74a05a54d13573a38878781d44812ac6df97d8762a56f9bb5dd87a99911820fe"; + }; + + patches = [ + # fixes tests, included in 0.5.2 + (fetchpatch { + url = "https://github.com/lmcinnes/pynndescent/commit/ef5d8c3c3bfe976063b6621e3e0734c0c22d813b.patch"; + sha256 = "sha256-49n3kevs3wpzd4FfZVKmNpF2o1V8pJs4KOx8zCAhR3s="; + }) + ]; + + checkInputs = [ + nose + ]; + + propagatedBuildInputs = [ + scikitlearn + scipy + numba + llvmlite + joblib + ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Nearest Neighbor Descent"; + homepage = "https://github.com/lmcinnes/pynndescent"; + license = licenses.bsd2; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pynuki/default.nix b/nixpkgs/pkgs/development/python-modules/pynuki/default.nix new file mode 100644 index 000000000000..9c3dc394cc04 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pynuki/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, requests +}: + +buildPythonPackage rec { + pname = "pynuki"; + version = "1.4.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pschmitt"; + repo = pname; + rev = version; + sha256 = "1nymlrf0j430851plp355697p55asfxjmavdh2zr96b16d41dnn4"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pynuki" ]; + + meta = with lib; { + description = "Python bindings for nuki.io bridges"; + homepage = "https://github.com/pschmitt/pynuki"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pynzb/default.nix b/nixpkgs/pkgs/development/python-modules/pynzb/default.nix index 294c2374f537..3f1cca75dc15 100644 --- a/nixpkgs/pkgs/development/python-modules/pynzb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynzb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix b/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix index 2dec1d8705bb..8f2686a79145 100644 --- a/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, unixODBC }: +{ lib, buildPythonPackage, fetchPypi, isPyPy, unixODBC }: buildPythonPackage rec { pname = "pyodbc"; diff --git a/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index 4171eaeeb57e..cf881a580482 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , Mako diff --git a/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix index 23de6b2323f0..c6839bba9896 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, lib }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix b/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix new file mode 100644 index 000000000000..a5414021b259 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyopenuv"; + version = "2.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1pzdcy65gndrlyhrwyc1rwsh8n4w79wla8n9fr13m00vac3cqkl0"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytest-aiohttp + pytest-cov + pytestCheckHook + ]; + + # Ignore the examples as they are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "pyopenuv" ]; + + meta = with lib; { + description = "Python API to retrieve data from openuv.io"; + homepage = "https://github.com/bachya/pyopenuv"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyotp/default.nix b/nixpkgs/pkgs/development/python-modules/pyotp/default.nix index 7ad07b3a6e8c..16916666a0d5 100644 --- a/nixpkgs/pkgs/development/python-modules/pyotp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyotp/default.nix @@ -2,19 +2,19 @@ buildPythonPackage rec { pname = "pyotp"; - version = "2.4.1"; + version = "2.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "038a3f70b34eaad3f72459e8b411662ef8dfcdd95f7d9203fa489e987a75584b"; + sha256 = "d28ddfd40e0c1b6a6b9da961c7d47a10261fb58f378cb00f05ce88b26df9c432"; }; pythonImportsCheck = [ "pyotp" ]; meta = with lib; { description = "Python One Time Password Library"; - homepage = "https://github.com/pyotp/pyotp"; + homepage = "https://github.com/pyauth/pyotp"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix index ffe7bf014232..c54e220228ab 100644 --- a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , pandoc, haskellPackages, texlive }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pypdf/default.nix b/nixpkgs/pkgs/development/python-modules/pypdf/default.nix index d69b1078aeef..1244f374b44c 100644 --- a/nixpkgs/pkgs/development/python-modules/pypdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix b/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix index cd91cc347a4f..26d27f4455af 100644 --- a/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/nixpkgs/pkgs/development/python-modules/pypeg2/default.nix b/nixpkgs/pkgs/development/python-modules/pypeg2/default.nix index 1f16a307a0c1..8b630f743d19 100644 --- a/nixpkgs/pkgs/development/python-modules/pypeg2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypeg2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pyphen/default.nix b/nixpkgs/pkgs/development/python-modules/pyphen/default.nix index d8b9abcf97a3..2f573b67838b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyphen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyphen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "Pyphen"; diff --git a/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix b/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix index bc0e45359990..1fc4198ebeb6 100644 --- a/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow +{ lib, buildPythonPackage, fetchFromGitLab, nose, pillow , isPy3k, isPyPy }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix b/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix index 8747840fd7c0..0c8c6c4328af 100644 --- a/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix b/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix index 83190bc292ab..348f91715022 100644 --- a/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pyprind/default.nix b/nixpkgs/pkgs/development/python-modules/pyprind/default.nix index d270136558fc..9c13a9535701 100644 --- a/nixpkgs/pkgs/development/python-modules/pyprind/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyprind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , psutil , pytest }: diff --git a/nixpkgs/pkgs/development/python-modules/pyptlib/default.nix b/nixpkgs/pkgs/development/python-modules/pyptlib/default.nix index af2575d21431..9f9f99884b98 100644 --- a/nixpkgs/pkgs/development/python-modules/pyptlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyptlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix b/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix index b806177b4d7d..22ac89cf6a90 100644 --- a/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose +{ lib, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose , django, jinja2, tornado, pyramid, pyramid_mako, Mako }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix b/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix new file mode 100644 index 000000000000..d7f15d966b37 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, packaging, sip_5 }: + +buildPythonPackage rec { + pname = "pyqt-builder"; + version = "1.6.0"; + + src = fetchPypi { + pname = "PyQt-builder"; + inherit version; + sha256 = "0g51yak53zzjs4gpq65i01cmpz7w8cjny9wfyxlgr2vi0wag107v"; + }; + + propagatedBuildInputs = [ packaging sip_5 ]; + + pythonImportsCheck = [ "pyqtbuild" ]; + + # There aren't tests + doCheck = false; + + meta = with lib; { + description = "PEP 517 compliant build system for PyQt"; + homepage = "https://pypi.org/project/PyQt-builder/"; + license = licenses.gpl3Only; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix index 98b30b247077..f43bfb9aaa6e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix b/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix index 262c5a17504a..42019e5a0022 100644 --- a/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -14,12 +14,12 @@ let in buildPythonPackage rec { pname = "PyQtWebEngine"; - version = "5.15.0"; + version = "5.15.2"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237"; + sha256 = "0d56ak71r14w4f9r96vaj34qcn2rbln3s6ildvvyc707fjkzwwjd"; }; inherit patches; diff --git a/nixpkgs/pkgs/development/python-modules/pyquery/default.nix b/nixpkgs/pkgs/development/python-modules/pyquery/default.nix index 2496d9d968fc..2bb2eb1c6fcc 100644 --- a/nixpkgs/pkgs/development/python-modules/pyquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyquery/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cssselect diff --git a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index 5f1e5c7d75a8..44ac5a9221ad 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webtest diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix index 88dc62886fc6..5c4e7c104bf0 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: +{ lib, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: buildPythonPackage rec { pname = "pyramid_beaker"; diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix index 2bb5a03bdb91..d3388fdff359 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , chameleon diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix index 80514cc91b48..55da77f49644 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyramid diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix index ab4025b72309..f2f156e98b67 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyramid diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix index 0497ab79613f..464d8d209bfb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webtest diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix index 8c71563e2d77..2f8c5e1e0753 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webtest diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix index 9167918fc47d..545883a25c1a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyramid diff --git a/nixpkgs/pkgs/development/python-modules/pyreport/default.nix b/nixpkgs/pkgs/development/python-modules/pyreport/default.nix index 09a1e7c6b418..6b9649699ba3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyreport/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyreport/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pyres/default.nix b/nixpkgs/pkgs/development/python-modules/pyres/default.nix index 6d49bd025948..bb15a4d927ab 100644 --- a/nixpkgs/pkgs/development/python-modules/pyres/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyres/default.nix @@ -31,6 +31,9 @@ buildPythonPackage rec { sha256 = "1rkpv7gbjxl9h9g7kncmsrgmi77l7pgfq8d7dbnsr3ia2jmjqb8y"; }; + # started redis-server makes this hang on darwin + doCheck = !stdenv.isDarwin; + checkPhase = '' redis-server & nosetests . --exclude test_worker_pids diff --git a/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix b/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix index f6be3c4c8974..9885d4f5443f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytz diff --git a/nixpkgs/pkgs/development/python-modules/pyro4/default.nix b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix index a84b22e06567..626560d89b6d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyro4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, lib , python , serpent , dill diff --git a/nixpkgs/pkgs/development/python-modules/pyroma/default.nix b/nixpkgs/pkgs/development/python-modules/pyroma/default.nix index e533f6501697..bddf2413970c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroma/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , docutils, pygments, setuptools }: diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index f2378863720c..e5c87a94b074 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildPythonPackage, fetchPypi}: +{lib, buildPythonPackage, fetchPypi}: buildPythonPackage rec { pname = "pyroute2"; diff --git a/nixpkgs/pkgs/development/python-modules/pyrr/default.nix b/nixpkgs/pkgs/development/python-modules/pyrr/default.nix index f8ac5d8e8675..cb1da5238681 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix b/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix index 211bc85f5112..79f6666474e6 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix b/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix index e3586e6dbf1c..4a7dc788caaa 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrss2gen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix index 7d2fdb5b4260..1bb096dc0c74 100644 --- a/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix @@ -1,17 +1,16 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchFromGitHub -, fetchpatch , substituteAll , xmlsec -, cryptography, defusedxml, future, pyopenssl, dateutil, pytz, requests, six -, mock, pyasn1, pymongo, pytest, responses +, cryptography, defusedxml, pyopenssl, dateutil, pytz, requests, six +, mock, pyasn1, pymongo, pytest, responses, xmlschema, importlib-resources }: buildPythonPackage rec { pname = "pysaml2"; - version = "5.0.0"; + version = "6.5.1"; disabled = !isPy3k; @@ -20,7 +19,7 @@ buildPythonPackage rec { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "0hwhxz45h8l1b0615hf855z7valfcmm0nb7k31bcj84v68zp5rjs"; + sha256 = "1gh74csjk6af23agyigk4id79s4li1xnkmbpp73aqyvlly2kd0b7"; }; patches = [ @@ -28,12 +27,6 @@ buildPythonPackage rec { src = ./hardcode-xmlsec1-path.patch; inherit xmlsec; }) - # remove on next release - (fetchpatch { - name = "fix-test-dates.patch"; - url = "https://github.com/IdentityPython/pysaml2/commit/1d97d2d26f63e42611558fdd0e439bb8a7496a27.patch"; - sha256 = "0r6d6hkk6z9yw7aqnsnylii516ysmdsc8dghwmgnwvw6cm7l388p"; - }) ]; postPatch = '' @@ -41,7 +34,17 @@ buildPythonPackage rec { sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml ''; - propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ]; + propagatedBuildInputs = [ + cryptography + dateutil + defusedxml + importlib-resources + pyopenssl + pytz + requests + six + xmlschema + ]; checkInputs = [ mock pyasn1 pymongo pytest responses ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyscss/default.nix b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix index 6da19bc48ab8..e4e7791fa79a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyscss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest diff --git a/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix b/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix index a35f2ae77f02..1a7c783e8291 100644 --- a/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/pysensors/default.nix b/nixpkgs/pkgs/development/python-modules/pysensors/default.nix index 214412c4ceed..8cff62b89c1f 100644 --- a/nixpkgs/pkgs/development/python-modules/pysensors/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysensors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: +{ lib, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: buildPythonPackage { version = "2017-07-13"; pname = "pysensors"; diff --git a/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix index ff3d624490ba..54f3f80a3f8f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , pyserial }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pysftp/default.nix b/nixpkgs/pkgs/development/python-modules/pysftp/default.nix index 28daf6b385e6..3333a30bd1ac 100644 --- a/nixpkgs/pkgs/development/python-modules/pysftp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/pyshark/default.nix b/nixpkgs/pkgs/development/python-modules/pyshark/default.nix new file mode 100644 index 000000000000..206e3671f47f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyshark/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, py, lxml, pytestCheckHook, wireshark-cli }: + +buildPythonPackage rec { + pname = "pyshark"; + version = "0.4.2.11"; + + src = fetchFromGitHub { + owner = "KimiNewt"; + repo = pname; + rev = "v${version}"; + sha256 = "07dkhkf85cplcj1h3k8mmqzsn4zdkxzr0zg3gvf8yc8p5g5azx9q"; + }; + + propagatedBuildInputs = [ + py + lxml + ]; + + preConfigure = '' + cd src + ''; + + preCheck = '' + cd .. + ''; + + checkInputs = [ + pytestCheckHook + wireshark-cli + ]; + + meta = with lib; { + description = "Python wrapper for tshark, allowing python packet parsing using wireshark dissectors"; + homepage = "https://github.com/KimiNewt/pyshark/"; + license = licenses.mit; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyshp/default.nix b/nixpkgs/pkgs/development/python-modules/pyshp/default.nix index 661c70a0ab26..7f494e98ad22 100644 --- a/nixpkgs/pkgs/development/python-modules/pyshp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyshp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , setuptools }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pysigset/default.nix b/nixpkgs/pkgs/development/python-modules/pysigset/default.nix index 8e31735db2e4..ccacb412924f 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pysigset"; diff --git a/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix b/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix index a113314aa403..abb85930e40e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { description = "Python bindings to Slurm"; license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; + platforms = platforms.linux; broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now }; } diff --git a/nixpkgs/pkgs/development/python-modules/pysma/default.nix b/nixpkgs/pkgs/development/python-modules/pysma/default.nix new file mode 100644 index 000000000000..f1005fe0b7a9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysma/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, attrs +, buildPythonPackage +, fetchPypi +, jmespath +, async-timeout +}: + +buildPythonPackage rec { + pname = "pysma"; + version = "0.3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1awcsbk14i2aw01f7b7hrmpn9q6vr9v6la0i9n7ldv1h8rzq6j16"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + attrs + jmespath + ]; + + # pypi does not contain tests and GitHub archive not available + doCheck = false; + pythonImportsCheck = [ "pysma" ]; + + meta = with lib; { + description = "Python library for interacting with SMA Solar's WebConnect"; + homepage = "https://github.com/kellerza/pysma"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix b/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix index 6834a78f4286..bea1438f6794 100644 --- a/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , samba, pkg-config , setuptools }: diff --git a/nixpkgs/pkgs/development/python-modules/pysmf/default.nix b/nixpkgs/pkgs/development/python-modules/pysmf/default.nix index 02559510100c..25f5fc6a20ca 100644 --- a/nixpkgs/pkgs/development/python-modules/pysmf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysmf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: buildPythonPackage rec { pname = "pysmf"; diff --git a/nixpkgs/pkgs/development/python-modules/pysmi/default.nix b/nixpkgs/pkgs/development/python-modules/pysmi/default.nix index 953581aa3029..7b96b97f0bb9 100644 --- a/nixpkgs/pkgs/development/python-modules/pysmi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysmi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ply diff --git a/nixpkgs/pkgs/development/python-modules/pysmt/default.nix b/nixpkgs/pkgs/development/python-modules/pysmt/default.nix new file mode 100644 index 000000000000..ce5b6b8673a0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysmt/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "pysmt"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "051j36kpz11ik9bhvp5jgxzc3h7f18i1pf5ssdhjwyabr0n0zra3"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "pysmt" ]; + + meta = with lib; { + description = "Python library for SMT formulae manipulation and solving"; + homepage = "https://github.com/pysmt/pysmt"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysnmp/default.nix b/nixpkgs/pkgs/development/python-modules/pysnmp/default.nix index 7dce4d9b4d18..0b0e298d5d00 100644 --- a/nixpkgs/pkgs/development/python-modules/pysnmp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysnmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyasn1 diff --git a/nixpkgs/pkgs/development/python-modules/pysocks/default.nix b/nixpkgs/pkgs/development/python-modules/pysocks/default.nix index 79c163726b76..70fb74ab4ddf 100644 --- a/nixpkgs/pkgs/development/python-modules/pysocks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index 4a0fb1413bbe..fdf350bd377c 100644 --- a/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy3k , xmltodict , requests @@ -9,17 +9,21 @@ # Test dependencies , pytest, pylint, flake8, graphviz , mock, sphinx, sphinx_rtd_theme +, requests-mock }: buildPythonPackage rec { pname = "pysonos"; - version = "0.0.37"; + version = "0.0.40"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "43a046c1c6086500fb0f4be1094ca963f5b0f555a04b692832b2b88ab741824e"; + # pypi package is missing test fixtures + src = fetchFromGitHub { + owner = "amelchio"; + repo = pname; + rev = "v${version}"; + sha256 = "0a0c7jwv39nbvpdcx32sd8kjmj4nyrd7k0yxhpmxdnx4zr4vvzqg"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; @@ -27,6 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest pylint flake8 graphviz mock sphinx sphinx_rtd_theme + requests-mock ]; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyspark/default.nix b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix index 342755131a3d..f8a7c09b4071 100644 --- a/nixpkgs/pkgs/development/python-modules/pyspark/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, py4j }: +{ buildPythonPackage, fetchPypi, lib, py4j }: buildPythonPackage rec { pname = "pyspark"; diff --git a/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix b/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix index 7c5d8ca5abf5..8445f6d7e89e 100644 --- a/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: buildPythonPackage rec { pname = "pysqueezebox"; diff --git a/nixpkgs/pkgs/development/python-modules/pysrt/default.nix b/nixpkgs/pkgs/development/python-modules/pysrt/default.nix index 4012a7324660..1099bffc40f0 100644 --- a/nixpkgs/pkgs/development/python-modules/pysrt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysrt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , chardet diff --git a/nixpkgs/pkgs/development/python-modules/pyssim/default.nix b/nixpkgs/pkgs/development/python-modules/pyssim/default.nix index 4f73ada61af6..cdbbfeabf887 100644 --- a/nixpkgs/pkgs/development/python-modules/pyssim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyssim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: +{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: buildPythonPackage rec { pname = "pyssim"; diff --git a/nixpkgs/pkgs/development/python-modules/pystache/default.nix b/nixpkgs/pkgs/development/python-modules/pystache/default.nix index 6ed036aecb1a..c93655e10a8e 100644 --- a/nixpkgs/pkgs/development/python-modules/pystache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pystache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }: +{ lib, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }: buildPythonPackage rec { pname = "pystache"; diff --git a/nixpkgs/pkgs/development/python-modules/pystemd/default.nix b/nixpkgs/pkgs/development/python-modules/pystemd/default.nix index 691865919490..e77dd605388a 100644 --- a/nixpkgs/pkgs/development/python-modules/pystemd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pystemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, systemd }: +{ lib, python, systemd }: python.pkgs.buildPythonPackage rec { pname = "pystemd"; diff --git a/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix b/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix index 0ba23ffec5df..120867f389cc 100644 --- a/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pystemmer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, fetchPypi, buildPythonPackage, cython }: +{ lib, python, fetchPypi, buildPythonPackage, cython }: buildPythonPackage rec { pname = "PyStemmer"; diff --git a/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix b/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix new file mode 100644 index 000000000000..bca2d47320eb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pysyncobj"; + version = "0.3.7"; + + src = fetchFromGitHub { + owner = "bakwc"; + repo = "PySyncObj"; + rev = version; + sha256 = "0i7gjapaggkfvys4rgd4krpmh6mxwpzv30ngiwb6ddgp8jx0nzxk"; + }; + + # Tests require network features + doCheck = false; + pythonImportsCheck = [ "pysyncobj" ]; + + meta = with lib; { + description = "Python library for replicating your class"; + homepage = "https://github.com/bakwc/PySyncObj"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytabix/default.nix b/nixpkgs/pkgs/development/python-modules/pytabix/default.nix index db8437d8957c..fb2e622eac9c 100644 --- a/nixpkgs/pkgs/development/python-modules/pytabix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytabix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/pytado/default.nix b/nixpkgs/pkgs/development/python-modules/pytado/default.nix index 636210c93d59..a54c89f348dd 100644 --- a/nixpkgs/pkgs/development/python-modules/pytado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytado/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "PyTado"; diff --git a/nixpkgs/pkgs/development/python-modules/pyte/default.nix b/nixpkgs/pkgs/development/python-modules/pyte/default.nix index 65d3d9218d06..e930f1d5717f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyte/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: buildPythonPackage rec { pname = "pyte"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix index 7384eb360704..fad9a70af0ff 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }: +{ lib, buildPythonPackage, fetchPypi, pytest, aiohttp }: buildPythonPackage rec { pname = "pytest-aiohttp"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix index 1a7f77bf9b6e..68b67f061bb1 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyannotate diff --git a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index 309a33e89073..4ca6bdac6e96 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , ansible diff --git a/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix index c621d9a47854..0f37d09a9e07 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: +{ lib, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; version = "0.14.0"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix index 493a2307e7e7..83757c2e1665 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , execnet , glob2 , Mako diff --git a/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix index 2fb02244d1d7..39c26a3e0f36 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, unzip }: +{ lib, buildPythonPackage, fetchPypi, pytest, unzip }: buildPythonPackage rec { pname = "pytest-catchlog"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix index 034c657b5b0f..414cf1ecc9cb 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, pytest, setuptools_scm }: buildPythonPackage rec { pname = "pytest-celery"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix index 41f316a18a65..4c3e9dd96feb 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "0.3.9"; + version = "1.0.1"; src = fetchPypi { pname = "pytest_check"; inherit version; - sha256 = "0asrrz0fgk6wqffsz1ffd6z9xyw314fwh5bwjzcq75w8w1g4ass9"; + sha256 = "1i01i5ab06ic11na13gcacrlcs2ab6rmaii0yz0x06z5ynnljn6s"; }; propagatedBuildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix index e271373b73ef..0c23a907cbae 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix @@ -1,40 +1,36 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , pytest , click -, pytestcov -, isPy27 -, mock +, pytestCheckHook }: buildPythonPackage rec { pname = "pytest-click"; - version = "0.3"; + version = "1.0.2"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Stranger6667"; repo = "pytest-click"; - rev = version; - sha256 = "1cd15anw8d4rq6qs03j6ag38199rqw7vp0w0w0fm41mvdzr0lwvz"; + rev = "v${version}"; + sha256 = "197nvlqlyfrqpy5lrkmfh1ywpr6j9zipxl9d7syg2a2n7jz3a8rj"; }; - postConfigure = '' - substituteInPlace setup.py \ - --replace "mock==1.0.1" "mock" - ''; - propagatedBuildInputs = [ pytest click ]; - checkInputs = [ pytestcov ] ++ lib.optionals isPy27 [ mock ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "pytest plugin for click"; homepage = "https://github.com/Stranger6667/pytest-click"; + changelog = "https://github.com/Stranger6667/pytest-click/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix index aa921ddeb3d1..003d7e14ab59 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, coverage }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix index b1cdb1033a64..1dc218c08085 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , setuptools_scm, pytest, cmake }: diff --git a/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix index bc6e2441b0f0..bdcab2788ae4 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, py, pytest }: +{ lib, buildPythonPackage, fetchPypi, py, pytest }: buildPythonPackage rec { pname = "pytest-datafiles"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix index 9a3dbed55b15..7108a8f4c176 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pytest }: buildPythonPackage rec { version = "0.5.1"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix index 069aa2812eb5..bfcda812529e 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix index 061f62bfc17b..32392f8f14ce 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , setuptools-git, pytest }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix index fd4ed0978060..805c19751ed1 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , pytest , pyflakes }: diff --git a/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix index 74e33a7731b3..7b459b4a294c 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: buildPythonPackage rec { pname = "pytest-flask"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index 41263ce692b3..c634aa00718e 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchFromGitHub , pytest -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix index 0b1090f7b81d..1b09d6863b97 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , pytest, pytest-metadata, setuptools_scm }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix new file mode 100644 index 000000000000..f790629a29cf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, requests +, werkzeug +}: + +buildPythonPackage rec { + pname = "pytest-httpserver"; + version = "0.3.7"; + + src = fetchPypi { + pname = "pytest_httpserver"; + inherit version; + sha256 = "sha256-YgTcrUlwh2jz0tJdMUgjm8RcqrtpJ/oUQm3SnxUc5Z4="; + }; + + propagatedBuildInputs = [ werkzeug ]; + + checkInputs = [ + pytest-cov + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ "pytest_httpserver" ]; + + meta = with lib; { + description = "HTTP server for pytest to test HTTP clients"; + homepage = "https://www.github.com/csernazs/pytest-httpserver"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix index e8b224dc1d4d..f7766003be10 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, setuptools_scm }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix index 0cc3a993c235..30a2757ecf32 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix new file mode 100644 index 000000000000..b07be1178c63 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pytest +, pytest-xdist +, pytest-dependency +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-order"; + version = "0.9.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b7i8z6rywnkb3skyg8bnfqgkjrwvkn64b4q07wfl1q7x65ksd26"; + }; + + propagatedBuildInputs = [ pytest ]; + + checkInputs = [ + pytestCheckHook + pytest-xdist + pytest-dependency + pytest-mock + ]; + + meta = { + description = "Pytest plugin that allows you to customize the order in which your tests are run"; + homepage = "https://github.com/mrbean-bremen/pytest-order"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jacg ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix index eb5203c02466..827386786b79 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-pep257/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pep257 }: +{ lib, buildPythonPackage, fetchPypi, pytest, pep257 }: buildPythonPackage rec { pname = "pytest-pep257"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix index 5148fa4b7608..4e08a8fabba0 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; version = "0.8.6"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix index 0d02a25ec3c7..78b99714378f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , py, pytest }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix index 2def886c5cba..d84bb3c9acf9 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix index 401307039e55..19d031b6a2b1 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 537f32316a31..1bd91fe70f78 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: buildPythonPackage rec { pname = "pytest-rerunfailures"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 41fcfc7b1597..ca3c9a37c1a9 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytest-shutil, pytest-fixture-config, psutil , requests, future, retry }: diff --git a/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix index 3edafdfb4734..9d088e44f8d7 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, isPyPy, buildPythonPackage, fetchPypi +{ lib, isPyPy, buildPythonPackage, fetchPypi , pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: diff --git a/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix index 42f399bb67f9..d57c7f66c244 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-snapshot"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1p33fcplfykwf5mdwg25n8hjgzxpx8w1iprjnfzibpxclfrxmy5i"; + sha256 = "77d736073598a6224825eef8b8e0c760812a61410af2180cb070b27eb79f257d"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix index f7454ee644ca..5006ac51150f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "pytest-subtesthack"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix index a910bf3245f4..8ea981ba2e7a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix b/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix index 0c5ae06e8611..fa794f94141a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest +{ lib, fetchPypi, buildPythonPackage, execnet, pytest , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix index e5019f842fee..30e43c17c919 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 +{ lib, fetchPypi, buildPythonPackage, execnet, pytest_6 , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytest/4.nix b/nixpkgs/pkgs/development/python-modules/pytest/4.nix index 63e57a7f769b..f30eec15a0a8 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest/4.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest/4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py +{ lib, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: diff --git a/nixpkgs/pkgs/development/python-modules/pytest/5.nix b/nixpkgs/pkgs/development/python-modules/pytest/5.nix index 1293cc94b0f1..341d5ac2240d 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest/5.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest/5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy , atomicwrites , attrs , funcsigs diff --git a/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/nixpkgs/pkgs/development/python-modules/pytest/default.nix index 6f5c99a99b19..798084d11117 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy , atomicwrites , attrs , funcsigs diff --git a/nixpkgs/pkgs/development/python-modules/pytestcache/default.nix b/nixpkgs/pkgs/development/python-modules/pytestcache/default.nix index 877e357d9469..cf8643db06d1 100644 --- a/nixpkgs/pkgs/development/python-modules/pytestcache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytestcache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, execnet }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix b/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix index 7fd901babd0b..d6203276b827 100644 --- a/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: buildPythonPackage rec { pname = "pytest-runner"; diff --git a/nixpkgs/pkgs/development/python-modules/python-doi/default.nix b/nixpkgs/pkgs/development/python-modules/python-doi/default.nix index 7e94f743da46..e0cb03d611d1 100644 --- a/nixpkgs/pkgs/development/python-modules/python-doi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-doi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k }: buildPythonPackage rec { pname = "python-doi"; diff --git a/nixpkgs/pkgs/development/python-modules/python-editor/default.nix b/nixpkgs/pkgs/development/python-modules/python-editor/default.nix index 19efcb89d3d3..212e191568c3 100644 --- a/nixpkgs/pkgs/development/python-modules/python-editor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "1.0.4"; diff --git a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix index 44e35a186e21..293d97712808 100644 --- a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , buildPythonPackage , pkg-config diff --git a/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix b/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix index f4305473797c..f9b01802c421 100644 --- a/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix b/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix index 392c5c2126d3..991ec3279dec 100644 --- a/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, fetchPypi +{ buildPythonPackage, lib, fetchPypi , requests , nose , responses diff --git a/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix b/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix index 661ea4ba2493..6c6806f043ce 100644 --- a/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { pname = "python-frontmatter"; diff --git a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index c706ff7903c3..1a2e28d57aba 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: +{ lib, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: buildPythonPackage rec { pname = "python-gitlab"; diff --git a/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix b/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix index 36ca3a719061..fe6867611070 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, gnupg }: +{ lib, buildPythonPackage, fetchPypi, gnupg }: buildPythonPackage rec { pname = "python-gnupg"; diff --git a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix index 238b9b9e4afa..c8f1179bc66b 100644 --- a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: buildPythonPackage rec { pname = "python-hosts"; diff --git a/nixpkgs/pkgs/development/python-modules/python-jose/default.nix b/nixpkgs/pkgs/development/python-modules/python-jose/default.nix index 0de220094c06..15c6474cc388 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jose/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-jose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , future, six, ecdsa, rsa , pycrypto, pytestcov, pytestrunner, cryptography , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix b/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix index 96ce13ab265b..cb36bf50e18b 100644 --- a/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 3a0ab33363ec..53dab817eb27 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , pytestCheckHook, mock, pytestcov, coverage , future, futures, ujson, isPy38 }: diff --git a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix index f22652d0f73c..e221f5b1efc1 100644 --- a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. @@ -30,7 +30,7 @@ buildPythonPackage rec { sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q"; }; - propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] + propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ujson ] ++ lib.optional (withProvider "autopep8") autopep8 ++ lib.optional (withProvider "mccabe") mccabe ++ lib.optional (withProvider "pycodestyle") pycodestyle @@ -42,12 +42,13 @@ buildPythonPackage rec { ++ lib.optional isPy27 configparser ++ lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; - # The tests require all the providers, disable otherwise. doCheck = providers == ["*"]; checkInputs = [ pytestCheckHook mock pytestcov coverage flaky + # Do not propagate flake8 or it will enable pyflakes implicitly + flake8 # rope is technically a dependency, but we don't add it by default since we # already have jedi, which is the preferred option rope diff --git a/nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix b/nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix index 94d8abd1fabd..379aaa5ab643 100644 --- a/nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-ldap-test/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, py4j }: +{ lib, buildPythonPackage, fetchPypi, py4j }: buildPythonPackage rec { pname = "python-ldap-test"; diff --git a/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix b/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix index 60767e77e761..b4760cef6295 100644 --- a/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: buildPythonPackage rec { pname = "python-Levenshtein"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1c9ybqcja31nghfcc8xxbbz9h60s9qi12b9hr4jyl69xbvg12fh3"; + sha256 = "0489zzjlfgzpc7vggs7s7db13pld2nlnw7iwgdz1f386i0x2fkjm"; }; # No tests included in archive diff --git a/nixpkgs/pkgs/development/python-modules/python-ly/default.nix b/nixpkgs/pkgs/development/python-modules/python-ly/default.nix index 6f83a7f61c75..cc38553a8176 100644 --- a/nixpkgs/pkgs/development/python-modules/python-ly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-ly/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv }: +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { pname = "python-ly"; diff --git a/nixpkgs/pkgs/development/python-modules/python-lzf/default.nix b/nixpkgs/pkgs/development/python-modules/python-lzf/default.nix index a1fd01134235..61194ff8f9cb 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lzf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lzf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "0.2.4"; diff --git a/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix b/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix index fe68ed60e372..36c297358e87 100644 --- a/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPyPy , python diff --git a/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix index 8321795c2fba..78c89408ac2d 100644 --- a/nixpkgs/pkgs/development/python-modules/python-miio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , appdirs diff --git a/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix b/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix index a24f2a383a31..131c0f2f5acb 100644 --- a/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-mnist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "python-mnist"; diff --git a/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix b/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix index ba3ecd3883a4..4bb12ab7237c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "python-nomad"; diff --git a/nixpkgs/pkgs/development/python-modules/python-openzwave-mqtt/default.nix b/nixpkgs/pkgs/development/python-modules/python-openzwave-mqtt/default.nix new file mode 100644 index 000000000000..a2c76c7d6d54 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-openzwave-mqtt/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, asyncio-mqtt +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-openzwave-mqtt"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "cgarwood"; + repo = pname; + rev = "v${version}"; + sha256 = "0zqx00dacs59y4gjr4swrn46c7hrp8a1167bcl270333284m8mqm"; + }; + + propagatedBuildInputs = [ + asyncio-mqtt + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python wrapper for OpenZWave's MQTT daemon"; + homepage = "https://github.com/cgarwood/python-openzwave-mqtt"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-otr/default.nix b/nixpkgs/pkgs/development/python-modules/python-otr/default.nix index 7a40998eebdc..6b657dba78df 100644 --- a/nixpkgs/pkgs/development/python-modules/python-otr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-otr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/python-packer/default.nix b/nixpkgs/pkgs/development/python-modules/python-packer/default.nix index ba02ec84635f..2e2b59eb29d4 100644 --- a/nixpkgs/pkgs/development/python-modules/python-packer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-packer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, sh }: buildPythonPackage rec { pname = "python-packer"; diff --git a/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix b/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix index 6e0c0ef5788e..d776002b2129 100644 --- a/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-pipedrive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix b/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix index 2d81581c0cc1..1af58300c2f0 100644 --- a/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix index c4cf0dc74255..4ef3b9f83790 100644 --- a/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix index 235d085fffdb..7a53e73b2b88 100644 --- a/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , redis diff --git a/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix b/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix index 8ec7f6887ad4..3162a0326288 100644 --- a/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , unzip }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix index 1860ff6d24d5..fd488f4be9d3 100644 --- a/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, python, text-unidecode }: +{ lib, fetchPypi, buildPythonPackage, python, text-unidecode }: buildPythonPackage rec { pname = "python-slugify"; diff --git a/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix index 084c66e172ad..fe4d6ea7bda7 100644 --- a/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-snappy"; - version = "0.5.4"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2"; + sha256 = "06l9my361ig4x5ycyrmq33q83zcdib3y2zxfxv7k7dlpyp9ri2hn"; }; buildInputs = [ snappy ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index ee9a60301444..e9c2ae146b09 100644 --- a/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , bidict , buildPythonPackage , fetchFromGitHub diff --git a/nixpkgs/pkgs/development/python-modules/python-tado/default.nix b/nixpkgs/pkgs/development/python-modules/python-tado/default.nix index 98c03b893093..5562e411dd19 100644 --- a/nixpkgs/pkgs/development/python-modules/python-tado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-tado/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "python-tado"; - version = "0.9.0"; + version = "0.11.0"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; rev = version; - sha256 = "0cr5sxdvjgdrrlhl32rs8pwyay8liyi6prm37y66dn00b41cb5l3"; + sha256 = "0fw4f9gqnhxwpxyb34qi8bl5pmzz13h4x3mdk903hhjyccanqncr"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index 52dea24c45fe..b681fcf85a93 100644 --- a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , certifi diff --git a/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix b/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix index 4b1e7e2c1eba..c368d97633f4 100644 --- a/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , fetchpatch diff --git a/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix b/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix index 7f6f14c9888c..94f56698a3e7 100644 --- a/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-u2flib-host/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, requests, hidapi }: +{ lib, fetchPypi, buildPythonPackage, requests, hidapi }: buildPythonPackage rec { pname = "python-u2flib-host"; diff --git a/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix b/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix index 69f741e74379..8d82ffb6b3b9 100644 --- a/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , udev }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix b/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix index fa82027777f6..f80721078dbb 100644 --- a/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-unshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix b/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix index f96086393f2e..8c3a5bf797d4 100644 --- a/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , oath diff --git a/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix b/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix index 503fbe101b92..7f6eee4906cb 100644 --- a/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 3e6d72845687..463ccb25b7dc 100644 --- a/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -35,6 +35,9 @@ buildPythonPackage { --replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; + # hangs on darwin + sandbox + doCheck = !stdenv.isDarwin; + meta = with lib; { homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit"; description = "Python XMP Toolkit for working with metadata"; diff --git a/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix b/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix index b9d9b110f60c..78378a738dba 100644 --- a/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python2-pythondialog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix b/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix index ad8ea88d1d0d..769067f53fb0 100644 --- a/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python3-openid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }: +{ lib, isPy3k, buildPythonPackage, fetchPypi, defusedxml }: buildPythonPackage rec { pname = "python3-openid"; diff --git a/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix b/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix index df12d7aeaff6..6a5c6a304f14 100644 --- a/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver +{ lib, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver , six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix b/nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix index 5fff75ada911..66cf28a15dde 100644 --- a/nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python_keyczar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyasn1 diff --git a/nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix b/nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix index c3f85affe81b..0f713bd21391 100644 --- a/nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python_mimeparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix b/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix index 2c5357297ea7..8f649d4d4d23 100644 --- a/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , pkg-config , systemd, libyaml, openzwave, cython, pyserial , six, pydispatcher, urwid }: diff --git a/nixpkgs/pkgs/development/python-modules/python_statsd/default.nix b/nixpkgs/pkgs/development/python-modules/python_statsd/default.nix index ae293c44c0f7..2aabaec2e14f 100644 --- a/nixpkgs/pkgs/development/python-modules/python_statsd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python_statsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pythondialog/default.nix b/nixpkgs/pkgs/development/python-modules/pythondialog/default.nix index c385f11b2f01..6f8b6a2bbec3 100644 --- a/nixpkgs/pkgs/development/python-modules/pythondialog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythondialog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix b/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix index 178e1855a061..54c84fe6ef59 100644 --- a/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythonirclib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , paver diff --git a/nixpkgs/pkgs/development/python-modules/pythonix/default.nix b/nixpkgs/pkgs/development/python-modules/pythonix/default.nix index 80535b28bf23..9261ab2a8f23 100644 --- a/nixpkgs/pkgs/development/python-modules/pythonix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythonix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }: +{ lib, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }: buildPythonPackage rec { pname = "pythonix"; diff --git a/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix b/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix index 1ced64375301..3bf0ad078c59 100644 --- a/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, nose }: +{ lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { pname = "pytimeparse"; diff --git a/nixpkgs/pkgs/development/python-modules/pytoml/default.nix b/nixpkgs/pkgs/development/python-modules/pytoml/default.nix index 64e6ed4c669a..b13dfd07dadc 100644 --- a/nixpkgs/pkgs/development/python-modules/pytoml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytoml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , python diff --git a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix index 83980c3d00b9..3ce1e70e8239 100644 --- a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/pytricia/default.nix b/nixpkgs/pkgs/development/python-modules/pytricia/default.nix index 8e168bf8181a..01c4ea014adc 100644 --- a/nixpkgs/pkgs/development/python-modules/pytricia/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytricia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/pytun/default.nix b/nixpkgs/pkgs/development/python-modules/pytun/default.nix index 2b49b169c6d1..3437c0fbe7a5 100644 --- a/nixpkgs/pkgs/development/python-modules/pytun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/pytzdata/default.nix b/nixpkgs/pkgs/development/python-modules/pytzdata/default.nix index 739325d33337..342bb088170d 100644 --- a/nixpkgs/pkgs/development/python-modules/pytzdata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytzdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "pytzdata"; diff --git a/nixpkgs/pkgs/development/python-modules/pyunifi/default.nix b/nixpkgs/pkgs/development/python-modules/pyunifi/default.nix index 1eec6f3ea84d..dfbae696b8e5 100644 --- a/nixpkgs/pkgs/development/python-modules/pyunifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyunifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix b/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix index f33aba8d6256..cd0460dc7e19 100644 --- a/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , requests }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pyutil/default.nix b/nixpkgs/pkgs/development/python-modules/pyutil/default.nix index f1c0d3be8ccf..dd1c7b2da5b0 100644 --- a/nixpkgs/pkgs/development/python-modules/pyutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptoolsDarcs diff --git a/nixpkgs/pkgs/development/python-modules/pyuv/default.nix b/nixpkgs/pkgs/development/python-modules/pyuv/default.nix index 95477196d8b9..0be0d61ed0db 100644 --- a/nixpkgs/pkgs/development/python-modules/pyuv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyuv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPyPy , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix b/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix new file mode 100644 index 000000000000..393170cfb9f0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyvesync"; + version = "1.3.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "02fpbyg46mlpc2c1j4zylw9a1h6bacxvigrl3cndsf6fxlhfx15z"; + }; + + propagatedBuildInputs = [ requests ]; + + # Test are not available (not in PyPI tarball and there are no GitHub releases) + doCheck = false; + pythonImportsCheck = [ "pyvesync" ]; + + meta = with lib; { + description = "Python library to manage Etekcity Devices and Levoit Air Purifier"; + homepage = "https://github.com/webdjoe/pyvesync"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix new file mode 100644 index 000000000000..ddec4f0f2397 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -0,0 +1,39 @@ +{ lib +, archinfo +, bitstring +, fetchPypi +, cffi +, buildPythonPackage +, future +, pycparser +}: + +buildPythonPackage rec { + pname = "pyvex"; + version = "9.0.5739"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jwxxw2kw7wkz7kh8m8vbavzw6m5k6xph7mazfn3k2qbsshh3lk3"; + }; + + propagatedBuildInputs = [ + archinfo + bitstring + cffi + future + pycparser + ]; + + # No tests are available on PyPI, GitHub release has tests + # Switch to GitHub release after all angr parts are present + doCheck = false; + pythonImportsCheck = [ "pyvex" ]; + + meta = with lib; { + description = "Python interface to libVEX and VEX IR"; + homepage = "https://github.com/angr/pyvex"; + license = with licenses; [ bsd2 gpl3Plus lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix b/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix index 7013cc7809dd..2fd5a96fa933 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/pywatchman/default.nix b/nixpkgs/pkgs/development/python-modules/pywatchman/default.nix index 5e3c4d6cc5a0..a2cd2a6eed5a 100644 --- a/nixpkgs/pkgs/development/python-modules/pywatchman/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywatchman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, watchman }: +{ lib, buildPythonPackage, fetchPypi, watchman }: buildPythonPackage rec { pname = "pywatchman"; diff --git a/nixpkgs/pkgs/development/python-modules/pywebdav/default.nix b/nixpkgs/pkgs/development/python-modules/pywebdav/default.nix index 5ed3e28b5b1b..2f6bb8553a4f 100644 --- a/nixpkgs/pkgs/development/python-modules/pywebdav/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywebdav/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "PyWebDAV"; diff --git a/nixpkgs/pkgs/development/python-modules/pywilight/default.nix b/nixpkgs/pkgs/development/python-modules/pywilight/default.nix index 66bdcca4793d..4fa4c0fa8542 100644 --- a/nixpkgs/pkgs/development/python-modules/pywilight/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywilight/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pywilight"; - version = "0.0.65"; + version = "0.0.68"; src = fetchPypi { inherit pname version; - sha256 = "1bldhg81lal9mbf55ky3gj2ndlplr0vfjp1bamd0mz5d9icas8nf"; + sha256 = "1s1xyw5hkfr4rlni1p9z4941pp1740fsg4a3b23a618hv2p1i4ww"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix b/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix index 32baa25e52e7..2d88460b4970 100644 --- a/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix @@ -1,19 +1,21 @@ { lib -, buildPythonPackage -, fetchFromGitHub , asyncio-dgram +, buildPythonPackage , click +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { pname = "pywizlight"; - version = "0.4.1"; + version = "0.4.5"; src = fetchFromGitHub { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "0kyhyda28zbni9sjv6kvky6wlhqldl47niddgpbjsv5dlb9xvxns"; + sha256 = "sha256-E2rpkdj93LymlkST8HgZ+8VcJFOWwz8787NPfTCSXFY="; }; propagatedBuildInputs = [ @@ -21,13 +23,24 @@ buildPythonPackage rec { click ]; - # no tests are present - doCheck = false; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + # Tests requires network features (e. g., discovery testing) + disabledTests = [ + "test_Bulb_Discovery" + "test_timeout" + "test_timeout_PilotBuilder" + ]; + pythonImportsCheck = [ "pywizlight" ]; meta = with lib; { description = "Python connector for WiZ light bulbs"; homepage = "https://github.com/sbidy/pywizlight"; + changelog = "https://github.com/sbidy/pywizlight/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyworld/default.nix b/nixpkgs/pkgs/development/python-modules/pyworld/default.nix new file mode 100644 index 000000000000..73cd1fcea229 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyworld/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, cython +}: + +buildPythonPackage rec { + pname = "pyworld"; + version = "0.2.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "896c910696975855578d855f490f94d7a57119e0a75f7f15e11fdf58ba891627"; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "pyworld" ]; + + meta = with lib; { + description = "PyWorld is a Python wrapper for WORLD vocoder"; + homepage = https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyx/default.nix b/nixpkgs/pkgs/development/python-modules/pyx/default.nix index b19e5f97e141..d46bd718a3ab 100644 --- a/nixpkgs/pkgs/development/python-modules/pyx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix b/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix new file mode 100644 index 000000000000..8040458bf766 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix @@ -0,0 +1,53 @@ +{ lib +, asynctest +, bleak +, click +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-cov +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyzerproc"; + version = "0.4.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "emlove"; + repo = pname; + rev = version; + sha256 = "1qlxvvy9fyff56dvc46nsd5ngkxqhdi7s4gwfndj7dn76j81srpq"; + }; + + # Remove pytest-runner, https://github.com/emlove/pyzerproc/pull/1 + patchPhase = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + ''; + + propagatedBuildInputs = [ + bleak + click + ]; + + checkInputs = [ + asynctest + pytest-asyncio + pytest-cov + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyzerproc" ]; + + meta = with lib; { + description = "Python library to control Zerproc Bluetooth LED smart string lights"; + homepage = "https://github.com/emlove/pyzerproc"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix b/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix index 03fce00629d8..e0434e8e4dd4 100644 --- a/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, python, buildPythonPackage, nose, future, coverage }: +{ lib, fetchPypi, python, buildPythonPackage, nose, future, coverage }: buildPythonPackage rec { pname = "PyZufall"; diff --git a/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix b/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix index a7c0fa3ff4a4..3949361a0a8c 100644 --- a/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -1,7 +1,6 @@ { lib, pkgs, buildPythonPackage, fetchPypi, isPy3k , numpy , pyqt5 -, nose }: buildPythonPackage rec { @@ -14,15 +13,14 @@ buildPythonPackage rec { sha256 = "b02bd2dc7de774f954544312ec1020cf2d7e03fdd23ec9eb79901da55ccb3365"; }; - checkInputs = [ - nose - ]; - propagatedBuildInputs = [ numpy pyqt5 ]; + # no tests executed + doCheck = false; + meta = { homepage = "https://github.com/hmeine/qimage2ndarray"; description = "A small python extension for quickly converting between QImages and numpy.ndarrays (in both directions)"; diff --git a/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix b/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix index ef540538792d..24c90d072a2b 100644 --- a/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/qrcode/default.nix b/nixpkgs/pkgs/development/python-modules/qrcode/default.nix index 113d53ff29b8..29f2ab49606f 100644 --- a/nixpkgs/pkgs/development/python-modules/qrcode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qrcode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix b/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix index 82c3773f3032..24719de779eb 100644 --- a/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , disabledIf , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/qserve/default.nix b/nixpkgs/pkgs/development/python-modules/qserve/default.nix index ff606d132363..0548b6fdf176 100644 --- a/nixpkgs/pkgs/development/python-modules/qserve/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qserve/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix b/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix index 11b4885e4c8a..4945bead42d4 100644 --- a/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: +{ lib, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: buildPythonPackage rec { pname = "QtAwesome"; diff --git a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix index 76db7090a045..17e1d9dbe83b 100644 --- a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyside, pytest }: +{ lib, buildPythonPackage, fetchPypi, pyside, pytest }: buildPythonPackage rec { pname = "QtPy"; diff --git a/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix b/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix index 25b3c113cec6..6288d196bb4e 100644 --- a/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python, isPy27 +{ lib, buildPythonPackage, fetchPypi, python, isPy27 , six }: diff --git a/nixpkgs/pkgs/development/python-modules/queuelib/default.nix b/nixpkgs/pkgs/development/python-modules/queuelib/default.nix index 7471ea180655..3814663c0445 100644 --- a/nixpkgs/pkgs/development/python-modules/queuelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/queuelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix b/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix index 79975ada5015..0de5d6de3bba 100644 --- a/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , mock diff --git a/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix b/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix index 5c561b6e6541..5d3540e01956 100644 --- a/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage }: +{ lib, fetchFromGitHub, buildPythonPackage }: buildPythonPackage { pname = "radicale_infcloud"; diff --git a/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix b/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix index c5ec1d3ab4ef..e484c07f31ca 100644 --- a/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix b/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix index 2d3e2bdc0e03..c3ae88d1775c 100644 --- a/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, pytest, pytest-mock, pytest-server-fixtures, pytest-localserver , termcolor, click, markdown2, six, jsonref, pyyaml, xmltodict, attrs }: diff --git a/nixpkgs/pkgs/development/python-modules/random2/default.nix b/nixpkgs/pkgs/development/python-modules/random2/default.nix index 9ed7701a3f45..6845a5707da7 100644 --- a/nixpkgs/pkgs/development/python-modules/random2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/random2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/rarfile/default.nix b/nixpkgs/pkgs/development/python-modules/rarfile/default.nix index 22c34b82a5fa..545782d853ea 100644 --- a/nixpkgs/pkgs/development/python-modules/rarfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rarfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27 # unrar is non-free software , useUnrar ? false, unrar }: diff --git a/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix b/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix index 4d3ff6d486b4..fc51e1488d6a 100644 --- a/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv + lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/rawkit/default.nix b/nixpkgs/pkgs/development/python-modules/rawkit/default.nix index 974f7ac4d1c6..0a96123db04c 100644 --- a/nixpkgs/pkgs/development/python-modules/rawkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rawkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, fetchpatch +{ lib, fetchPypi, buildPythonPackage, fetchpatch , libraw , pytest, mock }: diff --git a/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix b/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix index 507102222fe0..3de6f2038038 100644 --- a/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rcssmin"; version = "1.0.6"; diff --git a/nixpkgs/pkgs/development/python-modules/rdkit/default.nix b/nixpkgs/pkgs/development/python-modules/rdkit/default.nix new file mode 100644 index 000000000000..b747304446b7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rdkit/default.nix @@ -0,0 +1,157 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchzip +, cmake +, boost +, catch +, inchi +, cairo +, eigen +, python +, rapidjson +, maeparser +, coordgenlibs +, numpy +, pandas +, pillow +, git +}: +let + external = { + avalon = fetchzip { + url = "http://sourceforge.net/projects/avalontoolkit/files/AvalonToolkit_1.2/AvalonToolkit_1.2.0.source.tar"; + sha256 = "0nhxfxckb5a5qs0g148f55yarhncqjgjzcvdskkv9rxi2nrs7160"; + stripRoot = false; + }; + yaehmop = fetchFromGitHub { + owner = "greglandrum"; + repo = "yaehmop"; + rev = "1b13b52e2738a77715b1bad876e3b4e93f2b5269"; + sha256 = "1jp7wz8win4mgwxkaz2gnrgsaaqgln04n2lwgfr96isdv1klf62d"; + }; + freesasa = fetchFromGitHub + { + owner = "mittinatten"; + repo = "freesasa"; + rev = "2.0.3"; + sha256 = "0x686zm9fpyg5647fdgxnxgbwav99nc6ymh4bmkr2063yyda4kzc"; + }; + }; +in +buildPythonPackage rec { + version = "2020.09.3"; + pname = "rdkit"; + + src = + let + versionTag = lib.replaceStrings [ "." ] [ "_" ] version; + in + fetchFromGitHub { + owner = pname; + repo = pname; + rev = "Release_${versionTag}"; + sha256 = "1k1wvzcd1yfx4nhz3iq2aaadzdk5w6sfcb4imhvm7pkbzij0nicx"; + }; + + unpackPhase = '' + mkdir -p source/External/AvalonTools/avalon source/External/YAeHMOP/yaehmop source/External/FreeSASA/freesasa + cp -r ${src}/* source + cp -r ${external.avalon}/SourceDistribution/* source/External/AvalonTools/avalon + cp -r ${external.yaehmop}/* source/External/YAeHMOP/yaehmop + cp -r ${external.freesasa}/* source/External/FreeSASA/freesasa + + find source -type d -exec chmod 755 {} + + cp source/External/FreeSASA/freesasa2.c source/External/FreeSASA/freesasa/src + ln -s ${rapidjson} source/External/rapidjson-1.1.0 + ''; + + sourceRoot = "source"; + + nativeBuildInputs = [ + cmake + git # required by freesasa + ]; + + buildInputs = [ + boost + catch + inchi + eigen + cairo + rapidjson + ]; + + propagatedBuildInputs = [ + numpy + pandas + pillow + ]; + + hardeningDisable = [ "format" ]; # required by yaehmop + # doCheck = false; + dontUseSetuptoolsBuild = true; + dontUsePipInstall = true; + dontUseSetuptoolsCheck = true; + + preConfigure = '' + # Don't want this contacting the git remote during the build + substituteInPlace External/YAeHMOP/CMakeLists.txt --replace \ + 'GIT_TAG master' 'DOWNLOAD_COMMAND true' + + # Since we can't expand with bash in cmakeFlags + cmakeFlags="$cmakeFlags -DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')" + cmakeFlags="$cmakeFlags -DFREESASA_DIR=$PWD/External/FreeSASA/freesasa" + cmakeFlags="$cmakeFlags -DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa" + cmakeFlags="$cmakeFlags -DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon" + ''; + + cmakeFlags = [ + "-DCATCH_DIR=${catch}/include/catch" + "-DINCHI_LIBRARY=${inchi}/lib/libinchi.so" + "-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so" + "-DINCHI_INCLUDE_DIR=${inchi}/include/inchi" + "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" + "-DRDK_INSTALL_INTREE=OFF" + "-DRDK_INSTALL_STATIC_LIBS=OFF" + "-DRDK_BUILD_INCHI_SUPPORT=ON" + "-DRDK_BUILD_AVALON_SUPPORT=ON" + "-DRDK_BUILD_FREESASA_SUPPORT=ON" + "-DRDK_BUILD_YAEHMOP_SUPPORT=ON" + "-DRDK_BUILD_MAEPARSER_SUPPORT=ON" + "-DMAEPARSER_DIR=${maeparser}" + "-DRDK_BUILD_COORDGEN_SUPPORT=ON" + "-DCOORDGEN_DIR=${coordgenlibs}" + "-DRDK_USE_URF=OFF" + "-DRDK_USE_FLEXBISON=OFF" + "-DRDK_BUILD_CAIRO_SUPPORT=ON" + "-DRDK_BUILD_THREADSAFE_SSS=ON" + "-DRDK_TEST_MULTITHREADED=ON" + "-DRDK_BUILD_CPP_TESTS=ON" + "-DRDK_TEST_MULTITHREADED=ON" + "-DPYTHON_EXECUTABLE=${python}/bin/python" + "-DBOOST_ROOT=${boost}" + "-DBoost_NO_SYSTEM_PATHS=ON" + "-DBoost_NO_BOOST_CMAKE=TRUE" + ]; + + checkPhase = '' + export QT_QPA_PLATFORM='offscreen' + export RDBASE=$(realpath ..) + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + (cd $RDBASE/rdkit/Chem && python $RDBASE/rdkit/TestRunner.py test_list.py) + ''; + + pythonImportsCheck = [ + "rdkit" + "rdkit.Chem" + "rdkit.Chem.AllChem" + ]; + + meta = with lib; { + description = "Open source toolkit for cheminformatics"; + maintainers = [ maintainers.rmcgibbo ]; + license = licenses.bsd3; + homepage = "https://www.rdkit.org"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/readchar/default.nix b/nixpkgs/pkgs/development/python-modules/readchar/default.nix index 211f5d63a7dd..ea13c7083fe7 100644 --- a/nixpkgs/pkgs/development/python-modules/readchar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/readchar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: +{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: buildPythonPackage rec { pname = "readchar"; diff --git a/nixpkgs/pkgs/development/python-modules/readme/default.nix b/nixpkgs/pkgs/development/python-modules/readme/default.nix index 044c487eb037..95b45185a08c 100644 --- a/nixpkgs/pkgs/development/python-modules/readme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/readme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/rebulk/default.nix b/nixpkgs/pkgs/development/python-modules/rebulk/default.nix index 750efe357c22..8a4754e7a61d 100644 --- a/nixpkgs/pkgs/development/python-modules/rebulk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rebulk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: buildPythonPackage rec { pname = "rebulk"; diff --git a/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix b/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix index 08e7ff47aa1c..dce24cfa7a8f 100644 --- a/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix b/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix index c87a89b82a44..d9dd54e29f43 100644 --- a/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, cython, nose }: buildPythonPackage rec { pname = "reedsolo"; diff --git a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix new file mode 100644 index 000000000000..3380ef99f180 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "regenmaschine"; + version = "3.1.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "0m6i7vspp8ssdk2k32kznql1j8gkp300kzb7pk67hzvpijdy3mca"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + asynctest + pytest-aiohttp + pytest-asyncio + pytest-cov + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "regenmaschine" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Python library for interacting with RainMachine smart sprinkler controllers"; + homepage = "https://github.com/bachya/regenmaschine"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/remotecv/default.nix b/nixpkgs/pkgs/development/python-modules/remotecv/default.nix index dc40763f6fe6..078e431f3baa 100644 --- a/nixpkgs/pkgs/development/python-modules/remotecv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/remotecv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose +{ lib, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose , preggy, numpy, yanc, nose-focus, mock, opencv }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/rencode/default.nix b/nixpkgs/pkgs/development/python-modules/rencode/default.nix index a8f0f81ee71d..a742c422ee90 100644 --- a/nixpkgs/pkgs/development/python-modules/rencode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rencode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , cython diff --git a/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix b/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix index a9355cda41ca..2c51238e19b5 100644 --- a/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix +++ b/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/nixpkgs/pkgs/development/python-modules/repocheck/default.nix b/nixpkgs/pkgs/development/python-modules/repocheck/default.nix index ad8c3aef2eac..9d6c2c419216 100644 --- a/nixpkgs/pkgs/development/python-modules/repocheck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/repocheck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix index 7b8f0ecd8091..e986f47e6e0d 100644 --- a/nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix +++ b/nixpkgs/pkgs/development/python-modules/repoze_lru/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index 53761203113d..5d5e27a2e115 100644 --- a/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix index f64158f26a10..1b33bb6954bf 100644 --- a/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix +++ b/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix b/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix index 2b3d57831c8d..d39fcc5f2a6e 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, requests, six, urllib3 }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix b/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix index cd36a4528198..225a8f149e47 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix b/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix index a1c6f4fb0a1b..73272990e0f2 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }: +{ lib, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }: buildPythonPackage rec { pname = "requests-kerberos"; diff --git a/nixpkgs/pkgs/development/python-modules/requests/default.nix b/nixpkgs/pkgs/development/python-modules/requests/default.nix index a49b07102201..e0dfb9a24a64 100644 --- a/nixpkgs/pkgs/development/python-modules/requests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , urllib3, idna, chardet, certifi , pytest }: diff --git a/nixpkgs/pkgs/development/python-modules/resampy/default.nix b/nixpkgs/pkgs/development/python-modules/resampy/default.nix index 38b4ae9911d2..551c7f5b93e6 100644 --- a/nixpkgs/pkgs/development/python-modules/resampy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/resampy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest diff --git a/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix b/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix index b35900233736..947aa505f706 100644 --- a/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix b/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix index 12ba4f9a1a5b..c2f91c8fe1b1 100644 --- a/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/retrying/default.nix b/nixpkgs/pkgs/development/python-modules/retrying/default.nix index 65127d040f42..5e2451affb90 100644 --- a/nixpkgs/pkgs/development/python-modules/retrying/default.nix +++ b/nixpkgs/pkgs/development/python-modules/retrying/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix index c002f0baaa9d..b9b7cdb76c4f 100644 --- a/nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rfc-bibtex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, isPy3k }: +{ lib, buildPythonApplication, fetchPypi, isPy3k }: buildPythonApplication rec { pname = "rfc-bibtex"; diff --git a/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix index 561bda08d0cd..93f2f2ce37d8 100644 --- a/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, idna, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, idna, pytestCheckHook }: buildPythonPackage rec { pname = "rfc3986"; diff --git a/nixpkgs/pkgs/development/python-modules/rfc3987/default.nix b/nixpkgs/pkgs/development/python-modules/rfc3987/default.nix index 1ec8fc2153c1..41beb1c8c17f 100644 --- a/nixpkgs/pkgs/development/python-modules/rfc3987/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rfc3987/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rfc3987"; diff --git a/nixpkgs/pkgs/development/python-modules/rich/default.nix b/nixpkgs/pkgs/development/python-modules/rich/default.nix index d19f47281cdc..64739b3c65c6 100644 --- a/nixpkgs/pkgs/development/python-modules/rich/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rich/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "rich"; - version = "9.1.0"; + version = "9.10.0"; # tests not included in pypi tarball src = fetchFromGitHub { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "18iha0fs8vm0j11k39yxj26h8qxrp27ijhx6h1yyizbygmr5b5nk"; + sha256 = "1m1rswg16r4pxv7504nk7lpyxrwf16xw4w55rs3jisryx14ccic6"; }; format = "pyproject"; diff --git a/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix b/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix index 7ca9d711739a..d78c445a3e56 100644 --- a/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; version = "1.1.0"; diff --git a/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix b/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix index 0ac5d9ab2a3b..0724abec19a9 100644 --- a/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , pythonOlder , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/robomachine/default.nix b/nixpkgs/pkgs/development/python-modules/robomachine/default.nix index fe069be459cc..4f5d44006c44 100644 --- a/nixpkgs/pkgs/development/python-modules/robomachine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robomachine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: +{ lib, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: buildPythonPackage rec { pname = "RoboMachine"; diff --git a/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix b/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix index 3cf064d2669d..31b1f43a4e24 100644 --- a/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "robot-detection"; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index c3eb309dfe0b..8dfbb32fe08d 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , robotframework diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix index 967138620e98..f23979f21fd1 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix index 39e42596e2ae..bc9e0873fe54 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: +{ lib, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: buildPythonPackage rec { version = "1.2.3"; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix index 5fa87d17d11f..6d079a99b4f1 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }: +{ lib, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }: buildPythonPackage rec { version = "3.0.0"; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 60123d6b87d1..fbb8cb034a51 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: +{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: buildPythonPackage rec { version = "3.3.1"; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 7e3bcbcc55da..62fb43e02691 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , robotframework diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix index 5bc7bbceae71..9b90b25bfb72 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/robotframework/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework/default.nix index 953602ca1ada..cc57fa0d0264 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "robotframework"; diff --git a/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix b/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix index b0bd44f9c152..81226a23452e 100644 --- a/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework }: +{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework }: buildPythonPackage rec { version = "1.3"; diff --git a/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix b/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix index 126153ec50e5..5c46686adae4 100644 --- a/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , unittest2, lxml, robotframework }: diff --git a/nixpkgs/pkgs/development/python-modules/roku/default.nix b/nixpkgs/pkgs/development/python-modules/roku/default.nix index 5e3644468fe8..c82eda6e35c0 100644 --- a/nixpkgs/pkgs/development/python-modules/roku/default.nix +++ b/nixpkgs/pkgs/development/python-modules/roku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27 +{ lib, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27 }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/roman/default.nix b/nixpkgs/pkgs/development/python-modules/roman/default.nix index 33f0f7f18d7d..cde0ab0f271b 100644 --- a/nixpkgs/pkgs/development/python-modules/roman/default.nix +++ b/nixpkgs/pkgs/development/python-modules/roman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/rope/default.nix b/nixpkgs/pkgs/development/python-modules/rope/default.nix index 65edd602d8de..c4e451aade5e 100644 --- a/nixpkgs/pkgs/development/python-modules/rope/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: buildPythonPackage rec { pname = "rope"; diff --git a/nixpkgs/pkgs/development/python-modules/ropper/default.nix b/nixpkgs/pkgs/development/python-modules/ropper/default.nix index 8b193caa7b8b..5a472ceb1801 100644 --- a/nixpkgs/pkgs/development/python-modules/ropper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ropper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchPypi , capstone diff --git a/nixpkgs/pkgs/development/python-modules/routes/default.nix b/nixpkgs/pkgs/development/python-modules/routes/default.nix index 0129ef69e2c6..1176fcb4eb09 100644 --- a/nixpkgs/pkgs/development/python-modules/routes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/routes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , repoze_lru diff --git a/nixpkgs/pkgs/development/python-modules/rpdb/default.nix b/nixpkgs/pkgs/development/python-modules/rpdb/default.nix index fb84adb7d240..69a886f6e0da 100644 --- a/nixpkgs/pkgs/development/python-modules/rpdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/rpkg/default.nix b/nixpkgs/pkgs/development/python-modules/rpkg/default.nix index 731a5738e73e..5f1cfc622c9f 100644 --- a/nixpkgs/pkgs/development/python-modules/rpkg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils +{ lib, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils , koji, rpmfluff }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/rply/default.nix b/nixpkgs/pkgs/development/python-modules/rply/default.nix index 0da9d2b71018..33f8547496db 100644 --- a/nixpkgs/pkgs/development/python-modules/rply/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rply/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: +{ lib, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: buildPythonPackage rec { pname = "rply"; diff --git a/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix b/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix index 96050ba14b01..9957393770b3 100644 --- a/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , glibcLocales diff --git a/nixpkgs/pkgs/development/python-modules/rq/default.nix b/nixpkgs/pkgs/development/python-modules/rq/default.nix index c9ca5977cb10..8ec05aae9d52 100644 --- a/nixpkgs/pkgs/development/python-modules/rq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: +{ lib, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: buildPythonPackage rec { pname = "rq"; diff --git a/nixpkgs/pkgs/development/python-modules/rsa/4_0.nix b/nixpkgs/pkgs/development/python-modules/rsa/4_0.nix index 8400647aaad6..1a9ad2171a07 100644 --- a/nixpkgs/pkgs/development/python-modules/rsa/4_0.nix +++ b/nixpkgs/pkgs/development/python-modules/rsa/4_0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/nixpkgs/pkgs/development/python-modules/rsa/default.nix b/nixpkgs/pkgs/development/python-modules/rsa/default.nix index b688369beb56..7a990061e00e 100644 --- a/nixpkgs/pkgs/development/python-modules/rsa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rsa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/nixpkgs/pkgs/development/python-modules/rtslib/default.nix b/nixpkgs/pkgs/development/python-modules/rtslib/default.nix index e53756b0181a..e6289378c967 100644 --- a/nixpkgs/pkgs/development/python-modules/rtslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rtslib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }: +{ lib, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }: buildPythonPackage rec { pname = "rtslib"; diff --git a/nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix index 950f523f4a9a..1f829bb4e0ba 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel_base/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix index 1e5820a37f73..98c36221dcd5 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix index debf2aaf7747..8304f5d7dadc 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel_yaml_clib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchhg , ruamel_base diff --git a/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix b/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix index edb793c19d51..51cec6f86025 100644 --- a/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, hypothesis, isPy3k }: buildPythonPackage rec { pname = "rubymarshal"; diff --git a/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix b/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix index 1475b0032313..ace9b8269c53 100644 --- a/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/runsnakerun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , squaremap diff --git a/nixpkgs/pkgs/development/python-modules/rx/default.nix b/nixpkgs/pkgs/development/python-modules/rx/default.nix index 00808e744a29..5fd9064020a4 100644 --- a/nixpkgs/pkgs/development/python-modules/rx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rx/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "rx"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; # There are no tests on the pypi source @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ReactiveX"; repo = "rxpy"; rev = "v${version}"; - sha256 = "0rcwa8001il9p7s096b9gc5yld8cyxvrsmwh1gpc9b87j172z6ax"; + sha256 = "0p0cs67l40npkvwgn5sb18l1b6df1b9fg6rzlqkwk2aa0v3cpvhf"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix index 0154059c4f7b..9bb2a513174c 100644 --- a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: +{ lib, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: buildPythonPackage rec { pname = "s3fs"; diff --git a/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix b/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix index 9f97757edad4..4ffea014001b 100644 --- a/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , fetchFromGitHub , click , six diff --git a/nixpkgs/pkgs/development/python-modules/safe/default.nix b/nixpkgs/pkgs/development/python-modules/safe/default.nix index d167760c3e0e..6a4515b90f83 100644 --- a/nixpkgs/pkgs/development/python-modules/safe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix b/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix index 5e6aa5927eca..0b8edf8bdd90 100644 --- a/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix +++ b/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd +{ lib, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd , python-daemon, six, jinja2, mock, click }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/samplerate/default.nix b/nixpkgs/pkgs/development/python-modules/samplerate/default.nix index a4a19f7ad12e..9c26c9e2e2b3 100644 --- a/nixpkgs/pkgs/development/python-modules/samplerate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/samplerate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , numpy , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix b/nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix index 42872e318916..1be4c485b800 100644 --- a/nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sandboxlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix index 8a7a62d8ce84..222b4c60c7f2 100644 --- a/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: +{ lib, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: buildPythonPackage rec { pname = "sapi-python-client"; diff --git a/nixpkgs/pkgs/development/python-modules/scales/default.nix b/nixpkgs/pkgs/development/python-modules/scales/default.nix index 5aae62972688..3806ffb9d46b 100644 --- a/nixpkgs/pkgs/development/python-modules/scales/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scales/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/schedule/default.nix b/nixpkgs/pkgs/development/python-modules/schedule/default.nix index 596ed993233e..2eda0cd6ac98 100644 --- a/nixpkgs/pkgs/development/python-modules/schedule/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schedule/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/nixpkgs/pkgs/development/python-modules/schema/default.nix b/nixpkgs/pkgs/development/python-modules/schema/default.nix index 1502c7d10abe..483a891f9332 100644 --- a/nixpkgs/pkgs/development/python-modules/schema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schema/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }: +{ lib, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index 8fa0186498f4..f14c4d82f428 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix b/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix index 383cf1f70c68..8921e0061aa6 100644 --- a/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , fetchurl diff --git a/nixpkgs/pkgs/development/python-modules/scp/default.nix b/nixpkgs/pkgs/development/python-modules/scp/default.nix index f5cd96e71aaf..abbe932c2670 100644 --- a/nixpkgs/pkgs/development/python-modules/scp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , paramiko diff --git a/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix index 900943a0e153..006c8ed03023 100644 --- a/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }: +{ lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }: buildPythonPackage rec { pname = "scrapy-deltafetch"; diff --git a/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index 4f6eecfe9143..f9f896a563b7 100644 --- a/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: +{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: buildPythonPackage rec { pname = "scrapy-fake-useragent"; diff --git a/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix index ab00377f4a0e..5f6721f8162c 100644 --- a/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, six }: +{ lib, fetchPypi, buildPythonPackage, scrapy, six }: buildPythonPackage rec { pname = "scrapy-splash"; diff --git a/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix b/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix index f71f8d0c263a..5f238a7e05fa 100644 --- a/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: +{ lib, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: buildPythonApplication rec { pname = "screeninfo"; diff --git a/nixpkgs/pkgs/development/python-modules/scripttest/default.nix b/nixpkgs/pkgs/development/python-modules/scripttest/default.nix index ab234ce22434..5fe4b2b2ee6f 100644 --- a/nixpkgs/pkgs/development/python-modules/scripttest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scripttest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/sdnotify/default.nix b/nixpkgs/pkgs/development/python-modules/sdnotify/default.nix index 0003d9c01312..a447283c63ab 100644 --- a/nixpkgs/pkgs/development/python-modules/sdnotify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sdnotify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix b/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix index cc9594d04525..f4a4955a7392 100644 --- a/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix +++ b/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , pyusb diff --git a/nixpkgs/pkgs/development/python-modules/seekpath/default.nix b/nixpkgs/pkgs/development/python-modules/seekpath/default.nix index 637b55eec8d7..dbfe45107769 100644 --- a/nixpkgs/pkgs/development/python-modules/seekpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/seekpath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }: buildPythonPackage rec { pname = "seekpath"; diff --git a/nixpkgs/pkgs/development/python-modules/selectors2/default.nix b/nixpkgs/pkgs/development/python-modules/selectors2/default.nix index ff6b81d3105d..bd3f77b5b08a 100644 --- a/nixpkgs/pkgs/development/python-modules/selectors2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/selectors2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, psutil, mock }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/selectors34/default.nix b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix index ea3b403fdaed..2209ccf43d26 100644 --- a/nixpkgs/pkgs/development/python-modules/selectors34/default.nix +++ b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/semantic/default.nix b/nixpkgs/pkgs/development/python-modules/semantic/default.nix index 83e4879e1fdd..518b7637ad71 100644 --- a/nixpkgs/pkgs/development/python-modules/semantic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/semantic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/semver/default.nix b/nixpkgs/pkgs/development/python-modules/semver/default.nix index 71ec776db7c4..c281a6d6b0da 100644 --- a/nixpkgs/pkgs/development/python-modules/semver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/semver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix b/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix index dd324260f836..c1ad64b3f5e4 100644 --- a/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, stdenv + , sentencepiece , pkg-config }: diff --git a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index ea9bbc1f0c3f..6b49d6db499d 100644 --- a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -17,7 +17,7 @@ , rq , sanic , sqlalchemy -, lib, stdenv +, lib , tornado , urllib3 , trytond @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "0.19.4"; + version = "0.19.5"; src = fetchPypi { inherit pname version; - sha256 = "1052f0ed084e532f66cb3e4ba617960d820152aee8b93fc6c05bd53861768c1c"; + sha256 = "0grba3rpgg20sqhrh8mxcjwmwgbwrybrxymavh7xsad59570jykk"; }; checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond diff --git a/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix b/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix index 095b47db2bff..8f6d4eb94f58 100644 --- a/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , lxml , pytest , text-unidecode diff --git a/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix b/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix index ba4cdca0c636..2ae9defc504e 100644 --- a/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils +{ lib, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils , blockdiag }: diff --git a/nixpkgs/pkgs/development/python-modules/serpent/default.nix b/nixpkgs/pkgs/development/python-modules/serpent/default.nix index 36840813b401..50f6e0b63a63 100644 --- a/nixpkgs/pkgs/development/python-modules/serpent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/serpent/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, lib , python , isPy27 , enum34 diff --git a/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix b/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix index fa212d6a4de5..a409d48837e6 100644 --- a/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/serversyncstorage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix b/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix index a9c0e7fda893..fb7913ce25c9 100644 --- a/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv +{ lib , buildPythonPackage +, pythonOlder , fetchPypi , pytestCheckHook }: @@ -8,6 +9,8 @@ buildPythonPackage rec { pname = "setproctitle"; version = "1.2"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "9b4e48722dd96cbd66d5bf2eab930fff8546cd551dd8d774c8a319448bd381a6"; diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix index 18fae7b1610b..06e699e19a31 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-git/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix index ba42c21ad360..f1eb2903f03e 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pylint }: +{ lib, buildPythonPackage, fetchPypi, pylint }: buildPythonPackage rec { pname = "setuptools-lint"; diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix index 2d9a4b17d40f..ee4a3b551649 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index d8558aaf83a7..98795eadfd4d 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: buildPythonPackage rec { pname = "setuptools-scm-git-archive"; diff --git a/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix index a766bb6c294f..ba716c313fd5 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pip, pytest }: +{ lib, buildPythonPackage, fetchPypi, pip, pytest }: buildPythonPackage rec { pname = "setuptools_scm"; diff --git a/nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix index f6358a831c9c..41fe5043ea85 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptoolsdarcs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , darcsver diff --git a/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix b/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix index 1d29f77cf0f2..bef492e5dbcb 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix b/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix index 89f716d9be25..fd7d99fbb3fc 100644 --- a/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/sgmllib3k/default.nix b/nixpkgs/pkgs/development/python-modules/sgmllib3k/default.nix index 6884bed27483..1104c843c6ee 100644 --- a/nixpkgs/pkgs/development/python-modules/sgmllib3k/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sgmllib3k/default.nix @@ -1,8 +1,7 @@ -{ stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 -, lib }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix b/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix index 2225466658d5..ceb3b9abcd8b 100644 --- a/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -1,22 +1,40 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, click, colorama }: +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, attrs +, click +, colorama +, pytestCheckHook +}: buildPythonPackage rec { pname = "shamir-mnemonic"; - version = "0.1.0"; + version = "0.2.1"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "1cc08d276e05b13cd32bd3b0c5d1cb6c30254e0086e0f6857ec106d4cceff121"; + src = fetchFromGitHub { + owner = "trezor"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "1mi1n01yw8yycbiv1l0xnfzlhhq2arappyvyi2jm5yq65jln77kg"; }; - propagatedBuildInputs = [ click colorama ]; + propagatedBuildInputs = [ + attrs + click + colorama + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "shamir_mnemonic" ]; meta = with lib; { description = "Reference implementation of SLIP-0039"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; license = licenses.mit; - maintainers = with maintainers; [ _1000101 ]; + maintainers = with maintainers; [ _1000101 prusnak ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/shap/default.nix b/nixpkgs/pkgs/development/python-modules/shap/default.nix index 1ce9a879ee19..cfbd6f92b04c 100644 --- a/nixpkgs/pkgs/development/python-modules/shap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix index 77a4b98f54c3..300368b31f13 100644 --- a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/shippai/default.nix b/nixpkgs/pkgs/development/python-modules/shippai/default.nix index 8fd15b71a015..e7efb1ef2dc6 100644 --- a/nixpkgs/pkgs/development/python-modules/shippai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shippai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "shippai"; diff --git a/nixpkgs/pkgs/development/python-modules/shodan/default.nix b/nixpkgs/pkgs/development/python-modules/shodan/default.nix index f361659d9acb..9637602cce1f 100644 --- a/nixpkgs/pkgs/development/python-modules/shodan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.24.0"; + version = "1.25.0"; src = fetchPypi { inherit pname version; - sha256 = "0b5ec40c954cd48c4e3234e81ad92afdc68438f82ad392fed35b7097eb77b6dd"; + sha256 = "sha256-fivdvBtgv2IAQtABD0t2KoC0MRHb6pwEHXLUMl4mDCM="; }; propagatedBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { # The tests require a shodan api key, so skip them. doCheck = false; + pythonImportsCheck = [ "shodan" ]; meta = with lib; { description = "Python library and command-line utility for Shodan"; diff --git a/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix b/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix index 35401afa6e3e..f1c1efbc0ec2 100644 --- a/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/should-dsl/default.nix b/nixpkgs/pkgs/development/python-modules/should-dsl/default.nix index 1499f1ce4bc8..7510ba88d1d5 100644 --- a/nixpkgs/pkgs/development/python-modules/should-dsl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/should-dsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "should-dsl"; diff --git a/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix b/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix index 9959f26036cf..b733c1c95162 100644 --- a/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonAtLeast , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/signedjson/default.nix b/nixpkgs/pkgs/development/python-modules/signedjson/default.nix index 12614a3446bb..2f47113408e8 100644 --- a/nixpkgs/pkgs/development/python-modules/signedjson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/signedjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , canonicaljson diff --git a/nixpkgs/pkgs/development/python-modules/sigtools/default.nix b/nixpkgs/pkgs/development/python-modules/sigtools/default.nix index 0c11a2b6c561..1d81ba5180cf 100644 --- a/nixpkgs/pkgs/development/python-modules/sigtools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sigtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , repeated_test diff --git a/nixpkgs/pkgs/development/python-modules/simanneal/default.nix b/nixpkgs/pkgs/development/python-modules/simanneal/default.nix index 958f53be567d..2d29797b28f9 100644 --- a/nixpkgs/pkgs/development/python-modules/simanneal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simanneal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ lib, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "simanneal"; diff --git a/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix b/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix index f8d579b6088d..7228e6d9f3e9 100644 --- a/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simple-websocket-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage { pname = "simple-websocket-server"; diff --git a/nixpkgs/pkgs/development/python-modules/simpleai/default.nix b/nixpkgs/pkgs/development/python-modules/simpleai/default.nix index 0786ebfae6e4..2ad7fe9ba28d 100644 --- a/nixpkgs/pkgs/development/python-modules/simpleai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simpleai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix b/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix index ed86b48fc072..06fe8e236b37 100644 --- a/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , nose diff --git a/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix b/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix index 6395f4af223d..e81a7d41b7a5 100644 --- a/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simpleparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/skein/default.nix b/nixpkgs/pkgs/development/python-modules/skein/default.nix index 40a179264273..ad7cc0214393 100644 --- a/nixpkgs/pkgs/development/python-modules/skein/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skein/default.nix @@ -5,7 +5,7 @@ , jre , lib , pythonPackages -, stdenv + }: let diff --git a/nixpkgs/pkgs/development/python-modules/skein/skeinrepo.nix b/nixpkgs/pkgs/development/python-modules/skein/skeinrepo.nix index 85b4f19c8f73..d7bdef56ebe3 100644 --- a/nixpkgs/pkgs/development/python-modules/skein/skeinrepo.nix +++ b/nixpkgs/pkgs/development/python-modules/skein/skeinrepo.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook; - doBuild = false; - installPhase = '' mkdir -p $out diff --git a/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix b/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix index 36ec8b18ca7e..958fc613f6f3 100644 --- a/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: buildPythonPackage rec { pname = "sklearn-deap"; diff --git a/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix index 571398b783dc..d990295bff61 100644 --- a/nixpkgs/pkgs/development/python-modules/slackclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , aiohttp @@ -49,6 +49,8 @@ buildPythonPackage rec { responses ]; + pythonImportsCheck = [ "slack" ]; + meta = with lib; { description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API"; homepage = "https://github.com/slackapi/python-slackclient"; diff --git a/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix b/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix index e6d5e59a80e7..07be197f276c 100644 --- a/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }: +{ lib, fetchPypi, buildPythonPackage, dns, pyasn1 }: buildPythonPackage rec { pname = "sleekxmpp"; diff --git a/nixpkgs/pkgs/development/python-modules/slicer/default.nix b/nixpkgs/pkgs/development/python-modules/slicer/default.nix index b5521f415d7b..83f3e412ddcf 100644 --- a/nixpkgs/pkgs/development/python-modules/slicer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slicer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/slicerator/default.nix b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix index 396692200039..191159a648ec 100644 --- a/nixpkgs/pkgs/development/python-modules/slicerator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix b/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix index deb12817a7bd..0b320e790221 100644 --- a/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,5 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder -, crytic-compile, prettytable, setuptools, solc +{ lib, stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder +, crytic-compile, prettytable, setuptools +# solc is currently broken on Darwin, default to false +, solc, withSolc ? !stdenv.isDarwin }: buildPythonPackage rec { @@ -19,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ crytic-compile prettytable setuptools ]; - postFixup = '' + postFixup = lib.optionalString withSolc '' wrapProgram $out/bin/slither \ --prefix PATH : "${lib.makeBinPath [ solc ]}" ''; @@ -32,7 +34,7 @@ buildPythonPackage rec { contract details, and provides an API to easily write custom analyses. ''; homepage = "https://github.com/trailofbits/slither"; - license = licenses.agpl3; - maintainers = [ maintainers.asymmetric ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ asymmetric arturcygan ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix b/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix index 012a49eb3236..341f53cfe0b5 100644 --- a/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix @@ -1,14 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, substituteAll, aiodns, pyasn1, pyasn1-modules, aiohttp, gnupg, nose }: +{ lib +, buildPythonPackage +, aiodns +, aiohttp +, fetchPypi +, gnupg +, isPy3k +, pyasn1 +, pyasn1-modules +, pytestCheckHook +, substituteAll +}: buildPythonPackage rec { pname = "slixmpp"; - version = "1.6.0"; + version = "1.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0jamly1jv31ragpv8yn52av1m48iwl4i7f9knb67vmk8c22rjdwa"; + sha256 = "sha256-fy7sRKS7ih4JmjOW/noL8qJ1xWVpQLbBbObHnMwT3Bc="; }; patches = [ @@ -18,17 +29,24 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ aiodns pyasn1 pyasn1-modules aiohttp ]; + propagatedBuildInputs = [ + aiodns + aiohttp + pyasn1 + pyasn1-modules + ]; + + checkInputs = [ pytestCheckHook ]; - checkInputs = [ nose ]; + # Exclude live tests + disabledTestFiles = [ "tests/live_test.py" ]; - checkPhase = '' - nosetests --where=tests --exclude=live -i slixtest.py - ''; + pythonImportsCheck = [ "slixmpp" ]; - meta = { + meta = with lib; { description = "Elegant Python library for XMPP"; - license = lib.licenses.mit; - homepage = "https://dev.louiz.org/projects/slixmpp"; + homepage = "https://slixmpp.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/slob/default.nix b/nixpkgs/pkgs/development/python-modules/slob/default.nix index a7520c62a62c..0caec499a95b 100644 --- a/nixpkgs/pkgs/development/python-modules/slob/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slob/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/slowaes/default.nix b/nixpkgs/pkgs/development/python-modules/slowaes/default.nix index 5d738fea57e0..ddca8509744d 100644 --- a/nixpkgs/pkgs/development/python-modules/slowaes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slowaes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/smartdc/default.nix b/nixpkgs/pkgs/development/python-modules/smartdc/default.nix index 0b36a7e9f6e7..ceba9eae9e4b 100644 --- a/nixpkgs/pkgs/development/python-modules/smartdc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smartdc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/nixpkgs/pkgs/development/python-modules/smartypants/default.nix b/nixpkgs/pkgs/development/python-modules/smartypants/default.nix index a497f3db413b..d1e11e30d619 100644 --- a/nixpkgs/pkgs/development/python-modules/smartypants/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smartypants/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchhg , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix b/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix index 2c54f65d9c35..42602f15e9bc 100644 --- a/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, tornado }: +{ lib, fetchPypi, buildPythonPackage, tornado }: buildPythonPackage rec { pname = "snakeviz"; diff --git a/nixpkgs/pkgs/development/python-modules/snapcast/default.nix b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix index 8446683cb1aa..c5df9f7d991d 100644 --- a/nixpkgs/pkgs/development/python-modules/snapcast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pytest +{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest , construct }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix b/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix index 3364470da1b3..84b2bb2e1435 100644 --- a/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, PyStemmer, fetchPypi }: +{ lib, buildPythonPackage, PyStemmer, fetchPypi }: buildPythonPackage rec { pname = "snowballstemmer"; diff --git a/nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix b/nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix index ca9d8707ac63..abfee3718b53 100644 --- a/nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/socksipy-branch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/solax/default.nix b/nixpkgs/pkgs/development/python-modules/solax/default.nix new file mode 100644 index 000000000000..bce0bc74f912 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/solax/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pytest-asyncio +, pytest-cov +, pytest-httpserver +, pytestCheckHook +, setuptools-scm +, voluptuous +}: + +buildPythonPackage rec { + pname = "solax"; + version = "0.2.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h7q6y2cdkj9dqxw0k7pgz7a7vbpq1qw50pmy9rajphhv2600cbc"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ aiohttp voluptuous ]; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytest-httpserver + pytestCheckHook + ]; + + pythonImportsCheck = [ "solax" ]; + + meta = with lib; { + description = "Python wrapper for the Solax Inverter API"; + homepage = "https://github.com/squishykid/solax"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/nixpkgs/pkgs/development/python-modules/somajo/default.nix index bd351b5e86fa..54cd9beede3d 100644 --- a/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -1,23 +1,26 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }: +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }: buildPythonPackage rec { pname = "SoMaJo"; - version = "2.1.1"; + version = "2.1.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "0yj3yb0qvfdv4wh7nzcsh9in8nzk7b59dvjj0x02rsmlv4kw9ah1"; + sha256 = "1c4g8nhlcc348w0axdswv69q8k3qxwbnvim1yf7vagd0adv83gsj"; }; propagatedBuildInputs = [ regex ]; + # loops forever + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Tokenizer and sentence splitter for German and English web texts"; homepage = "https://github.com/tsproisl/SoMaJo"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ danieldk ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/nixpkgs/pkgs/development/python-modules/sopel/default.nix index 095c0917e596..7b549933588b 100644 --- a/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy +{ lib, buildPythonPackage, fetchPypi, isPyPy , dnspython , geoip2 , ipython diff --git a/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix b/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix index e918a1aee3bc..daeca60c1e14 100644 --- a/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/nixpkgs/pkgs/development/python-modules/spacy/default.nix index e13127abeb31..eef7b116b894 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = "https://github.com/explosion/spaCy"; license = licenses.mit; - maintainers = with maintainers; [ danieldk sdll ]; + maintainers = with maintainers; [ sdll ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/spark_parser/default.nix b/nixpkgs/pkgs/development/python-modules/spark_parser/default.nix index ba927431f2c0..fb30daf81fe7 100644 --- a/nixpkgs/pkgs/development/python-modules/spark_parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spark_parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix b/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix index b97cbee2a5fe..41c11172d9bf 100644 --- a/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/speaklater/default.nix b/nixpkgs/pkgs/development/python-modules/speaklater/default.nix index efb0908dc5fc..a9acfb2dbb38 100644 --- a/nixpkgs/pkgs/development/python-modules/speaklater/default.nix +++ b/nixpkgs/pkgs/development/python-modules/speaklater/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/nixpkgs/pkgs/development/python-modules/spglib/default.nix index 08bbb34156bf..88da35a0f972 100644 --- a/nixpkgs/pkgs/development/python-modules/spglib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spglib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }: buildPythonPackage rec { pname = "spglib"; diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix new file mode 100644 index 000000000000..958c1a6b19c5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, sphinx +, livereload +}: + +buildPythonPackage rec { + pname = "sphinx-autobuild"; + version = "2020.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vbaf4vrxahylyp8zrlw5dx1d2faajp926c3pl5i1wlkp1yll62b"; + }; + + propagatedBuildInputs = [ sphinx livereload ]; + + # No tests included. + doCheck = false; + pythonImportsCheck = [ "sphinx_autobuild" ]; + + meta = with lib; { + description = "Rebuild Sphinx documentation on changes, with live-reload in the browser"; + homepage = "https://github.com/executablebooks/sphinx-autobuild"; + license = with licenses; [ mit ]; + maintainer = with maintainers; [holgerpeters]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix index 77f283795db5..d2c20e980e7a 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 11e3c2a87e93..87da4131351d 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index e2bfc5bdaa55..9c3c16657f29 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 6822c0f153d3..068c4d5d2e94 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index b429522f9d3c..931af4b4dde2 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "2.1.4"; pname = "sphinxcontrib-bibtex"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "629612b001f86784669d65e662377a482052decfd9a0a17c46860878eef7b9e0"; + sha256 = "f53ec0cd534d2c8f0a51b4b3473ced46e9cb0dd99a7c5019249fe0ef9cbef18e"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index a2603b876e5e..956e3c033b9b 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 7398cbc433ff..1f33c06b984e 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 150840f19b40..8ca631a2b3c9 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index 609799f18647..cd67732605bb 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 6375bdab3c24..a9548305d3bd 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index adf02860d127..9d16ede62a20 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 52ebe15c1b62..b898e9cb67d2 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index a3054f341450..2b5beb4df079 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix index ee652b42d8a1..21ada23d47f4 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix index 2d56b57df9be..a298025f8ba3 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index db8997dfd216..e028b6eea80e 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/nixpkgs/pkgs/development/python-modules/spinners/default.nix b/nixpkgs/pkgs/development/python-modules/spinners/default.nix new file mode 100644 index 000000000000..1e71296fd176 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/spinners/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchPypi +, isPy27 +, lib }: + +buildPythonPackage rec { + pname = "spinners"; + version = "0.0.24"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0zz2z6dpdjdq5z8m8w8dfi8by0ih1zrdq0caxm1anwhxg2saxdhy"; + }; + + # Tests are not included in the PyPI distribution and the git repo does not have tagged releases + doCheck = false; + pythonImportsCheck = [ "spinners" ]; + + meta = with lib; { + description = "Spinners for the Terminal."; + homepage = "https://github.com/manrajgrover/py-spinners"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix index e0a8d6b9c18a..9533db6e4a73 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, +{ lib, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, jupyter_client, pyzmq }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/spyder/3.nix b/nixpkgs/pkgs/development/python-modules/spyder/3.nix index 34d59d0eb227..0fb98fa38e3d 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/3.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder/3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, +{ lib, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, psutil, pyflakes, rope, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine diff --git a/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/nixpkgs/pkgs/development/python-modules/spyder/default.nix index 26013e71158d..c41ef74c5b16 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle, - psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, - qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, - spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server -, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch, three-merge, pyls-black, pyls-spyder +{ lib, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, + jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, + keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, + cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, + watchdog, python-language-server, pyqtwebengine, atomicwrites, pyxdg, + diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8 }: buildPythonPackage rec { @@ -23,6 +24,7 @@ buildPythonPackage rec { numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder + flake8 ]; # There is no test for spyder diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 4050adc29f55..33b408240fc6 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchPypi , buildPythonPackage , flask diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index 4ef0adefe3e7..84be4587e66e 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchPypi , buildPythonPackage , sqlalchemy diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index 6a8c910cfce6..15ac7dc3a555 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pytest , Wand diff --git a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index 2bb700f67557..1c49e1f4a026 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.3"; + version = "3.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1linla3za1gb3w0n0k6h3q8in62qhipizff259p14gzmyr95rjjv"; + sha256 = "sha256-LJuvUTbsL2anQENEuW1oaSUsMEiXnSgLEAhZ6EP5bNs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix b/nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix index 1d0b3f15c3fc..3057f89adf4e 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlite3dbm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix b/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix index ccbc6659fe3d..f3c438342bce 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/squaremap/default.nix b/nixpkgs/pkgs/development/python-modules/squaremap/default.nix index c17a88435dd6..bab9e2f99f28 100644 --- a/nixpkgs/pkgs/development/python-modules/squaremap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/squaremap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/nixpkgs/pkgs/development/python-modules/srp/default.nix b/nixpkgs/pkgs/development/python-modules/srp/default.nix index 2afbb22d64e5..c0d3a0a4aedc 100644 --- a/nixpkgs/pkgs/development/python-modules/srp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/srp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, lib }: +{ buildPythonPackage, fetchPypi, six, lib }: buildPythonPackage rec { pname = "srp"; diff --git a/nixpkgs/pkgs/development/python-modules/srptools/default.nix b/nixpkgs/pkgs/development/python-modules/srptools/default.nix index f130009d30d6..68ca009d9dc2 100644 --- a/nixpkgs/pkgs/development/python-modules/srptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/srptools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: buildPythonPackage rec { pname = "srptools"; diff --git a/nixpkgs/pkgs/development/python-modules/srsly/default.nix b/nixpkgs/pkgs/development/python-modules/srsly/default.nix index 42320e50fa8d..c6db32a15e41 100644 --- a/nixpkgs/pkgs/development/python-modules/srsly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/srsly/default.nix @@ -1,9 +1,9 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , pythonOlder , cython +, catalogue , mock , numpy , pathlib @@ -13,17 +13,19 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.3.2"; + version = "2.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f78eaef8d982e98921ce026d4205e652a9333137259f0b621f5c7b579e746e9d"; + sha256 = "e29730be53015970e4a59050e8e9f9be44d762108a617df56c9dfc981b515ab7"; }; nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ catalogue ]; + checkInputs = [ mock numpy @@ -41,6 +43,5 @@ buildPythonPackage rec { description = "Modern high-performance serialization utilities for Python"; homepage = "https://github.com/explosion/srsly"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix b/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix index c399ee760fd6..f325d40ba92d 100644 --- a/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , dnspython , mock, nose }: diff --git a/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix b/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix index 8300c3ec2f65..904595865b8c 100644 --- a/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/ssdp/default.nix b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix index 82ea4b066a3c..ac39cffa393e 100644 --- a/nixpkgs/pkgs/development/python-modules/ssdp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/sseclient/default.nix b/nixpkgs/pkgs/development/python-modules/sseclient/default.nix index 9d944e112fe2..6bbeb23ed1f5 100644 --- a/nixpkgs/pkgs/development/python-modules/sseclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sseclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , requests, six , backports_unittest-mock, pytestCheckHook, pytestrunner }: diff --git a/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix b/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix index 5254b5c4dcca..90e4962d3e8f 100644 --- a/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.3.1"; + version = "0.4.0"; pname = "sshtunnel"; src = fetchPypi { inherit pname version; - sha256 = "e0cac8a6a154c7a9651b42038e3f6cf35bb88c8ee4b94822b28a5b2fe7140f95"; + sha256 = "sha256-58sOp3Tbgb+RhE2yLecqQKro97D5u5ug9mbUdO9r+fw="; }; propagatedBuildInputs = [ paramiko ]; diff --git a/nixpkgs/pkgs/development/python-modules/sslib/default.nix b/nixpkgs/pkgs/development/python-modules/sslib/default.nix index 026ac8a30b75..407053785f09 100644 --- a/nixpkgs/pkgs/development/python-modules/sslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sslib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "sslib"; diff --git a/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/nixpkgs/pkgs/development/python-modules/starlette/default.nix index d802a2300035..94513e5d620c 100644 --- a/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -15,7 +15,6 @@ , databases , pytestCheckHook , pytest-asyncio -, pytestcov , typing-extensions , ApplicationServices }: @@ -46,12 +45,14 @@ buildPythonPackage rec { checkInputs = [ aiosqlite databases + pytest-asyncio pytestCheckHook typing-extensions ]; - pytestFlagsArray = [ "--ignore=tests/test_graphql.py" ]; - + disabledTestFiles = [ "tests/test_graphql.py" ]; + # https://github.com/encode/starlette/issues/1131 + disabledTests = [ "test_debug_html" ]; pythonImportsCheck = [ "starlette" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix index d49bae2eab91..e7f1e442f4d8 100644 --- a/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix +++ b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix @@ -1,29 +1,35 @@ { lib , fetchFromGitHub , buildPythonPackage +, poetry , isPy27 , docopt , easywatch , jinja2 , pytestCheckHook +, pytest-check , markdown }: buildPythonPackage rec { pname = "staticjinja"; - version = "0.4.0"; + version = "1.0.4"; + format = "pyproject"; disabled = isPy27; # 0.4.0 drops python2 support - # For some reason, in pypi the tests get disabled when using - # PY_IGNORE_IMPORTMISMATCH, so we just fetch from GitHub + # No tests in pypi src = fetchFromGitHub { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "0pysk8pzmcg1nfxz8m4i6bvww71w2zg6xp33zgg5vrf8yd2dfx9i"; + sha256 = "1saz6f71s693gz9c2k3bq2di2mrkj65mgmfdg86jk0z0zzjk90y1"; }; + nativeBuildInputs = [ + poetry + ]; + propagatedBuildInputs = [ jinja2 docopt @@ -32,13 +38,13 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + pytest-check markdown ]; - # Import paths differ by a "build/lib" subdirectory, but the files are - # the same, so we ignore import mismatches. + # The tests need to find and call the installed staticjinja executable preCheck = '' - export PY_IGNORE_IMPORTMISMATCH=1 + export PATH="$PATH:$out/bin"; ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/statsd/default.nix b/nixpkgs/pkgs/development/python-modules/statsd/default.nix index 447fed3263c3..561a1d14ca42 100644 --- a/nixpkgs/pkgs/development/python-modules/statsd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/statsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/stompclient/default.nix b/nixpkgs/pkgs/development/python-modules/stompclient/default.nix index 17bafbad282e..149be55da580 100644 --- a/nixpkgs/pkgs/development/python-modules/stompclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stompclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix b/nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix index 53701999b021..e76365a525ad 100644 --- a/nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix +++ b/nixpkgs/pkgs/development/python-modules/strict-rfc3339/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "strict-rfc3339"; diff --git a/nixpkgs/pkgs/development/python-modules/stringcase/default.nix b/nixpkgs/pkgs/development/python-modules/stringcase/default.nix index 10afb5113931..e02cc0384f9a 100644 --- a/nixpkgs/pkgs/development/python-modules/stringcase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stringcase/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix b/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix index 2dac94ac15d2..2b536fa0e628 100644 --- a/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , mmpython diff --git a/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix b/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix index 4bf74fe00b4e..af307919387f 100644 --- a/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/suds/default.nix b/nixpkgs/pkgs/development/python-modules/suds/default.nix index 24425fef95f1..1a96df26da1d 100644 --- a/nixpkgs/pkgs/development/python-modules/suds/default.nix +++ b/nixpkgs/pkgs/development/python-modules/suds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/sumo/default.nix b/nixpkgs/pkgs/development/python-modules/sumo/default.nix index e647cd4a9d27..e1b3d8c705eb 100644 --- a/nixpkgs/pkgs/development/python-modules/sumo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sumo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , h5py , matplotlib , numpy diff --git a/nixpkgs/pkgs/development/python-modules/sure/default.nix b/nixpkgs/pkgs/development/python-modules/sure/default.nix index efff79f679f4..ee21e9c45168 100644 --- a/nixpkgs/pkgs/development/python-modules/sure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sure/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , rednose diff --git a/nixpkgs/pkgs/development/python-modules/survey/default.nix b/nixpkgs/pkgs/development/python-modules/survey/default.nix index f9bec0451ff4..436127fae9c4 100644 --- a/nixpkgs/pkgs/development/python-modules/survey/default.nix +++ b/nixpkgs/pkgs/development/python-modules/survey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , wrapio diff --git a/nixpkgs/pkgs/development/python-modules/svg-path/default.nix b/nixpkgs/pkgs/development/python-modules/svg-path/default.nix index 585dbf64b3c3..820d4121633b 100644 --- a/nixpkgs/pkgs/development/python-modules/svg-path/default.nix +++ b/nixpkgs/pkgs/development/python-modules/svg-path/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "svg.path"; version = "4.0.2"; diff --git a/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix b/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix index fb0475ef3b97..38516ab73c3e 100644 --- a/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , lxml diff --git a/nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix index 613de201b2d1..9dbd29739fe8 100644 --- a/nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, flake8 }: +{ lib, buildPythonPackage, fetchPypi, jinja2, flake8 }: buildPythonPackage rec { pname = "swagger-ui-bundle"; diff --git a/nixpkgs/pkgs/development/python-modules/swspotify/default.nix b/nixpkgs/pkgs/development/python-modules/swspotify/default.nix index 321a48e72b6f..e213e9e265ef 100644 --- a/nixpkgs/pkgs/development/python-modules/swspotify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/swspotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }: buildPythonPackage rec { pname = "SwSpotify"; diff --git a/nixpkgs/pkgs/development/python-modules/sybase/default.nix b/nixpkgs/pkgs/development/python-modules/sybase/default.nix index 20c2a158a3b2..5a14e7e7f40e 100644 --- a/nixpkgs/pkgs/development/python-modules/sybase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sybase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/systemd/default.nix b/nixpkgs/pkgs/development/python-modules/systemd/default.nix index 2035ce8b26ba..86c330bd1d88 100644 --- a/nixpkgs/pkgs/development/python-modules/systemd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/systemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }: +{ lib, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }: buildPythonPackage rec { pname = "systemd"; diff --git a/nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix b/nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix index 87a81e4fb17d..5d9b5a034c2b 100644 --- a/nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sysv_ipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/tarman/default.nix b/nixpkgs/pkgs/development/python-modules/tarman/default.nix index 682da22ced8a..c2a2c4405e28 100644 --- a/nixpkgs/pkgs/development/python-modules/tarman/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tarman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/taskw/default.nix b/nixpkgs/pkgs/development/python-modules/taskw/default.nix index 5a1358947130..9e1ae3302c12 100644 --- a/nixpkgs/pkgs/development/python-modules/taskw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/taskw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/nixpkgs/pkgs/development/python-modules/tatsu/default.nix index cba34a95a7bd..540c315c8ff6 100644 --- a/nixpkgs/pkgs/development/python-modules/tatsu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tatsu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , colorama, mypy, pyyaml, regex , dataclasses, typing , pytestrunner, pytest-mypy diff --git a/nixpkgs/pkgs/development/python-modules/tblib/default.nix b/nixpkgs/pkgs/development/python-modules/tblib/default.nix index 7e704e0b2c60..2f06b665d33f 100644 --- a/nixpkgs/pkgs/development/python-modules/tblib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tblib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "tblib"; diff --git a/nixpkgs/pkgs/development/python-modules/telegram/default.nix b/nixpkgs/pkgs/development/python-modules/telegram/default.nix index 95293d095fd5..c297efc0efdd 100644 --- a/nixpkgs/pkgs/development/python-modules/telegram/default.nix +++ b/nixpkgs/pkgs/development/python-modules/telegram/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix index bca75224fa3e..dd3b4641beaf 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , numpy , absl-py , mock diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix index 91880562eb3a..1daaac6ae7eb 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , fetchpatch +, bazel_0_26 , buildBazelPackage , buildPythonPackage , python @@ -26,6 +27,8 @@ let # first build all binaries and generate setup.py using bazel bazel-wheel = buildBazelPackage { + bazel = bazel_0_26; + name = "${pname}-${version}-py2.py3-none-any.whl"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index 9f64a689e2b8..0e2df1a4678d 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -288,9 +288,9 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "0vyy1hv0jy5pqwvnc8pxb9isgnbw07c4a4d4wn61db00np114crz" + "1i7z2a7bc2q1vn1h9nx1xc6g1r1cby2xvbcs20fj9h6c2fgaw9j4" else - "0vczv5f9s4dxgwdkmf1y9b9ybh5d3y1nllqhb5q8aj9kq73izyn9"; + "0s8q5rxq8abr50c5jpwv96ncfc0k8jw7w70ri8viqy031g9v9v45"; }; buildAttrs = { diff --git a/nixpkgs/pkgs/development/python-modules/termcolor/default.nix b/nixpkgs/pkgs/development/python-modules/termcolor/default.nix index df0f4d6208a3..e440dab114fa 100644 --- a/nixpkgs/pkgs/development/python-modules/termcolor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/termcolor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix b/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix index 28e49316ad71..51a0b0712240 100644 --- a/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix +++ b/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index c4520b1c1982..46c8a2853b54 100644 --- a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -1,33 +1,49 @@ { lib , aiohttp , backoff +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , wrapt }: buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.10.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "18frynmy47i9c24mdy819y2dnjwmhnmkly5mbmhikpbmm6d0yjf1"; + sha256 = "sha256-s0IZ1UNldYddaR3zJoYS6ey8Kjxd1fr4fOwf0gNNbow="; }; + patches = [ + (fetchpatch { + name = "dont-use-dummpy-module-bs4.patch"; + url = "https://github.com/zabuldon/teslajsonpy/pull/138/commits/f5a788e47d8338c8ebb06d954f802ba1ec614db3.patch"; + sha256 = "0rws7fhxmca8d5w0bkygx8scvzah3yvb3yfhn05qmp73mn3pmcb3"; + }) + ]; + propagatedBuildInputs = [ aiohttp backoff + beautifulsoup4 wrapt ]; checkInputs = [ pytestCheckHook ]; # Not all Home Assistant related check pass - disabledTests = [ "test_values_on_init" ]; + # https://github.com/zabuldon/teslajsonpy/issues/121 + # https://github.com/zabuldon/teslajsonpy/pull/124 + disabledTests = [ + "test_values_on_init" + "test_get_value_on_init" + ]; pythonImportsCheck = [ "teslajsonpy" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/testing-common-database/default.nix b/nixpkgs/pkgs/development/python-modules/testing-common-database/default.nix new file mode 100644 index 000000000000..1d50ed1ec49d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/testing-common-database/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "testing.common.database"; + version = "2.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wvdv0frl7xib05sixjv9m6jywaa2wdhdhsqqdfk45akk2r80pcn"; + }; + + # There are no unit tests + doCheck = false; + + meta = with lib; { + description = "utilities for testing.* packages"; + homepage = "https://github.com/tk0miya/testing.common.database"; + license = licenses.asl20; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix b/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix new file mode 100644 index 000000000000..7ebff6ccc365 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchFromGitHub, postgresql, testing-common-database +, pg8000, pytestCheckHook, psycopg2, sqlalchemy }: + +buildPythonPackage rec { + pname = "testing.postgresql"; + # Version 1.3.0 isn't working so let's use the latest commit from GitHub + version = "unstable-2017-10-31"; + + src = fetchFromGitHub { + owner = "tk0miya"; + repo = pname; + rev = "c81ded434d00ec8424de0f9e1f4063c778c6aaa8"; + sha256 = "1asqsi38di768i1sc1qm1k068dj0906ds6lnx7xcbxws0s25m2q3"; + }; + + # Add PostgreSQL to search path + prePatch = '' + substituteInPlace src/testing/postgresql.py \ + --replace "/usr/local/pgsql" "${postgresql}" + ''; + + propagatedBuildInputs = [ testing-common-database pg8000 ]; + + # Fix tests for Darwin build. See: + # https://github.com/NixOS/nixpkgs/pull/74716#issuecomment-598546916 + __darwinAllowLocalNetworking = true; + + checkInputs = [ pytestCheckHook psycopg2 sqlalchemy ]; + + meta = with lib; { + description = "Use temporary postgresql instance in testing"; + homepage = "https://github.com/tk0miya/testing.postgresql"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/testpath/default.nix b/nixpkgs/pkgs/development/python-modules/testpath/default.nix index a5ab52e5cdd5..c95bd0c78b66 100644 --- a/nixpkgs/pkgs/development/python-modules/testpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/testpath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/testrepository/default.nix b/nixpkgs/pkgs/development/python-modules/testrepository/default.nix index c249ca212b6d..45093a5f7cf7 100644 --- a/nixpkgs/pkgs/development/python-modules/testrepository/default.nix +++ b/nixpkgs/pkgs/development/python-modules/testrepository/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , testtools diff --git a/nixpkgs/pkgs/development/python-modules/testscenarios/default.nix b/nixpkgs/pkgs/development/python-modules/testscenarios/default.nix index 465384edcb0c..8df35ac4b889 100644 --- a/nixpkgs/pkgs/development/python-modules/testscenarios/default.nix +++ b/nixpkgs/pkgs/development/python-modules/testscenarios/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , testtools diff --git a/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/nixpkgs/pkgs/development/python-modules/thinc/default.nix index bd520f2c4bfd..75e1a029a256 100644 --- a/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "Practical Machine Learning for NLP in Python"; homepage = "https://github.com/explosion/thinc"; license = licenses.mit; - maintainers = with maintainers; [ aborsu danieldk sdll ]; + maintainers = with maintainers; [ aborsu sdll ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/threadpool/default.nix b/nixpkgs/pkgs/development/python-modules/threadpool/default.nix index 7a1696feb665..9c83e7e45c28 100644 --- a/nixpkgs/pkgs/development/python-modules/threadpool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/threadpool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/thrift/default.nix b/nixpkgs/pkgs/development/python-modules/thrift/default.nix index c7279b867b10..7b16d6668705 100644 --- a/nixpkgs/pkgs/development/python-modules/thrift/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thrift/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix b/nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix index abfad4ffaac9..28b2e5a9f93c 100644 --- a/nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thumborpexif/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/tilestache/default.nix b/nixpkgs/pkgs/development/python-modules/tilestache/default.nix index 170360c133ed..ce46fd56f243 100644 --- a/nixpkgs/pkgs/development/python-modules/tilestache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tilestache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , modestmaps diff --git a/nixpkgs/pkgs/development/python-modules/timelib/default.nix b/nixpkgs/pkgs/development/python-modules/timelib/default.nix index 65b121ddfafd..e2f3cc1d3cc8 100644 --- a/nixpkgs/pkgs/development/python-modules/timelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/timelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix b/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix index b1160cafe309..c2d21fea153f 100644 --- a/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "timeout-decorator"; version = "0.5.0"; diff --git a/nixpkgs/pkgs/development/python-modules/tissue/default.nix b/nixpkgs/pkgs/development/python-modules/tissue/default.nix index fc4316c98fe9..e1ef7f9edf46 100644 --- a/nixpkgs/pkgs/development/python-modules/tissue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tissue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/tlsh/default.nix b/nixpkgs/pkgs/development/python-modules/tlsh/default.nix index 302b113364d2..7be95b970888 100644 --- a/nixpkgs/pkgs/development/python-modules/tlsh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tlsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , cmake diff --git a/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix b/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix index a952c95d93e4..37751890c7b3 100644 --- a/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ecdsa diff --git a/nixpkgs/pkgs/development/python-modules/tlslite/default.nix b/nixpkgs/pkgs/development/python-modules/tlslite/default.nix index a1e78c5db76c..52b662be2b2e 100644 --- a/nixpkgs/pkgs/development/python-modules/tlslite/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tlslite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/todoist/default.nix b/nixpkgs/pkgs/development/python-modules/todoist/default.nix index 62749d3b02f6..23c68007cd3f 100644 --- a/nixpkgs/pkgs/development/python-modules/todoist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/todoist/default.nix @@ -4,25 +4,13 @@ buildPythonPackage rec { pname = "todoist-python"; - version = "8.1.2"; + version = "8.1.3"; src = fetchPypi { inherit pname version; - sha256 = "750b2d2300e8590cd56414ab7bbbc8dfcaf8c27102b342398955812176499498"; + sha256 = "sha256-AFRKA5VRD6jyiguZYP7WOQOWqHq1GjUzbuez0f1070U="; }; - patches = [ - # From https://github.com/Doist/todoist-python/pull/80 - (fetchpatch { - url = "https://github.com/Doist/todoist-python/commit/605443c67a8e2f105071e0da001c9f6f2a89ef19.patch"; - sha256 = "0ah0s5by783kqlaimsbxz11idz0bhc2428aw9vdjpngmzb7ih1pa"; - }) - (fetchpatch { - url = "https://github.com/Doist/todoist-python/commit/f2f8e1e5b3ab1674ad9f0dff885702a25d1d18e9.patch"; - sha256 = "1kp63yk9kj87zvvgfl60m6lxdm5sx3dny4g0s67ap1jbz350wifn"; - }) - ]; - propagatedBuildInputs = [ requests ] ++ lib.optional (pythonOlder "3.5") typing; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix index 875e70cee58e..d7eece650026 100644 --- a/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder , click , click-completion , factory_boy diff --git a/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index ec435a0ac359..cf122613f633 100644 --- a/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , fetchurl diff --git a/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix b/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix index 2bed18870166..bed053f82826 100644 --- a/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/nixpkgs/pkgs/development/python-modules/toml/default.nix b/nixpkgs/pkgs/development/python-modules/toml/default.nix index 0d0d87c73d11..bdc1b141eed7 100644 --- a/nixpkgs/pkgs/development/python-modules/toml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/toml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "toml"; diff --git a/nixpkgs/pkgs/development/python-modules/toposort/default.nix b/nixpkgs/pkgs/development/python-modules/toposort/default.nix index 43df3c4e21e9..540835c7e310 100644 --- a/nixpkgs/pkgs/development/python-modules/toposort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/toposort/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index 928616eb4f8a..79f6a19ffcb5 100644 --- a/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , ninja diff --git a/nixpkgs/pkgs/development/python-modules/traceback2/default.nix b/nixpkgs/pkgs/development/python-modules/traceback2/default.nix index 5309ae47a02d..040874286bde 100644 --- a/nixpkgs/pkgs/development/python-modules/traceback2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/traceback2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/nixpkgs/pkgs/development/python-modules/tracing/default.nix b/nixpkgs/pkgs/development/python-modules/tracing/default.nix index f4c01f003a9a..c2adc9ec9c5a 100644 --- a/nixpkgs/pkgs/development/python-modules/tracing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tracing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , sphinx diff --git a/nixpkgs/pkgs/development/python-modules/traits/default.nix b/nixpkgs/pkgs/development/python-modules/traits/default.nix index e3bc8b43fe4e..d9986dd87fe1 100644 --- a/nixpkgs/pkgs/development/python-modules/traits/default.nix +++ b/nixpkgs/pkgs/development/python-modules/traits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/transaction/default.nix b/nixpkgs/pkgs/development/python-modules/transaction/default.nix index def2559a72d0..6bb5987ba484 100644 --- a/nixpkgs/pkgs/development/python-modules/transaction/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transaction/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , zope_interface diff --git a/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 594204754408..6c04bacbd7cb 100644 --- a/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , fetchFromGitHub , pythonOlder , cookiecutter @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.2.2"; + version = "4.3.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - hash = "sha256-sBMCzEgYX6HQbzoEIYnmMdpYecCCsQjTdl2mO1Veu9M="; + hash = "sha256-vv4wKf1PcuVR63ZQJd3oixdNvS7VcTmAaKkmL8I4COg="; }; propagatedBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - sed -ri 's/tokenizers==[0-9.]+/tokenizers/g' setup.py + sed -ri 's/tokenizers[=>]=[^"]+/tokenizers/g' setup.py src/transformers/dependency_versions_table.py ''; pythonImportsCheck = [ "transformers" ]; diff --git a/nixpkgs/pkgs/development/python-modules/transip/default.nix b/nixpkgs/pkgs/development/python-modules/transip/default.nix index e270d5a0662d..94d3cb85be40 100644 --- a/nixpkgs/pkgs/development/python-modules/transip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/translationstring/default.nix b/nixpkgs/pkgs/development/python-modules/translationstring/default.nix index 2f39b57b480f..f7036128e08e 100644 --- a/nixpkgs/pkgs/development/python-modules/translationstring/default.nix +++ b/nixpkgs/pkgs/development/python-modules/translationstring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix b/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix index a128b150579a..a9f3042fb397 100644 --- a/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six @@ -15,10 +15,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; + # no tests + doCheck = false; + meta = with lib; { description = "Python implementation of the Transmission bittorent client RPC protocol"; homepage = "https://pypi.python.org/pypi/transmissionrpc/"; license = licenses.mit; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/treq/default.nix b/nixpkgs/pkgs/development/python-modules/treq/default.nix index 477223e96186..447e2a5b9863 100644 --- a/nixpkgs/pkgs/development/python-modules/treq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/treq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six +{ lib, fetchPypi, buildPythonPackage, service-identity, requests, six , mock, twisted, incremental, pep8, httpbin }: diff --git a/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix b/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix index 537b4db7995a..cef74c8636b7 100644 --- a/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , trezor diff --git a/nixpkgs/pkgs/development/python-modules/trueskill/default.nix b/nixpkgs/pkgs/development/python-modules/trueskill/default.nix index 0c3efa404ec6..db16ed7fafbc 100644 --- a/nixpkgs/pkgs/development/python-modules/trueskill/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trueskill/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix b/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix index 24eb10637078..f32045ce9cde 100644 --- a/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , sphinx diff --git a/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix b/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix index f2cdbe8dc633..845aff673b76 100644 --- a/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests-cache diff --git a/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix b/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix index fa155b86f407..6a720421c72f 100644 --- a/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/twiggy/default.nix b/nixpkgs/pkgs/development/python-modules/twiggy/default.nix index 9647dc8ae67c..45e59860227a 100644 --- a/nixpkgs/pkgs/development/python-modules/twiggy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twiggy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 7931a4ad0ec9..56f3ba29ddf1 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -1,21 +1,33 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub -, pyjwt, pysocks, pytz, requests, six, nose, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, nose +, pyjwt +, pysocks +, pytz +, requests +, six +}: buildPythonPackage rec { pname = "twilio"; - version = "6.43.0"; + version = "6.51.1"; + # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0p2chrzakqx5694g305j0klh9lxlclm5qp0qjm6wqicivyybggzg"; + sha256 = "sha256-OHtmUFm/9GkpIzz0DdSdlHyBFRIgu8GxQ4S4VMJik9o="; }; buildInputs = [ nose mock ]; propagatedBuildInputs = [ pyjwt pysocks pytz six requests ]; + pythonImportsCheck = [ "twilio" ]; + meta = with lib; { description = "Twilio API client and TwiML generator"; homepage = "https://github.com/twilio/twilio-python/"; diff --git a/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix b/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix new file mode 100644 index 000000000000..d4910cfdbe9d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, requests, rx, pytestCheckHook, responses, isPy3k }: + +buildPythonPackage rec { + pname = "twitch-python"; + version = "0.0.19"; + + src = fetchPypi { + inherit pname version; + sha256 = "b0b02abdd33458e4ffabc632aa6a6779f3599e188819632551353b6c5553f5c5"; + }; + + disabled = !isPy3k; + + postPatch = '' + substituteInPlace setup.py --replace "'pipenv'," "" + ''; + + propagatedBuildInputs = [ requests rx ]; + + checkInputs = [ pytestCheckHook responses ]; + + pythonImportsCheck = [ "twitch" ]; + + meta = with lib; { + description = "Twitch module for Python"; + homepage = "https://github.com/PetterKraabol/Twitch-Python"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix index 72f30514dc67..644a97d2b2ec 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-lang diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix index ee5bf9bdbe10..d718a18822be 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-log diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix index 14b0bcd0673c..bf9ec099ddba 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-lang diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix index 4b4a5c0fc2e2..93178f467921 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-lang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix index 8cf99c39dc20..61f5d99a8f1c 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-log/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-options diff --git a/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix b/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix index a5505330bc0a..b3ae7f7f5d94 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter-common-options/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/twitter/default.nix b/nixpkgs/pkgs/development/python-modules/twitter/default.nix index 23d647d93153..7114dc661f42 100644 --- a/nixpkgs/pkgs/development/python-modules/twitter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/txaio/default.nix b/nixpkgs/pkgs/development/python-modules/txaio/default.nix index 4d756fa89f3f..814b6234ee3b 100644 --- a/nixpkgs/pkgs/development/python-modules/txaio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/txaio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }: buildPythonPackage rec { pname = "txaio"; diff --git a/nixpkgs/pkgs/development/python-modules/txamqp/default.nix b/nixpkgs/pkgs/development/python-modules/txamqp/default.nix index f0e3904a8815..cc66e041ae38 100644 --- a/nixpkgs/pkgs/development/python-modules/txamqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/txamqp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twisted diff --git a/nixpkgs/pkgs/development/python-modules/txdbus/default.nix b/nixpkgs/pkgs/development/python-modules/txdbus/default.nix index 461ddeee34b4..31afbd4fdf95 100644 --- a/nixpkgs/pkgs/development/python-modules/txdbus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/txdbus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, twisted }: +{ lib, buildPythonPackage, fetchPypi, six, twisted }: buildPythonPackage rec { pname = "txdbus"; diff --git a/nixpkgs/pkgs/development/python-modules/txgithub/default.nix b/nixpkgs/pkgs/development/python-modules/txgithub/default.nix index 402e5011ede6..09af476e94df 100644 --- a/nixpkgs/pkgs/development/python-modules/txgithub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/txgithub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyopenssl diff --git a/nixpkgs/pkgs/development/python-modules/txrequests/default.nix b/nixpkgs/pkgs/development/python-modules/txrequests/default.nix index 06979e2b9b39..be32dc4a7387 100644 --- a/nixpkgs/pkgs/development/python-modules/txrequests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/txrequests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twisted diff --git a/nixpkgs/pkgs/development/python-modules/typeguard/default.nix b/nixpkgs/pkgs/development/python-modules/typeguard/default.nix index 448e52af7afa..7aced09b33da 100644 --- a/nixpkgs/pkgs/development/python-modules/typeguard/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typeguard/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , pythonOlder -, lib, stdenv +, lib , setuptools_scm , pytest , typing-extensions diff --git a/nixpkgs/pkgs/development/python-modules/typesystem/default.nix b/nixpkgs/pkgs/development/python-modules/typesystem/default.nix index e993363769a8..e93fd83656f8 100644 --- a/nixpkgs/pkgs/development/python-modules/typesystem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typesystem/default.nix @@ -30,7 +30,15 @@ buildPythonPackage rec { pytestcov ]; - disabledTests = [ "test_to_json_schema_complex_regular_expression" ]; + disabledTests = [ + # https://github.com/encode/typesystem/issues/102. cosmetic issue where python3.8 changed + # the default string formatting of regular expression flags which breaks test assertion + "test_to_json_schema_complex_regular_expression" + ]; + disabledTestFiles = [ + # for some reason jinja2 not picking up forms directory (1% of tests) + "tests/test_forms.py" + ]; meta = with lib; { description = "A type system library for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/typogrify/default.nix b/nixpkgs/pkgs/development/python-modules/typogrify/default.nix index faa1c8641c05..25445d8a7d29 100644 --- a/nixpkgs/pkgs/development/python-modules/typogrify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typogrify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix b/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix index df0923833fd5..a7cd91d6845b 100644 --- a/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytz }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix b/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix index 370ed527d193..36d725d14f45 100644 --- a/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, pyyaml }: buildPythonPackage rec { pname = "ua-parser"; diff --git a/nixpkgs/pkgs/development/python-modules/uarray/default.nix b/nixpkgs/pkgs/development/python-modules/uarray/default.nix index 37ba1ab25e2f..32a877582342 100644 --- a/nixpkgs/pkgs/development/python-modules/uarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uarray/default.nix @@ -1,33 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , fetchpatch , matchpy , numpy , astunparse , typing-extensions -, black -, pytest +, pytestCheckHook , pytestcov -, numba -, nbval -, python -, isPy37 }: buildPythonPackage rec { pname = "uarray"; - version = "0.6.0"; + version = "0.8.2"; - src = fetchPypi { - inherit pname version; - sha256 = "fa63ae7034833a99bc1628d3cd5501d4d00f2e6437b6cbe73f710dcf212a6bea"; + src = fetchFromGitHub { + owner = "Quansight-Labs"; + repo = pname; + rev = version; + sha256 = "1x2jp7w2wmn2awyv05xs0frpq0fa0rprwcxyg72wgiss0bnzxnhm"; }; - doCheck = false; # currently has circular dependency module import, remove when bumping to >0.5.1 - checkInputs = [ pytest nbval pytestcov numba ]; - propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions black ]; + patches = [( + # Fixes a compile error with newer versions of GCC -- should be included + # in the next release after 0.8.2 + fetchpatch { + url = "https://github.com/Quansight-Labs/uarray/commit/a2012fc7bb94b3773eb402c6fe1ba1a894ea3d18.patch"; + sha256 = "1qqh407qg5dz6x766mya2bxrk0ffw5h17k478f5kcs53g4dyfc3s"; + } + )]; + checkInputs = [ pytestCheckHook pytestcov ]; + propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ]; + + # Tests must be run from outside the source directory + preCheck = '' + cd $TMP + ''; + pytestFlagsArray = ["--pyargs" "uarray"]; pythonImportsCheck = [ "uarray" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/ujson/2.nix b/nixpkgs/pkgs/development/python-modules/ujson/2.nix index f31b26a1960a..36aa5a020c35 100644 --- a/nixpkgs/pkgs/development/python-modules/ujson/2.nix +++ b/nixpkgs/pkgs/development/python-modules/ujson/2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools_scm diff --git a/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/nixpkgs/pkgs/development/python-modules/ujson/default.nix index 1c12a092a2f5..9c759bd41b36 100644 --- a/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/umalqurra/default.nix b/nixpkgs/pkgs/development/python-modules/umalqurra/default.nix index 4411dbac11b8..0e1b4c681e5b 100644 --- a/nixpkgs/pkgs/development/python-modules/umalqurra/default.nix +++ b/nixpkgs/pkgs/development/python-modules/umalqurra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix b/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix index f471fbef4c8c..b9abe2bb7682 100644 --- a/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix @@ -6,22 +6,25 @@ , scikitlearn , scipy , numba +, pynndescent +, tensorflow , pytestCheckHook }: buildPythonPackage rec { pname = "umap-learn"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; rev = version; - sha256 = "080by8h4rxr5ijx8vp8kn952chiqz029j26c04k4js4g9s7201bq"; + sha256 = "sha256-2Z5RDi4bz8hh8zMwkcCQY9NrGaVd1DJEBOmrCl2oSvM="; }; checkInputs = [ nose + tensorflow pytestCheckHook ]; @@ -30,8 +33,13 @@ buildPythonPackage rec { scikitlearn scipy numba + pynndescent ]; + preCheck = '' + export HOME=$TMPDIR + ''; + disabledTests = [ # Plot functionality requires additional packages. # These test also fail with 'RuntimeError: cannot cache function' error. diff --git a/nixpkgs/pkgs/development/python-modules/umemcache/default.nix b/nixpkgs/pkgs/development/python-modules/umemcache/default.nix index f852483cda68..26f8ba02756c 100644 --- a/nixpkgs/pkgs/development/python-modules/umemcache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/umemcache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl }: +{ lib, buildPythonPackage, isPy3k, fetchurl }: buildPythonPackage rec { pname = "umemcache"; diff --git a/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix b/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix index 117188198ca8..b43927c063ec 100644 --- a/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , nose, numpy, future }: diff --git a/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix b/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix index 4f8d461c87e2..31095fcd50e6 100644 --- a/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix index 80ac5151b53f..a0574f948f0d 100644 --- a/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix b/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix index 9393ff58bc27..ede2b0d3f093 100644 --- a/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unicodecsv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/unidecode/default.nix b/nixpkgs/pkgs/development/python-modules/unidecode/default.nix index 34de3d713866..70724bb71b51 100644 --- a/nixpkgs/pkgs/development/python-modules/unidecode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unidecode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, glibcLocales }: buildPythonPackage rec { pname = "Unidecode"; diff --git a/nixpkgs/pkgs/development/python-modules/unifi/default.nix b/nixpkgs/pkgs/development/python-modules/unifi/default.nix index 66ab9ba3972b..fc98695dd6fa 100644 --- a/nixpkgs/pkgs/development/python-modules/unifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , fetchPypi, urllib3 }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/unittest2/default.nix b/nixpkgs/pkgs/development/python-modules/unittest2/default.nix index a7c1252f4b46..ae8cab53b0c5 100644 --- a/nixpkgs/pkgs/development/python-modules/unittest2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unittest2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix b/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix index 52d2a42b4baf..96b27127cc60 100644 --- a/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/development/python-modules/upass/default.nix b/nixpkgs/pkgs/development/python-modules/upass/default.nix index 442876d7a975..61197c7219da 100644 --- a/nixpkgs/pkgs/development/python-modules/upass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/upass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , pyperclip diff --git a/nixpkgs/pkgs/development/python-modules/update_checker/default.nix b/nixpkgs/pkgs/development/python-modules/update_checker/default.nix index f9171e8cbc9d..432232c60f91 100644 --- a/nixpkgs/pkgs/development/python-modules/update_checker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/update_checker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, isPy27 +{ lib, buildPythonPackage, fetchPypi, requests, isPy27 }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix b/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix index 5164bf854ada..21fe31630de6 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/nixpkgs/pkgs/development/python-modules/uptime/default.nix b/nixpkgs/pkgs/development/python-modules/uptime/default.nix index 8f8c067d36ae..640d2a6ed570 100644 --- a/nixpkgs/pkgs/development/python-modules/uptime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uptime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/uranium/default.nix b/nixpkgs/pkgs/development/python-modules/uranium/default.nix index f5bca2ed0fef..ff262d6b0a32 100644 --- a/nixpkgs/pkgs/development/python-modules/uranium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uranium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, cmake +{ lib, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/uritools/default.nix b/nixpkgs/pkgs/development/python-modules/uritools/default.nix index b06da7c6acc7..2f4710eea46b 100644 --- a/nixpkgs/pkgs/development/python-modules/uritools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uritools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "uritools"; diff --git a/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix b/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix index 3a7158be73c8..e78dc9b904dc 100644 --- a/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pycurl, six }: +{ lib, buildPythonPackage, fetchPypi, pycurl, six }: buildPythonPackage rec { pname = "urlgrabber"; diff --git a/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/nixpkgs/pkgs/development/python-modules/urwid/default.nix index e3c5311136c2..7dcc56d9f6e8 100644 --- a/nixpkgs/pkgs/development/python-modules/urwid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/urwid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: buildPythonPackage rec { pname = "urwid"; @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A full-featured console (xterm et al.) user interface library"; - homepage = "http://excess.org/urwid"; + homepage = "https://excess.org/urwid"; repositories.git = "git://github.com/wardi/urwid.git"; license = licenses.lgpl21; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix b/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix index 4c3a3e896f86..863989156c3d 100644 --- a/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix +++ b/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , glibcLocales diff --git a/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix b/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix index b1f5b301dee4..6dbb6ce184ff 100644 --- a/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pyusb }: +{ lib, fetchurl, buildPythonPackage, pyusb }: buildPythonPackage rec { pname = "usbtmc"; diff --git a/nixpkgs/pkgs/development/python-modules/user-agents/default.nix b/nixpkgs/pkgs/development/python-modules/user-agents/default.nix index 7f8470cfbdc8..d01c601c82a0 100644 --- a/nixpkgs/pkgs/development/python-modules/user-agents/default.nix +++ b/nixpkgs/pkgs/development/python-modules/user-agents/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }: +{ lib, buildPythonPackage, fetchFromGitHub, ua-parser }: buildPythonPackage rec { pname = "user-agents"; diff --git a/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch b/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch deleted file mode 100644 index bd4e5e48b149..000000000000 --- a/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/tests/test_pipes.py b/tests/test_pipes.py -index d883abf..2e74d7a 100644 ---- a/tests/test_pipes.py -+++ b/tests/test_pipes.py -@@ -2,6 +2,7 @@ import asyncio - import io - import os - import socket -+import unittest - - from uvloop import _testbase as tb - -@@ -96,6 +97,7 @@ class _BasePipeTest: - # extra info is available - self.assertIsNotNone(proto.transport.get_extra_info('pipe')) - -+ @unittest.skip("darwin sandbox") - def test_read_pty_output(self): - proto = MyReadPipeProto(loop=self.loop) - -@@ -198,6 +200,7 @@ class _BasePipeTest: - self.loop.run_until_complete(proto.done) - self.assertEqual('CLOSED', proto.state) - -+ @unittest.skip("darwin sandbox") - def test_write_pty(self): - master, slave = os.openpty() - os.set_blocking(master, False) diff --git a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index a37e6a3675ba..27f7b68fe89c 100644 --- a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -1,69 +1,69 @@ { lib , stdenv , buildPythonPackage +, pythonOlder , fetchPypi -, pyopenssl , libuv -, psutil -, isPy27 -, pythonAtLeast , CoreServices , ApplicationServices # Check Inputs +, aiohttp +, psutil +, pyopenssl , pytestCheckHook -# , pytest-asyncio }: buildPythonPackage rec { pname = "uvloop"; - version = "0.14.0"; - disabled = isPy27; + version = "0.15.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "07j678z9gf41j98w72ysrnb5sa41pl5yxd7ib17lcwfxqz0cjfhj"; + sha256 = "0rfhr84km8k5gj0036b2pznwmc8macx56vkxc3aksvns95dksl0s"; }; - patches = lib.optional stdenv.isDarwin ./darwin_sandbox.patch; - buildInputs = [ libuv - ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; - - pythonImportsCheck = [ - "uvloop" - "uvloop.loop" + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ApplicationServices ]; dontUseSetuptoolsCheck = true; - checkInputs = [ pytestCheckHook pyopenssl psutil ]; + checkInputs = [ + aiohttp + pytestCheckHook + pyopenssl + psutil + ]; pytestFlagsArray = [ # from pytest.ini, these are NECESSARY to prevent failures "--capture=no" "--assert=plain" + "--strict" "--tb=native" # ignore code linting tests "--ignore=tests/test_sourcecode.py" ]; - disabledTests = [ - "test_sock_cancel_add_reader_race" # asyncio version of test is supposed to be skipped but skip doesn't happen. uvloop version runs fine - ] ++ lib.optionals (pythonAtLeast "3.8") [ "test_write_to_closed_transport" ]; # https://github.com/MagicStack/uvloop/issues/355 - # force using installed/compiled uvloop vs source by moving tests to temp dir preCheck = '' export TEST_DIR=$(mktemp -d) cp -r tests $TEST_DIR pushd $TEST_DIR - '' + lib.optionalString stdenv.isDarwin '' - # Some tests fail on Darwin - rm tests/test_[stu]*.py ''; + postCheck = '' popd ''; + pythonImportsCheck = [ + "uvloop" + "uvloop.loop" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; @@ -72,6 +72,5 @@ buildPythonPackage rec { homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; maintainers = with maintainers; [ costrouc ]; - broken = pythonAtLeast "3.9"; # see: https://github.com/MagicStack/uvloop/issues/365 }; } diff --git a/nixpkgs/pkgs/development/python-modules/validate-email/default.nix b/nixpkgs/pkgs/development/python-modules/validate-email/default.nix index 327cfcf3f0d3..2b1fdb4963d5 100644 --- a/nixpkgs/pkgs/development/python-modules/validate-email/default.nix +++ b/nixpkgs/pkgs/development/python-modules/validate-email/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "validate-email"; diff --git a/nixpkgs/pkgs/development/python-modules/validictory/default.nix b/nixpkgs/pkgs/development/python-modules/validictory/default.nix index e89b3d7bcd23..29ffb76591ef 100644 --- a/nixpkgs/pkgs/development/python-modules/validictory/default.nix +++ b/nixpkgs/pkgs/development/python-modules/validictory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/vcversioner/default.nix b/nixpkgs/pkgs/development/python-modules/vcversioner/default.nix index 7d73a6e812dd..236bb8d149b6 100644 --- a/nixpkgs/pkgs/development/python-modules/vcversioner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vcversioner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "vcversioner"; diff --git a/nixpkgs/pkgs/development/python-modules/vdf/default.nix b/nixpkgs/pkgs/development/python-modules/vdf/default.nix index 9e4e92d21ae7..846aa7a13dfc 100644 --- a/nixpkgs/pkgs/development/python-modules/vdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , pytest, pytestcov, mock }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index bda65ab49076..1f7642bfe347 100644 --- a/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/vega/default.nix b/nixpkgs/pkgs/development/python-modules/vega/default.nix index 3a36d5de6064..083aa6302098 100644 --- a/nixpkgs/pkgs/development/python-modules/vega/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vega/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage , fetchPypi, pythonOlder +{ lib, buildPythonPackage , fetchPypi, pythonOlder , pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/venusian/default.nix b/nixpkgs/pkgs/development/python-modules/venusian/default.nix index 68d974aabec8..82e291ae4623 100644 --- a/nixpkgs/pkgs/development/python-modules/venusian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/venusian/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/versioneer/default.nix b/nixpkgs/pkgs/development/python-modules/versioneer/default.nix index fa3329503a36..3685e78d4b4e 100644 --- a/nixpkgs/pkgs/development/python-modules/versioneer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/versioneer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/versiontools/default.nix b/nixpkgs/pkgs/development/python-modules/versiontools/default.nix index 45b34d95301d..f74c8610b4cc 100644 --- a/nixpkgs/pkgs/development/python-modules/versiontools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/versiontools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix b/nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix index f2c8cee451d3..003fd6db621c 100644 --- a/nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/veryprettytable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , termcolor diff --git a/nixpkgs/pkgs/development/python-modules/vidstab/default.nix b/nixpkgs/pkgs/development/python-modules/vidstab/default.nix index 548105a01778..4119b26259d7 100644 --- a/nixpkgs/pkgs/development/python-modules/vidstab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vidstab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/nixpkgs/pkgs/development/python-modules/vine/default.nix b/nixpkgs/pkgs/development/python-modules/vine/default.nix index 048fa435e0be..8fc895cfa44c 100644 --- a/nixpkgs/pkgs/development/python-modules/vine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , case, pytest, pythonOlder }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix index 9b225021cf21..4dfebc13075f 100644 --- a/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix index 658f41126fc9..087a1a2ca517 100644 --- a/nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/nixpkgs/pkgs/development/python-modules/vmprof/default.nix b/nixpkgs/pkgs/development/python-modules/vmprof/default.nix index f8be722ef90f..3962a1e02c36 100644 --- a/nixpkgs/pkgs/development/python-modules/vmprof/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vmprof/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , colorama diff --git a/nixpkgs/pkgs/development/python-modules/vncdo/default.nix b/nixpkgs/pkgs/development/python-modules/vncdo/default.nix index cb1b1677e1b5..ef33a46cc34c 100644 --- a/nixpkgs/pkgs/development/python-modules/vncdo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vncdo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , buildPythonPackage, isPy27 , pillow , twisted diff --git a/nixpkgs/pkgs/development/python-modules/volkszaehler/default.nix b/nixpkgs/pkgs/development/python-modules/volkszaehler/default.nix index fdd3e1923a39..b86394bc2b62 100644 --- a/nixpkgs/pkgs/development/python-modules/volkszaehler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/volkszaehler/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "volkszaehler"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "087gw1k3f81lm859r0j65cjia8c2dcy4cx8c7s3mb5msb1csdh0x"; + sha256 = "13zhxq08wn5y9yn6xbazfl0gxxysmirwpc26wcnr6jk2va1kpc4l"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix b/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix index 63be8cd4bd05..9882724fbb63 100644 --- a/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix +++ b/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "voluptuous"; diff --git a/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/nixpkgs/pkgs/development/python-modules/vsure/default.nix index 578578a21b17..40b1b328f16f 100644 --- a/nixpkgs/pkgs/development/python-modules/vsure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vsure/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "vsure"; - version = "1.6.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "1lsr0wl1dwbzpn68ww348yk6v42bw89nrghz5gjsimrr428zw6qn"; + sha256 = "sha256-EFat1sewh0Y9PHs08Grlk2RparA47GqkUv/WJ3J2494="; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/vultr/default.nix b/nixpkgs/pkgs/development/python-modules/vultr/default.nix index d4349d310be2..975e4098112a 100644 --- a/nixpkgs/pkgs/development/python-modules/vultr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vultr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/nixpkgs/pkgs/development/python-modules/vxi11/default.nix b/nixpkgs/pkgs/development/python-modules/vxi11/default.nix index 5d9531aa904d..242fe47b33d0 100644 --- a/nixpkgs/pkgs/development/python-modules/vxi11/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vxi11/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, nose }: buildPythonPackage rec { pname = "python-vxi11"; diff --git a/nixpkgs/pkgs/development/python-modules/w3lib/default.nix b/nixpkgs/pkgs/development/python-modules/w3lib/default.nix index ae404e01cfb9..0c80423e36a2 100644 --- a/nixpkgs/pkgs/development/python-modules/w3lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/w3lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/waitress/default.nix b/nixpkgs/pkgs/development/python-modules/waitress/default.nix index 09f4f66e0b52..4edd4c6ccffb 100644 --- a/nixpkgs/pkgs/development/python-modules/waitress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/waitress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix b/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix index 29c30e7ba6ad..86d405a33ef9 100644 --- a/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: +{ lib, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: buildPythonPackage rec { pname = "wakeonlan"; diff --git a/nixpkgs/pkgs/development/python-modules/warlock/default.nix b/nixpkgs/pkgs/development/python-modules/warlock/default.nix index 80dcabdcb207..1b62c918f339 100644 --- a/nixpkgs/pkgs/development/python-modules/warlock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/warlock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/wasabi/default.nix b/nixpkgs/pkgs/development/python-modules/wasabi/default.nix index 5a0c2ecaa5f5..3e674ae266f1 100644 --- a/nixpkgs/pkgs/development/python-modules/wasabi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wasabi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "75fec6db6193c8615d7f398ae4aa2c4ad294e6e3e81c6a6dbbbd3864ee2223c3"; + sha256 = "6e5228a51f5550844ef5080e74759e7ecb6e344241989d018686ba968f0b4f5a"; }; checkInputs = [ pytestCheckHook ]; @@ -20,6 +20,5 @@ buildPythonPackage rec { homepage = "https://github.com/ines/wasabi"; changelog = "https://github.com/ines/wasabi/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/nixpkgs/pkgs/development/python-modules/watchdog/default.nix index 5cb8929b9dbe..693cfcce9260 100644 --- a/nixpkgs/pkgs/development/python-modules/watchdog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/watchdog/default.nix @@ -5,22 +5,34 @@ , pathtools , pyyaml , pkgs +, pytest-cov +, pytestCheckHook }: buildPythonPackage rec { pname = "watchdog"; - version = "0.10.4"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "e38bffc89b15bafe2a131f0e1c74924cf07dcec020c2e0a26cccd208831fcd43"; + sha256 = "sha256-N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI="; }; buildInputs = lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.CoreServices ]; - propagatedBuildInputs = [ argh pathtools pyyaml ]; - doCheck = false; + propagatedBuildInputs = [ + argh + pathtools + pyyaml + ]; + + checkInputs = [ + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "watchdog" ]; meta = with lib; { description = "Python API and shell utilities to monitor file system events"; diff --git a/nixpkgs/pkgs/development/python-modules/web/default.nix b/nixpkgs/pkgs/development/python-modules/web/default.nix index 84b4cc8dcfbb..1b40519d592a 100644 --- a/nixpkgs/pkgs/development/python-modules/web/default.nix +++ b/nixpkgs/pkgs/development/python-modules/web/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook , cheroot , dbutils, mysqlclient, pymysql, mysql-connector, psycopg2 }: diff --git a/nixpkgs/pkgs/development/python-modules/webapp2/default.nix b/nixpkgs/pkgs/development/python-modules/webapp2/default.nix index 048c5d91b1d2..841fb5bd74b6 100644 --- a/nixpkgs/pkgs/development/python-modules/webapp2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webapp2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webob diff --git a/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix b/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix index 040341ed376a..dcb2bd3817d7 100644 --- a/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , routes diff --git a/nixpkgs/pkgs/development/python-modules/webob/default.nix b/nixpkgs/pkgs/development/python-modules/webob/default.nix index 78ca8f918a3f..124b45a2eb39 100644 --- a/nixpkgs/pkgs/development/python-modules/webob/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webob/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/nixpkgs/pkgs/development/python-modules/websockify/default.nix b/nixpkgs/pkgs/development/python-modules/websockify/default.nix index 021344b2207a..d3072e750419 100644 --- a/nixpkgs/pkgs/development/python-modules/websockify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/websockify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/nixpkgs/pkgs/development/python-modules/webtest/default.nix b/nixpkgs/pkgs/development/python-modules/webtest/default.nix index 98ee58d3f6c4..d56e5415b918 100644 --- a/nixpkgs/pkgs/development/python-modules/webtest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webtest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/whisper/default.nix b/nixpkgs/pkgs/development/python-modules/whisper/default.nix index ad25df4868a4..7b084c16267d 100644 --- a/nixpkgs/pkgs/development/python-modules/whisper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whisper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mock, six }: +{ lib, buildPythonPackage, fetchPypi, mock, six }: buildPythonPackage rec { pname = "whisper"; diff --git a/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix index 2399c6ed73f2..3c63c727c0d7 100644 --- a/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27 }: +{ lib, fetchPypi, buildPythonPackage, isPy27 }: buildPythonPackage rec { pname = "whitenoise"; diff --git a/nixpkgs/pkgs/development/python-modules/whoosh/default.nix b/nixpkgs/pkgs/development/python-modules/whoosh/default.nix index f5bbccec2a5e..d3ff703f694a 100644 --- a/nixpkgs/pkgs/development/python-modules/whoosh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whoosh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "Whoosh"; diff --git a/nixpkgs/pkgs/development/python-modules/willow/default.nix b/nixpkgs/pkgs/development/python-modules/willow/default.nix index fbf4965117b3..3dafd4df44b3 100644 --- a/nixpkgs/pkgs/development/python-modules/willow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/willow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/word2vec/default.nix b/nixpkgs/pkgs/development/python-modules/word2vec/default.nix index 647914bfbe5f..259566c8fc26 100644 --- a/nixpkgs/pkgs/development/python-modules/word2vec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/word2vec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchzip diff --git a/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix b/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix index b4dd108ae739..80f22efbda85 100644 --- a/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , matplotlib , mock , numpy diff --git a/nixpkgs/pkgs/development/python-modules/worldengine/default.nix b/nixpkgs/pkgs/development/python-modules/worldengine/default.nix index 51c0de77917d..13ce4bc873d6 100644 --- a/nixpkgs/pkgs/development/python-modules/worldengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/worldengine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonOlder , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/wrapio/default.nix b/nixpkgs/pkgs/development/python-modules/wrapio/default.nix index 757585bd1455..bbbc1917f541 100644 --- a/nixpkgs/pkgs/development/python-modules/wrapio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wrapio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/ws4py/default.nix b/nixpkgs/pkgs/development/python-modules/ws4py/default.nix index 2b7a66df285c..8abf78520dca 100644 --- a/nixpkgs/pkgs/development/python-modules/ws4py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ws4py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, git +{ lib, buildPythonPackage, fetchPypi, pytest, mock, git , cherrypy, gevent, tornado }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix b/nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix index 12aa3c88d968..e2cc26ff143e 100644 --- a/nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wsgiproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , paste diff --git a/nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix b/nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix index 81a2f98b86f8..2a9856cdd086 100644 --- a/nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wsgiproxy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/wtforms/default.nix b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix index 45c465ddcba7..96440c438bcb 100644 --- a/nixpkgs/pkgs/development/python-modules/wtforms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , markupsafe diff --git a/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix b/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix index 21bb787402c1..e9cfe3174327 100644 --- a/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/x256/default.nix b/nixpkgs/pkgs/development/python-modules/x256/default.nix index 4ceb2dcae791..4430fa2e4b8a 100644 --- a/nixpkgs/pkgs/development/python-modules/x256/default.nix +++ b/nixpkgs/pkgs/development/python-modules/x256/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/xapp/default.nix b/nixpkgs/pkgs/development/python-modules/xapp/default.nix index 28901017b2b5..72f386b36272 100644 --- a/nixpkgs/pkgs/development/python-modules/xapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , psutil @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - sha256 = "1pp3z4q6ryxcc26kaq222j53ji110n2v7rx29c7vy1fbb8mq64im"; + sha256 = "1zgh4k96i939w4scikajmlriayk1zg3md16f8fckjvqbphpxrysl"; }; propagatedBuildInputs = [ @@ -33,6 +33,9 @@ buildPythonPackage rec { substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec" ''; + doCheck = false; + pythonImportsCheck = [ "xapp" ]; + meta = with lib; { homepage = "https://github.com/linuxmint/python-xapp"; description = "Cross-desktop libraries and common resources for python"; diff --git a/nixpkgs/pkgs/development/python-modules/xattr/default.nix b/nixpkgs/pkgs/development/python-modules/xattr/default.nix index 3583358a5605..a39c3532f4b8 100644 --- a/nixpkgs/pkgs/development/python-modules/xattr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xattr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/xboxapi/default.nix b/nixpkgs/pkgs/development/python-modules/xboxapi/default.nix new file mode 100644 index 000000000000..973f2f6aba24 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/xboxapi/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "xboxapi"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "mKeRix"; + repo = "xboxapi-python"; + rev = version; + sha256 = "10mhvallkwf5lw91hj5rv16sziqhhjq7sgcgr28sqqnlgjnyazdd"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "xboxapi" ]; + + meta = with lib; { + description = "Python XBOX One API wrapper"; + homepage = "https://github.com/mKeRix/xboxapi-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/xcaplib/default.nix b/nixpkgs/pkgs/development/python-modules/xcaplib/default.nix index f6bb5712c2eb..086eaf1e3488 100644 --- a/nixpkgs/pkgs/development/python-modules/xcaplib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xcaplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchdarcs , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/xdot/default.nix b/nixpkgs/pkgs/development/python-modules/xdot/default.nix index 21b45b9c322d..7dbbd89e781b 100644 --- a/nixpkgs/pkgs/development/python-modules/xdot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xdot/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run, stdenv +{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run , wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix b/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix index e3328c7e4534..efdb40cd6f87 100644 --- a/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix b/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix index 88f7b9b94a1f..e372a843cf84 100644 --- a/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi +, pytestCheckHook +, installShellFiles }: buildPythonPackage rec { @@ -12,14 +14,21 @@ buildPythonPackage rec { sha256 = "0ghsjs5bxl996pap910q9s21nywb26mfpjd92rbfywbnj8f2k2cy"; }; - # No tests included - # https://github.com/redacted/XKCD-password-generator/issues/32 - doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "xkcdpass" ]; + + postInstall = '' + installManPage *.? + install -Dm444 -t $out/share/doc/${pname} README* + ''; meta = with lib; { - homepage = "https://pypi.python.org/pypi/xkcdpass/"; description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; + homepage = "https://pypi.python.org/pypi/xkcdpass/"; license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/nixpkgs/pkgs/development/python-modules/xknx/default.nix index b448f87a2d36..221076fae84c 100644 --- a/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.16.1"; + version = "0.16.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "0nma0fq67p9c90b6s5v7n4s6j94sdiwqf8rk1k2vfc6nxxn1jfll"; + sha256 = "sha256-toB66woREkFUv3J14wwquRo+uAOgXKO+cwFgyw4Mma8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xlrd/default.nix b/nixpkgs/pkgs/development/python-modules/xlrd/default.nix index 031ac047936e..d880fd833965 100644 --- a/nixpkgs/pkgs/development/python-modules/xlrd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xlrd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix index a5b67632d836..6f7726da68d7 100644 --- a/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index e06daf3c5b86..fdf042c2ac29 100644 --- a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address +{ lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address , pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs }: diff --git a/nixpkgs/pkgs/development/python-modules/xmodem/default.nix b/nixpkgs/pkgs/development/python-modules/xmodem/default.nix index 9023c4cc79ee..a53567f7fa8b 100644 --- a/nixpkgs/pkgs/development/python-modules/xmodem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xmodem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }: buildPythonPackage rec { pname = "xmodem"; diff --git a/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix b/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix index fd046adadd97..65e2b3711fa0 100644 --- a/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, isPy3k }: +{ lib, buildPythonPackage, fetchurl, isPy3k }: buildPythonPackage rec { pname = "xmpp.py"; version = "0.5.0rc1"; diff --git a/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix b/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix index 0852fd2e15cf..f037cb40338c 100644 --- a/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , xorgserver diff --git a/nixpkgs/pkgs/development/python-modules/xxhash/default.nix b/nixpkgs/pkgs/development/python-modules/xxhash/default.nix index d2f6ae54a4cf..08bcfcdacdee 100644 --- a/nixpkgs/pkgs/development/python-modules/xxhash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xxhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index 7145c504cd92..13545c0430d1 100644 --- a/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, pyyaml, pathspec }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/yanc/default.nix b/nixpkgs/pkgs/development/python-modules/yanc/default.nix index 6d4a3b41fbcc..925276c0ad62 100644 --- a/nixpkgs/pkgs/development/python-modules/yanc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yanc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, nose }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, nose }: buildPythonPackage rec { pname = "yanc"; diff --git a/nixpkgs/pkgs/development/python-modules/yapf/default.nix b/nixpkgs/pkgs/development/python-modules/yapf/default.nix index 36409ae40195..9c0e9d353993 100644 --- a/nixpkgs/pkgs/development/python-modules/yapf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yapf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "yapf"; diff --git a/nixpkgs/pkgs/development/python-modules/yapsy/default.nix b/nixpkgs/pkgs/development/python-modules/yapsy/default.nix index 359a855a3e5f..e60b0a114731 100644 --- a/nixpkgs/pkgs/development/python-modules/yapsy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yapsy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/yarl/default.nix b/nixpkgs/pkgs/development/python-modules/yarl/default.nix index 7a88b695f639..0aeb85e6ca2d 100644 --- a/nixpkgs/pkgs/development/python-modules/yarl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yarl/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchPypi , buildPythonPackage , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/ydiff/default.nix b/nixpkgs/pkgs/development/python-modules/ydiff/default.nix index be935b1995c6..e7452b89a539 100644 --- a/nixpkgs/pkgs/development/python-modules/ydiff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ydiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, docutils, pygments +{ lib, buildPythonPackage, fetchPypi, docutils, pygments , gitMinimal, mercurial, subversion, patchutils, less }: diff --git a/nixpkgs/pkgs/development/python-modules/yowsup/default.nix b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix index 48c21434194f..0ff3212f48ca 100644 --- a/nixpkgs/pkgs/development/python-modules/yowsup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, fetchFromGitHub, six, python-axolotl, pytest +{ buildPythonPackage, lib, fetchFromGitHub, six, python-axolotl, pytest , isPy3k, consonance, appdirs }: diff --git a/nixpkgs/pkgs/development/python-modules/yq/default.nix b/nixpkgs/pkgs/development/python-modules/yq/default.nix index 83f9c7a9980b..1dde1405bf6b 100644 --- a/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -3,36 +3,32 @@ , buildPythonPackage , fetchPypi , substituteAll -, pkgs , argcomplete , pyyaml , xmltodict -# Test inputs -, coverage -, flake8 , jq -, pytest -, toml +, pytestCheckHook }: buildPythonPackage rec { pname = "yq"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl"; + sha256 = "sha256-HSrUA1BNMGtSWLhsaY+YVtetWLe7F6K4dWkaanuMTCA="; }; patches = [ (substituteAll { src = ./jq-path.patch; - jq = "${lib.getBin pkgs.jq}/bin/jq"; + jq = "${lib.getBin jq}/bin/jq"; }) ]; postPatch = '' - substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" + substituteInPlace test/test.py \ + --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" ''; propagatedBuildInputs = [ @@ -41,16 +37,11 @@ buildPythonPackage rec { argcomplete ]; - doCheck = true; - checkInputs = [ - pytest - coverage - flake8 - toml + pytestCheckHook ]; - checkPhase = "pytest ./test/test.py"; + pytestFlagsArray = [ "test/test.py" ]; pythonImportsCheck = [ "yq" ]; @@ -59,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command-line YAML processor - jq wrapper for YAML documents"; homepage = "https://github.com/kislyuk/yq"; - license = [ licenses.asl20 ]; - maintainers = [ maintainers.womfoo ]; + license = licenses.asl20; + maintainers = with maintainers; [ womfoo SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix b/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix index f1af120d56eb..8610306ea6f2 100644 --- a/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/nixpkgs/pkgs/development/python-modules/zake/default.nix b/nixpkgs/pkgs/development/python-modules/zake/default.nix index 1d1d21a462ec..89635a88f35e 100644 --- a/nixpkgs/pkgs/development/python-modules/zake/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , kazoo diff --git a/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix b/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix index 4e126074b184..23eae31057fc 100644 --- a/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zbaemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zconfig diff --git a/nixpkgs/pkgs/development/python-modules/zbase32/default.nix b/nixpkgs/pkgs/development/python-modules/zbase32/default.nix index a4e7a476beca..715da719bbbc 100644 --- a/nixpkgs/pkgs/development/python-modules/zbase32/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zbase32/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptoolsDarcs diff --git a/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix b/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix index 3b75de3a24b6..97289ec36300 100644 --- a/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zc_lockfile/default.nix @@ -2,7 +2,7 @@ , fetchPypi , mock , zope_testing -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix b/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix index 4e126074b184..23eae31057fc 100644 --- a/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zconfig diff --git a/nixpkgs/pkgs/development/python-modules/zerobin/default.nix b/nixpkgs/pkgs/development/python-modules/zerobin/default.nix index e12088756686..19d02a70496b 100644 --- a/nixpkgs/pkgs/development/python-modules/zerobin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zerobin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , cherrypy diff --git a/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix index f85674d68673..6dccf51100e2 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }: +{ lib, buildPythonPackage, fetchPypi, openssl, bzip2 }: buildPythonPackage rec { pname = "zeroc-ice"; diff --git a/nixpkgs/pkgs/development/python-modules/zfec/default.nix b/nixpkgs/pkgs/development/python-modules/zfec/default.nix index 8a5aaf46b0e4..bcec7a092511 100644 --- a/nixpkgs/pkgs/development/python-modules/zfec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zfec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptoolsDarcs diff --git a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 2f3500516cb9..3141f666a63a 100644 --- a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.51"; + version = "0.0.53"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "14v01kclf096ax88cd6ckfs8gcffqissli9vpr0wfzli08afmbi9"; + sha256 = "16n99r7bjd3lnxn72lfnxg44n7mkv196vdhkw2sf1nq1an4ks1nc"; }; propagatedBuildInputs = [ aiohttp zigpy ]; diff --git a/nixpkgs/pkgs/development/python-modules/zict/default.nix b/nixpkgs/pkgs/development/python-modules/zict/default.nix index da36c1cba899..611660fc3eb5 100644 --- a/nixpkgs/pkgs/development/python-modules/zict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, heapdict, pythonOlder }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index 4de49cbc46b3..1a1c639a4738 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , async-timeout , asynctest , buildPythonPackage diff --git a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index 9a6b0feb3b77..dbc42561db63 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "14qyxm7bj62fsvxfp6x3r1ygjlv7q3jjvq6gzj30na78x1fqr9g1"; + sha256 = "18grqx1fzh539ccar0865shgd2mnfni65rjj787cq5j5p5rn0yc7"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zodb/default.nix b/nixpkgs/pkgs/development/python-modules/zodb/default.nix index d48b9c4b9507..aa7cc6c97ebd 100644 --- a/nixpkgs/pkgs/development/python-modules/zodb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zodb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , python diff --git a/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix b/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix index 899d7f3344be..a3583654e660 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/nixpkgs/pkgs/development/python-modules/zope_component/default.nix b/nixpkgs/pkgs/development/python-modules/zope_component/default.nix index 6ea86b9b984d..65556c9dc417 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_component/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_component/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope-deferredimport diff --git a/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix b/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix index e8d05b7767b3..e3ede9f94aff 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_i18nmessageid diff --git a/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix b/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix index 6b66cca18aab..15010d80a145 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_testrunner diff --git a/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix b/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix index cda7af8e7a0c..7eb66f7a9c57 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_testing diff --git a/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix b/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix index 0e8f35431364..cbd5cd6d6539 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/zope_event/default.nix b/nixpkgs/pkgs/development/python-modules/zope_event/default.nix index cc82da7ea9a1..2ebf6e017b5f 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_event/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_event/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix b/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix index 09f08c7bba48..0586227c61c5 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix b/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix index 7aae2a24d623..4792a09e26b2 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_schema diff --git a/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix index 49270488ecdb..1155adc83e9e 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix b/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix index 7a32045fc3e3..7b5d7abf682f 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_event diff --git a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 390624b50de7..809d8252cb2e 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/zope_location/default.nix b/nixpkgs/pkgs/development/python-modules/zope_location/default.nix index 62b2cef9ea75..69fee2e338ff 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_location/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_location/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_proxy diff --git a/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix b/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix index af108c058c7f..67e8a191d97a 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix b/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix index c7e228c4e05b..75683cb2eb8f 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_location diff --git a/nixpkgs/pkgs/development/python-modules/zope_size/default.nix b/nixpkgs/pkgs/development/python-modules/zope_size/default.nix index 79eadc880a25..6945dddceaa3 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_size/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_size/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_i18nmessageid diff --git a/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix b/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix index 3d7cbf90c25f..2f37f15453da 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_testing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix b/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix index c516106e48bb..5ee42c842753 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/nixpkgs/pkgs/development/python-modules/zstd/default.nix b/nixpkgs/pkgs/development/python-modules/zstd/default.nix index af7bb7692f66..1d8fa8d93e9c 100644 --- a/nixpkgs/pkgs/development/python-modules/zstd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zstd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, fetchPypi, buildPythonPackage +{ lib, pkg-config, fetchPypi, buildPythonPackage , buildPackages , zstd, pytest }: diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix index 0859f08c2f7d..03bf7275cc71 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, runCommand, makeWrapper, ruby }@defs: +{ lib, callPackage, runCommand, makeWrapper, ruby }@defs: # Use for simple installation of Ruby tools shipped in a Gem. # Start with a Gemfile that includes `gem <toolgem>` diff --git a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 70cb7e3ca398..00c6fb73214b 100644 --- a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -403,6 +403,10 @@ in ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; + openssl = attrs: { + buildInputs = [ openssl ]; + }; + opus-ruby = attrs: { dontBuild = false; postPatch = '' diff --git a/nixpkgs/pkgs/development/ruby-modules/testing/driver.nix b/nixpkgs/pkgs/development/ruby-modules/testing/driver.nix index 65e7c8d4416d..23a9a1cec543 100644 --- a/nixpkgs/pkgs/development/ruby-modules/testing/driver.nix +++ b/nixpkgs/pkgs/development/ruby-modules/testing/driver.nix @@ -5,7 +5,7 @@ nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace Confusingly, the ideal result ends with something like: error: build of ‘/nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv’ failed */ -{ writeText, lib, callPackage, testFiles, stdenv, ruby }@defs: +{ writeText, lib, callPackage, testFiles, ruby }@defs: let testTools = rec { test = import ./testing.nix; diff --git a/nixpkgs/pkgs/development/tools/ameba/default.nix b/nixpkgs/pkgs/development/tools/ameba/default.nix index f8cb74411161..13e9c56be9ff 100644 --- a/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/nixpkgs/pkgs/development/tools/ameba/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, crystal }: +{ lib, fetchFromGitHub, crystal }: crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y"; + sha256 = "sha256-+ZsefwH1hag2syWaEXkdxgmxk6JsxP7MvV+ILlo+Hy8="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix index 884b511b8af1..03e01aadb716 100644 --- a/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: with python3Packages; buildPythonApplication rec { diff --git a/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix b/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix index ae54723dda3b..338bc3e189c1 100644 --- a/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "bingrep"; diff --git a/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix index de351524f39b..3ac6b34f9488 100644 --- a/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix @@ -4,13 +4,13 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "brakeman"; - version = "4.8.0"; - source.sha256 = "0xy28pq4x1i7xns5af9k8fx35sqffz2lg94fgbsi9zhi877b7srg"; + version = "5.0.0"; + source.sha256 = "0k1ynqsr9b0vnxqb7d5hbdk4q1i98zjzdnx4y1ylikz4rmkizf91"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; homepage = "https://brakemanscanner.org/"; - changelog = "https://github.com/presidentbeef/brakeman/releases/tag/v${version}"; + changelog = "https://github.com/presidentbeef/brakeman/blob/v${version}/CHANGES.md"; license = [ licenses.unfreeRedistributable ]; platforms = ruby.meta.platforms; maintainers = [ maintainers.marsam ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 6277b1d4239e..06c366529df3 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, python3, fetchFromGitHub }: +{ pkgs, lib, python3, fetchFromGitHub }: let pname = "checkov"; diff --git a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index f3ad1d81e57d..4d7bc7c277b2 100644 --- a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.4.1"; + version = "2.4.2"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-UHH+nV62jHvEY6T5UKz5cm9zse9pWHPAjjsGHfpPoPY="; + sha256 = "sha256-hOTxlrS47gS7stfNXuGKkAbCINhPXBVncOdPr1EDU5M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix b/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix new file mode 100644 index 000000000000..b05f9b944400 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "dotenv-linter"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "dotenv-linter"; + repo = "dotenv-linter"; + rev = "v${version}"; + sha256 = "sha256-3Lj5GtWGyWDkZPhxYQu7UWzmh7TO5wk1UJ0lek1jTto="; + }; + + cargoSha256 = "sha256-zdvIC+VUASjhrlyRts+JJeh5xdcdpX6Ixle6HhbMJJU="; + + meta = with lib; { + description = "Lightning-fast linter for .env files. Written in Rust"; + homepage = "https://dotenv-linter.github.io"; + license = licenses.mit; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix index cfb974c86ddd..026650220991 100644 --- a/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages }: +{ lib, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "egypt"; diff --git a/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix index b8f3aa0ac1fb..4061090b1828 100644 --- a/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "evmdis-unstable"; diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index fc39e86007d4..5578e03dc96e 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.143.0"; + version = "0.144.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-j4vsuPs/xr/oy4ZWGBBCy+2mPMQtxE01gqpjsYITCa0="; + sha256 = "sha256-Qr/fizCV+t6SbETEqns72Xv24ucLcqi1JRXF8SAtQRU="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix b/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix index 6ea079e3ec15..94b440f58c8d 100644 --- a/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, +{ lib, mkDerivation, cmake, elfutils, diff --git a/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix index ff5014bd46a9..0ef33270e92b 100644 --- a/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake +{ lib, fetchFromGitHub, rustPlatform, qt5, git, cmake , pkg-config, makeWrapper }: rustPlatform.buildRustPackage rec { diff --git a/nixpkgs/pkgs/development/tools/analysis/rr/default.nix b/nixpkgs/pkgs/development/tools/analysis/rr/default.nix index b63713f00073..c0121d242177 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rr/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rr/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: +{ lib, gcc9Stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: -stdenv.mkDerivation rec { +gcc9Stdenv.mkDerivation rec { version = "5.4.0"; pname = "rr"; diff --git a/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix b/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix index 261645c062d3..870f084580b8 100644 --- a/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }: +{ lib, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }: mkDerivation rec { pname = "snowman"; diff --git a/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix index 51b363c6be33..3455d78b23f4 100644 --- a/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.4.8"; + version = "0.4.16"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "1anbanvaikj8g5jcmjd165krzvjdwj1cl8f3vm1nmy997x8vxihf"; + sha256 = "sha256-2PYHKJ141RWdUIDAKAFK6IzR4C41bHi/A8lDErSRLnU="; }; - cargoSha256 = "18xnqsrnf2gc9zny8ayzf1bah8mq1fy5k807cz039gqz36cvnma0"; + cargoSha256 = "sha256-x5wU0Ld4ssRoNqo9graJhjlpel+VdVdkKZMjHFqZsrE="; meta = with lib; { description = "SystemVerilog linter"; diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 617d255d7e51..aa5223ce3f8d 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.23.1"; + version = "0.24.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "19vgan743xsnglwva93fs4sqcbpqbyrxbgn5qff809ns8hj8ir94"; + sha256 = "00v6d1ffj1f4djbdf41bw4ymy2fhph1b5kfi50fp9c3c7319sqwr"; }; - vendorSha256 = "1y6ra9bkp6wl0pikvyqywhg5w18v3glnyvwqrddkkkabspl05nqx"; + vendorSha256 = "1xy1vg34nv6v77sx13d3663v7xfm0f2kimdsjqzwpkzz8a6q6g2m"; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 7d66264564b0..14153b920e8e 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.36.10"; + version = "0.38.1"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "11kv13d4cw515r79azfha1ksmvsha1rvg0jak9nvz9ggivyn0s7a"; + sha256 = "sha256-ezTmtKR6ng3fuVJzLP81o0aoaqu3XPUMF0BIKFCwXdw="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix index 17f390714620..b879a6ef2374 100644 --- a/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: with python3.pkgs; diff --git a/nixpkgs/pkgs/development/tools/asn2quickder/default.nix b/nixpkgs/pkgs/development/tools/asn2quickder/default.nix index b2432f7fefc6..9ffcbb172d48 100644 --- a/nixpkgs/pkgs/development/tools/asn2quickder/default.nix +++ b/nixpkgs/pkgs/development/tools/asn2quickder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake +{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake , pytestrunner, pytest, six, pyparsing, asn1ate }: buildPythonApplication rec { diff --git a/nixpkgs/pkgs/development/tools/async/default.nix b/nixpkgs/pkgs/development/tools/async/default.nix index 54e16cb6faaf..a45e93ab151e 100644 --- a/nixpkgs/pkgs/development/tools/async/default.nix +++ b/nixpkgs/pkgs/development/tools/async/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "async"; diff --git a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 8a48b43312eb..0859ed513230 100644 --- a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -4,75 +4,33 @@ , enableTelemetry ? false }: -let - py = python3.override { - packageOverrides = self: super: { - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "1.0.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0j6f4a9rpfh25k1gp7azqhnni4mb4fgy50jammgjgddw1l3w0w92"; - }; - }); - - aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { - version = "1.27.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ="; - }; - }); - - dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec { - version = "0.7.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y="; - }; - }); - - cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec { - version = "1.6.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0glsvaz8igi2wy1hsnhm9fkn6560vdvdixzvkq6dn20z3hpaa5hk"; - }; - }); - }; - }; - -in - -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.6.2"; + version = "1.14.0"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0scnymhhiiqrs2j0jaypxgq2wg1qf1w8f55qfay0b3nf51y6mh8y"; + sha256 = "E+xIS0Z3M/ilBswH8XwXWnGb9gbDRuuKKE39qau9fFc="; }; # Tests are not included in the PyPI package doCheck = false; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ aws-lambda-builders aws-sam-translator chevron click cookiecutter dateparser + python-dateutil docker flask - idna jmespath - pathlib2 requests serverlessrepo - six tomlkit + watchdog ]; postFixup = if enableTelemetry then "echo aws-sam-cli TELEMETRY IS ENABLED" else '' @@ -83,19 +41,18 @@ buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ - --replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \ - --replace "docker~=4.2.0" "docker~=4.3" \ - --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ + --replace "boto3~=1.14.23" "boto3~=1.14" \ + --replace "dateparser~=0.7" "dateparser>=0.7" \ + --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "requests==2.23.0" "requests~=2.24" \ - --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ - --replace "tomlkit==0.5.8" "tomlkit~=0.7.0" + --replace "watchdog==0.10.3" "watchdog" ''; meta = with lib; { homepage = "https://github.com/awslabs/aws-sam-cli"; description = "CLI tool for local development and testing of Serverless applications"; license = licenses.asl20; - maintainers = with maintainers; [ andreabedini lo1tuma ]; + maintainers = with maintainers; [ lo1tuma ]; }; } diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index 822480b1d3f3..98a6bcd5bbcc 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "azure-storage-azcopy"; diff --git a/nixpkgs/pkgs/development/tools/b4/default.nix b/nixpkgs/pkgs/development/tools/b4/default.nix new file mode 100644 index 000000000000..8210f7c409a5 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/b4/default.nix @@ -0,0 +1,36 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "b4"; + version = "0.6.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z"; + }; + + preConfigure = '' + substituteInPlace setup.py \ + --replace 'requests~=2.24' 'requests~=2.25' + ''; + + # tests make dns requests and fails + doCheck = false; + + propagatedBuildInputs = with python3Packages; [ + requests + dnspython + dkimpy + + # These may be required in the future for other patch attestation features + #pycryptodomex~=3.9.9 + #PyNaCl + ]; + + meta = with lib; { + homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; + license = licenses.gpl2Only; + description = "A helper utility to work with patches made available via a public-inbox archive"; + maintainers = with maintainers; [ jb55 ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix index 94efcc9be063..bc3a2828f6cd 100644 --- a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix +++ b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix @@ -56,7 +56,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0yl5rs6y1xifxjfsa9zv8bjcwiky7rxk9y3rmi01pqpsm7ik12a9"; + sha256 = "0rwwjjj6zaj4hdcbsbp0di53xn6203r2vgpddhdrp8iph9ab60cg"; }; buildAttrs = { diff --git a/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/nixpkgs/pkgs/development/tools/bazelisk/default.nix index e4a6b3c2869e..f9b4c3ea724f 100644 --- a/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bazelisk"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "1mc1l2g2qrg9djpyyz203a6dpx5fxllisybmhrpmikyza15w935q"; + sha256 = "sha256-jXRTj/7GJO6rSueOmw8aNg69w43lxiDbSeZR802+kws="; }; - vendorSha256 = "116wy1a7gmi2w8why9hszhcybfvpwp4iq62vshb25cdcma6q4mjh"; + vendorSha256 = "sha256-fW7KHsxhBfz947Tg+O5bdtiH6xMeKmLRHX9FWQSyxVQ="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index ac03288f1485..1dfe784ec254 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -3,7 +3,8 @@ , fetchFromGitHub , git , go -, lib, stdenv +, lib +, stdenv }: buildBazelPackage rec { @@ -64,7 +65,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "1m7fmb03lirffxx04ck73bn5zwaji7zdwhlqq8s1c6pgp755d3vi"; + sha256 = "1vijh3nl30n8k6xlx6in92pzs70x15akbqiqalk8apgvphvdz8vy"; }; buildAttrs = { @@ -86,5 +87,6 @@ buildBazelPackage rec { license = licenses.asl20; maintainers = [ maintainers.uri-canva ]; platforms = platforms.darwin ++ platforms.linux; + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 0b5a7362ded1..41ae9ce21125 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -25,11 +25,11 @@ }: let - version = "3.3.1"; + version = "3.7.2"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0ir796kl8r9hpr3li26qsdy1z2lx2bv82zmk4a2s7q64clyg9wg0"; + sha256 = "1cfrbs23lg0jnl22ddylx3clcjw7bdpbix7r5lqibab346s5n9fy"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -49,13 +49,15 @@ let srcs.io_bazel_rules_sass srcs.platforms # `bazel query` wants all of these to be available regardless of platform. - srcs."java_tools_javac11_darwin-v8.0.zip" - srcs."java_tools_javac11_linux-v8.0.zip" - srcs."java_tools_javac11_windows-v8.0.zip" - srcs."coverage_output_generator-v2.1.zip" + srcs."java_tools_javac11_darwin-v10.0.zip" + srcs."java_tools_javac11_linux-v10.0.zip" + srcs."java_tools_javac11_windows-v10.0.zip" + srcs."coverage_output_generator-v2.5.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.19.0rc1.tar.gz" + srcs."android_tools_pkg-0.19.0rc3.tar.gz" srcs."bazel-toolchains-3.1.0.tar.gz" + srcs."com_github_grpc_grpc" + srcs.upb srcs.rules_pkg srcs.rules_cc srcs.rules_java @@ -98,7 +100,7 @@ let [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ]; # Java toolchain used for the build and tests - javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; + javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}"; platforms = lib.platforms.linux ++ lib.platforms.darwin; @@ -112,7 +114,7 @@ let remote_java_tools = stdenv.mkDerivation { name = "remote_java_tools_${system}"; - src = srcDepsSet."java_tools_javac11_${system}-v8.0.zip"; + src = srcDepsSet."java_tools_javac11_${system}-v10.0.zip"; nativeBuildInputs = [ autoPatchelfHook unzip ]; buildInputs = [ gcc-unwrapped ]; @@ -169,13 +171,19 @@ stdenv.mkDerivation rec { sourceRoot = "."; patches = [ - ./python-shebang.patch - # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' # This is breaking the build of any C target. This patch removes the last # argument if it's found to be an empty string. ../trim-last-argument-to-gcc-if-empty.patch + # On Darwin, using clang 6 to build fails because of a linker error (see #105573), + # but using clang 7 fails because libarclite_macosx.a cannot be found when linking + # the xcode_locator tool. + # This patch removes using the -fobjc-arc compiler option and makes the code + # compile without automatic reference counting. Caveat: this leaks memory, but + # we accept this fact because xcode_locator is only a short-lived process used during the build. + ./no-arc.patch + # --experimental_strict_action_env (which may one day become the default # see bazelbuild/bazel#2574) hardcodes the default # action environment to a non hermetic value (e.g. "/usr/local/bin"). @@ -371,6 +379,8 @@ stdenv.mkDerivation rec { src/tools/xcode/stdredirect/BUILD \ tools/osx/BUILD + substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' "" + # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch new file mode 100644 index 000000000000..012e613c2f19 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch @@ -0,0 +1,34 @@ +--- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100 ++++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100 +@@ -21,10 +21,6 @@ + // 6,6.4,6.4.1 = 6.4.1 + // 6.3,6.3.0 = 6.3 + +-#if !defined(__has_feature) || !__has_feature(objc_arc) +-#error "This file requires ARC support." +-#endif +- + #import <CoreServices/CoreServices.h> + #import <Foundation/Foundation.h> + +--- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100 ++++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100 +@@ -123,7 +123,6 @@ + "macosx", + "clang", + "-mmacosx-version-min=10.9", +- "-fobjc-arc", + "-framework", + "CoreServices", + "-framework", +--- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100 ++++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100 +@@ -27,7 +27,7 @@ + ]) + + DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ +- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \ ++ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \ + -framework Foundation -o $@ $< + """ + diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/python-shebang.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/python-shebang.patch deleted file mode 100644 index 75547264fcc8..000000000000 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/python-shebang.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java 2020-05-25 14:46:01.608403087 +0200 -+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java 2020-05-25 14:50:52.881398320 +0200 -@@ -238,14 +238,15 @@ - // TODO(#8685): Remove this special-case handling as part of making the proper shebang a - // property of the Python toolchain configuration. - String pythonExecutableName = OS.getCurrent() == OS.OPENBSD ? "python3" : "python"; -+ String pythonShebang = "#!/usr/bin/env " + pythonExecutableName; - ruleContext.registerAction( - new SpawnAction.Builder() - .addInput(zipFile) - .addOutput(executable) - .setShellCommand( - shExecutable, -- "echo '#!/usr/bin/env " -- + pythonExecutableName -+ "echo '" -+ + pythonShebang - + "' | cat - " - + zipFile.getExecPathString() - + " > " diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json index 4007a77b0652..96553d9d8859 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json @@ -39,14 +39,6 @@ "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" ] }, - "8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip": { - "name": "8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip", - "sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip", - "https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip" - ] - }, "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": { "name": "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", @@ -55,6 +47,14 @@ "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" ] }, + "9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz": { + "name": "9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz", + "sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz", + "https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz" + ] + }, "android_tools_for_testing": { "name": "android_tools_for_testing", "patch_cmds": [ @@ -65,14 +65,22 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz" + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" }, - "android_tools_pkg-0.19.0rc1.tar.gz": { - "name": "android_tools_pkg-0.19.0rc1.tar.gz", - "sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087", + "android_tools_pkg-0.19.0rc3.tar.gz": { + "name": "android_tools_pkg-0.19.0rc3.tar.gz", + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + ] + }, + "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { + "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" ] }, "bazel-toolchains-3.1.0.tar.gz": { @@ -143,6 +151,21 @@ "https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz" ] }, + "com_github_grpc_grpc": { + "name": "com_github_grpc_grpc", + "patch_args": [ + "-p1" + ], + "patches": [ + "//third_party/grpc:grpc_1.26.0.patch" + ], + "sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81", + "strip_prefix": "grpc-1.26.0", + "urls": [ + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.26.0.tar.gz" + ] + }, "com_google_googletest": { "name": "com_google_googletest", "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", @@ -166,20 +189,20 @@ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], "patches": [ - "//third_party/protobuf:3.11.3.patch" + "//third_party/protobuf:3.13.0.patch" ], - "sha256": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852", - "strip_prefix": "protobuf-3.11.3", + "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", + "strip_prefix": "protobuf-3.13.0", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" ] }, - "coverage_output_generator-v2.1.zip": { - "name": "coverage_output_generator-v2.1.zip", - "sha256": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e", + "coverage_output_generator-v2.5.zip": { + "name": "coverage_output_generator-v2.5.zip", + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.zip" + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" ] }, "desugar_jdk_libs": { @@ -199,6 +222,14 @@ "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" ] }, + "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { + "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "urls": [ + "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + ] + }, "io_bazel_rules_sass": { "name": "io_bazel_rules_sass", "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", @@ -217,25 +248,25 @@ "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" ] }, - "java_tools_javac11_darwin-v8.0.zip": { - "name": "java_tools_javac11_darwin-v8.0.zip", - "sha256": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1", + "java_tools_javac11_darwin-v10.0.zip": { + "name": "java_tools_javac11_darwin-v10.0.zip", + "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip" ] }, - "java_tools_javac11_linux-v8.0.zip": { - "name": "java_tools_javac11_linux-v8.0.zip", - "sha256": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e", + "java_tools_javac11_linux-v10.0.zip": { + "name": "java_tools_javac11_linux-v10.0.zip", + "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip" ] }, - "java_tools_javac11_windows-v8.0.zip": { - "name": "java_tools_javac11_windows-v8.0.zip", - "sha256": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430", + "java_tools_javac11_windows-v10.0.zip": { + "name": "java_tools_javac11_windows-v10.0.zip", + "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip" ] }, "java_tools_langtools_javac11": { @@ -245,13 +276,6 @@ "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" ] }, - "java_tools_langtools_javac12": { - "name": "java_tools_langtools_javac12", - "sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip" - ] - }, "openjdk11_darwin_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "name": "openjdk11_darwin_archive", @@ -279,31 +303,31 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" ] }, - "openjdk12_darwin_archive": { + "openjdk14_darwin_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk12_darwin_archive", - "sha256": "67ca9d285056132ebb19fa237a14affda52132142e1171fe1c20e18974b3b8a5", - "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-macosx_x64", + "name": "openjdk14_darwin_archive", + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-macosx_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" ] }, - "openjdk12_linux_archive": { + "openjdk14_linux_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk12_linux_archive", - "sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13", - "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64", + "name": "openjdk14_linux_archive", + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" ] }, - "openjdk12_windows_archive": { + "openjdk14_windows_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk12_windows_archive", - "sha256": "cf28404c23c3aa1115363ba6e796c30580a768e1d7d6681a7d053e516008e00d", - "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-win_x64", + "name": "openjdk14_windows_archive", + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-win_x64.zip" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" ] }, "openjdk_linux": { @@ -351,8 +375,17 @@ "name": "openjdk_linux_ppc64le_vanilla", "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", "urls": [ - "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "openjdk_linux_s390x_vanilla": { + "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz", + "name": "openjdk_linux_s390x_vanilla", + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" ] }, "openjdk_linux_vanilla": { @@ -430,9 +463,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e", + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.zip" + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" ] }, "remote_java_tools_darwin_for_testing": { @@ -445,10 +478,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1", + "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_darwin-v8.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip" ] }, "remote_java_tools_javac11_test_darwin": { @@ -461,9 +494,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1", + "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip" ] }, "remote_java_tools_javac11_test_linux": { @@ -476,9 +509,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e", + "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip" ] }, "remote_java_tools_javac11_test_windows": { @@ -491,54 +524,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip" - ] - }, - "remote_java_tools_javac12_test_darwin": { - "name": "remote_java_tools_javac12_test_darwin", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "54df966e7583bafe659e39b4103a4ce934201d969de638d071ada07d8e0c1a3a", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_darwin-v3.0.zip" - ] - }, - "remote_java_tools_javac12_test_linux": { - "name": "remote_java_tools_javac12_test_linux", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "3997ee9a57b095748f1c0d084839fab2fbc72504aeb7b37b1f71c31738d330e3", + "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_linux-v3.0.zip" - ] - }, - "remote_java_tools_javac12_test_windows": { - "name": "remote_java_tools_javac12_test_windows", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "cfad1718dad1fed12816748eed27ab30b9ea1268c8ce9940acf3b5b7d82d483d", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_windows-v3.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip" ] }, "remote_java_tools_linux_for_testing": { @@ -551,10 +539,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e", + "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_linux-v8.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip" ] }, "remote_java_tools_windows_for_testing": { @@ -567,10 +555,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430", + "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_windows-v8.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip" ] }, "remotejdk11_linux_aarch64_for_testing": { @@ -621,8 +609,26 @@ "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", "strip_prefix": "jdk-11.0.7+10", "urls": [ - "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_s390x_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_s390x_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" ] }, "remotejdk11_macos_for_testing": { @@ -659,6 +665,57 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" ] }, + "remotejdk14_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_linux_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "remotejdk14_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_macos_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "remotejdk14_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_win_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, "rules_cc": { "name": "rules_cc", "patch_cmds": [ @@ -669,11 +726,11 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f", - "strip_prefix": "rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0", + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip", - "https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip" + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" ] }, "rules_java": { @@ -742,12 +799,35 @@ "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" ] }, - "v3.11.3.tar.gz": { - "name": "v3.11.3.tar.gz", - "sha256": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852", + "upb": { + "name": "upb", + "patch_args": [ + "-p1" + ], + "patches": [ + "//third_party/grpc:upb_gcc10_fix.patch" + ], + "sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454", + "strip_prefix": "upb-9effcbcb27f0a665f9f345030188c0b291e32482", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz", + "https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz" + ] + }, + "v1.26.0.tar.gz": { + "name": "v1.26.0.tar.gz", + "sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81", + "urls": [ + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.26.0.tar.gz" + ] + }, + "v3.13.0.tar.gz": { + "name": "v3.13.0.tar.gz", + "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" ] }, "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": { diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix new file mode 100644 index 000000000000..5482db67caee --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -0,0 +1,639 @@ +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles +, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs +# this package (through the fixpoint glass) +, bazel_self +# needed only for the updater +, bazel_3 +, lr, xe, zip, unzip, bash, writeCBin, coreutils +, which, gawk, gnused, gnutar, gnugrep, gzip, findutils +# updater +, python27, python3, writeScript +# Apple dependencies +, cctools, libcxx, CoreFoundation, CoreServices, Foundation +# Allow to independently override the jdks used to build and run respectively +, buildJdk, runJdk +, buildJdkName +, runtimeShell +# Downstream packages for tests +, bazel-watcher +# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). +# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). +, enableNixHacks ? false +, gcc-unwrapped +, autoPatchelfHook +, file +, substituteAll +, writeTextFile +}: + +let + version = "4.0.0"; + sourceRoot = "."; + + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + sha256 = "1lfdx54dpzwrqysg5ngqhq7a0i01xk981crd4pdk4jb5f07ghl6k"; + }; + + # Update with `eval $(nix-build -A bazel.updater)`, + # then add new dependencies from the dict in ./src-deps.json as required. + srcDeps = lib.attrsets.attrValues srcDepsSet; + srcDepsSet = + let + srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); + toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { + urls = d.urls; + sha256 = d.sha256; + }); + in builtins.listToAttrs (map toFetchurl [ + srcs.desugar_jdk_libs + srcs.io_bazel_skydoc + srcs.bazel_skylib + srcs.io_bazel_rules_sass + srcs.platforms + (if stdenv.hostPlatform.isDarwin + then srcs."java_tools_javac11_darwin-v10.5.zip" + else srcs."java_tools_javac11_linux-v10.5.zip") + srcs."coverage_output_generator-v2.5.zip" + srcs.build_bazel_rules_nodejs + srcs."android_tools_pkg-0.19.0rc3.tar.gz" + srcs.bazel_toolchains + srcs.com_github_grpc_grpc + srcs.upb + srcs.com_google_protobuf + srcs.rules_pkg + srcs.rules_cc + srcs.rules_java + srcs.rules_proto + srcs.com_google_absl + srcs.com_github_google_re2 + srcs.com_github_cares_cares + ]); + + distDir = runCommand "bazel-deps" {} '' + mkdir -p $out + for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done + ''; + + defaultShellPath = lib.makeBinPath + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + # + [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip python27 python3 ]; + + # Java toolchain used for the build and tests + javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}"; + + platforms = lib.platforms.linux ++ lib.platforms.darwin; + + # This repository is fetched by bazel at runtime + # however it contains prebuilt java binaries, with wrong interpreter + # and libraries path. + # We prefetch it, patch it, and override it in a global bazelrc. + system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; + arch = stdenv.hostPlatform.parsed.cpu.name; + + remote_java_tools = stdenv.mkDerivation { + name = "remote_java_tools_${system}"; + + src = srcDepsSet."java_tools_javac11_${system}-v10.5.zip"; + + nativeBuildInputs = [ autoPatchelfHook unzip ]; + buildInputs = [ gcc-unwrapped ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir $out; + ''; + + installPhase = '' + cp -Ra * $out/ + touch $out/WORKSPACE + ''; + }; + + bazelRC = writeTextFile { + name = "bazel-rc"; + text = '' + startup --server_javabase=${runJdk} + + # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054 + # Most commands inherit from 'build' anyway. + build --distdir=${distDir} + fetch --distdir=${distDir} + query --distdir=${distDir} + + build --override_repository=${remote_java_tools.name}=${remote_java_tools} + fetch --override_repository=${remote_java_tools.name}=${remote_java_tools} + query --override_repository=${remote_java_tools.name}=${remote_java_tools} + + # Provide a default java toolchain, this will be the same as ${runJdk} + build --host_javabase='@local_jdk//:jdk' + + # load default location for the system wide configuration + try-import /etc/bazel.bazelrc + ''; + }; + +in +stdenv.mkDerivation rec { + pname = "bazel"; + inherit version; + + meta = with lib; { + homepage = "https://github.com/bazelbuild/bazel/"; + description = "Build tool that builds code quickly and reliably"; + license = licenses.asl20; + maintainers = [ maintainers.mboes ]; + inherit platforms; + }; + + inherit src; + inherit sourceRoot; + patches = [ + # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' + # This is breaking the build of any C target. This patch removes the last + # argument if it's found to be an empty string. + ../trim-last-argument-to-gcc-if-empty.patch + + # On Darwin, using clang 6 to build fails because of a linker error (see #105573), + # but using clang 7 fails because libarclite_macosx.a cannot be found when linking + # the xcode_locator tool. + # This patch removes using the -fobjc-arc compiler option and makes the code + # compile without automatic reference counting. Caveat: this leaks memory, but + # we accept this fact because xcode_locator is only a short-lived process used during the build. + ./no-arc.patch + + # --experimental_strict_action_env (which may one day become the default + # see bazelbuild/bazel#2574) hardcodes the default + # action environment to a non hermetic value (e.g. "/usr/local/bin"). + # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. + # So we are replacing this bazel paths by defaultShellPath, + # improving hermeticity and making it work in nixos. + (substituteAll { + src = ../strict_action_env.patch; + strictActionEnvPatch = defaultShellPath; + }) + + # bazel reads its system bazelrc in /etc + # override this path to a builtin one + (substituteAll { + src = ../bazel_rc.patch; + bazelSystemBazelRCPath = bazelRC; + }) + ] ++ lib.optional enableNixHacks ../nix-hacks.patch; + + + # Additional tests that check bazel’s functionality. Execute + # + # nix-build . -A bazel.tests + # + # in the nixpkgs checkout root to exercise them locally. + passthru.tests = + let + runLocal = name: attrs: script: + let + attrs' = removeAttrs attrs [ "buildInputs" ]; + buildInputs = [ python3 ] ++ (attrs.buildInputs or []); + in + runCommandCC name ({ + inherit buildInputs; + preferLocalBuild = true; + meta.platforms = platforms; + } // attrs') script; + + # bazel wants to extract itself into $install_dir/install every time it runs, + # so let’s do that only once. + extracted = bazelPkg: + let install_dir = + # `install_base` field printed by `bazel info`, minus the hash. + # yes, this path is kinda magic. Sorry. + "$HOME/.cache/bazel/_bazel_nixbld"; + in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' + export HOME=$(mktemp -d) + touch WORKSPACE # yeah, everything sucks + install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" + # assert it’s actually below install_dir + [[ "$install_base" =~ ${install_dir} ]] \ + || (echo "oh no! $install_base but we are \ + trying to copy ${install_dir} to $out instead!"; exit 1) + cp -R ${install_dir} $out + ''; + + bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: + let + be = extracted bazelPkg; + in runLocal name { inherit buildInputs; } ( + # skip extraction caching on Darwin, because nobody knows how Darwin works + (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + # set up home with pre-unpacked bazel + export HOME=$(mktemp -d) + mkdir -p ${be.install_dir} + cp -R ${be}/install ${be.install_dir} + + # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 + # Bazel checks whether the mtime of the install dir files + # is >9 years in the future, otherwise it extracts itself again. + # see PosixFileMTime::IsUntampered in src/main/cpp/util + # What the hell bazel. + ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} + '') + + + '' + # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 + # about why to create a subdir for the workspace. + cp -r ${workspaceDir} wd && chmod u+w wd && cd wd + + ${bazelScript} + + touch $out + ''); + + bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; + + bazel-examples = fetchFromGitHub { + owner = "bazelbuild"; + repo = "examples"; + rev = "4183fc709c26a00366665e2d60d70521dc0b405d"; + sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; + }; + + in (if !stdenv.hostPlatform.isDarwin then { + # `extracted` doesn’t work on darwin + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + } else {}) // { + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + + bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + # downstream packages using buildBazelPackage + # fixed-output hashes of the fetch phase need to be spot-checked manually + downstream = recurseIntoAttrs ({ + inherit bazel-watcher; + } + # dm-sonnet is only packaged for linux + // (lib.optionalAttrs stdenv.isLinux { + # TODO(timokau) dm-sonnet is broken currently + # dm-sonnet-linux = python3.pkgs.dm-sonnet; + })); + }; + + src_for_updater = stdenv.mkDerivation rec { + name = "updater-sources"; + inherit src; + buildInputs = [ unzip ]; + inherit sourceRoot; + installPhase = '' + cp -r . "$out" + ''; + }; + # update the list of workspace dependencies + passthru.updater = writeScript "update-bazel-deps.sh" '' + #!${runtimeShell} + (cd "${src_for_updater}" && + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ + "${bazel_3}"/bin/bazel \ + query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ + --loading_phase_threads=1 \ + --output build) \ + | "${python3}"/bin/python3 "${./update-srcDeps.py}" \ + "${builtins.toString ./src-deps.json}" + ''; + + # Necessary for the tests to pass on Darwin with sandbox enabled. + # Bazel starts a local server and needs to bind a local address. + __darwinAllowLocalNetworking = true; + + # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. + customBash = writeCBin "bash" '' + #include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include <unistd.h> + + extern char **environ; + + int main(int argc, char *argv[]) { + char *path = getenv("PATH"); + char *pathToAppend = "${defaultShellPath}"; + char *newPath; + if (path != NULL) { + int length = strlen(path) + 1 + strlen(pathToAppend) + 1; + newPath = malloc(length * sizeof(char)); + snprintf(newPath, length, "%s:%s", path, pathToAppend); + } else { + newPath = pathToAppend; + } + setenv("PATH", newPath, 1); + execve("${bash}/bin/bash", argv, environ); + return 0; + } + ''; + + postPatch = let + + darwinPatches = '' + bazelLinkFlags () { + eval set -- "$NIX_LDFLAGS" + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" + done + } + + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails + export GCOV=${coreutils}/bin/false + + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 + export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD + + substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' "" + + # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead + sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc + + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + + sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done + ''; + + genericPatches = '' + # Substitute j2objc and objc wrapper's python shebang to plain python path. + # These scripts explicitly depend on Python 2.7, hence we use python27. + # See also `postFixup` where python27 is added to $out/nix-support + substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + + # md5sum is part of coreutils + sed -i 's|/sbin/md5|md5sum|' \ + src/BUILD + + # replace initial value of pythonShebang variable in BazelPythonSemantics.java + substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \ + --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\"" + + # substituteInPlace is rather slow, so prefilter the files with grep + grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do + # If you add more replacements here, you must change the grep above! + # Only files containing /bin are taken into account. + # We default to python3 where possible. See also `postFixup` where + # python3 is added to $out/nix-support + substituteInPlace "$path" \ + --replace /bin/bash ${customBash}/bin/bash \ + --replace "/usr/bin/env bash" ${customBash}/bin/bash \ + --replace "/usr/bin/env python" ${python3}/bin/python \ + --replace /usr/bin/env ${coreutils}/bin/env \ + --replace /bin/true ${coreutils}/bin/true + done + + # bazel test runner include references to /bin/bash + substituteInPlace tools/build_rules/test_rules.bzl \ + --replace /bin/bash ${customBash}/bin/bash + + for i in $(find tools/cpp/ -type f) + do + substituteInPlace $i \ + --replace /bin/bash ${customBash}/bin/bash + done + + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/bash ${customBash}/bin/bash + + # add nix environment vars to .bazelrc + cat >> .bazelrc <<EOF + # Limit the resources Bazel is allowed to use during the build to 1/2 the + # available RAM and 3/4 the available CPU cores. This should help avoid + # overwhelming the build machine. + build --local_ram_resources=HOST_RAM*.5 + build --local_cpu_resources=HOST_CPUS*.75 + + build --distdir=${distDir} + fetch --distdir=${distDir} + build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" + build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" + build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" + build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" + build --host_javabase='@local_jdk//:jdk' + build --host_java_toolchain='${javaToolchain}' + build --verbose_failures + EOF + + # add the same environment vars to compile.sh + sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ + -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \ + -e "/\$command \\\\$/a --verbose_failures \\\\" \ + -i scripts/bootstrap/compile.sh + + # This is necessary to avoid: + # "error: no visible @interface for 'NSDictionary' declares the selector + # 'initWithContentsOfURL:error:'" + # This can be removed when the apple_sdk is upgraded beyond 10.13+ + sed -i '/initWithContentsOfURL:versionPlistUrl/ { + N + s/error:nil\];/\];/ + }' tools/osx/xcode_locator.m + + # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash + echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp + cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp + mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash + + patchShebangs . + ''; + in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + + genericPatches; + + buildInputs = [ + buildJdk + python3 + ]; + + # when a command can’t be found in a bazel build, you might also + # need to add it to `defaultShellPath`. + nativeBuildInputs = [ + installShellFiles + zip + python3 + unzip + makeWrapper + which + customBash + ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; + + # Bazel makes extensive use of symlinks in the WORKSPACE. + # This causes problems with infinite symlinks if the build output is in the same location as the + # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a + # subdirectory. + # Failing to do this causes "infinite symlink expansion detected" + preBuildPhases = ["preBuildPhase"]; + preBuildPhase = '' + mkdir bazel_src + shopt -s dotglob extglob + mv !(bazel_src) bazel_src + ''; + # Needed to build fish completion + propagatedBuildInputs = [ python3.pkgs.absl-py ]; + buildPhase = '' + # Increasing memory during compilation might be necessary. + # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" + + # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md + # and `git rev-parse --short HEAD` which would result in + # "3.7.0- (@non-git)" due to non-git build and incomplete changelog. + # Actual bazel releases use scripts/release/common.sh which is based + # on branch/tag information which we don't have with tarball releases. + # Note that .bazelversion is always correct and is based on bazel-* + # executable name, version checks should work fine + export EMBED_LABEL="${version}- (@non-git)" + ${customBash}/bin/bash ./bazel_src/compile.sh + ./bazel_src/scripts/generate_bash_completion.sh \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.bash \ + --prepend=./bazel_src/scripts/bazel-complete-header.bash \ + --prepend=./bazel_src/scripts/bazel-complete-template.bash + ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.fish + ''; + + installPhase = '' + mkdir -p $out/bin + + # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel + # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch} + # The binary _must_ exist with this naming if your project contains a .bazelversion + # file. + cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + + # shell completion files + installShellCompletion --bash \ + --name bazel.bash \ + ./bazel_src/output/bazel-complete.bash + installShellCompletion --zsh \ + --name _bazel \ + ./bazel_src/scripts/zsh_completion/_bazel + installShellCompletion --fish \ + --name bazel.fish \ + ./bazel_src/output/bazel-complete.fish + ''; + + doInstallCheck = true; + installCheckPhase = '' + export TEST_TMPDIR=$(pwd) + + hello_test () { + $out/bin/bazel test \ + --test_output=errors \ + --java_toolchain='${javaToolchain}' \ + examples/cpp:hello-success_test \ + examples/java-native/src/test/java/com/example/myproject:hello + } + + cd ./bazel_src + + # test whether $WORKSPACE_ROOT/tools/bazel works + + mkdir -p tools + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exit 1 + EOF + chmod +x tools/bazel + + # first call should fail if tools/bazel is used + ! hello_test + + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exec "$BAZEL_REAL" "$@" + EOF + + # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} + hello_test + ''; + + # Save paths to hardcoded dependencies so Nix can detect them. + postFixup = '' + mkdir -p $out/nix-support + echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends + # The templates get tar’d up into a .jar, + # so nix can’t detect python is needed in the runtime closure + # Some of the scripts explicitly depend on Python 2.7. Otherwise, we + # default to using python3. Therefore, both python27 and python3 are + # runtime dependencies. + echo "${python27}" >> $out/nix-support/depends + echo "${python3}" >> $out/nix-support/depends + '' + lib.optionalString stdenv.isDarwin '' + echo "${cctools}" >> $out/nix-support/depends + ''; + + dontStrip = true; + dontPatchELF = true; +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch new file mode 100644 index 000000000000..012e613c2f19 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch @@ -0,0 +1,34 @@ +--- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100 ++++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100 +@@ -21,10 +21,6 @@ + // 6,6.4,6.4.1 = 6.4.1 + // 6.3,6.3.0 = 6.3 + +-#if !defined(__has_feature) || !__has_feature(objc_arc) +-#error "This file requires ARC support." +-#endif +- + #import <CoreServices/CoreServices.h> + #import <Foundation/Foundation.h> + +--- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100 ++++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100 +@@ -123,7 +123,6 @@ + "macosx", + "clang", + "-mmacosx-version-min=10.9", +- "-fobjc-arc", + "-framework", + "CoreServices", + "-framework", +--- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100 ++++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100 +@@ -27,7 +27,7 @@ + ]) + + DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ +- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \ ++ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \ + -framework Foundation -o $@ $< + """ + diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json new file mode 100644 index 000000000000..43ad41003152 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json @@ -0,0 +1,1498 @@ +{ + "1.25.0.zip": { + "name": "1.25.0.zip", + "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", + "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" + ] + }, + "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": { + "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" + ] + }, + "382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz": { + "name": "382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", + "sha256": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", + "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" + ] + }, + "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { + "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" + ] + }, + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { + "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": { + "name": "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" + ] + }, + "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": { + "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", + "urls": [ + "https://mirror.bazel.build/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" + ] + }, + "android_tools": { + "name": "android_tools", + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + }, + "android_tools_for_testing": { + "name": "android_tools_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + }, + "android_tools_pkg-0.19.0rc3.tar.gz": { + "name": "android_tools_pkg-0.19.0rc3.tar.gz", + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "urls": [ + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + ] + }, + "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { + "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + ] + }, + "bazel-skylib-1.0.3.tar.gz": { + "name": "bazel-skylib-1.0.3.tar.gz", + "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz" + ] + }, + "bazel-toolchains-3.1.0.tar.gz": { + "name": "bazel-toolchains-3.1.0.tar.gz", + "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" + ] + }, + "bazel_j2objc": { + "name": "bazel_j2objc", + "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", + "strip_prefix": "j2objc-2.5", + "urls": [ + "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", + "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" + ] + }, + "bazel_skylib": { + "name": "bazel_skylib", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz" + ] + }, + "bazel_toolchains": { + "name": "bazel_toolchains", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", + "strip_prefix": "bazel-toolchains-3.1.0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" + ] + }, + "bazel_website": { + "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n", + "name": "bazel_website", + "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4", + "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42", + "urls": [ + "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz" + ] + }, + "boringssl": { + "generator_function": "grpc_deps", + "generator_name": "boringssl", + "name": "boringssl", + "sha256": "81333e496d7b74a60aa6fa622c028ba382a0a6b9c815cc6ccb221042383b9a9b", + "strip_prefix": "boringssl-412844d75b14b9090b58423fd5f5ed8c2fd80212", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz", + "https://github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz" + ] + }, + "build_bazel_apple_support": { + "generator_function": "grpc_deps", + "generator_name": "build_bazel_apple_support", + "name": "build_bazel_apple_support", + "sha256": "122ebf7fe7d1c8e938af6aeaee0efe788a3a2449ece5a8d6a428cb18d6f88033", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz", + "https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz" + ] + }, + "build_bazel_rules_apple": { + "generator_function": "grpc_deps", + "generator_name": "build_bazel_rules_apple", + "name": "build_bazel_rules_apple", + "sha256": "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e", + "strip_prefix": "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz", + "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz" + ] + }, + "build_bazel_rules_nodejs": { + "name": "build_bazel_rules_nodejs", + "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz", + "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz" + ] + }, + "com_github_cares_cares": { + "build_file": "@com_github_grpc_grpc//third_party:cares/cares.BUILD", + "generator_function": "grpc_deps", + "generator_name": "com_github_cares_cares", + "name": "com_github_cares_cares", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "strip_prefix": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + ] + }, + "com_github_gflags_gflags": { + "generator_function": "grpc_deps", + "generator_name": "com_github_gflags_gflags", + "name": "com_github_gflags_gflags", + "sha256": "63ae70ea3e05780f7547d03503a53de3a7d2d83ad1caaa443a31cb20aea28654", + "strip_prefix": "gflags-28f50e0fed19872e0fd50dd23ce2ee8cd759338e", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz", + "https://github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz" + ] + }, + "com_github_google_benchmark": { + "generator_function": "grpc_deps", + "generator_name": "com_github_google_benchmark", + "name": "com_github_google_benchmark", + "sha256": "f68aec93154d010324c05bcd8c5cc53468b87af88d87acb5ddcfaa1bba044837", + "strip_prefix": "benchmark-090faecb454fbd6e6e17a75ef8146acb037118d4", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz", + "https://github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz" + ] + }, + "com_github_google_re2": { + "generator_function": "grpc_deps", + "generator_name": "com_github_google_re2", + "name": "com_github_google_re2", + "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", + "strip_prefix": "re2-aecba11114cf1fac5497aeb844b6966106de3eb6", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" + ] + }, + "com_github_grpc_grpc": { + "name": "com_github_grpc_grpc", + "patch_args": [ + "-p1" + ], + "patches": [ + "//third_party/grpc:grpc_1.32.0.patch" + ], + "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", + "strip_prefix": "grpc-1.32.0", + "urls": [ + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + ] + }, + "com_google_absl": { + "generator_function": "grpc_deps", + "generator_name": "com_google_absl", + "name": "com_google_absl", + "sha256": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", + "strip_prefix": "abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz" + ] + }, + "com_google_googletest": { + "name": "com_google_googletest", + "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", + "strip_prefix": "googletest-release-1.10.0", + "urls": [ + "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", + "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" + ] + }, + "com_google_protobuf": { + "name": "com_google_protobuf", + "patch_args": [ + "-p1" + ], + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "patches": [ + "//third_party/protobuf:3.13.0.patch" + ], + "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", + "strip_prefix": "protobuf-3.13.0", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" + ] + }, + "coverage_output_generator-v2.5.zip": { + "name": "coverage_output_generator-v2.5.zip", + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" + ] + }, + "cython": { + "build_file": "@com_github_grpc_grpc//third_party:cython.BUILD", + "generator_function": "grpc_deps", + "generator_name": "cython", + "name": "cython", + "sha256": "d68138a2381afbdd0876c3cb2a22389043fa01c4badede1228ee073032b07a27", + "strip_prefix": "cython-c2b80d87658a8525ce091cbe146cb7eaa29fed5c", + "urls": [ + "https://github.com/cython/cython/archive/c2b80d87658a8525ce091cbe146cb7eaa29fed5c.tar.gz" + ] + }, + "desugar_jdk_libs": { + "name": "desugar_jdk_libs", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz": { + "name": "df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", + "sha256": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", + "urls": [ + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz" + ] + }, + "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { + "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { + "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "urls": [ + "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + ] + }, + "enum34": { + "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD", + "generator_function": "grpc_deps", + "generator_name": "enum34", + "name": "enum34", + "sha256": "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1", + "strip_prefix": "enum34-1.1.6", + "urls": [ + "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz" + ] + }, + "envoy_api": { + "generator_function": "grpc_deps", + "generator_name": "envoy_api", + "name": "envoy_api", + "sha256": "9150f920abd3e710e0e58519cd769822f13d7a56988f2c34c2008815ec8d9c88", + "strip_prefix": "data-plane-api-8dcc476be69437b505af181a6e8b167fdb101d7e", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz" + ] + }, + "futures": { + "build_file": "@com_github_grpc_grpc//third_party:futures.BUILD", + "generator_function": "grpc_deps", + "generator_name": "futures", + "name": "futures", + "sha256": "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794", + "strip_prefix": "futures-3.3.0", + "urls": [ + "https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00/futures-3.3.0.tar.gz" + ] + }, + "io_bazel_rules_go": { + "generator_function": "grpc_deps", + "generator_name": "io_bazel_rules_go", + "name": "io_bazel_rules_go", + "sha256": "a82a352bffae6bee4e95f68a8d80a70e87f42c4741e6a448bec11998fcc82329", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz" + ] + }, + "io_bazel_rules_python": { + "generator_function": "grpc_deps", + "generator_name": "io_bazel_rules_python", + "name": "io_bazel_rules_python", + "sha256": "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161", + "url": "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz" + }, + "io_bazel_rules_sass": { + "name": "io_bazel_rules_sass", + "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", + "strip_prefix": "rules_sass-1.25.0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", + "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" + ] + }, + "io_bazel_skydoc": { + "name": "io_bazel_skydoc", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" + ] + }, + "io_opencensus_cpp": { + "generator_function": "grpc_deps", + "generator_name": "io_opencensus_cpp", + "name": "io_opencensus_cpp", + "sha256": "90d6fafa8b1a2ea613bf662731d3086e1c2ed286f458a95c81744df2dbae41b1", + "strip_prefix": "opencensus-cpp-c9a4da319bc669a772928ffc55af4a61be1a1176", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz", + "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" + ] + }, + "java_tools_javac11_darwin-v10.5.zip": { + "name": "java_tools_javac11_darwin-v10.5.zip", + "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + ] + }, + "java_tools_javac11_linux-v10.5.zip": { + "name": "java_tools_javac11_linux-v10.5.zip", + "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + ] + }, + "java_tools_javac11_windows-v10.5.zip": { + "name": "java_tools_javac11_windows-v10.5.zip", + "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + ] + }, + "java_tools_langtools_javac11": { + "name": "java_tools_langtools_javac11", + "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" + ] + }, + "jekyll_tree_0_17_1": { + "name": "jekyll_tree_0_17_1", + "sha256": "02256ddd20eeaf70cf8fcfe9b2cdddd7be87aedd5848d549474fb0358e0031d3", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.1.tar" + ] + }, + "jekyll_tree_0_17_2": { + "name": "jekyll_tree_0_17_2", + "sha256": "13b35dd309a0d52f0a2518a1193f42729c75255f5fae40cea68e4d4224bfaa2e", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.2.tar" + ] + }, + "jekyll_tree_0_18_1": { + "name": "jekyll_tree_0_18_1", + "sha256": "98b77f48e37a50fc6f83100bf53f661e10732bb3ddbc226e02d0225cb7a9a7d8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.18.1.tar" + ] + }, + "jekyll_tree_0_19_1": { + "name": "jekyll_tree_0_19_1", + "sha256": "ec892c59ba18bb8de1f9ae2bde937db144e45f28d6d1c32a2cee847ee81b134d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.1.tar" + ] + }, + "jekyll_tree_0_19_2": { + "name": "jekyll_tree_0_19_2", + "sha256": "3c2d9f21ec2fd1c0b8a310f6eb6043027c838810cdfc2457d4346a0e5cdcaa7a", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.2.tar" + ] + }, + "jekyll_tree_0_20_0": { + "name": "jekyll_tree_0_20_0", + "sha256": "bb79a63810bf1b0aa1f89bd3bbbeb4a547a30ab9af70c9be656cc6866f4b015b", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.20.0.tar" + ] + }, + "jekyll_tree_0_21_0": { + "name": "jekyll_tree_0_21_0", + "sha256": "23ec39c0138d358c544151e5c81586716d5d1c6124f10a742bead70516e6eb93", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.21.0.tar" + ] + }, + "jekyll_tree_0_22_0": { + "name": "jekyll_tree_0_22_0", + "sha256": "bec5cfaa5560e082e41e33bde276cf93f0f7bcfd2914a3e868f921df8b3ab725", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.22.0.tar" + ] + }, + "jekyll_tree_0_23_0": { + "name": "jekyll_tree_0_23_0", + "sha256": "56c80fcf49dc606fab8ed5e737a7409e9a486585b7b98673be69b5a4984dd774", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.23.0.tar" + ] + }, + "jekyll_tree_0_24_0": { + "name": "jekyll_tree_0_24_0", + "sha256": "988fa567906a73e50d3669909285187ef88c76ecd4aa277f4d1f355fc06a90c8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.24.0.tar" + ] + }, + "jekyll_tree_0_25_0": { + "name": "jekyll_tree_0_25_0", + "sha256": "e8ab61c047225e808982a564ecd692fd63bd243dccc88a8768ed069a5362a685", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.25.0.tar" + ] + }, + "jekyll_tree_0_26_0": { + "name": "jekyll_tree_0_26_0", + "sha256": "3907dfc6fb27d246e67877e553e8951fac239bb49f2dec7e06b6b09cb0b98b8d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.26.0.tar" + ] + }, + "jekyll_tree_0_27_0": { + "name": "jekyll_tree_0_27_0", + "sha256": "97e2633fefee389daade775da43907aa68699b32212f4e48cb095abe18aa7e65", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.27.0.tar" + ] + }, + "jekyll_tree_0_28_0": { + "name": "jekyll_tree_0_28_0", + "sha256": "64b3fc267fb1f4c56345d96f0ad9f07a2efe43bd15361f818368849cf941b3b7", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.28.0.tar" + ] + }, + "jekyll_tree_0_29_0": { + "name": "jekyll_tree_0_29_0", + "sha256": "99d7a6bf9ef0145c59c54b4319fb31cb855681782080a5490909c4a5463c7215", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.0.tar" + ] + }, + "jekyll_tree_0_29_1": { + "name": "jekyll_tree_0_29_1", + "sha256": "cf0a517f1660a7c4fd26a7ef6f3594bbefcf2b670bc0ed610bf3bb6ec3a9fdc3", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.1.tar" + ] + }, + "jekyll_tree_1_0_0": { + "name": "jekyll_tree_1_0_0", + "sha256": "61ef65c738a8cd65059f58f2ee5f7eef493136ac4d5e5c3464787d17043febdf", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.0.0.tar" + ] + }, + "jekyll_tree_1_1_0": { + "name": "jekyll_tree_1_1_0", + "sha256": "46d82c9249896903ee6be2295fc52a1346a9ee82f61f89b8a2181232c3bd999b", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.1.0.tar" + ] + }, + "jekyll_tree_1_2_0": { + "name": "jekyll_tree_1_2_0", + "sha256": "d402a8391ca2624673f124ff42ba8d0d40d4139e5d23111f3995dc6c5f70f63d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.2.0.tar" + ] + }, + "jekyll_tree_2_0_0": { + "name": "jekyll_tree_2_0_0", + "sha256": "7d7c424ede503856c61b645d8fdc2513ec6ea8600d76c5e87c45a9a45c16de3e", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.0.0.tar" + ] + }, + "jekyll_tree_2_1_0": { + "name": "jekyll_tree_2_1_0", + "sha256": "b0fd257b1d6b1b05705742d55a13b9a20d3e99f49c89334750c872d620e5b88f", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.1.0.tar" + ] + }, + "jekyll_tree_2_2_0": { + "name": "jekyll_tree_2_2_0", + "sha256": "4c1506786ab98df8039ec7354b82da7b586b2ae4ab7f7e7d08f3caf74ff28e3d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.2.0.tar" + ] + }, + "jekyll_tree_3_0_0": { + "name": "jekyll_tree_3_0_0", + "sha256": "bd1096ad609c253fa7b1473edf4a3aa51f36243e188dbb62c68d8ed4aca2419d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.0.0.tar" + ] + }, + "jekyll_tree_3_1_0": { + "name": "jekyll_tree_3_1_0", + "sha256": "f9d2e22e24af426d6c9de163d91abe6d8af7eb1eabb1d7ff5e9cf4bededf465a", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.1.0-807b377.tar" + ] + }, + "jekyll_tree_3_2_0": { + "name": "jekyll_tree_3_2_0", + "sha256": "6cff8654e739a0c3062183a5a6cc82fcf9a77323051f8c007866d7f4101052a6", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.2.0.tar" + ] + }, + "jekyll_tree_3_3_0": { + "name": "jekyll_tree_3_3_0", + "sha256": "36b81e8ddf4f3caccf41acc82d9e49f000c1be9e92c9cc82793d60ff70636176", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.3.0.tar" + ] + }, + "jekyll_tree_3_4_0": { + "name": "jekyll_tree_3_4_0", + "sha256": "af82e775d911135bcff76e500bb003c4a9fccb949f8ddf4d93c58eca195bf5e8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.4.0.tar" + ] + }, + "jekyll_tree_3_5_0": { + "name": "jekyll_tree_3_5_0", + "sha256": "aa96cbad14cfab0b422d1d17eac3107a75eb05854d40ab4f1379a6fc87b2e1f8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.0.tar" + ] + }, + "jekyll_tree_3_5_1": { + "name": "jekyll_tree_3_5_1", + "sha256": "1c949ba8da353c93c74a70638e5cb321ea1cd5582eda1b6ad88c6d2d0b569f2f", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.1.tar" + ] + }, + "jekyll_tree_3_6_0": { + "name": "jekyll_tree_3_6_0", + "sha256": "1b7a16a2098ca0c290c208a11db886e950d6c523b2cac2d0a0cba4a04aa832f3", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.6.0.tar" + ] + }, + "jekyll_tree_3_7_0": { + "name": "jekyll_tree_3_7_0", + "sha256": "a534d37ef3867c92fae8692852f92820a34f63a5f9092bbbec6505c0f69d8094", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.7.0.tar" + ] + }, + "openjdk11_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_darwin_archive", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "openjdk11_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_linux_archive", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "openjdk11_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_windows_archive", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "openjdk14_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk14_darwin_archive", + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "openjdk14_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk14_linux_archive", + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "openjdk14_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk14_windows_archive", + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, + "openjdk15_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_darwin_archive", + "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz" + ] + }, + "openjdk15_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_linux_archive", + "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" + ] + }, + "openjdk15_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_windows_archive", + "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip" + ] + }, + "openjdk_linux": { + "downloaded_file_path": "zulu-linux.tar.gz", + "name": "openjdk_linux", + "sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz" + ] + }, + "openjdk_linux_aarch64": { + "downloaded_file_path": "zulu-linux-aarch64.tar.gz", + "name": "openjdk_linux_aarch64", + "sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" + ] + }, + "openjdk_linux_aarch64_minimal": { + "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", + "name": "openjdk_linux_aarch64_minimal", + "sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" + ] + }, + "openjdk_linux_aarch64_vanilla": { + "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", + "name": "openjdk_linux_aarch64_vanilla", + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + }, + "openjdk_linux_minimal": { + "downloaded_file_path": "zulu-linux-minimal.tar.gz", + "name": "openjdk_linux_minimal", + "sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz" + ] + }, + "openjdk_linux_ppc64le_vanilla": { + "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz", + "name": "openjdk_linux_ppc64le_vanilla", + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "openjdk_linux_s390x_vanilla": { + "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz", + "name": "openjdk_linux_s390x_vanilla", + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "openjdk_linux_vanilla": { + "downloaded_file_path": "zulu-linux-vanilla.tar.gz", + "name": "openjdk_linux_vanilla", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "openjdk_macos": { + "downloaded_file_path": "zulu-macos.tar.gz", + "name": "openjdk_macos", + "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz" + ] + }, + "openjdk_macos_minimal": { + "downloaded_file_path": "zulu-macos-minimal.tar.gz", + "name": "openjdk_macos_minimal", + "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz" + ] + }, + "openjdk_macos_vanilla": { + "downloaded_file_path": "zulu-macos-vanilla.tar.gz", + "name": "openjdk_macos_vanilla", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "openjdk_win": { + "downloaded_file_path": "zulu-win.zip", + "name": "openjdk_win", + "sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" + ] + }, + "openjdk_win_minimal": { + "downloaded_file_path": "zulu-win-minimal.zip", + "name": "openjdk_win_minimal", + "sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" + ] + }, + "openjdk_win_vanilla": { + "downloaded_file_path": "zulu-win-vanilla.zip", + "name": "openjdk_win_vanilla", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "platforms": { + "name": "platforms", + "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", + "strip_prefix": "platforms-46993efdd33b73649796c5fc5c9efb193ae19d51", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" + ] + }, + "remote_coverage_tools": { + "name": "remote_coverage_tools", + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" + ] + }, + "remote_coverage_tools_for_testing": { + "name": "remote_coverage_tools_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" + ] + }, + "remote_java_tools_darwin": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_darwin", + "name": "remote_java_tools_darwin", + "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip" + ] + }, + "remote_java_tools_darwin_for_testing": { + "name": "remote_java_tools_darwin_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip" + ] + }, + "remote_java_tools_javac11_test_darwin": { + "name": "remote_java_tools_javac11_test_darwin", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + ] + }, + "remote_java_tools_javac11_test_linux": { + "name": "remote_java_tools_javac11_test_linux", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + ] + }, + "remote_java_tools_javac11_test_windows": { + "name": "remote_java_tools_javac11_test_windows", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + ] + }, + "remote_java_tools_linux": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_linux", + "name": "remote_java_tools_linux", + "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip" + ] + }, + "remote_java_tools_linux_for_testing": { + "name": "remote_java_tools_linux_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip" + ] + }, + "remote_java_tools_windows": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_windows", + "name": "remote_java_tools_windows", + "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip" + ] + }, + "remote_java_tools_windows_for_testing": { + "name": "remote_java_tools_windows_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip" + ] + }, + "remotejdk11_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux", + "name": "remotejdk11_linux", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "remotejdk11_linux_aarch64": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_aarch64", + "name": "remotejdk11_linux_aarch64", + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + }, + "remotejdk11_linux_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_aarch64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + }, + "remotejdk11_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "remotejdk11_linux_ppc64le": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_ppc64le", + "name": "remotejdk11_linux_ppc64le", + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_ppc64le_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_ppc64le_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_s390x": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_s390x", + "name": "remotejdk11_linux_s390x", + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_s390x_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_s390x_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_macos", + "name": "remotejdk11_macos", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "remotejdk11_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_macos_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "remotejdk11_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_win", + "name": "remotejdk11_win", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "remotejdk11_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_win_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "remotejdk14_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_linux", + "name": "remotejdk14_linux", + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "remotejdk14_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_linux_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "remotejdk14_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_macos", + "name": "remotejdk14_macos", + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "remotejdk14_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_macos_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "remotejdk14_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_win", + "name": "remotejdk14_win", + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, + "remotejdk14_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_win_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, + "remotejdk15_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_linux_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" + ] + }, + "remotejdk15_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_macos_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz" + ] + }, + "remotejdk15_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_win_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip" + ] + }, + "rules_cc": { + "name": "rules_cc", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + ] + }, + "rules_java": { + "name": "rules_java", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "rules_nodejs-2.2.2.tar.gz": { + "name": "rules_nodejs-2.2.2.tar.gz", + "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz", + "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz" + ] + }, + "rules_pkg": { + "name": "rules_pkg", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" + ] + }, + "rules_pkg-0.2.4.tar.gz": { + "name": "rules_pkg-0.2.4.tar.gz", + "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" + ] + }, + "rules_proto": { + "name": "rules_proto", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", + "strip_prefix": "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" + ] + }, + "six": { + "build_file": "@com_github_grpc_grpc//third_party:six.BUILD", + "generator_function": "grpc_deps", + "generator_name": "six", + "name": "six", + "sha256": "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", + "urls": [ + "https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca/six-1.12.0.tar.gz" + ] + }, + "upb": { + "generator_function": "grpc_deps", + "generator_name": "upb", + "name": "upb", + "sha256": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", + "strip_prefix": "upb-382d5afc60e05470c23e8de19b19fc5ad231e732", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", + "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" + ] + }, + "v1.32.0.tar.gz": { + "name": "v1.32.0.tar.gz", + "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", + "urls": [ + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + ] + }, + "v3.13.0.tar.gz": { + "name": "v3.13.0.tar.gz", + "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" + ] + }, + "zlib": { + "build_file": "@com_github_grpc_grpc//third_party:zlib.BUILD", + "generator_function": "grpc_deps", + "generator_name": "zlib", + "name": "zlib", + "sha256": "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45", + "strip_prefix": "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz", + "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz" + ] + }, + "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": { + "name": "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": { + "name": "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "zulu11.37.17-ca-jdk11.0.6-win_x64.zip": { + "name": "zulu11.37.17-ca-jdk11.0.6-win_x64.zip", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": { + "name": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz", + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + } +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py new file mode 100755 index 000000000000..9e998e05875e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python3 +import sys +import json + +if len(sys.argv) != 2: + print("usage: ./this-script src-deps.json < WORKSPACE", file=sys.stderr) + print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr) + print("Hail Eris.", file=sys.stderr) + sys.exit(1) + +http_archives = [] + +# just the kw args are the dict { name, sha256, urls … } +def http_archive(**kw): + http_archives.append(kw) +# like http_file +def http_file(**kw): + http_archives.append(kw) + +# this is inverted from http_archive/http_file and bundles multiple archives +def distdir_tar(**kw): + for archive_name in kw['archives']: + http_archives.append({ + "name": archive_name, + "sha256": kw['sha256'][archive_name], + "urls": kw['urls'][archive_name] + }) + +# TODO? +def git_repository(**kw): + print(json.dumps(kw, sort_keys=True, indent=4), file=sys.stderr) + sys.exit(1) + +# execute the WORKSPACE like it was python code in this module, +# using all the function stubs from above. +exec(sys.stdin.read()) + +# transform to a dict with the names as keys +d = { el['name']: el for el in http_archives } + +def has_urls(el): + return ('url' in el and el['url']) or ('urls' in el and el['urls']) +def has_sha256(el): + return 'sha256' in el and el['sha256'] +bad_archives = list(filter(lambda el: not has_urls(el) or not has_sha256(el), d.values())) +if bad_archives: + print('Following bazel dependencies are missing url or sha256', file=sys.stderr) + print('Check bazel sources for master or non-checksummed dependencies', file=sys.stderr) + for el in bad_archives: + print(json.dumps(el, sort_keys=True, indent=4), file=sys.stderr) + sys.exit(1) + +with open(sys.argv[1], "w") as f: + print(json.dumps(d, sort_keys=True, indent=4), file=f) diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 436b681e0054..441254ce263c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "bazel-buildtools"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix index 30b957eb5e30..11931a197c0c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -38,7 +38,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-cpp"; + name = "bazel-test-java"; inherit workspaceDir; bazelPkg = bazel; buildInputs = [ openjdk8 ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index 0784de4cfd39..3858a681659b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -17,15 +17,29 @@ let com_google_protobuf = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf"; - rev = "v3.7.0"; - sha256 = "0nlxif4cajqllsj2vdh7zp14ag48fb8lsa64zmq8625q9m2lcmdh"; + rev = "v3.13.0"; + sha256 = "1nqsvi2yfr93kiwlinz8z7c68ilg1j75b2vcpzxzvripxx5h6xhd"; }; bazel_skylib = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-skylib"; - rev = "f83cb8dd6f5658bc574ccd873e25197055265d1c"; - sha256 = "091fb0ky0956wgv8gghy9ay3yfx6497mb72qvibf0y9dllmxyn9l"; + rev = "2ec2e6d715e993d96ad6222770805b5bd25399ae"; + sha256 = "1z2r2vx6kj102zvp3j032djyv99ski1x1sl4i3p6mswnzrzna86s"; + }; + + rules_python = fetchFromGitHub { + owner = "bazelbuild"; + repo = "rules_python"; + rev = "c8c79aae9aa1b61d199ad03d5fe06338febd0774"; + sha256 = "1zn58wv5wcylpi0xj7riw34i1jjpqahanxx8y9srwrv0v93b6pqz"; + }; + + rules_proto = fetchFromGitHub { + owner = "bazelbuild"; + repo = "rules_proto"; + rev = "a0761ed101b939e19d83b2da5f59034bffc19c12"; + sha256 = "09lqfj5fxm1fywxr5w8pnpqd859gb6751jka9fhxjxjzs33glhqf"; }; net_zlib = fetchurl rec { @@ -40,7 +54,9 @@ let load("//:proto-support.bzl", "protobuf_deps") protobuf_deps() - ''; + load("@rules_proto//proto:repositories.bzl", "rules_proto_toolchains") + rules_proto_toolchains() + ''; protoSupport = writeText "proto-support.bzl" '' """Load dependencies needed to compile the protobuf library as a 3rd-party consumer.""" @@ -62,13 +78,17 @@ let name = "bazel_skylib", path = "${bazel_skylib}", ) - - native.bind( - name = "zlib", - actual = "@net_zlib//:zlib", + native.local_repository( + name = "rules_proto", + path = "${rules_proto}", + ) + native.local_repository( + name = "rules_python", + path = "${rules_python}", ) + http_archive( - name = "net_zlib", + name = "zlib", build_file = "@com_google_protobuf//:third_party/zlib.BUILD", sha256 = "${net_zlib.sha256}", strip_prefix = "zlib-1.2.11", @@ -89,6 +109,8 @@ let ''; personBUILD = writeText "BUILD" '' + load("@rules_proto//proto:defs.bzl", "proto_library") + proto_library( name = "person_proto", srcs = ["person.proto"], diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py index 52d40e0f94e8..4105aeeb11bc 100755 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py @@ -47,6 +47,9 @@ def winsdk_configure(*args, **kw): pass def register_local_rc_exe_toolchains(*args, **kw): pass def register_toolchains(*args, **kw): pass def debian_deps(): pass +def grpc_deps(): pass +def grpc_extra_deps(): pass +def bazel_skylib_workspace(): pass # execute the WORKSPACE like it was python code in this module, # using all the function stubs from above. diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch index 75873d6055c0..f64e220eb29b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -14,15 +14,16 @@ diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.c index a5ce5d18f4..3d6838ce82 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx -@@ -43,11 +43,6 @@ +@@ -43,11 +43,10 @@ struct cmLinkImplementation; --#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) + #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) -# define HAVE_APPLICATION_SERVICES -# include <ApplicationServices/ApplicationServices.h> --#endif -- ++# include <CoreFoundation/CoreFoundation.h> + #endif + #if !defined(CMAKE_BOOTSTRAP) # include "cmXMLParser.h" diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 67adc2438c7f..5e5875cc36c4 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.19.2"; + version = "3.19.3"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "1w67w0ak6vf37501dlz9yhnzlvvpw1w10n2nm3hi7yxp4cxzvq73"; + sha256 = "sha256-P6ynwTFJSh401m6fiXL/U2nkjUGeqM6qPcFbTBE2dzI="; }; patches = [ diff --git a/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix b/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix index 25450ceb6d9b..601f7ea9fea0 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, git, fetchFromGitHub, rustPlatform }: +{ lib, git, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "fac-build"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 638be6b02d83..d314064904d1 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,15 +51,15 @@ rec { }; }; - gradle_latest = gradle_6_7; + gradle_latest = gradle_6_8; - gradle_6_7 = gradleGen rec { - name = "gradle-6.7"; - nativeVersion = "0.22-milestone-8"; + gradle_6_8 = gradleGen rec { + name = "gradle-6.8.1"; + nativeVersion = "0.22-milestone-9"; src = fetchurl { url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1i6zm55wzy13wvvmf3804b0rs47yrqqablf4gpf374ls05cpgmca"; + sha256 = "1zfn7400k39qbiidd5zxay6v5f5xz8x4g7rrf04p71bkmws1lngx"; }; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index 74d96d4af002..7009aa4898fa 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -1,6 +1,6 @@ { lib , python3 -, stdenv + , writeTextDir , substituteAll , fetchpatch diff --git a/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix b/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix index 03eac2db5e38..53333c217ba5 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/pants/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages }: +{ lib, pythonPackages }: with lib; with pythonPackages; diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix index d3926beb3216..30c55dbca373 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; license = lib.licenses.asl20; + maintainers = lib.teams.beam.members; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index aa3af12c934b..0c6450766b1a 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ gleber tazjin ]; + maintainers = lib.teams.beam.members; license = lib.licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix b/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix index 4360a3f3a308..1fb4206d5cec 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "samurai"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "michaelforney"; repo = pname; rev = version; - sha256 = "0k0amxpi3v9v68a8vc69r4b86xs12vhzm0wxd7f11vap1pnqz2cz"; + sha256 = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI="; }; makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index f80d278c86df..efc6523cd986 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "4db8d5c27413f69297adfffac57485d88d73c60e"; - version = "2020-12-26"; + rev = "830b72140583e2790bbd3649890ac8ef5371d0c6"; + version = "2021-02-04"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "B8abzdohkw3aPhbENJ2vxZFLWhIpf0HF/uv+WJbVRYg="; + sha256 = "0wq2mf8s254ns0sss5q394c1j2rnvl42x9l6kkrav505hbx0gyq6"; }; dontBuild = true; @@ -25,9 +25,7 @@ stdenv.mkDerivation rec { install bin/sbt $out/bin - wrapProgram $out/bin/sbt --prefix PATH : ${ - lib.makeBinPath [ which curl ] - } + wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]} ''; passthru = { diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 6bd0b83cec1d..9e45c3e8b902 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "sha256-hqbyjnmWYHQQEGarGqGSZ9DI1E6uIdqpPJxgVspvnaQ="; + sha256 = "sha256-wqdZ/kCjwhoWtaiNAM1m869vByHk6mG2OULfuDotVP0="; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix index 1de2ecbbc8b8..8b5b608fdf39 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ stdenv, fetchurl, python3Packages, lib }: +{ fetchurl, python3Packages, lib }: python3Packages.buildPythonApplication rec { pname = "scons"; @@ -16,11 +16,19 @@ python3Packages.buildPythonApplication rec { postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") '' substituteInPlace setup.cfg \ --replace "build/dist" "dist" + '' + lib.optionalString (lib.versionAtLeast version "4.1.0") '' + substituteInPlace setup.cfg \ + --replace "build/doc/man/" "" ''; # The release tarballs don't contain any tests (runtest.py and test/*): doCheck = lib.versionOlder version "4.0.0"; + postInstall = lib.optionalString (lib.versionAtLeast version "4.1.0") '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + meta = with lib; { description = "An improved, cross-platform substitute for Make"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix index eb86d5955971..4b07eb0501d8 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix @@ -12,7 +12,7 @@ in { sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; }).override { python3Packages = python2Packages; }; scons_latest = mkScons { - version = "4.0.1"; - sha256 = "0z00l9wzaiqyjq0hapbvsjclvcfjjjq04kmxi7ffq966nl2d2bkj"; + version = "4.1.0"; + sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix b/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix index 868ea265f6f4..8cab1667b218 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , crystal_0_34 , crystal_0_35 diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index 5c80cbe096e4..68c1e9451917 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.19.2"; + version = "1.19.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "1gak5m4n4bfji1hcv8y5lj1m8a39rars8igqxdr89d2i45dkpbx0"; + sha256 = "0hyjyk3yw2yjb47j9kd6as5bsa2wkjricnx0803sg2p4qc8rb72f"; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/buildpack/default.nix b/nixpkgs/pkgs/development/tools/buildpack/default.nix index 68d0a53387a6..aa60d7be5b51 100644 --- a/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fNPgdMwqQq2Gh/rkf6KHEd34rnQqhw7Jf1L34oVorqM="; + sha256 = "sha256-VTQ3NOskBp7ic8a/nn/ZbALJVff+Pb/ZHHbld/OxQdo="; }; - vendorSha256 = "sha256-U38j5fxECKjYr5pqaNk0+Z0opQNqiYV2+6dIEaHUVF8="; + vendorSha256 = "sha256-n8X2NyQiOpEQ0d/ek1kdxKFfaCFf0EucflVLZjOGMfY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/capnproto-java/default.nix b/nixpkgs/pkgs/development/tools/capnproto-java/default.nix new file mode 100644 index 000000000000..95b78b724eb6 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/capnproto-java/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, capnproto, pkg-config }: + +stdenv.mkDerivation rec { + pname = "capnproto-java"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "capnproto"; + repo = pname; + rev = "v${version}"; + hash = "sha256:1512x70xa6mlg9dmr84r8xbf0jzysjal51ivhhh2ppl97yiqjgls"; + }; + + patches = [ + # Add make install rule + (fetchpatch { + url = "https://github.com/capnproto/capnproto-java/commit/e96448d3f5737db25e55cd268652712b69db5cc0.diff"; + sha256 = "0f3vyap1zsxy675900pzg5ngh7bf9icllm1w04q64g8i91sdzljl"; + }) + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ capnproto ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "Cap'n Proto codegen plugin for Java"; + longDescription = "Only includes compiler plugin, the Java runtime/library that the generated code will link to must be built separately with Maven."; + homepage = "https://dwrensha.github.io/capnproto-java/index.html"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index 702e5935689d..0cc386b657c7 100644 --- a/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "clj-kondo"; - version = "2020.11.07"; + version = "2020.12.12"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json"; - sha256 = "0mwclqjh38alkddr5r7bfqn5lplx06h9gladi89kp06qdxc1hp7a"; + sha256 = "ea5c18586fd8803b138a4dd197a0019d5e5a2c76ebe4925b9b54a10125a68c57"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "1xqryfcn82bp8wasqnllfgvhl5w9zm63yw8c2kgxz18dayhq4i31"; + sha256 = "27b8a82fb613803ab9c712866b7cc89c40fcafc4ac3af178c11b4ed7549934dc"; }; dontUnpack = true; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { native-image \ -jar ${src} \ -H:Name=clj-kondo \ + ${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \ -H:+ReportExceptionStackTraces \ -J-Dclojure.spec.skip-macros=true \ -J-Dclojure.compiler.direct-linking=true \ diff --git a/nixpkgs/pkgs/development/tools/clog-cli/default.nix b/nixpkgs/pkgs/development/tools/clog-cli/default.nix index 182a7f98c4c2..c3b477e3ea36 100644 --- a/nixpkgs/pkgs/development/tools/clog-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/clog-cli/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib, stdenv }: +{ fetchFromGitHub, rustPlatform, lib }: with rustPlatform; diff --git a/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index 5fcaa35378d7..e729b8c448a9 100644 --- a/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.24"; + version = "0.1.25"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "11d335lx6pa8pvsiv9m00ig8b8y203rzad4krr0p9c04ppw0c966"; + sha256 = "sha256-tbwmHsiR/RJl3CJrzJtI6GA3v9mNAirbEHXX+wDMd2k="; }; - vendorSha256 = "1dr1sql0ph3k6hylgikhiaaskxwnsynspp770p9i7y7fasmb53jw"; + vendorSha256 = "sha256-vOaklBsMuKTQ3cJgXDClM1RWh+ovemO1uDWXeK1ygU4="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/compile-daemon/default.nix b/nixpkgs/pkgs/development/tools/compile-daemon/default.nix index ef08b2d58134..a12fb4424e8e 100644 --- a/nixpkgs/pkgs/development/tools/compile-daemon/default.nix +++ b/nixpkgs/pkgs/development/tools/compile-daemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "compile-daemon-unstable"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index bd8608a91197..5ba6718a6bd2 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,17 +1,17 @@ -{ fetchFromGitHub, lib, stdenv, buildGoModule, +{ fetchFromGitHub, lib, buildGoModule, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.26.0"; + version = "3.27.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "1z8hiamg3h1fnsmr8j5l9q6c8cd81lqmd00gcmz4spw73pqfxg3r"; + sha256 = "sha256-JfOCht+awc0I22vtRD5hgowgdVkcJR3qSxnxLoc3XZY="; }; - vendorSha256 = "1kxnpn4py8a2rz1gwg0y3yiwcwphj38pkp2k9z1p85ccm2wblljz"; + vendorSha256 = "sha256-4zKe8y+9fedvCt/XmPf0HxtyqLz+FP4Ylt6k9KBjaIw="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 232efe32a1a8..64ca730d7dc0 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep +{ buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep , src, version, hasBootstrapScript, postPatch ? "" , ... }: let diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index b1ee5349a5c1..6c9cffe41b20 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: let version = "1.2.4"; in buildGoModule rec { diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index ffdf588895aa..c6d609e38cf1 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { name = "drone.io-${version}"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index 855fd879a8e2..da9261741515 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.7.3"; + version = "6.7.5"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-XaoM/1YuHBl8ndPz3EByW1X0CzTuvJ5ju11mStbJnEU="; + sha256 = "sha256-pL8h/hsaiVveZ32ee0bUepzcS7igJGVtGuHocrC21pY="; }; - vendorSha256 = "sha256-xeptlcJLj+R1BdC8Rdi3hsJVxdrmvfeTMsrhMNGrXi8="; + vendorSha256 = "sha256-IcIUYFmiVuRrZQisjWX5grOZPqovibgF5NmbG96FISI="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index adfc6a2580a3..6f11ee9e8773 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt -, writeScript, nixosTests, jq, cacert, curl }: +{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix +, nixfmt, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.263.2"; + version = "2.263.4"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "13l7y1307iv54z2zsjy0slzv2hpqv9i35qb15xa8s6sl7lcm9l49"; + sha256 = "1disj0a0qh7gzjqm6bjb7dx0v74k74hkyvxpg12ahdj2g04p8jhx"; }; buildCommand = '' diff --git a/nixpkgs/pkgs/development/tools/corgi/default.nix b/nixpkgs/pkgs/development/tools/corgi/default.nix index a7698ef4fb8e..e39e42c40af5 100644 --- a/nixpkgs/pkgs/development/tools/corgi/default.nix +++ b/nixpkgs/pkgs/development/tools/corgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "corgi-${rev}"; diff --git a/nixpkgs/pkgs/development/tools/cppclean/default.nix b/nixpkgs/pkgs/development/tools/cppclean/default.nix index 4e00eb903ebe..460d7cddb83d 100644 --- a/nixpkgs/pkgs/development/tools/cppclean/default.nix +++ b/nixpkgs/pkgs/development/tools/cppclean/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: with python3Packages; diff --git a/nixpkgs/pkgs/development/tools/cue/default.nix b/nixpkgs/pkgs/development/tools/cue/default.nix index 243be958b07d..28660732ea4f 100644 --- a/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/nixpkgs/pkgs/development/tools/cue/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchgit, lib, stdenv }: +{ buildGoModule, fetchgit, lib }: buildGoModule rec { pname = "cue"; diff --git a/nixpkgs/pkgs/development/tools/dapper/default.nix b/nixpkgs/pkgs/development/tools/dapper/default.nix index c49870346cbf..a95cac4514b7 100644 --- a/nixpkgs/pkgs/development/tools/dapper/default.nix +++ b/nixpkgs/pkgs/development/tools/dapper/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "dapper"; - version = "0.5.4"; + version = "0.5.5"; goPackagePath = "github.com/rancher/dapper"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "rancher"; repo = "dapper"; rev = "v${version}"; - sha256 = "sha256-2KyDFiCxqoQt/m12vyHH8/L88+dOQGGsnI3l1G82NxQ="; + sha256 = "sha256-QzPW1uC/WuYM/lLqyKodIozGTz5Qn1haoDvgNgjhrRA="; }; patchPhase = '' substituteInPlace main.go --replace 0.0.0 ${version} diff --git a/nixpkgs/pkgs/development/tools/dapr/cli/default.nix b/nixpkgs/pkgs/development/tools/dapr/cli/default.nix index 7a8243ece25d..57fd984dc17c 100644 --- a/nixpkgs/pkgs/development/tools/dapr/cli/default.nix +++ b/nixpkgs/pkgs/development/tools/dapr/cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ buildGoModule, fetchFromGitHub, lib }: let pname = "dapr"; diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index 9c01c1e9d2d1..6634c2b6384d 100644 --- a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dbmate"; diff --git a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 16e5fce1ebc0..eacd35ed760c 100644 --- a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0k3vrz12dgfirz9p4ckgk2swr42w8fl50hdgg8pwc7yh2jsz8zl0"; + sha256 = "sha256-Zwh8baMD8jt+yfsK0jpsTEU32rT+IAQGwavVT3rpRsU="; }; buildInputs = [ jre makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix b/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix index 119aa2eb8f81..930078b2dc72 100644 --- a/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix +++ b/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, pythonPackages, fetchFromGitHub }: +{ lib, pythonPackages, fetchFromGitHub }: let - pgdbconn = pythonPackages.buildPythonPackage { + pgdbconn = pythonPackages.buildPythonPackage rec { pname = "pgdbconn"; version = "0.8.0"; src = fetchFromGitHub { owner = "perseas"; repo = "pgdbconn"; - rev = "26c1490e4f32e4b5b925e5b82014ad106ba5b057"; + rev = "v${version}"; sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z"; }; # The tests are impure (they try to access a PostgreSQL server) diff --git a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix index 6017d704fc17..c42197e13cf1 100644 --- a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: let - version = "20.2.0.175.1842"; + version = "20.4.0.379.2205"; desktopItem = makeDesktopItem { name = "sqldeveloper"; @@ -46,7 +46,7 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "1fcaq7ffn1q35f7rvp3ybs2191lvfc0jgjx7y4wn1nqglgj7zy7n"; + sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k"; }; buildInputs = [ makeWrapper unzip ]; diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index 2b8a6f7cca02..42c2a55fd3eb 100644 --- a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "timescaledb-parallel-copy"; diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index cec374ccb3a9..34d5d12607f7 100644 --- a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "timescaledb-tune"; diff --git a/nixpkgs/pkgs/development/tools/deis/default.nix b/nixpkgs/pkgs/development/tools/deis/default.nix index c8e20d42063f..8286435d9a3a 100644 --- a/nixpkgs/pkgs/development/tools/deis/default.nix +++ b/nixpkgs/pkgs/development/tools/deis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "deis"; diff --git a/nixpkgs/pkgs/development/tools/deisctl/default.nix b/nixpkgs/pkgs/development/tools/deisctl/default.nix index 0f5df40d92c7..67245a5ebbe7 100644 --- a/nixpkgs/pkgs/development/tools/deisctl/default.nix +++ b/nixpkgs/pkgs/development/tools/deisctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "deis"; diff --git a/nixpkgs/pkgs/development/tools/delve/default.nix b/nixpkgs/pkgs/development/tools/delve/default.nix index 62fb32c85163..f0926e23aa73 100644 --- a/nixpkgs/pkgs/development/tools/delve/default.nix +++ b/nixpkgs/pkgs/development/tools/delve/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "delve"; - version = "1.5.1"; + version = "1.6.0"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "10zvla2jqxqibxdk3zbnsxg63i0zcwcn9npvw3bbicwd2z4vvskk"; + sha256 = "sha256-krNCS5GaEMuwQ9XS8w0myL+xZX6goNNNBgUiRVoZPIU="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/dep/default.nix b/nixpkgs/pkgs/development/tools/dep/default.nix index ff7f370b0d44..ff7bad87afd6 100644 --- a/nixpkgs/pkgs/development/tools/dep/default.nix +++ b/nixpkgs/pkgs/development/tools/dep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "dep"; diff --git a/nixpkgs/pkgs/development/tools/dep2nix/default.nix b/nixpkgs/pkgs/development/tools/dep2nix/default.nix index daa68b1b9311..5d98ecd57296 100644 --- a/nixpkgs/pkgs/development/tools/dep2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/dep2nix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage +{ lib, fetchFromGitHub, buildGoPackage , makeWrapper, nix-prefetch-scripts }: buildGoPackage rec { diff --git a/nixpkgs/pkgs/development/tools/devd/default.nix b/nixpkgs/pkgs/development/tools/devd/default.nix index 32f29f7e128c..0789850a4945 100644 --- a/nixpkgs/pkgs/development/tools/devd/default.nix +++ b/nixpkgs/pkgs/development/tools/devd/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { pname = "devd"; diff --git a/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/nixpkgs/pkgs/development/tools/devpi-client/default.nix index 766f3f2b7292..5905e05d0710 100644 --- a/nixpkgs/pkgs/development/tools/devpi-client/default.nix +++ b/nixpkgs/pkgs/development/tools/devpi-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchPypi # buildInputs diff --git a/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/nixpkgs/pkgs/development/tools/devpi-server/default.nix index 3d8cb16bb478..8a484a23349c 100644 --- a/nixpkgs/pkgs/development/tools/devpi-server/default.nix +++ b/nixpkgs/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, nginx }: +{ lib, fetchFromGitHub, python3Packages, nginx }: python3Packages.buildPythonApplication rec { pname = "devpi-server"; diff --git a/nixpkgs/pkgs/development/tools/dockle/default.nix b/nixpkgs/pkgs/development/tools/dockle/default.nix new file mode 100644 index 000000000000..c20e2866dc7e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -0,0 +1,43 @@ +{ lib, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, lvm2 }: + +buildGoModule rec { + pname = "dockle"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "goodwithtech"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Zc2ZlyeWdRvyuJLDDTONfh0/q+HKR4lNtSFMjgJWrRY="; + }; + + vendorSha256 = "sha256-4IJKXcnMXBqoEjsV4Xg2QYvKwxDDUjcZtrj9IRuT6i4="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ btrfs-progs lvm2 ]; + + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X main.version=${version}" + ]; + + preCheck = '' + # Remove tests that use networking + rm pkg/scanner/scan_test.go pkg/utils/fetch_test.go + ''; + + meta = with lib; { + homepage = "https://containers.goodwith.tech"; + changelog = "https://github.com/goodwithtech/dockle/releases/tag/v${version}"; + description = "Container Image Linter for Security"; + longDescription = '' + Container Image Linter for Security. + Helping build the Best-Practice Docker Image. + Easy to start. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/documentation/antora/default.nix b/nixpkgs/pkgs/development/tools/documentation/antora/default.nix index d553df59446a..ea8aeb83c8cd 100644 --- a/nixpkgs/pkgs/development/tools/documentation/antora/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/antora/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nodePackages }: +{ lib, nodePackages }: let linkNodeDeps = ({ pkg, deps, name ? "" }: diff --git a/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 2e04d3dd365e..d031145a9977 100644 --- a/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 +{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 , python2Packages }: python2Packages.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix index b1ea6a0634b5..d82c288e5aad 100644 --- a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , meson , ninja diff --git a/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix index d2e555a4550d..c8e6cafa27af 100644 --- a/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "mdsh"; diff --git a/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix index bee22856eb10..64d834f1bb29 100644 --- a/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: with python3.pkgs; diff --git a/nixpkgs/pkgs/development/tools/easyjson/default.nix b/nixpkgs/pkgs/development/tools/easyjson/default.nix index a458f0dbfceb..75bfc1d4c14f 100644 --- a/nixpkgs/pkgs/development/tools/easyjson/default.nix +++ b/nixpkgs/pkgs/development/tools/easyjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "easyjson"; diff --git a/nixpkgs/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix index 2e60885111d9..e906936d2e72 100644 --- a/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/nixpkgs/pkgs/development/tools/electron/default.nix @@ -76,30 +76,30 @@ rec { headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; }; - electron_9 = mkElectron "9.4.1" { - x86_64-linux = "36c6c33e2702f591c34a7e6ebd7d0828d554a4ce2eafb319a0cd16ffd4cc4b28"; - x86_64-darwin = "3e2f87d899be684eab226c572c566e89c05114059c9add1a33d2be63100b18fd"; - i686-linux = "be5f8d18f11ad7c0655faec4040a8af6239f29f1155210024a01826a30b0dbbe"; - armv7l-linux = "b710a0e3b80ef265760d49c9210f78a6410007521b0ed73c8b868b05d22a0a60"; - aarch64-linux = "e2fc73309780fc0e9b5abebcb8256b2bc389672f0bcc261269da5891a3df66dc"; - headers = "0sabqcjd6gcc6khyhiz3rk30p1y4bxsajy4rs9866bqyafq86j6q"; + electron_9 = mkElectron "9.4.3" { + x86_64-linux = "7744ec8af6512e569d600d7fd8e9105d3ca5ac7b6f54390dd553edbd7816289f"; + x86_64-darwin = "68c67a32f149618d629eb4a8a8044b98dc6ceedc16d46ff20782fcccad72fc44"; + i686-linux = "904955ee8365b95439fb4643844ac868b59525ed230a76c8e0395c0aa5719813"; + armv7l-linux = "5cfb3ae97a75d33d4b102d75944610dd56a566ee98186a030eb5bdbbd3d76323"; + aarch64-linux = "8afa647e4b5b1e290d5d852c7420e82916ba740e3e5576599076dc139cd1d556"; + headers = "0712160j1yvl9fmj2vm9lznkwnmji1hjzyicb4vis52lbrwx820l"; }; - electron_10 = mkElectron "10.3.0" { - x86_64-linux = "1a4afb659400c7acca0734df1b981b867e5dfdd15d4d3b73fd276d87b682f089"; - x86_64-darwin = "9c5cca484b28dc5cca89a7f1c77e65b3a04251f4eee740265c358efae351cb94"; - i686-linux = "fcb298bca0ab229e92b92c418d3e352885ff4291f735a35c7822b3ca17ae8a86"; - armv7l-linux = "48accf0fbef1f2d1a81e12c2e66b9280f871029b16947d0bebe036cf1fb71b1c"; - aarch64-linux = "2c99b4ec87ba657c33efb3a7e907e3f3e315e87347954231cb8bae393c1c96fd"; - headers = "1k97pfzxqrgw4y76js2chq13avgp9czin9q9mlh1zdf13bih96hj"; + electron_10 = mkElectron "10.3.2" { + x86_64-linux = "e28748c813ddc69c611a47961d68ae2dc3761f547c509d9ce2c56c2c6eadc9a2"; + x86_64-darwin = "3120ae3eab94d9102003f6fa2dc833a0629295c7ec0e154b35f61116d55a4954"; + i686-linux = "13f42ad6ea0fa41553b8f50323d0baaa29272220a2e81ca5293ad4439cda1d79"; + armv7l-linux = "0e571f63697b8985782175af07bdd7069886195d9ccd7fc5c04578b4144ea922"; + aarch64-linux = "173551fa6cd3ca1fb52fab3bd3e7f0ffd3e4758e78a5174e6d636a45a282ab8f"; + headers = "00x71b18prc55pv3sykbzpmkxf8yjzf2cdnlqif993jab8fbwmqn"; }; - electron_11 = mkElectron "11.2.1" { - x86_64-linux = "607d9d58c9a3b5c36461acc6bbe473bc604eee42a55c2c617ac46d095cf98abb"; - x86_64-darwin = "39d95668a3ea04bdc652ff9e2889c7a88f638534420e8e256679cbf4b7658a65"; - i686-linux = "59f226133d01fb6acf86fe98907964f79dcf2902054e5c4c9c4ff84a3ea88f4a"; - armv7l-linux = "85051d8eacf04aeec3dd74e46e7888d01bd4e6caf7ec2001122a1f3e11db44ee"; - aarch64-linux = "8aa9be5d6c139386390bad64f78b95756206a40fe4982fc9f199b67a7d06bec5"; - headers = "12sy8zzb0z654b85c5l1j8762nhwmkim1pbz1y3qzgbzvpbd5arq"; + electron_11 = mkElectron "11.2.3" { + x86_64-linux = "9249901fd7b85a7f952abe0df2ce83a566df612ef3ee15cce488cb1d751bc94d"; + x86_64-darwin = "e0b2784b25fd4a5ee4041d508d59bbb8386039c7ea7e9cea3e547c672f052b60"; + i686-linux = "78b2dd2d7b5e891e695cd31c28ac5fa1e99967ff538b944aa9d1ec224e82a964"; + armv7l-linux = "06178cd44792c7dceb72286460948cb7f575acba4e46cf72c154f243e93eaf65"; + aarch64-linux = "e23f2572a6a66779aff5d7cf25149fd343b0eef420fbfa3e8c3742284ce6e613"; + headers = "1yjc7zl7l5n3l2s2x3lbic2lc527alcd4mnwih7pjl5dhvdgmbm9"; }; } diff --git a/nixpkgs/pkgs/development/tools/eliot-tree/default.nix b/nixpkgs/pkgs/development/tools/eliot-tree/default.nix index e60642c5fe60..adcedfe643c5 100644 --- a/nixpkgs/pkgs/development/tools/eliot-tree/default.nix +++ b/nixpkgs/pkgs/development/tools/eliot-tree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "eliot-tree"; diff --git a/nixpkgs/pkgs/development/tools/fac/default.nix b/nixpkgs/pkgs/development/tools/fac/default.nix index ef3298c54780..c50fd834e031 100644 --- a/nixpkgs/pkgs/development/tools/fac/default.nix +++ b/nixpkgs/pkgs/development/tools/fac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, git }: buildGoPackage rec { pname = "fac"; diff --git a/nixpkgs/pkgs/development/tools/fdroidserver/default.nix b/nixpkgs/pkgs/development/tools/fdroidserver/default.nix index 1b0c44f57548..2cc5e6b7ca5c 100644 --- a/nixpkgs/pkgs/development/tools/fdroidserver/default.nix +++ b/nixpkgs/pkgs/development/tools/fdroidserver/default.nix @@ -49,6 +49,9 @@ python.pkgs.buildPythonApplication rec { ruamel_yaml ]; + # no tests + doCheck = false; + meta = with lib; { homepage = "https://f-droid.org"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; diff --git a/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix index d50491692ef3..acbdf431fe23 100644 --- a/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix +++ b/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "fcct"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "coreos"; repo = "fcct"; rev = "v${version}"; - sha256 = "0kdsnsp9nzkkfwakcx64md66yz2k7cpw8bkhdv798yirbrqprgp6"; + sha256 = "0gxaj2fy889fl5vhb4s89rhih9a65aqjsz2yffhi5z4fa2im8szv"; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/fedpkg/default.nix b/nixpkgs/pkgs/development/tools/fedpkg/default.nix index 285e71707fd5..d9633e88f346 100644 --- a/nixpkgs/pkgs/development/tools/fedpkg/default.nix +++ b/nixpkgs/pkgs/development/tools/fedpkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }: +{ lib, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }: let fedora_cert = buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/tools/flootty/default.nix b/nixpkgs/pkgs/development/tools/flootty/default.nix index 4867b9c2cb99..e4f76ca9f6af 100644 --- a/nixpkgs/pkgs/development/tools/flootty/default.nix +++ b/nixpkgs/pkgs/development/tools/flootty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "Flootty"; diff --git a/nixpkgs/pkgs/development/tools/flyway/default.nix b/nixpkgs/pkgs/development/tools/flyway/default.nix index bcad4ffb4e94..4f2bd805260c 100644 --- a/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "7.3.1"; + version = "7.5.2"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1qridl42jldwv6wka7l54g354aj9f3vbgzhyz5gdz5vdzs9x93w8"; + sha256 = "sha256-oO7k6JOKUm11OYNN+tH/zqF9ucgrsnF4PcphT8+xnS8="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/gauge/default.nix b/nixpkgs/pkgs/development/tools/gauge/default.nix index a0eb7370bee0..168910da06f5 100644 --- a/nixpkgs/pkgs/development/tools/gauge/default.nix +++ b/nixpkgs/pkgs/development/tools/gauge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gauge"; diff --git a/nixpkgs/pkgs/development/tools/gdm/default.nix b/nixpkgs/pkgs/development/tools/gdm/default.nix index 7c7f73af1e0f..7ecb7895d2f9 100644 --- a/nixpkgs/pkgs/development/tools/gdm/default.nix +++ b/nixpkgs/pkgs/development/tools/gdm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gdm"; diff --git a/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/nixpkgs/pkgs/development/tools/ginkgo/default.nix index b65e7c6a5eef..c6ed583ce876 100644 --- a/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ginkgo"; - version = "1.14.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "1pvslbfrpzc8n99x33gyvk9aaz6lvdyyg6cj3axjzkyjxmh6d5kc"; + sha256 = "sha256-NvScoKnLr0herVrjEnij45yN0MxC/MoRJJHcy59rOuA="; }; - vendorSha256 = "072amyw1ir18v9vk268j2y7dhw3lfwvxzvzsdqhnp50rxsa911bx"; + vendorSha256 = "sha256-xBa2n2BV+aXPCZ3G+rFIqHtjcXfs1rDjKbmRzjaDSb8="; doCheck = false; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/gir/default.nix b/nixpkgs/pkgs/development/tools/gir/default.nix index 8f38b41f7ae2..c88ffef4df12 100644 --- a/nixpkgs/pkgs/development/tools/gir/default.nix +++ b/nixpkgs/pkgs/development/tools/gir/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "gir"; diff --git a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix index ed9205ee2516..3fda533c5277 100644 --- a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix +++ b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-d5B+SSUXtOD4x+dChQsUCkiHuHcW3lOrL4QhQekY7cA="; + sha256 = "sha256-l3Aftu1RkcDgzdzrKIAlziDgbjYfj5xLIbysS0a5JZw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/git-repo-updater/default.nix b/nixpkgs/pkgs/development/tools/git-repo-updater/default.nix index dbf83677999a..d78972aa07bd 100644 --- a/nixpkgs/pkgs/development/tools/git-repo-updater/default.nix +++ b/nixpkgs/pkgs/development/tools/git-repo-updater/default.nix @@ -12,6 +12,9 @@ buildPythonApplication rec { propagatedBuildInputs = [ colorama GitPython ]; + # no tests + doCheck = false; + meta = with lib; { description = "Easily update multiple Git repositories at once"; homepage = "https://github.com/earwig/git-repo-updater"; diff --git a/nixpkgs/pkgs/development/tools/git-series/default.nix b/nixpkgs/pkgs/development/tools/git-series/default.nix index 4f13c3de40bb..0f7677c7aa26 100644 --- a/nixpkgs/pkgs/development/tools/git-series/default.nix +++ b/nixpkgs/pkgs/development/tools/git-series/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform +{ lib, fetchFromGitHub, fetchpatch, rustPlatform , openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2 }: diff --git a/nixpkgs/pkgs/development/tools/github/cligh/default.nix b/nixpkgs/pkgs/development/tools/github/cligh/default.nix index dfe66c789ca4..ce340239ac4c 100644 --- a/nixpkgs/pkgs/development/tools/github/cligh/default.nix +++ b/nixpkgs/pkgs/development/tools/github/cligh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: +{ lib, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: buildPythonApplication rec { pname = "cligh"; diff --git a/nixpkgs/pkgs/development/tools/glide/default.nix b/nixpkgs/pkgs/development/tools/glide/default.nix index f8abde7e00a7..05e4ae810612 100644 --- a/nixpkgs/pkgs/development/tools/glide/default.nix +++ b/nixpkgs/pkgs/development/tools/glide/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "glide"; diff --git a/nixpkgs/pkgs/development/tools/gllvm/default.nix b/nixpkgs/pkgs/development/tools/gllvm/default.nix index f2c552252fb2..78038440a96d 100644 --- a/nixpkgs/pkgs/development/tools/gllvm/default.nix +++ b/nixpkgs/pkgs/development/tools/gllvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gllvm"; diff --git a/nixpkgs/pkgs/development/tools/glock/default.nix b/nixpkgs/pkgs/development/tools/glock/default.nix index c00478c9fb6a..b2d1e09e74f3 100644 --- a/nixpkgs/pkgs/development/tools/glock/default.nix +++ b/nixpkgs/pkgs/development/tools/glock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "glock"; diff --git a/nixpkgs/pkgs/development/tools/glpaper/default.nix b/nixpkgs/pkgs/development/tools/glpaper/default.nix index 9ad85e840bad..6b7b13437cc6 100644 --- a/nixpkgs/pkgs/development/tools/glpaper/default.nix +++ b/nixpkgs/pkgs/development/tools/glpaper/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { name = "glpaper"; - version = "unstable-2020-03-30"; + version = "unstable-2020-10-11"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/glpaper"; - rev = "a95db77088dfb5636a87f3743fc9b5eca70c1ae2"; - sha256 = "04y12910wvhy4aqx2sa63dy9l6nbs7b77yqpdhc96x2b3mgzgjfs"; + rev = "9e7ec7cd270af330039c395345c7d23c04682267"; + sha256 = "sha256-yBHRg6eg+PK/ixuM0MBty3RJY9qcemr3Dt+8SAitqnk="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix index 57d0e93a9b0c..5131436e0248 100644 --- a/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-bindata-assetfs"; diff --git a/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/nixpkgs/pkgs/development/tools/go-bindata/default.nix index 5d257bbf9982..fc44efca8289 100644 --- a/nixpkgs/pkgs/development/tools/go-bindata/default.nix +++ b/nixpkgs/pkgs/development/tools/go-bindata/default.nix @@ -1,22 +1,23 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "go-bindata"; - version = "unstable-2015-10-23"; + version = "3.22.0"; - goPackagePath = "github.com/jteeuwen/go-bindata"; + goPackagePath = "github.com/kevinburke/go-bindata"; src = fetchFromGitHub { - owner = "jteeuwen"; - repo = "go-bindata"; - rev = "a0ff2567cfb70903282db057e799fd826784d41d"; - sha256 = "0d6zxv0hgh938rf59p1k5lj0ymrb8kcps2vfrb9kaarxsvg7y69v"; + owner = "kevinburke"; + repo = pname; + rev = "v${version}"; + sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; }; - excludedPackages = "testdata"; + subPackages = [ "go-bindata" ]; meta = with lib; { - homepage = "https://github.com/jteeuwen/go-bindata"; + homepage = "https://github.com/kevinburke/go-bindata"; + changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md"; description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; maintainers = with maintainers; [ cstrahan ]; license = licenses.cc0; diff --git a/nixpkgs/pkgs/development/tools/go-junit-report/default.nix b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix index f1e822e3633f..110cdbfabc9f 100644 --- a/nixpkgs/pkgs/development/tools/go-junit-report/default.nix +++ b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-junit-report-unstable"; diff --git a/nixpkgs/pkgs/development/tools/go-langserver/default.nix b/nixpkgs/pkgs/development/tools/go-langserver/default.nix index fdefd6b0178b..ac6034dffa42 100644 --- a/nixpkgs/pkgs/development/tools/go-langserver/default.nix +++ b/nixpkgs/pkgs/development/tools/go-langserver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-langserver"; diff --git a/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/nixpkgs/pkgs/development/tools/go-migrate/default.nix index 1786bfe5f0f9..d07e3cd80d32 100644 --- a/nixpkgs/pkgs/development/tools/go-migrate/default.nix +++ b/nixpkgs/pkgs/development/tools/go-migrate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-migrate"; diff --git a/nixpkgs/pkgs/development/tools/go-outline/default.nix b/nixpkgs/pkgs/development/tools/go-outline/default.nix index d30d5c30f3a1..fe4c2e8d4dfd 100644 --- a/nixpkgs/pkgs/development/tools/go-outline/default.nix +++ b/nixpkgs/pkgs/development/tools/go-outline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-outline"; diff --git a/nixpkgs/pkgs/development/tools/go-protobuf/default.nix b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix index 0187552d8445..1fa027ae72b9 100644 --- a/nixpkgs/pkgs/development/tools/go-protobuf/default.nix +++ b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-protobuf"; diff --git a/nixpkgs/pkgs/development/tools/go-repo-root/default.nix b/nixpkgs/pkgs/development/tools/go-repo-root/default.nix index 25fc87f8985d..b7653aa144e4 100644 --- a/nixpkgs/pkgs/development/tools/go-repo-root/default.nix +++ b/nixpkgs/pkgs/development/tools/go-repo-root/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "go-repo-root"; diff --git a/nixpkgs/pkgs/development/tools/go-swagger/default.nix b/nixpkgs/pkgs/development/tools/go-swagger/default.nix index 1515dae3391d..94f9b6d8ebe8 100644 --- a/nixpkgs/pkgs/development/tools/go-swagger/default.nix +++ b/nixpkgs/pkgs/development/tools/go-swagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mBBjZRjaD1m6sIKR1/MRAKW25bGVNihxBwQMbw/lby4="; + sha256 = "sha256-gA7YpzroIP26u/kmbwlcYkWVfeJ8YDEAl0H9GGQrXA8="; }; - vendorSha256 = "sha256-Am0ypcViUcAcf96qv5qE7K3FvQuQs1XlpIqZf2upWyc="; + vendorSha256 = "sha256-eRcE6ai7076HqTWRJ8zKoV6/PJRgUpKvKF+0T7MgLQE="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/go-symbols/default.nix b/nixpkgs/pkgs/development/tools/go-symbols/default.nix index 3f41007716e7..a259b768561b 100644 --- a/nixpkgs/pkgs/development/tools/go-symbols/default.nix +++ b/nixpkgs/pkgs/development/tools/go-symbols/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-symbols"; diff --git a/nixpkgs/pkgs/development/tools/go2nix/default.nix b/nixpkgs/pkgs/development/tools/go2nix/default.nix index bcd1f56f5256..b5a224cb5ae7 100644 --- a/nixpkgs/pkgs/development/tools/go2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/go2nix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper, +{ lib, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper, fetchFromGitHub }: buildGoPackage rec { diff --git a/nixpkgs/pkgs/development/tools/goa/default.nix b/nixpkgs/pkgs/development/tools/goa/default.nix index 63322b6d3639..56b47bd8c601 100644 --- a/nixpkgs/pkgs/development/tools/goa/default.nix +++ b/nixpkgs/pkgs/development/tools/goa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goa"; diff --git a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix index 995bd3102cc0..f610b19d79b9 100644 --- a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix +++ b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gocode-gomod"; diff --git a/nixpkgs/pkgs/development/tools/gocode/default.nix b/nixpkgs/pkgs/development/tools/gocode/default.nix index 9bed4073b2b3..be9f70da9341 100644 --- a/nixpkgs/pkgs/development/tools/gocode/default.nix +++ b/nixpkgs/pkgs/development/tools/gocode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gocode-unstable"; diff --git a/nixpkgs/pkgs/development/tools/goconvey/default.nix b/nixpkgs/pkgs/development/tools/goconvey/default.nix index dcec045e5ebc..fb6ce653cc4b 100644 --- a/nixpkgs/pkgs/development/tools/goconvey/default.nix +++ b/nixpkgs/pkgs/development/tools/goconvey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goconvey"; diff --git a/nixpkgs/pkgs/development/tools/godef/default.nix b/nixpkgs/pkgs/development/tools/godef/default.nix index 6d4f40ba6bca..99fe932013e7 100644 --- a/nixpkgs/pkgs/development/tools/godef/default.nix +++ b/nixpkgs/pkgs/development/tools/godef/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "godef"; diff --git a/nixpkgs/pkgs/development/tools/godot/headless.nix b/nixpkgs/pkgs/development/tools/godot/headless.nix index 20d3b48f2fd5..a8d640eba1aa 100644 --- a/nixpkgs/pkgs/development/tools/godot/headless.nix +++ b/nixpkgs/pkgs/development/tools/godot/headless.nix @@ -1,4 +1,4 @@ -{ godot, lib, stdenv }: +{ godot, lib }: godot.overrideAttrs (oldAttrs: rec { pname = "godot-headless"; sconsFlags = "target=release_debug platform=server tools=yes"; diff --git a/nixpkgs/pkgs/development/tools/godot/server.nix b/nixpkgs/pkgs/development/tools/godot/server.nix index 6ce347355e3b..4254dc746b66 100644 --- a/nixpkgs/pkgs/development/tools/godot/server.nix +++ b/nixpkgs/pkgs/development/tools/godot/server.nix @@ -1,4 +1,4 @@ -{ godot, lib, stdenv }: +{ godot, lib }: godot.overrideAttrs (oldAttrs: rec { pname = "godot-server"; sconsFlags = "target=release platform=server tools=no"; diff --git a/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix b/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix index 0f772134a0e2..0fd45598a837 100644 --- a/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix +++ b/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gojsontoyaml"; diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 2679d56ec64d..2e973e9a0b06 100644 --- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.35.2"; + version = "1.36.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-UntDMiznrHZsaBFTcnNhnh59j+yY1zdpWrFNlalxTDA="; + sha256 = "sha256-AObZI104q+kOvV3/6aAusl5PMro1nbNUasvmJ4mRGz8="; }; - vendorSha256 = "sha256-6YacyQqTq9WQk8PgvoIxflh6HRmv5xgxtWq6HrprJis="; + vendorSha256 = "sha256-jr8sYfonggAHqtq3A8YVuTqJu3/iIu0OgBEUWj6bq+A="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/golint/default.nix b/nixpkgs/pkgs/development/tools/golint/default.nix index 1f75384f3387..89b9f1464950 100644 --- a/nixpkgs/pkgs/development/tools/golint/default.nix +++ b/nixpkgs/pkgs/development/tools/golint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "lint"; diff --git a/nixpkgs/pkgs/development/tools/gomacro/default.nix b/nixpkgs/pkgs/development/tools/gomacro/default.nix new file mode 100644 index 000000000000..e96fccd0a3b5 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/gomacro/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gomacro"; + rev = "b4c3ab9b218fd12f22759354f4f3e37635828d1f"; + version = "20210131-${lib.strings.substring 0 7 rev}"; + + src = fetchFromGitHub { + owner = "cosmos72"; + repo = "gomacro"; + sha256 = "0ci486zqrhzvs3njn2ygaxsgjx3fn8bbj2q3sd80xvjiyjvq866g"; + inherit rev; + }; + + vendorSha256 = "1ib4h57drikyy5aq4ms6vc1p29djlpjrh7xd3bgyykr9zmm2w1kx"; + subPackages = [ "." ]; + + meta = with lib; { + description = "Interactive Go interpreter and debugger with generics and macros"; + homepage = "https://github.com/cosmos72/gomacro"; + license = licenses.mpl20; + maintainers = with maintainers; [ shofius ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/gomodifytags/default.nix b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix index 650f1b89f30e..254113f21064 100644 --- a/nixpkgs/pkgs/development/tools/gomodifytags/default.nix +++ b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gomodifytags"; diff --git a/nixpkgs/pkgs/development/tools/gomplate/default.nix b/nixpkgs/pkgs/development/tools/gomplate/default.nix index f8d6553f74d8..45602a053522 100644 --- a/nixpkgs/pkgs/development/tools/gomplate/default.nix +++ b/nixpkgs/pkgs/development/tools/gomplate/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gomplate"; - version = "3.8.0"; + version = "3.9.0"; owner = "hairyhenderson"; rev = "v${version}"; src = fetchFromGitHub { inherit owner rev; repo = pname; - sha256 = "058shbrhpd8ghdj5qa6n7mf1bh8qvpmiv3yjj39jys359zhin06n"; + sha256 = "sha256-liy8cqn+hWoTOHchCY1LLu23tNvz7eGA+AN0d0APjC4="; }; - vendorSha256 = "0wqz3anxlzb0ds6xmpnaxq5rjgcmzkzrdqhnkfkjq32b7mj9mks3"; + vendorSha256 = "sha256-Ph9z/Tom7O7V7yZ/On+etty+Bl653HiY/J3d3yfweeQ="; # some tests require network access postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/gopkgs/default.nix b/nixpkgs/pkgs/development/tools/gopkgs/default.nix index e4a72cb27a17..a5413c6a9c05 100644 --- a/nixpkgs/pkgs/development/tools/gopkgs/default.nix +++ b/nixpkgs/pkgs/development/tools/gopkgs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gopkgs"; diff --git a/nixpkgs/pkgs/development/tools/gopls/default.nix b/nixpkgs/pkgs/development/tools/gopls/default.nix index 7a7c98e28940..1617900acee7 100644 --- a/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchgit }: buildGoModule rec { pname = "gopls"; diff --git a/nixpkgs/pkgs/development/tools/gore/default.nix b/nixpkgs/pkgs/development/tools/gore/default.nix index 30d7cd1ef336..43bb2d2aad7b 100644 --- a/nixpkgs/pkgs/development/tools/gore/default.nix +++ b/nixpkgs/pkgs/development/tools/gore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gore"; diff --git a/nixpkgs/pkgs/development/tools/gosec/default.nix b/nixpkgs/pkgs/development/tools/gosec/default.nix index 69d74496e615..bbc19894661b 100644 --- a/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gosec"; - version = "2.5.0"; + version = "2.6.1"; subPackages = [ "cmd/gosec" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "0hwa4sxw9sqzivg80nqsi9g1hz8apnnck73x5dvnn1zbwvycx3g9"; + sha256 = "sha256-KMXRYudnJab/X6FBG0lnG9hHVmbKwnrN1oqkSn6q3DU="; }; - vendorSha256 = "1lldi56kah689xf8n1hfpk9qy0gbci62xnjs5jrh54kbgka23gvw"; + vendorSha256 = "sha256-0yxGEUOame9yfeIErLESWY8kZtt7Q4vD3TU6Wl9Xa54="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/gotags/default.nix b/nixpkgs/pkgs/development/tools/gotags/default.nix index ea40bd0e6fe1..274f7a476c2b 100644 --- a/nixpkgs/pkgs/development/tools/gotags/default.nix +++ b/nixpkgs/pkgs/development/tools/gotags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "gotags"; diff --git a/nixpkgs/pkgs/development/tools/gotests/default.nix b/nixpkgs/pkgs/development/tools/gotests/default.nix index 87a93abee8ef..faa2e60aca40 100644 --- a/nixpkgs/pkgs/development/tools/gotests/default.nix +++ b/nixpkgs/pkgs/development/tools/gotests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotests"; diff --git a/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/nixpkgs/pkgs/development/tools/gotestsum/default.nix index ece194f00030..435edd61623b 100644 --- a/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "gotestsum"; diff --git a/nixpkgs/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix index 7ca3486a503a..285d546d7421 100644 --- a/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchgit }: buildGoModule rec { pname = "gotools-unstable"; diff --git a/nixpkgs/pkgs/development/tools/govendor/default.nix b/nixpkgs/pkgs/development/tools/govendor/default.nix index edd9b577be4c..b24afebb3aa3 100644 --- a/nixpkgs/pkgs/development/tools/govendor/default.nix +++ b/nixpkgs/pkgs/development/tools/govendor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "govendor"; diff --git a/nixpkgs/pkgs/development/tools/govers/default.nix b/nixpkgs/pkgs/development/tools/govers/default.nix index cac76daa6fc3..5e2d89cfd5df 100644 --- a/nixpkgs/pkgs/development/tools/govers/default.nix +++ b/nixpkgs/pkgs/development/tools/govers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "govers"; diff --git a/nixpkgs/pkgs/development/tools/gox/default.nix b/nixpkgs/pkgs/development/tools/gox/default.nix index 3deb73acb441..4aa7a314c876 100644 --- a/nixpkgs/pkgs/development/tools/gox/default.nix +++ b/nixpkgs/pkgs/development/tools/gox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gox"; diff --git a/nixpkgs/pkgs/development/tools/gron/default.nix b/nixpkgs/pkgs/development/tools/gron/default.nix index 6d182b0b5f50..b8242cc3cd87 100644 --- a/nixpkgs/pkgs/development/tools/gron/default.nix +++ b/nixpkgs/pkgs/development/tools/gron/default.nix @@ -1,20 +1,25 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gron"; - version = "0.6.0"; - - owner = "tomnomnom"; - repo = "gron"; - goPackagePath = "github.com/${owner}/${repo}"; + version = "0.6.1"; src = fetchFromGitHub { - inherit owner repo; + owner = "tomnomnom"; + repo = "gron"; rev = "v${version}"; - sha256 = "05f3w4zr15wd7xk75l12y5kip4gnv719a2x9w2hy23q3pnss9wk0"; + sha256 = "0qmzawkhg0qn9kxxrssbdjni2khvamhrcklv3yxc0ljmh77mh61m"; }; - goDeps = ./deps.nix; + patches = [ + (fetchpatch { + name = "fix-inconsistent-vendoring.patch"; + url = "https://github.com/tomnomnom/gron/pull/85/commits/d549a6cb68ed0e0ec7cc81d8275353acfe218725.patch"; + sha256 = "1461v4f7w6q75l3988br0g1ynfhzsh34z38pd2w8fp57vrgkcfi5"; + }) + ]; + + vendorSha256 = "0va88c3rjlc2nbpqx4ila36rwrx57wcdhig4jp9q58vv4zqc2yxy"; meta = with lib; { description = "Make JSON greppable!"; @@ -26,7 +31,7 @@ buildGoPackage rec { ''; homepage = "https://github.com/tomnomnom/gron"; license = licenses.mit; - maintainers = [ maintainers.fgaz ]; - platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ fgaz SuperSandro2000 ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/gron/deps.nix b/nixpkgs/pkgs/development/tools/gron/deps.nix deleted file mode 100644 index effc255d877e..000000000000 --- a/nixpkgs/pkgs/development/tools/gron/deps.nix +++ /dev/null @@ -1,57 +0,0 @@ -[ - rec { - owner = "fatih"; - repo = "color"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - rec { - owner = "nwidger"; - repo = "jsoncolor"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40"; - sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; - }; - } - rec { - owner = "pkg"; - repo = "errors"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - rec { - owner = "mattn"; - repo = "go-colorable"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - rec { - owner = "mattn"; - repo = "go-isatty"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } -] diff --git a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 02c4c96bd8e7..b857b910f0a5 100644 --- a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,5 +1,5 @@ { mkDerivation, base, containers, fetchgit, hedgehog -, optparse-applicative, parsec, lib, stdenv, template-haskell, text +, optparse-applicative, parsec, lib, template-haskell, text }: mkDerivation { pname = "dconf2nix"; diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix deleted file mode 100644 index 512aec84eead..000000000000 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ mkDerivation, aeson, base, binary, blaze-markup, brittany -, bytestring, containers, data-default, deepseq, directory, extra -, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th -, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios -, hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin -, hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin -, hls-tactics-plugin, hslogger, hspec, hspec-core -, hspec-expectations, lens, lsp-test, mtl, optparse-applicative -, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions -, shake, lib, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml -, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun -, temporary, text, transformers, unordered-containers, with-utf8 -, yaml -}: -mkDerivation { - pname = "haskell-language-server"; - version = "0.8.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-default directory extra filepath ghc ghcide - gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative - optparse-simple process shake text unordered-containers - ]; - executableHaskellDepends = [ - aeson base binary brittany bytestring containers deepseq directory - extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide - gitrev hashable haskell-lsp hie-bios hls-class-plugin - hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin - hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens - mtl optparse-applicative optparse-simple ormolu process regex-tdfa - safe-exceptions shake stylish-haskell temporary text transformers - unordered-containers with-utf8 - ]; - testHaskellDepends = [ - aeson base blaze-markup bytestring containers data-default - directory extra filepath haskell-lsp hie-bios hls-plugin-api - hslogger hspec hspec-core hspec-expectations lens lsp-test process - stm tasty tasty-ant-xml tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun temporary text transformers - unordered-containers yaml - ]; - testToolDepends = [ ghcide ]; - homepage = "https://github.com/haskell/haskell-language-server#readme"; - description = "LSP server for GHC"; - license = lib.licenses.asl20; -} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix deleted file mode 100644 index c51689343903..000000000000 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ mkDerivation, aeson, base, containers, fetchgit, ghc -, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake -, lib, stdenv, text, transformers, unordered-containers -}: -mkDerivation { - pname = "hls-class-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers ghc ghc-exactprint ghcide haskell-lsp - hls-plugin-api lens shake text transformers unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix deleted file mode 100644 index b5774ddcbfd3..000000000000 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ mkDerivation, aeson, base, containers, deepseq, Diff, directory -, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide -, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api -, parser-combinators, pretty-simple, QuickCheck, safe-exceptions -, shake, lib, stdenv, temporary, text, time, transformers -, unordered-containers -}: -mkDerivation { - pname = "hls-eval-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq Diff directory extra filepath ghc - ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types - hls-plugin-api parser-combinators pretty-simple QuickCheck - safe-exceptions shake temporary text time transformers - unordered-containers - ]; - description = "Eval plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix deleted file mode 100644 index 1c7d31004b6a..000000000000 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc -, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, stdenv, text -, unordered-containers -}: -mkDerivation { - pname = "hls-explicit-imports-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide haskell-lsp-types - hls-plugin-api shake text unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix deleted file mode 100644 index 4a90933d1e7f..000000000000 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ mkDerivation, aeson, apply-refact, base, binary, bytestring -, containers, data-default, deepseq, Diff, directory, extra -, fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide -, hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens -, regex-tdfa, shake, lib, stdenv, temporary, text, transformers -, unordered-containers -}: -mkDerivation { - pname = "hls-hlint-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc ghc-lib ghc-lib-parser-ex - ghcide hashable haskell-lsp hlint hls-plugin-api hslogger lens - regex-tdfa shake temporary text transformers unordered-containers - ]; - description = "Hlint integration plugin with Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix deleted file mode 100644 index 311a26633a5c..000000000000 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ mkDerivation, aeson, base, containers, deepseq, directory, extra -, fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types -, hls-plugin-api, retrie, safe-exceptions, shake, lib, stdenv, text -, transformers, unordered-containers -}: -mkDerivation { - pname = "hls-retrie-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra ghc ghcide hashable - haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions - shake text transformers unordered-containers - ]; - description = "Retrie integration plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix deleted file mode 100644 index 4f476431d9b7..000000000000 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, aeson, base, checkers, containers, deepseq -, directory, extra, fetchgit, filepath, fingertree, generic-lens -, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide -, haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover -, lens, mtl, QuickCheck, refinery, retrie, shake, lib, stdenv, syb, text -, transformers -}: -mkDerivation { - pname = "hls-tactics-plugin"; - version = "0.5.1.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra filepath fingertree - generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide - haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text - transformers - ]; - testHaskellDepends = [ - base checkers containers ghc hie-bios hls-plugin-api hspec mtl - QuickCheck - ]; - testToolDepends = [ hspec-discover ]; - description = "Tactics plugin for Haskell Language Server"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; -} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh deleted file mode 100755 index aaccf8b9b9fe..000000000000 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix jq curl -# -# This script will update the haskell-language-server derivation to the latest version using -# cabal2nix. -# -# Note that you should always try building haskell-language-server after updating it here, since -# some of the overrides in pkgs/development/haskell/configuration-nix.nix may -# need to be updated/changed. -# -# Remember to split out different updates into multiple commits - -set -eo pipefail - -# This is the directory of this update.sh script. -script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" - -# =========================== -# HLS -# =========================== - -# hls derivation created with cabal2nix. -hls_derivation_file="${script_dir}/default.nix" - -# This is the current revision of hls in Nixpkgs. -hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")" - -# This is the latest release version of hls on GitHub. -# Get all tag names, filter to the hls ones (no prefix like 'hls-plugin-api-'), -# sort for the latest one and select just that -hls_latest_release=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/haskell/haskell-language-server/tags | - jq --raw-output 'map(.name) | .[]' | - grep '^[0-9]' | - sort --version-sort | - tail -n1) - -# Use this value instead for the very latest revision -# hls_head=(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output) - -hls_new_version=$hls_latest_release - -echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version." -echo "Running cabal2nix and outputting to ${hls_derivation_file}..." -cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" -cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix" -for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do - cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix" -done - -echo "Finished." diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 09cb60901e43..4203564ae4a5 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "865" "884" "8102" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "865" "884" "8103" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix index 42cf33224201..8c817e8eeef0 100644 --- a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix @@ -1,7 +1,7 @@ { mkDerivation, async, base, bytestring, connection, containers , directory, hpack, hspec, hspec-discover, hspec-expectations , http-client, http-conduit, lens, lens-aeson, megaparsec, mtl -, optparse-applicative, parser-combinators, retry, lib, stdenv, text +, optparse-applicative, parser-combinators, retry, lib, text , unix, unordered-containers, utf8-string, fetchzip, dotenv }: mkDerivation rec { diff --git a/nixpkgs/pkgs/development/tools/hcloud/default.nix b/nixpkgs/pkgs/development/tools/hcloud/default.nix index 5c4fe48f60fb..3e6ef4d4d342 100644 --- a/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hcloud"; diff --git a/nixpkgs/pkgs/development/tools/heroku/default.nix b/nixpkgs/pkgs/development/tools/heroku/default.nix index e1aee1e28ca7..81c059d2939f 100644 --- a/nixpkgs/pkgs/development/tools/heroku/default.nix +++ b/nixpkgs/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.45.0"; + version = "7.47.11"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "0yxwy7ldi4r7r03a9ay7ikawfwa11x7lvldjskm7nl4a1g4i3jqi"; + sha256 = "1inf2radpkd9jndap91cw0wbb2qmi71i287vyydl492372cf3cs2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/hover/default.nix b/nixpkgs/pkgs/development/tools/hover/default.nix index cb638af43d69..81661dce8b40 100644 --- a/nixpkgs/pkgs/development/tools/hover/default.nix +++ b/nixpkgs/pkgs/development/tools/hover/default.nix @@ -18,7 +18,7 @@ let pname = "hover"; - version = "0.46.1"; + version = "0.46.2"; libs = with xorg; [ libX11.dev @@ -46,13 +46,13 @@ let subPackages = [ "." ]; - vendorSha256 = "1ixfmhp5g57hn23zyf85hy9jnyadayhdbalj4d0bx4q4p5c9qchi"; + vendorSha256 = "0hdh4vwzvwlarjzg6pv9dp665r9px9yplfjpgyyfjyy5b9sxl795"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-flutter-desktop"; repo = pname; - sha256 = "04f3dx2dcllfrw3ay1sbb72pj18ln7bxi9rrcaahqhsd7bn2ff9k"; + sha256 = "1gmsv7hmj7zzfwbz50az3kvgzqvj0jn8i2pv7sjyl9dx1bavi5g3"; }; nativeBuildInputs = [ addOpenGLRunpath makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/htmltest/default.nix b/nixpkgs/pkgs/development/tools/htmltest/default.nix new file mode 100644 index 000000000000..83d436dda082 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/htmltest/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "htmltest"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "wjdp"; + repo = pname; + rev = "v${version}"; + sha256 = "0z2j54ywim1nl10vidcnbwhywyzanj4qd93ai533808wrm3ghwb6"; + }; + + vendorSha256 = "0zx3ii9crick647kslzwg4d39li6jds938f9j9dp287rhrlzjfbm"; + + # tests require network access + doCheck = false; + + meta = with lib; { + description = "Tool to test generated HTML output"; + longDescription = '' + htmltest runs your HTML output through a series of checks to ensure all your + links, images, scripts references work, your alt tags are filled in, etc. + ''; + homepage = "https://github.com/wjdp/htmltest"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/icr/default.nix b/nixpkgs/pkgs/development/tools/icr/default.nix index 13c4cbe37db8..11e52f77cb80 100644 --- a/nixpkgs/pkgs/development/tools/icr/default.nix +++ b/nixpkgs/pkgs/development/tools/icr/default.nix @@ -1,15 +1,25 @@ -{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkg-config, which -, openssl, readline, libyaml, zlib }: +{ lib +, fetchFromGitHub +, crystal +, shards +, makeWrapper +, pkg-config +, which +, openssl +, readline +, libyaml +, zlib +}: crystal.buildCrystalPackage rec { pname = "icr"; - version = "0.8.0"; + version = "unstable-2020-10-06"; src = fetchFromGitHub { owner = "crystal-community"; - repo = pname; - rev = "v${version}"; - sha256 = "1bz2bhs6csyg2rhrlknlvaiilq3vq8plxjh1hdxmbrfi3n6c7k5a"; + repo = "icr"; + rev = "8c57cd7c1fdf8088cb05c1587bd6c40d244a8a80"; + sha256 = "sha256-b0w6oG2npNgdi2ZowMlJy0iUxQWqb9+DiruQl7Ztb0E="; }; shardsFile = ./shards.nix; diff --git a/nixpkgs/pkgs/development/tools/ijq/default.nix b/nixpkgs/pkgs/development/tools/ijq/default.nix new file mode 100644 index 000000000000..0b0af79301ef --- /dev/null +++ b/nixpkgs/pkgs/development/tools/ijq/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchgit, lib, jq, makeWrapper }: + +buildGoModule rec { + pname = "ijq"; + version = "0.2.3"; + + src = fetchgit { + url = "https://git.sr.ht/~gpanders/ijq"; + rev = "v${version}"; + sha256 = "14n54jh5387jf97zhc7aidn7w60zp5624xbvq4jdbsh96apg3bk1"; + }; + + vendorSha256 = "0xbni6lk6y3ig7pj2234fv7ra6b8qv0k8m3bvh59wwans8xpihzb"; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/ijq" \ + --prefix PATH : "${lib.makeBinPath [ jq ]}" + ''; + + meta = with lib; { + description = "Interactive wrapper for jq"; + homepage = "https://git.sr.ht/~gpanders/ijq"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ justinas ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/java/cfr/default.nix b/nixpkgs/pkgs/development/tools/java/cfr/default.nix index 35ac0dbc6a51..68841d48d47e 100644 --- a/nixpkgs/pkgs/development/tools/java/cfr/default.nix +++ b/nixpkgs/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfr"; - version = "0.150"; + version = "0.151"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "09lq21phnhr374wb8gj355jsqj8c4m5m818r3pbr8f8zpaamjxfj"; + sha256 = "sha256-MW6QFbmvKVP8/0/oa/O7pwXzLnzSW9blNcaY3ool6Dc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/jbang/default.nix b/nixpkgs/pkgs/development/tools/jbang/default.nix index b161b1d137c3..c41fb4c639f3 100644 --- a/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.62.0"; + version = "0.65.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-Ffh08477Wc4yEUo2YBM2yxC288Kq05ZkKXf/XSW2iXc="; + sha256 = "sha256-Puddnem03RGORKkvcLy5o/eOzKzrOuRvqPk5FsjQ3Lw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/jd/default.nix b/nixpkgs/pkgs/development/tools/jd/default.nix index 772e2802ff57..96d2807b9ab9 100644 --- a/nixpkgs/pkgs/development/tools/jd/default.nix +++ b/nixpkgs/pkgs/development/tools/jd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "jd"; diff --git a/nixpkgs/pkgs/development/tools/jid/default.nix b/nixpkgs/pkgs/development/tools/jid/default.nix index 5e4e3df69427..b48de54dd22e 100644 --- a/nixpkgs/pkgs/development/tools/jid/default.nix +++ b/nixpkgs/pkgs/development/tools/jid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jid"; diff --git a/nixpkgs/pkgs/development/tools/jira_cli/default.nix b/nixpkgs/pkgs/development/tools/jira_cli/default.nix index 7b7647da033e..cf15a61477e4 100644 --- a/nixpkgs/pkgs/development/tools/jira_cli/default.nix +++ b/nixpkgs/pkgs/development/tools/jira_cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libffi, openssl, python3Packages }: +{ lib, libffi, openssl, python3Packages }: let inherit (python3Packages) fetchPypi buildPythonApplication vcrpy mock hiro; in diff --git a/nixpkgs/pkgs/development/tools/jl/default.nix b/nixpkgs/pkgs/development/tools/jl/default.nix index e0bf896c149f..15347432f70e 100644 --- a/nixpkgs/pkgs/development/tools/jl/default.nix +++ b/nixpkgs/pkgs/development/tools/jl/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchFromGitHub, fetchpatch , aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra -, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib, stdenv +, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib , text, unordered-containers, vector }: mkDerivation rec { diff --git a/nixpkgs/pkgs/development/tools/jmespath/default.nix b/nixpkgs/pkgs/development/tools/jmespath/default.nix index f5a7092e60f9..5abbf71e7f41 100644 --- a/nixpkgs/pkgs/development/tools/jmespath/default.nix +++ b/nixpkgs/pkgs/development/tools/jmespath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jmespath"; diff --git a/nixpkgs/pkgs/development/tools/jp/default.nix b/nixpkgs/pkgs/development/tools/jp/default.nix index d8d703feed30..f1f5b37c10dc 100644 --- a/nixpkgs/pkgs/development/tools/jp/default.nix +++ b/nixpkgs/pkgs/development/tools/jp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jp"; diff --git a/nixpkgs/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix index bbdd1bd016d5..38439e62473f 100644 --- a/nixpkgs/pkgs/development/tools/just/default.nix +++ b/nixpkgs/pkgs/development/tools/just/default.nix @@ -1,26 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: +{ lib, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "4B72VYQ+HBvhGQNl577DuZpvWNIvv/6fejRQtVKtFKY="; + sha256 = "sha256-K8jeX1/Wn6mbf48GIR2wRAwiwg1rxtbtCPjjH+4dPYw="; }; - cargoSha256 = "uOOpDRWPSoH49NTu82rDxxDR/2icoe4ECxVQb/J/45w="; + cargoSha256 = "sha256-a9SBeX3oesdoC5G+4dK2tbt+W7VA4jPqCM9tOAex4DI="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' installManPage man/just.1 - installShellCompletion --bash --name just.bash completions/just.bash - installShellCompletion --fish --name just.fish completions/just.fish - installShellCompletion --zsh --name _just completions/just.zsh + installShellCompletion --cmd just \ + --bash completions/just.bash \ + --fish completions/just.fish \ + --zsh completions/just.zsh ''; checkInputs = [ coreutils bash ]; diff --git a/nixpkgs/pkgs/development/tools/k6/default.nix b/nixpkgs/pkgs/development/tools/k6/default.nix index 6a8fe4caf01b..6a94d40c2062 100644 --- a/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/nixpkgs/pkgs/development/tools/k6/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "k6"; diff --git a/nixpkgs/pkgs/development/tools/kcli/default.nix b/nixpkgs/pkgs/development/tools/kcli/default.nix index 6c9f62c6f72d..9cd1c976162f 100644 --- a/nixpkgs/pkgs/development/tools/kcli/default.nix +++ b/nixpkgs/pkgs/development/tools/kcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kcli"; diff --git a/nixpkgs/pkgs/development/tools/kind/default.nix b/nixpkgs/pkgs/development/tools/kind/default.nix index 3fff2aae1f4d..47b23ae2342d 100644 --- a/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/nixpkgs/pkgs/development/tools/kind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: with lib; diff --git a/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix b/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix index a089511fb684..6d66f141e912 100644 --- a/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix +++ b/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z80e"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "KnightOS"; repo = "z80e"; rev = version; - sha256 = "0gdv17ynjd6zf3i4hkimd89xkrd8kxas3bf8d5sq54fdicapvkzc"; + sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc="; }; nativeBuildInputs = [ cmake knightos-scas ]; diff --git a/nixpkgs/pkgs/development/tools/krew/default.nix b/nixpkgs/pkgs/development/tools/krew/default.nix index 7449d6df38eb..f2a4f390f82c 100644 --- a/nixpkgs/pkgs/development/tools/krew/default.nix +++ b/nixpkgs/pkgs/development/tools/krew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "krew"; diff --git a/nixpkgs/pkgs/development/tools/kubectx/default.nix b/nixpkgs/pkgs/development/tools/kubectx/default.nix index f2186709e835..469558553323 100644 --- a/nixpkgs/pkgs/development/tools/kubectx/default.nix +++ b/nixpkgs/pkgs/development/tools/kubectx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kubectx"; diff --git a/nixpkgs/pkgs/development/tools/kubeprompt/default.nix b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix index 4fc8f3253429..39cd59cbec6c 100644 --- a/nixpkgs/pkgs/development/tools/kubeprompt/default.nix +++ b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kubeprompt"; diff --git a/nixpkgs/pkgs/development/tools/kubicorn/default.nix b/nixpkgs/pkgs/development/tools/kubicorn/default.nix index f0985277a25e..706b91aad251 100644 --- a/nixpkgs/pkgs/development/tools/kubicorn/default.nix +++ b/nixpkgs/pkgs/development/tools/kubicorn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/nixpkgs/pkgs/development/tools/kustomize/default.nix b/nixpkgs/pkgs/development/tools/kustomize/default.nix index 6ff123bb2be3..f658995fe901 100644 --- a/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.9.2"; - # rev is the 3.9.2 commit, mainly for kustomize version command output - rev = "e98eada7365fc564c9aba392e954f306a9cbf1dd"; + version = "3.10.0"; + # rev is the 3.9.3 commit, mainly for kustomize version command output + rev = "602ad8aa98e2e17f6c9119e027a09757e63c8bec"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in '' @@ -17,13 +17,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "0p1rxswfaj0g3y8nfw70qmxrlyv1pnzkapy1mxpzzyf04mmhg7wn"; + sha256 = "1qr0mi83df8d9qd2svyr1h26pg97qi67nnygrkydnp8an28k48hi"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "1pv8g0nnrpzbvd6dqgnrw2i27xkilbrr9npdz6pxr7mmbcg3w3w9"; + vendorSha256 = "0p2j8mm7jpladpm6v3451g38n5bax0g368dk5h5r5gmkr6srxdy4"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; @@ -34,6 +34,6 @@ buildGoModule rec { ''; homepage = "https://github.com/kubernetes-sigs/kustomize"; license = licenses.asl20; - maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man]; + maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man saschagrunert ]; }; } diff --git a/nixpkgs/pkgs/development/tools/lazygit/default.nix b/nixpkgs/pkgs/development/tools/lazygit/default.nix index 1e8ebb0d0879..a2707eb72e99 100644 --- a/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lazygit"; diff --git a/nixpkgs/pkgs/development/tools/leaps/default.nix b/nixpkgs/pkgs/development/tools/leaps/default.nix index e68542e584f2..934881b6781c 100644 --- a/nixpkgs/pkgs/development/tools/leaps/default.nix +++ b/nixpkgs/pkgs/development/tools/leaps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "leaps"; diff --git a/nixpkgs/pkgs/development/tools/manul/default.nix b/nixpkgs/pkgs/development/tools/manul/default.nix index 4265c2a74501..306c9143c5c6 100644 --- a/nixpkgs/pkgs/development/tools/manul/default.nix +++ b/nixpkgs/pkgs/development/tools/manul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { name = "manul-unstable-2016-09-30"; diff --git a/nixpkgs/pkgs/development/tools/minizinc/default.nix b/nixpkgs/pkgs/development/tools/minizinc/default.nix index 4e5f39472626..97aedfd8f8a0 100644 --- a/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }: +{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.4.3"; + version = "2.5.3"; in stdenv.mkDerivation { pname = "minizinc"; @@ -12,28 +12,9 @@ stdenv.mkDerivation { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "0mahf621zwwywimly5nd6j39j7qr48k5p7zwpfqnjq4wn010mbf8"; + sha256 = "1kc65sxkc64pr560qaaznc44jnlvq7pbpzwijad410lpcnna5byg"; }; - patches = [ - # Fix build with newer Bison versions: - # https://github.com/MiniZinc/libminizinc/issues/389 - (fetchpatch { - url = "https://github.com/MiniZinc/libminizinc/commit/d3136f6f198d3081943c17ac6890dbe14a81d112.diff"; - sha256 = "1f4wxn9422ndgq6dd0vqdxm2313srm7gn9nh82aas2xijdxlmz2c"; - }) - (fetchpatch { - name = "bison-3.7-compat-1.patch"; - url = "https://github.com/MiniZinc/libminizinc/commit/8d4dcf302e78231f7c2665150e8178cacd06f91c.patch"; - sha256 = "1wgciyrqijv7b4wqha94is5skji8j7b9wq6fkdsnsimfd3xpxhqw"; - }) - (fetchpatch { - name = "bison-3.7-compat-2.patch"; - url = "https://github.com/MiniZinc/libminizinc/commit/952ffda0bd23dc21f83d3e3f080ea5b3a414e8e0.patch"; - sha256 = "0cnsfqw0hwm7rmazqnb99725rm2vdwab75vdpr5x5l3kjwsn76rj"; - }) - ]; - meta = with lib; { homepage = "https://www.minizinc.org/"; description = "A medium-level constraint modelling language"; diff --git a/nixpkgs/pkgs/development/tools/minizinc/ide.nix b/nixpkgs/pkgs/development/tools/minizinc/ide.nix index 7709423e676f..0683b9e1265c 100644 --- a/nixpkgs/pkgs/development/tools/minizinc/ide.nix +++ b/nixpkgs/pkgs/development/tools/minizinc/ide.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: +{ lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }: let - version = "2.4.3"; + version = "2.5.3"; in -stdenv.mkDerivation { +mkDerivation { pname = "minizinc-ide"; inherit version; - nativeBuildInputs = [ qmake makeWrapper ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtwebengine qtwebkit ]; src = fetchFromGitHub { owner = "MiniZinc"; repo = "MiniZincIDE"; rev = version; - sha256 = "0dfqh73rnp00336pyr1hlgl1wb4m2kh28zvdkamjgml60gmg6wdr"; + sha256 = "1c80ilb1xbgzfadgal668h2zsaiv62il1jnljizrisgb7pszzyzw"; + fetchSubmodules = true; }; sourceRoot = "source/MiniZincIDE"; diff --git a/nixpkgs/pkgs/development/tools/misc/act/default.nix b/nixpkgs/pkgs/development/tools/misc/act/default.nix index 6bf13ce7ec65..85ab64a230ef 100644 --- a/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.18"; + version = "0.2.20"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "16c5qxxi37pdcqrf8aliad6lkqx9jk57yc2q6gpw9ffar49km4qi"; + sha256 = "sha256-HgFm58zdaycOH65jfu3QsfFemhXymp3OTekISih+8WA="; }; - vendorSha256 = "1xw80vb49bd0n620yaxwcvyf9glkscc42i847blan4hw6k957hii"; + vendorSha256 = "sha256-9LEyxIBe4c938RQbLOQOsAb9MGNtjngm48P3P83BTNw="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 27e043a9ac49..31c5d0d26e8f 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.44.2"; + version = "1.46.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "1bam4sb0yhxciykph7wn41zs8fa7c9iwnbihd5kza0cylbb7fbkb"; + sha256 = "0cxgc18xpwyb5wp08km7aj8asn5biqnwq9fkgkk6wv1r1ihqlhf2"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 97b5f9ed82c5..780b2a8906f7 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -18,11 +18,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.46.4"; + version = "1.49.1"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "1p46zi1hh9calkcfgqz60c6rdi9i7i16ylj84iibi6k0pc690fjy"; + sha256 = "5Z6CUj/HfSj+pC9iDEmU/OKCYePSAazU9q9M3glnOZU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/misc/bonnmotion/default.nix b/nixpkgs/pkgs/development/tools/misc/bonnmotion/default.nix new file mode 100644 index 000000000000..7ec9f3e1400a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/bonnmotion/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchzip, substituteAll, bash, jre }: + +stdenv.mkDerivation rec { + pname = "bonnmotion"; + version = "3.0.1"; + + src = fetchzip { + url = "https://sys.cs.uos.de/bonnmotion/src/bonnmotion-${version}.zip"; + sha256 = "16bjgr0hy6an892m5r3x9yq6rqrl11n91f9rambq5ik1cxjqarxw"; + }; + + patches = [ + # The software has a non-standard install bash script which kind of works. + # However, to make it fully functional, the automatically detection of the + # program paths must be substituted with full paths. + (substituteAll { + src = ./install.patch; + inherit bash jre; + }) + ]; + + installPhase = '' + runHook preInstall + + ./install + + mkdir -p $out/bin $out/share/bonnmotion + cp -r ./classes ./lib $out/share/bonnmotion/ + cp ./bin/bm $out/bin/ + + substituteInPlace $out/bin/bm \ + --replace /build/source $out/share/bonnmotion + + runHook postInstall + ''; + + meta = with lib; { + description = "A mobility scenario generation and analysis tool"; + longDescription = '' + BonnMotion is a Java software which creates and analyzes mobility + scenarios and is most commonly used as a tool for the investigation of + mobile ad hoc network characteristics. The scenarios can also be exported + for several network simulators, such as ns-2, ns-3, GloMoSim/QualNet, + COOJA, MiXiM, and ONE. + ''; + homepage = "https://sys.cs.uos.de/bonnmotion/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/bonnmotion/install.patch b/nixpkgs/pkgs/development/tools/misc/bonnmotion/install.patch new file mode 100644 index 000000000000..86be99b3dd5e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/bonnmotion/install.patch @@ -0,0 +1,75 @@ +diff --git a/install b/install +index 95afa2c..70c5fca 100755 +--- a/install ++++ b/install +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!@bash@/bin/bash + + echo "BonnMotion - a mobility scenario generation and analysis tool" + echo "Copyright (C) 2002-2012 University of Bonn" +@@ -19,28 +19,11 @@ echo "along with this program; if not, write to the Free Software" + echo "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" + echo + +-OS=`uname -s | tr A-Z a-z | sed -e s/_.\*//` +- + PACKAGE=edu.bonn.cs.iv.bonnmotion +-JAVAPATH=`which java 2> /dev/null` +-if [ ! "$JAVAPATH" = "" ] +-then +- JAVAPATH=`dirname ${JAVAPATH}` +-fi +-echo -n Please enter your Java binary path \[$JAVAPATH\]:\ +-read KBDENTRY +-if [ ! "$KBDENTRY" = "" ] +-then +- JAVAPATH=$KBDENTRY +-fi ++JAVAPATH="@jre@/bin" + if [ -x "${JAVAPATH}/java" ] + then +- cd `dirname $0` +- BONNMOTION=`pwd` +- +- cd "${JAVAPATH}" +- JAVAPATH=`pwd` +- cd "${BONNMOTION}" ++ BONNMOTION="$(realpath .)" + + CLASSPATH="${BONNMOTION}/classes" + DOCPATH="${BONNMOTION}/javadoc" +@@ -52,14 +35,7 @@ then + then + mkdir "${DOCPATH}" + fi +- if [ $OS = "cygwin" ] +- then +- cd "${CLASSPATH}" +- CLASSPATH=`cmd.exe /c cd` +- cd "${DOCPATH}" +- DOCPATH=`cmd.exe /c cd` +- fi +- ++ + for l in $BONNMOTION/lib/*.jar + do + LIBRARYPATH=$LIBRARYPATH:$l +@@ -69,7 +45,7 @@ then + APPS=`ls` + cd "${BONNMOTION}/bin" + +- echo \#\!/bin/bash > .head ++ echo \#\!@bash@/bin/bash > .head + echo >> .head + echo BONNMOTION=\"$BONNMOTION\" >> .head + echo PACKAGE=\"$PACKAGE\" >> .head +@@ -103,8 +79,6 @@ then + fi + echo "done." + echo +- echo "$ ./bin/bm -h" +- ./bm + else + echo No executable \"$JAVAPATH/java\", aborting. + fi diff --git a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 655807d95069..0cf98d651c5b 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -13,13 +13,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1az11q3wmr8wc7alx9l70wq9am41cm0y17g5gsaqmahws3dxfi8m"; + sha256 = "1lr9804xyzbs72f9jbbzy1fjqxwrwpb4rp431wqialvms4251d8f"; }; patches = lib.optional stdenv.isDarwin (substituteAll { diff --git a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 73ea64f1d62c..140e4869e88a 100644 --- a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "circleci-cli"; diff --git a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index af435d417cef..d99649fd2a9b 100644 --- a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.01.20-01.39.32"; + version = "2021.02.10-21.13.12"; src = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; - sha256 = "sha256-DqvAIM5YHtcUNZHoH+fcZym6EaPX5a/vgphTFfTO6bU="; + sha256 = "sha256-kYetCpInY87l1NTaIhjzkNc2LQctMbSmcdQuI7zrFG4="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix b/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix index 60d3c5c45394..5c130a99c926 100644 --- a/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , pkg-config , fetchurl , meson diff --git a/nixpkgs/pkgs/development/tools/misc/dialog/default.nix b/nixpkgs/pkgs/development/tools/misc/dialog/default.nix index 97db1b5b7e81..ac5fb4118beb 100644 --- a/nixpkgs/pkgs/development/tools/misc/dialog/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dialog/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , ncurses , withLibrary ? false, libtool , unicodeSupport ? true @@ -10,14 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { pname = "dialog"; - version = "1.3-20201126"; + version = "1.3-20210117"; src = fetchurl { - urls = [ - "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz" - "https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz" - ]; - sha256 = "sha256-ySM6bI6jOlniN45RRq4r0TtRl0TP22R690IK2sWtOGY="; + url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"; + sha256 = "PB7Qj0S89vFZ8qpv3nZduU6Jl7Pu+0nYtMhmkWk8Q+E="; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/development/tools/misc/docopts/default.nix b/nixpkgs/pkgs/development/tools/misc/docopts/default.nix index 3614270574e4..74450bdfe737 100644 --- a/nixpkgs/pkgs/development/tools/misc/docopts/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/docopts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "docopts"; diff --git a/nixpkgs/pkgs/development/tools/misc/edb/default.nix b/nixpkgs/pkgs/development/tools/misc/edb/default.nix new file mode 100644 index 000000000000..ec65ca62fa30 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/edb/default.nix @@ -0,0 +1,42 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, boost, capstone +, double-conversion, graphviz, qtxmlpatterns }: + +mkDerivation rec { + pname = "edb"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "eteran"; + repo = "edb-debugger"; + rev = "1.3.0"; + fetchSubmodules = true; + sha256 = "fFUau8XnsRFjC83HEsqyhrwCCBOfDmV6oACf3txm7O8="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ boost.dev capstone double-conversion graphviz qtxmlpatterns ]; + + postPatch = '' + # Remove CMAKE_INSTALL_PREFIX from DEFAULT_PLUGIN_PATH otherwise the nix store path will appear twice. + substituteInPlace ./src/CMakeLists.txt --replace \ + '-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_PREFIX}/''${CMAKE_INSTALL_LIBDIR}/edb\"' \ + '-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_LIBDIR}/edb\"' + + # The build script checks for the presence of .git to determine whether + # submodules were fetched and will throw an error if it's not there. + # Avoid using leaveDotGit in the fetchFromGitHub options as it is non-deterministic. + mkdir -p src/qhexview/.git + + # Change default optional terminal program path to one that is more likely to work on NixOS. + substituteInPlace ./src/Configuration.cpp --replace "/usr/bin/xterm" "xterm"; + ''; + + meta = with lib; { + description = "Cross platform AArch32/x86/x86-64 debugger"; + homepage = "https://github.com/eteran/edb-debugger"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lihop maxxk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index 5edbdba4141e..82b2d2af7cd8 100644 --- a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = version; - sha256 = "0c7mainlwn3pd9q6i1f82m5znv8m6fs15zq7nrbm04fy554h0pzz"; + sha256 = "sha256-u3gTzsAoV4fgQjsnONIIGFE/Y02bKbCTg30O9FTI2/w="; }; - vendorSha256 = "1z4j8vm9mnhjhhmhlj0ycs8b1wpm7lhsfqjnk7w8gfapvj3yfk6h"; + vendorSha256 = "sha256-0Eznh9xXuYf4mVZipyE99fKwkGYeSAorhBLamupGkvw="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix index cd19e263f0a5..e3ee51c58fdc 100644 --- a/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "elfinfo"; diff --git a/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix b/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix index c01bb61f4f69..a82ff178c9eb 100644 --- a/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix @@ -1,8 +1,12 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchPypi , gdb , flask +, six +, bidict +, python-engineio +, python-socketio , flask-socketio , flask-compress , pygdbmi @@ -12,14 +16,48 @@ , eventlet , }: +let + # gdbgui only works with the latest previous major version of flask-socketio, + # which depends itself on the latest previous major versions of dependencies. + python-engineio' = python-engineio.overridePythonAttrs (old: rec { + version = "3.14.2"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "119halljynqsgswlhlh750qv56js1p7j52sc0nbwxh8450zmbd7a"; + }; + propagatedBuildInputs = [ six ]; + doCheck = false; + }); + python-socketio' = python-socketio.overridePythonAttrs (old: rec { + version = "4.6.1"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "047syhrrxh327p0fnab0d1zy25zijnj3gs1qg3kjpsy1jaj5l7yd"; + }; + propagatedBuildInputs = [ bidict python-engineio' ]; + doCheck = false; + }); + flask-socketio' = flask-socketio.overridePythonAttrs (old: rec { + version = "4.3.2"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "0s2xs9kv9cbwy8bcxszhdwlcb9ldv0fj33lwilf5vypj0wsin01p"; + }; + propagatedBuildInputs = [ flask python-socketio' ]; + doCheck = false; + }); +in buildPythonApplication rec { pname = "gdbgui"; - version = "0.13.2.1"; + version = "0.14.0.2"; buildInputs = [ gdb ]; propagatedBuildInputs = [ flask - flask-socketio + flask-socketio' flask-compress pygdbmi pygments @@ -30,13 +68,14 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0zn5wi47m8pn4amx574ryyhqvhynipxzyxbx0878ap6g36vh6l1h"; + sha256 = "1v6wwsncgnhlg5c7gsmzcp52hfblfnz5kf5pk4d0zybflsxak02d"; }; postPatch = '' echo ${version} > gdbgui/VERSION.txt # remove upper version bound sed -ie 's!, <.*"!"!' setup.py + sed -i 's/greenlet==/greenlet>=/' setup.py ''; postInstall = '' @@ -52,6 +91,6 @@ buildPythonApplication rec { homepage = "https://www.gdbgui.com/"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ yrashk ]; + maintainers = with maintainers; [ yrashk dump_stack ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/gede/default.nix b/nixpkgs/pkgs/development/tools/misc/gede/default.nix index 39954b458b4d..486557d9219a 100644 --- a/nixpkgs/pkgs/development/tools/misc/gede/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "gede"; - version = "2.16.2"; + version = "2.17.1"; src = fetchurl { - url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz"; - sha256 = "18a8n9yvhgkbc97p2995j7b5ncfdzy1fy13ahdafqmcpkl4r1hrj"; + url = "http://gede.dexar.se/uploads/source/${pname}-${version}.tar.xz"; + sha256 = "0hbsy2ymzgl8xd9mnh43gxdfncy7g6czxfvfyh7zp3ij8yiwf8x3"; }; nativeBuildInputs = [ qmake makeWrapper python ]; @@ -25,7 +25,7 @@ mkDerivation rec { meta = with lib; { description = "Graphical frontend (GUI) to GDB"; - homepage = "http://gede.acidron.com"; + homepage = "http://gede.dexar.se"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ juliendehos ]; diff --git a/nixpkgs/pkgs/development/tools/misc/hound/default.nix b/nixpkgs/pkgs/development/tools/misc/hound/default.nix index 476179ac8e7a..201241fb8350 100644 --- a/nixpkgs/pkgs/development/tools/misc/hound/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hound/default.nix @@ -1,39 +1,38 @@ -{ lib, stdenv -, buildGoPackage +{ lib +, buildGoModule , fetchFromGitHub , makeWrapper , mercurial , git }: -buildGoPackage rec { - pname = "hound-unstable"; - version = "2018-11-02"; - rev = "74ec7448a234d8d09e800b92e52c92e378c07742"; - - nativeBuildInputs = [ makeWrapper ]; - - goPackagePath = "github.com/etsy/hound"; +buildGoModule rec { + pname = "hound"; + version = "unstable-2021-01-26"; src = fetchFromGitHub { - inherit rev; - owner = "etsy"; + owner = "hound-search"; repo = "hound"; - sha256 = "0g6nvgqjabprcl9z5ci5frhbam1dzq978h1d6aanf8vvzslfgdpq"; + rev = "b88fc1f79d668e6671a478ddf4fb3e73a63067b9"; + sha256 = "00xc3cj7d3klvhsh9hivvjwgzb6lycw3r3w7nch98nv2j8iljc44"; }; - postInstall = with stdenv; let - binPath = lib.makeBinPath [ mercurial git ]; - in '' - wrapProgram $out/bin/houndd --prefix PATH : ${binPath} + vendorSha256 = "0x1nhhhvqmz3qssd2d44zaxbahj8lh9r4m5jxdvzqk6m3ly7y0b6"; + + nativeBuildInputs = [ makeWrapper ]; + + # requires network access + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/houndd --prefix PATH : ${lib.makeBinPath [ mercurial git ]} ''; - meta = { + meta = with lib; { inherit (src.meta) homepage; - description = "Lightning fast code searching made easy"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ grahamc ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ grahamc SuperSandro2000 ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix index 992b76bd62da..32c32b536d9d 100644 --- a/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config }: rustPlatform.buildRustPackage rec { pname = "itm-tools"; diff --git a/nixpkgs/pkgs/development/tools/misc/loccount/default.nix b/nixpkgs/pkgs/development/tools/misc/loccount/default.nix index 59bab3742a26..32a14404c606 100644 --- a/nixpkgs/pkgs/development/tools/misc/loccount/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/loccount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitLab }: +{ lib, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { pname = "loccount"; version = "1.2"; diff --git a/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix b/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix index a8a18b254b98..acc8490b7c20 100644 --- a/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, python37Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -with python37Packages; buildPythonApplication rec { +with python3Packages; buildPythonApplication rec { pname = "nrfutil"; version = "6.1"; diff --git a/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix b/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix new file mode 100644 index 000000000000..94f92bfcf298 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, libftdi1 +, libusb1 +, udev +}: + +stdenv.mkDerivation rec { + pname = "openfpgaloader"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "trabucayre"; + repo = "openFPGALoader"; + rev = "v${version}"; + sha256 = "0j87mlghbanh6c7lrxv0x3p6zgd0wrkcs9b8jf6ifh7b3ivcfg82"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + libftdi1 + libusb1 + udev + ]; + + meta = with lib; { + description = "Universal utility for programming FPGAs"; + homepage = "https://github.com/trabucayre/openFPGALoader"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ danderson ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix b/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix index 7447bf660226..71747f0d1172 100644 --- a/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "perfect-hash"; version = "0.4.1"; diff --git a/nixpkgs/pkgs/development/tools/misc/ptags/default.nix b/nixpkgs/pkgs/development/tools/misc/ptags/default.nix index 0ef7a2aa73a4..8406ecf298f8 100644 --- a/nixpkgs/pkgs/development/tools/misc/ptags/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ptags/default.nix @@ -2,7 +2,7 @@ , cargo , lib , rustPlatform -, stdenv + }: rustPlatform.buildRustPackage rec { diff --git a/nixpkgs/pkgs/development/tools/misc/scc/default.nix b/nixpkgs/pkgs/development/tools/misc/scc/default.nix index 49052c141a1a..8a5cbbcfdfae 100644 --- a/nixpkgs/pkgs/development/tools/misc/scc/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/scc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "scc"; diff --git a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index c68a1c1547cc..c41ab92fb97d 100644 --- a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -1,37 +1,26 @@ -{ stdenv -, lib -, fetchFromGitHub -, cargo -, rustc -, rustPlatform -, pkg-config -, glib -, openssl -, darwin -}: +{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { - version = "0.2.14"; + version = "0.2.15"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; - rev = version; - sha256 = "1ahg3cpb9pbgpdjglnfxm5c8r8qrgwaxwz5s394478ix7f9dxind"; + rev = "v${version}"; + sha256 = "1kygk7ilv7la36kv4jdn1ird7f3896wgr88kyqf0iagfqkzb2vsb"; }; - cargoSha256 = "0jphs0frr399iywi9ch8g271igayzv1vi3wa4v3yx19xdxawlgda"; + + cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj"; cargoBuildFlags = [ "--features=all" ]; - nativeBuildInputs = [ - pkg-config cargo rustc - ]; - buildInputs = [ - openssl - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + # Tests fail because of client server setup which is not possible inside the pure environment, # see https://github.com/mozilla/sccache/issues/460 - checkPhase = null; + doCheck = false; meta = with lib; { description = "Ccache with Cloud Storage"; diff --git a/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix b/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix index 0c1bb8ede1b8..0cfbd0680ba6 100644 --- a/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semver-tool"; - version = "2.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "fsaintjacques"; repo = pname; rev = version; - sha256 = "0lpwsa86qb5w6vbnsn892nb3qpxxx9ifxch8pw3ahzx2dqhdgnrr"; + sha256 = "sha256-coy/g4nEvSN+0/aqK2r3EEIaoUcnsZhzX66H1qsK9ac="; }; dontBuild = true; # otherwise we try to 'make' which fails. diff --git a/nixpkgs/pkgs/development/tools/misc/svls/default.nix b/nixpkgs/pkgs/development/tools/misc/svls/default.nix index 9cae7b901691..c6915e294d2e 100644 --- a/nixpkgs/pkgs/development/tools/misc/svls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.1.18"; + version = "0.1.25"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "08n2sp0yj7ql5aagxw94dn8bx2jkigs9zlylf5zkg673bh54829x"; + sha256 = "sha256-+o15rElJZXQu2Hq1/79ms9wqYimINrViSdQltSJlGN8="; }; - cargoSha256 = "0k8x6kgxc2w7ldi456s4kg4v80b064drfa26zg5chcmcrr5zgmyv"; + cargoSha256 = "sha256-zLDUQcnvjyr+QJLVq6ADGPee0Fd7HeDhPAkb05hYLcE="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index 498508d091fc..9695c75a3c16 100644 --- a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "w9PLKLFjKehtub1LbVX9TbvKkj/S1t0MwZIZurF2x18="; + sha256 = "sha256-0WbUJYNRBKixRFl+YM1uSEltQneB6FYPFHNVVhmdseA="; }; - vendorSha256 = "J8ovcUeQsb58Bq/EM9mvYqtuDY1bXTEVCC9/AH+UttU="; + vendorSha256 = "sha256-WYTn2QoI1Z3L4Wxjrq0YT++X9vMA1Wm3zgl08CYiU1Y="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index 47966dcc1336..557ff4fa967c 100644 --- a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "tokei"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994="; buildInputs = lib.optionals stdenv.isDarwin [ - libiconv darwin.apple_sdk.frameworks.Security + libiconv Security ]; # enable all output formats diff --git a/nixpkgs/pkgs/development/tools/misc/unused/default.nix b/nixpkgs/pkgs/development/tools/misc/unused/default.nix index 6487c3fc2c0c..1a5f3efe0e6a 100644 --- a/nixpkgs/pkgs/development/tools/misc/unused/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/unused/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake }: +{ lib, fetchFromGitHub, rustPlatform, cmake }: rustPlatform.buildRustPackage rec { pname = "unused"; version = "0.2.1"; diff --git a/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix b/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix index 6afcfe871a47..d448251bf13d 100644 --- a/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub, clang-unwrapped }: +{ lib, python3, fetchFromGitHub, clang-unwrapped }: python3.pkgs.buildPythonApplication rec { pname = "whatstyle"; diff --git a/nixpkgs/pkgs/development/tools/modd/default.nix b/nixpkgs/pkgs/development/tools/modd/default.nix index efe4c9605668..c42e364b88ed 100644 --- a/nixpkgs/pkgs/development/tools/modd/default.nix +++ b/nixpkgs/pkgs/development/tools/modd/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { pname = "modd"; diff --git a/nixpkgs/pkgs/development/tools/mustache-go/default.nix b/nixpkgs/pkgs/development/tools/mustache-go/default.nix index 99e4eb621564..40181f16288a 100644 --- a/nixpkgs/pkgs/development/tools/mustache-go/default.nix +++ b/nixpkgs/pkgs/development/tools/mustache-go/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mustache-go"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix index a9b4218224ee..6c70b046cabc 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -4,6 +4,8 @@ with ocamlPackages; buildDunePackage rec { pname = "ocaml-top"; version = "1.2.0-rc"; + useDune2 = true; + src = fetchzip { url = "https://github.com/OCamlPro/ocaml-top/archive/${version}.tar.gz"; sha256 = "1r290m9vvr25lgaanivz05h0kf4fd3h5j61wj4hpp669zffcyyb5"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index 9c888e284fc5..c03dbf756237 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "ocp-index"; version = "1.2.1"; + useDune2 = true; + src = fetchzip { url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz"; sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index 4fe408fb77f0..b99880fe7f33 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -11,8 +11,8 @@ let sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; }; cppo = fetchurl { - url = "https://github.com/mjambon/cppo/archive/v1.6.5.tar.gz"; - sha256 = "1dkm3d5h6h56y937gcdk2wixlpzl59vv5pmiafglr89p20kf7gqf"; + url = "https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz"; + sha256 = "185q0x54id7pfc6rkbjscav8sjkrg78fz65rgfw7b4bqlyb2j9z7"; }; cudf = fetchurl { url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; @@ -27,8 +27,8 @@ let sha256 = "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz"; }; extlib = fetchurl { - url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; - sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; + url = "https://ygrek.org/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; + sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; }; mccs = fetchurl { url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+11.tar.gz"; @@ -43,25 +43,25 @@ let sha256 = "0cjw69r7iilidi7b6arr92kjnjspchvwnmwr1b1gyaxqxpr2s98m"; }; re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz"; - sha256 = "0qkv42a4hpqpxvqa4kdkkcbhbg7aym9kv4mqgm3m51vxbd0pq0lv"; + url = "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz"; + sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj"; }; result = fetchurl { - url = "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz"; - sha256 = "1lrnbxdq80gbhnp85mqp1kfk0bkh6q1c93sfz2qgnq2qyz60w4sk"; + url = "https://github.com/janestreet/result/archive/1.4.tar.gz"; + sha256 = "1cjlncnzkwc6zr4v8dgy8nin490blbyxzwwp0qh0cla7s3q2jw0n"; }; seq = fetchurl { url = "https://github.com/c-cube/seq/archive/0.1.tar.gz"; sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.7.zip"; - sha256 = "03yxj4hw9p5dh34b1yzl3xd0l1v2l2az0n7ix453yjrkn0wn0xic"; + url = "https://github.com/ocaml/opam/archive/2.0.8.zip"; + sha256 = "1h55jh4nnx1fcn7v7ss3fgxrn6ixkgnq7pvg5njz8c9xq4njwbc1"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.0.7"; + version = "2.0.8"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -69,7 +69,7 @@ in stdenv.mkDerivation { postUnpack = '' ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/cmdliner.tbz - ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tar.gz + ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tbz ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz ln -sv ${srcs.dune-local} $sourceRoot/src_ext/dune-local.tbz @@ -78,7 +78,7 @@ in stdenv.mkDerivation { ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz - ln -sv ${srcs.result} $sourceRoot/src_ext/result.tbz + ln -sv ${srcs.result} $sourceRoot/src_ext/result.tar.gz ln -sv ${srcs.seq} $sourceRoot/src_ext/seq.tar.gz ''; @@ -117,4 +117,4 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.7 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.0.8 -p opam-shebangs.patch diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/installer.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/installer.nix new file mode 100644 index 000000000000..4501ddd63f04 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/installer.nix @@ -0,0 +1,17 @@ +{ lib, unzip, opam, ocamlPackages }: + +ocamlPackages.buildDunePackage { + pname = "opam-installer"; + + useDune2 = true; + + inherit (opam) version src; + nativeBuildInputs = [ unzip ]; + + configureFlags = [ "--disable-checks" "--prefix=$out" ]; + buildInputs = with ocamlPackages; [ opam-format cmdliner ]; + + meta = opam.meta // { + description = "Handle (un)installation from opam install files"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl b/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl index 1cbad6f5f44e..b94aa7dd9a2f 100755 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -21,7 +21,7 @@ chomp $OPAM_RELEASE_SHA256; my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG"; my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`; -my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^available: ocaml-version >= "(.*)"$/m +my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" {>= "(.*)"}$/m or die "could not parse ocaml version bound\n"; print <<"EOF"; diff --git a/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix b/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix index 82ed82a67bdc..c9728f9cbbf6 100644 --- a/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix +++ b/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchgit , autoreconfHook diff --git a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index c09331de5980..34d6abb7273d 100644 --- a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xYG605Z8WGFH5byJA+sHPBjBmWi8b+TTtWRnQnmYN/4="; + sha256 = "sha256-KxYGXwK6wF5MDY+zrSdcQqBYkSdnxOCYudTh+TwTkm8="; }; - vendorSha256 = "sha256-0ZowddIiVHVg1OKhaCFo+vQKcUe6wZ6L0J8RdMvZyGk="; + vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/out-of-tree/default.nix b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix index 9ab69d1d5d85..4547012e2f32 100644 --- a/nixpkgs/pkgs/development/tools/out-of-tree/default.nix +++ b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: +{ lib, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: buildGoModule rec { pname = "out-of-tree"; diff --git a/nixpkgs/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix index d4dd46cdcb5c..16e5ac082039 100644 --- a/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/nixpkgs/pkgs/development/tools/packer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; version = "1.6.6"; diff --git a/nixpkgs/pkgs/development/tools/packet-cli/default.nix b/nixpkgs/pkgs/development/tools/packet-cli/default.nix index ec07e4b058ee..79457643ce67 100644 --- a/nixpkgs/pkgs/development/tools/packet-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/packet-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "packet-cli"; diff --git a/nixpkgs/pkgs/development/tools/packet/default.nix b/nixpkgs/pkgs/development/tools/packet/default.nix index 31ccf19bb05f..723e5d8bb2d1 100644 --- a/nixpkgs/pkgs/development/tools/packet/default.nix +++ b/nixpkgs/pkgs/development/tools/packet/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "packet"; diff --git a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix index 79c8f3791880..ce733b8a2131 100644 --- a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix +++ b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages }: +{ lib, rustPlatform, fetchFromGitHub, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "parinfer-rust"; diff --git a/nixpkgs/pkgs/development/tools/parsing/javacc/default.nix b/nixpkgs/pkgs/development/tools/parsing/javacc/default.nix new file mode 100644 index 000000000000..d074e3dda93e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/parsing/javacc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, ant, jdk }: + +stdenv.mkDerivation rec { + pname = "javacc"; + version = "7.0.10"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "120jva4sw1kylkwgqf869zxddss01mcn1nmimx9vmd4xaadz7cf2"; + }; + + nativeBuildInputs = [ ant jdk ]; + + buildPhase = '' + ant jar + ''; + + installPhase = '' + mkdir -p $out/target + mv scripts $out/bin + mv target/javacc.jar $out/target/ + ''; + + meta = with lib; { + homepage = "https://javacc.github.io/javacc"; + description = "A parser generator for building parsers from grammars"; + license = licenses.bsd2; + maintainers = [ teams.deshaw.members ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/pax-rs/default.nix b/nixpkgs/pkgs/development/tools/pax-rs/default.nix index cda3ba5e8a8b..ff4219ad09c6 100644 --- a/nixpkgs/pkgs/development/tools/pax-rs/default.nix +++ b/nixpkgs/pkgs/development/tools/pax-rs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : +{ lib, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : with rustPlatform; buildRustPackage rec { diff --git a/nixpkgs/pkgs/development/tools/pew/default.nix b/nixpkgs/pkgs/development/tools/pew/default.nix index 6ca94041bb50..2d7294ec1052 100644 --- a/nixpkgs/pkgs/development/tools/pew/default.nix +++ b/nixpkgs/pkgs/development/tools/pew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: with python3.pkgs; diff --git a/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/nixpkgs/pkgs/development/tools/pgformatter/default.nix index d5c6872cd7dc..26d7063c81f2 100644 --- a/nixpkgs/pkgs/development/tools/pgformatter/default.nix +++ b/nixpkgs/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "4.4"; + version = "5.0"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "1sqjw6q005lws7qhkd26jqyb1xqmpcklzw5hk8paxxi8mzyjn0jp"; + sha256 = "10ml3va6ip501ibaykbhq8282y1j6r8bc8azc1gqxskk5jvfz1jm"; }; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index b0e65ed85a08..47c3e26fa6ad 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -1,7 +1,7 @@ { pkgs ? import <nixpkgs> { } , lib ? pkgs.lib , poetry ? null -, poetryLib ? import ./lib.nix { inherit lib pkgs; } +, poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; } }: let inherit (poetryLib) isCompatible readTOML moduleName; @@ -71,7 +71,40 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.14.0"; + version = "1.15.4"; + + /* Returns a package of editable sources whose changes will be available without needing to restart the + nix-shell. + In editablePackageSources you can pass a mapping from package name to source directory to have + those packages available in the resulting environment, whose source changes are immediately available. + + */ + mkPoetryEditablePackage = + { projectDir ? null + , pyproject ? projectDir + "/pyproject.toml" + , python ? pkgs.python3 + , pyProject ? readTOML pyproject + # Example: { my-app = ./src; } + , editablePackageSources + }: + assert editablePackageSources != { }; + import ./editable.nix { + inherit pyProject python pkgs lib poetryLib editablePackageSources; + }; + + /* Returns a package containing scripts defined in tool.poetry.scripts. + */ + mkPoetryScriptsPackage = + { projectDir ? null + , pyproject ? projectDir + "/pyproject.toml" + , python ? pkgs.python3 + , pyProject ? readTOML pyproject + , scripts ? pyProject.tool.poetry.scripts + }: + assert scripts != { }; + import ./shell-scripts.nix { + inherit lib python scripts; + }; /* Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. @@ -84,11 +117,25 @@ lib.makeScope pkgs.newScope (self: { , python ? pkgs.python3 , pwd ? projectDir , preferWheels ? false + # Example: { my-app = ./src; } + , editablePackageSources ? { } , __isBootstrap ? false # Hack: Always add Poetry as a build input unless bootstrapping }@attrs: let poetryPkg = poetry.override { inherit python; }; pyProject = readTOML pyproject; + + scripts = pyProject.tool.poetry.scripts or { }; + hasScripts = scripts != { }; + scriptsPackage = self.mkPoetryScriptsPackage { + inherit python scripts; + }; + + hasEditable = editablePackageSources != { }; + editablePackage = self.mkPoetryEditablePackage { + inherit pyProject python editablePackageSources; + }; + poetryLock = readTOML poetrylock; lockFiles = let @@ -180,10 +227,13 @@ lib.makeScope pkgs.newScope (self: { inputAttrs = mkInputAttrs { inherit py pyProject; attrs = { }; includeBuildSystem = false; }; + storePackages = builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs); in { python = py; - poetryPackages = builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs); + poetryPackages = storePackages + ++ lib.optional hasScripts scriptsPackage + ++ lib.optional hasEditable editablePackage; poetryLock = poetryLock; inherit pyProject; }; @@ -203,38 +253,17 @@ lib.makeScope pkgs.newScope (self: { , pwd ? projectDir , python ? pkgs.python3 , preferWheels ? false - # Example: { my-app = ./src; } , editablePackageSources ? { } }: let - py = self.mkPoetryPackages ( - { - inherit pyproject poetrylock overrides python pwd preferWheels; - } - ); - - inherit (py) pyProject; - - # Add executables from tool.poetry.scripts - scripts = pyProject.tool.poetry.scripts or { }; - hasScripts = scripts != { }; - scriptsPackage = import ./shell-scripts.nix { - inherit scripts lib; - inherit (py) python; + poetryPython = self.mkPoetryPackages { + inherit pyproject poetrylock overrides python pwd preferWheels editablePackageSources; }; - hasEditable = editablePackageSources != { }; - editablePackage = import ./editable.nix { - inherit pkgs lib poetryLib editablePackageSources; - inherit (py) pyProject python; - }; + inherit (poetryPython) poetryPackages; in - py.python.withPackages ( - _: py.poetryPackages - ++ lib.optional hasEditable editablePackage - ++ lib.optional hasScripts scriptsPackage - ); + poetryPython.python.withPackages (_: poetryPackages); /* Creates a Python application from pyproject.toml and poetry.lock diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index 6a0ee70f8635..4626f7fec37e 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -1,4 +1,4 @@ -{ lib, pkgs }: +{ lib, pkgs, stdenv }: let inherit (import ./semver.nix { inherit lib ireplace; }) satisfiesSemver; inherit (builtins) genList length; @@ -194,6 +194,23 @@ let inherit src; }; }; + + # Maps Nixpkgs CPU values to target machines known to be supported for manylinux* wheels. + # (a.k.a. `uname -m` output from CentOS 7) + # + # This is current as of manylinux2014 (PEP-0599), and is a superset of manylinux2010 / manylinux1. + # s390x is not supported in Nixpkgs, so we don't map it. + manyLinuxTargetMachines = { + x86_64 = "x86_64"; + i686 = "i686"; + aarch64 = "aarch64"; + armv7l = "armv7l"; + powerpc64 = "ppc64"; + powerpc64le = "ppc64le"; + }; + + # Machine tag for our target platform (if available) + targetMachine = manyLinuxTargetMachines.${stdenv.targetPlatform.parsed.cpu.name} or null; in { inherit @@ -207,5 +224,6 @@ in cleanPythonSources moduleName getPythonVersion + targetMachine ; } diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index c01f99c01d44..bb7b4e39b037 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -31,7 +31,7 @@ pythonPackages.callPackage inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName; inherit (import ./pep425.nix { - inherit lib python; + inherit lib poetryLib python; inherit (pkgs) stdenv; }) selectWheel ; @@ -161,7 +161,7 @@ pythonPackages.callPackage builtins.fetchGit { inherit (source) url; rev = source.resolved_reference or source.reference; - ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD"; + ref = sourceSpec.branch or sourceSpec.rev or (if sourceSpec?tag then "refs/tags/${sourceSpec.tag}" else "HEAD"); } ) else if isUrl then diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 5810d6d2a749..9ee690815faf 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -39,7 +39,7 @@ self: super: ansible-lint = super.ansible-lint.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; preBuild = '' export HOME=$(mktemp -d) ''; @@ -48,42 +48,46 @@ self: super: astroid = super.astroid.overridePythonAttrs ( old: rec { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); av = super.av.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.ffmpeg_4 ]; } ); bcrypt = super.bcrypt.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ]; } ); cairocffi = super.cairocffi.overridePythonAttrs ( old: { inherit (pkgs.python3.pkgs.cairocffi) patches; - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); cairosvg = super.cairosvg.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); + celery = super.celery.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + }); + cssselect2 = super.cssselect2.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -93,14 +97,14 @@ self: super: ( super.cffi.overridePythonAttrs ( old: { - buildInputs = old.buildInputs or [ ] ++ [ pkgs.libffi ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ]; } ) ); cftime = super.cftime.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython ]; } @@ -108,13 +112,13 @@ self: super: colour = super.colour.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.d2to1 ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ]; } ); configparser = super.configparser.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.toml ]; @@ -126,15 +130,40 @@ self: super: cryptography = super.cryptography.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs or [ ] + nativeBuildInputs = (old.nativeBuildInputs or [ ]) + ++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]; + } // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") { + CRYPTOGRAPHY_DONT_BUILD_RUST = "1"; } ); + daphne = super.daphne.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"],' "" + ''; + }); + + datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace "setuptools==" "setuptools>=" + ''; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; + }); + + dcli = super.dcli.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; + }); + + ddtrace = super.ddtrace.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ + (pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]) ++ [ self.cython ]; + }); + dictdiffer = super.dictdiffer.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; } ); @@ -166,8 +195,8 @@ self: super: enableParallelBuilding = true; dontUseCmakeConfigure = true; - nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; - buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ pkgs.dlib.nativeBuildInputs; + buildInputs = (old.buildInputs or [ ]) ++ pkgs.dlib.buildInputs; } ); @@ -194,7 +223,7 @@ self: super: faker = super.faker.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); @@ -211,13 +240,13 @@ self: super: fastparquet = super.fastparquet.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); grandalf = super.grandalf.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); @@ -234,8 +263,8 @@ self: super: h5py = super.h5py.overridePythonAttrs ( old: if old.format != "wheel" then rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkg-config self.cython ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; configure_flags = "--hdf5=${pkgs.hdf5}"; postConfigure = '' ${self.python.executable} setup.py configure ${configure_flags} @@ -275,7 +304,7 @@ self: super: ''; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ # Commented out packages are declared required, but not actually # needed to build. They are not yet packaged for nixpkgs. # bitshuffle @@ -335,7 +364,7 @@ self: super: jira = super.jira.overridePythonAttrs ( old: { inherit (pkgs.python3Packages.jira) patches; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytestrunner self.cryptography self.pyjwt @@ -349,6 +378,11 @@ self: super: } ); + jsonslicer = super.jsonslicer.overridePythonAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.yajl ]; + }); + jupyter = super.jupyter.overridePythonAttrs ( old: rec { # jupyter is a meta-package. Everything relevant comes from the @@ -360,7 +394,7 @@ self: super: keyring = super.keyring.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.toml ]; postPatch = '' @@ -371,7 +405,7 @@ self: super: kiwisolver = super.kiwisolver.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cppy ]; } @@ -392,7 +426,7 @@ self: super: llvmlite = super.llvmlite.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.llvm ]; # Disable static linking # https://github.com/numba/llvmlite/issues/93 @@ -407,7 +441,7 @@ self: super: export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config ''; - __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; passthru = old.passthru // { llvm = pkgs.llvm; }; } @@ -421,8 +455,8 @@ self: super: lxml = super.lxml.overridePythonAttrs ( old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ]; - buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; + nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ]; + buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ]; } ); @@ -447,11 +481,11 @@ self: super: XDG_RUNTIME_DIR = "/tmp"; - buildInputs = old.buildInputs + buildInputs = (old.buildInputs or [ ]) ++ lib.optional enableGhostscript pkgs.ghostscript ++ lib.optional stdenv.isDarwin [ Cocoa ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; @@ -482,16 +516,16 @@ self: super: mccabe = super.mccabe.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); mip = super.mip.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoPatchelfHook ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoPatchelfHook ]; - buildInputs = old.buildInputs ++ [ pkgs.zlib self.cppy ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.zlib self.cppy ]; } ); @@ -507,11 +541,11 @@ self: super: excludes = [ "pyproject.toml" ]; }) ]; - buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; } )) else super.molecule.overridePythonAttrs (old: { - buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; }); mongomock = super.mongomock.overridePythonAttrs (oa: { @@ -545,13 +579,19 @@ self: super: multiaddr = super.multiaddr.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; + } + ); + + mysqlclient = super.mysqlclient.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ]; } ); netcdf4 = super.netcdf4.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython ]; @@ -595,8 +635,8 @@ self: super: }; in { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - buildInputs = old.buildInputs ++ [ blas self.cython ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ]; + buildInputs = (old.buildInputs or [ ]) ++ [ blas self.cython ]; enableParallelBuilding = true; preBuild = '' ln -s ${cfg} site.cfg @@ -610,14 +650,21 @@ self: super: openexr = super.openexr.overridePythonAttrs ( old: rec { - buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openexr pkgs.ilmbase ]; NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; } ); + osqp = super.osqp.overridePythonAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ]; + dontUseCmakeConfigure = true; + } + ); + parsel = super.parsel.overridePythonAttrs ( old: rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ self.pytest-runner ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -628,7 +675,7 @@ self: super: withMysql = old.passthru.withMysql or false; in { - buildInputs = old.buildInputs or [ ] ++ [ pkgs.sqlite ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ]; propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; @@ -637,11 +684,33 @@ self: super: pillow = super.pillow.overridePythonAttrs ( old: { - nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs; - buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; + nativeBuildInputs = [ pkgs.pkg-config ] ++ (old.nativeBuildInputs or [ ]); + buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ (old.buildInputs or [ ]); } ); + # Work around https://github.com/nix-community/poetry2nix/issues/244 + # where git deps are not picked up as they should + pip = + if lib.versionAtLeast super.pip.version "20.3" then + super.pip.overridePythonAttrs + (old: + let + pname = "pip"; + version = "20.2.4"; + in + { + name = pname + "-" + version; + inherit version; + src = pkgs.fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = version; + sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do="; + name = "${pname}-${version}-source"; + }; + }) else super.pip; + poetry-core = super.poetry-core.overridePythonAttrs (old: { # "Vendor" dependencies (for build-system support) postPatch = '' @@ -667,17 +736,17 @@ self: super: psycopg2 = super.psycopg2.overridePythonAttrs ( old: { - buildInputs = old.buildInputs + buildInputs = (old.buildInputs or [ ]) ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; } ); psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( old: { - buildInputs = old.buildInputs + buildInputs = (old.buildInputs or [ ]) ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; } ); @@ -704,7 +773,7 @@ self: super: in if arrowCppVersion != pyArrowVersion then throw errorMessage else { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython pkgs.pkg-config pkgs.cmake @@ -717,7 +786,7 @@ self: super: PARQUET_HOME = _arrow-cpp; inherit ARROW_HOME; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.arrow-cpp ]; @@ -736,7 +805,7 @@ self: super: ) else super.pyarrow.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython ]; } @@ -752,7 +821,7 @@ self: super: ).overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.meson pkgs.ninja pkgs.pkg-config @@ -771,7 +840,7 @@ self: super: pycocotools = super.pycocotools.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython self.numpy ]; @@ -822,27 +891,27 @@ self: super: pygobject = super.pygobject.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.glib pkgs.gobject-introspection ]; } ); pylint = super.pylint.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); pyopenssl = super.pyopenssl.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]; } ); python-bugzilla = super.python-bugzilla.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.docutils ]; } @@ -850,7 +919,7 @@ self: super: python-ldap = super.python-ldap.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.openldap pkgs.cyrus_sasl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openldap pkgs.cyrus_sasl ]; } ); @@ -872,7 +941,7 @@ self: super: old: { format = "other"; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config pkgs.qt5.qmake pkgs.xorg.lndir @@ -889,7 +958,7 @@ self: super: ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets ; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.dbus pkgs.qt5.qtbase pkgs.qt5.qtsvg @@ -972,6 +1041,10 @@ self: super: pytest = super.pytest.overridePythonAttrs ( old: { + # Fixes https://github.com/pytest-dev/pytest/issues/7891 + postPatch = old.postPatch or "" + '' + sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg + ''; doCheck = false; } ); @@ -996,15 +1069,37 @@ self: super: } ); + # pytest-splinter seems to put a .marker file in an empty directory + # presumably so it's tracked by and can be installed with MANIFEST.in, see + # https://github.com/pytest-dev/pytest-splinter/commit/a48eeef662f66ff9d3772af618748e73211a186b + # + # This directory then gets used as an empty initial profile directory and is + # zipped up. But if the .marker file is in the Nix store, it has the + # creation date of 1970, and Zip doesn't work with such old files, so it + # fails at runtime! + # + # We fix this here by just removing the file after the installation + # + # The error you get without this is: + # + # E ValueError: ZIP does not support timestamps before 1980 + # /nix/store/55b9ip7xkpimaccw9pa0vacy5q94f5xa-python3-3.7.6/lib/python3.7/zipfile.py:357: ValueError + pytest-splinter = super.pytest-splinter.overrideAttrs (old: { + postInstall = old.postInstall or "" + '' + rm $out/${super.python.sitePackages}/pytest_splinter/profiles/firefox/.marker + ''; + }); + + ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); python-prctl = super.python-prctl.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libcap ]; } @@ -1012,7 +1107,7 @@ self: super: pyzmq = super.pyzmq.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; } ); @@ -1035,13 +1130,13 @@ self: super: pandas = super.pandas.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython ]; } ); panel = super.panel.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.nodejs ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.nodejs ]; } ); @@ -1065,11 +1160,11 @@ self: super: scipy = super.scipy.overridePythonAttrs ( old: if old.format != "wheel" then { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; enableParallelBuilding = true; - buildInputs = old.buildInputs ++ [ self.numpy.blas ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.numpy.blas ]; preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES @@ -1082,14 +1177,14 @@ self: super: scikit-learn = super.scikit-learn.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gfortran pkgs.glibcLocales ] ++ lib.optionals stdenv.cc.isClang [ pkgs.llvmPackages.openmp ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython ]; @@ -1099,7 +1194,7 @@ self: super: shapely = super.shapely.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos self.cython ]; inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; } ); @@ -1117,8 +1212,8 @@ self: super: tables = super.tables.overridePythonAttrs ( old: { HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.hdf5 self.numpy self.numexpr ]; } ); @@ -1147,7 +1242,7 @@ self: super: tinycss2 = super.tinycss2.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -1168,14 +1263,17 @@ self: super: # is explicitly disabled with USE_CUDA=0. find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \; ''; - buildInputs = old.buildInputs ++ lib.optionals enableCuda [ - pkgs.linuxPackages.nvidia_x11 - pkgs.nccl.dev - pkgs.nccl.out - ]; + buildInputs = + (old.buildInputs or [ ]) + ++ [ self.typing-extensions ] + ++ lib.optionals enableCuda [ + pkgs.linuxPackages.nvidia_x11 + pkgs.nccl.dev + pkgs.nccl.out + ]; propagatedBuildInputs = [ - super.numpy - super.future + self.numpy + self.future ]; }) ) @@ -1210,7 +1308,7 @@ self: super: vispy = super.vispy.overrideAttrs ( old: { inherit (pkgs.python3.pkgs.vispy) patches; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython self.setuptools-scm-git-archive ]; @@ -1219,7 +1317,7 @@ self: super: uvloop = super.uvloop.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ + buildInputs = (old.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices pkgs.darwin.apple_sdk.frameworks.CoreServices ]; @@ -1237,7 +1335,7 @@ self: super: weasyprint = super.weasyprint.overridePythonAttrs ( old: { inherit (pkgs.python3.pkgs.weasyprint) patches; - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -1257,15 +1355,15 @@ self: super: format = "wheel"; }; # If "wheel" is built from source - sourcePackage = ( + sourcePackage = (( pkgs.python3.pkgs.override { python = self.python; } - ).wheel.overridePythonAttrs ( - old: { - inherit (super.wheel) pname name version src; - } - ); + ).wheel.override { + inherit (self) buildPythonPackage bootstrapped-pip setuptools; + }).overrideAttrs (old: { + inherit (super.wheel) pname name version src; + }); in if isWheel then wheelPackage else sourcePackage; @@ -1293,13 +1391,22 @@ self: super: credis = super.credis.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.cython ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython ]; } ); hashids = super.hashids.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.flit-core ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ]; + } + ); + + packaging = super.packaging.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ + # From 20.5 until 20.7, packaging used flit for packaging (heh) + # See https://github.com/pypa/packaging/pull/352 and https://github.com/pypa/packaging/pull/367 + lib.optional (lib.versionAtLeast old.version "20.5" && lib.versionOlder old.version "20.8") [ self.flit-core ]; } ); @@ -1317,4 +1424,47 @@ self: super: propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.toolz ]; } ); + + # For some reason the toml dependency of tqdm declared here: + # https://github.com/tqdm/tqdm/blob/67130a23646ae672836b971e1086b6ae4c77d930/pyproject.toml#L2 + # is not translated correctly to a nix dependency. + tqdm = super.tqdm.overrideAttrs ( + old: { + buildInputs = [ super.toml ] ++ (old.buildInputs or [ ]); + } + ); + + watchdog = super.watchdog.overrideAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) + ++ pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreServices; + } + ); + + # pyee cannot find `vcversioner` and other "setup requirements", so it tries to + # download them from the internet, which only works when nix sandboxing is disabled. + # Additionally, since pyee uses vcversioner to specify its version, we need to do this + # manually specify its version. + pyee = super.pyee.overrideAttrs ( + old: { + postPatch = old.postPatch or "" + '' + sed -i setup.py \ + -e '/setup_requires/,/],/d' \ + -e 's/vcversioner={},/version="${old.version}",/' + ''; + } + ); + + # nixpkgs has setuptools_scm 4.1.2 + # but newrelic has a seemingly unnecessary version constraint for <4 + # So we patch that out + newrelic = super.newrelic.overridePythonAttrs ( + old: { + postPatch = old.postPatch or "" + '' + substituteInPlace setup.py --replace '"setuptools_scm>=3.2,<4"' '"setuptools_scm"' + ''; + } + ); + + } diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index edf556377b33..9e29c5301ab7 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, python, isLinux ? stdenv.isLinux }: +{ lib, stdenv, poetryLib, python, isLinux ? stdenv.isLinux }: let inherit (lib.strings) hasSuffix hasInfix splitString removeSuffix; + inherit (poetryLib) targetMachine; # The 'cpxy" as determined by `python.version` # @@ -72,12 +73,16 @@ let withPlatform = if isLinux then - ( - x: x.platform == "manylinux1_${stdenv.hostPlatform.linuxArch}" - || x.platform == "manylinux2010_${stdenv.hostPlatform.linuxArch}" - || x.platform == "manylinux2014_${stdenv.hostPlatform.linuxArch}" - || x.platform == "any" - ) + if targetMachine != null + then + ( + x: x.platform == "manylinux1_${targetMachine}" + || x.platform == "manylinux2010_${targetMachine}" + || x.platform == "manylinux2014_${targetMachine}" + || x.platform == "any" + ) + else + (x: x.platform == "any") else (x: hasInfix "macosx" x.platform || x.platform == "any"); filterWheel = x: let diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index e8d4159deeee..dc9cd2936d06 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -1,6 +1,6 @@ { lib, stdenv, poetryLib }: python: let - inherit (poetryLib) ireplace; + inherit (poetryLib) ireplace targetMachine; # Like builtins.substring but with stop being offset instead of length substr = start: stop: s: builtins.substring start (stop - start) s; @@ -95,7 +95,7 @@ let else if stdenv.isDarwin then "darwin" else throw "Unsupported platform" ); - platform_machine = stdenv.hostPlatform.linuxArch; + platform_machine = targetMachine; platform_python_implementation = let impl = python.passthru.implementation; @@ -132,7 +132,7 @@ let mVal = ''[a-zA-Z0-9\'"_\. ]+''; mOp = "in|[!=<>]+"; e = stripStr exprs.value; - m = builtins.map stripStr (builtins.match "^(${mVal}) *(${mOp}) *(${mVal})$" e); + m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); m0 = processVar (builtins.elemAt m 0); m2 = processVar (builtins.elemAt m 2); in diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update index d69878ad0849..33a2823f360a 100755 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update @@ -3,6 +3,7 @@ rev=$(curl -s https://api.github.com/repos/python-poetry/poetry/releases/latest | jq -r '.name') nix-prefetch-github --rev "$rev" python-poetry poetry > src.json +echo >> src.json src=$(nix-build --no-out-link --expr 'with import <nixpkgs> {}; fetchFromGitHub (lib.importJSON ./src.json)') cp $src/pyproject.toml $src/poetry.lock . diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/update b/nixpkgs/pkgs/development/tools/poetry2nix/update index f96763dbee3b..41866437aa4a 100755 --- a/nixpkgs/pkgs/development/tools/poetry2nix/update +++ b/nixpkgs/pkgs/development/tools/poetry2nix/update @@ -16,7 +16,7 @@ mv poetry2nix-master/* . mkdir build cp *.* build/ cp -r pkgs hooks bin build/ -rm build/shell.nix build/generate.py build/overlay.nix build/flake.nix +rm build/shell.nix build/generate.py build/overlay.nix build/flake.* cat > build/README.md << EOF Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix diff --git a/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix index dd2345378d43..eab000e8d8e4 100644 --- a/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix @@ -1,5 +1,5 @@ # This file was originally generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "pprof-unstable"; diff --git a/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix index c978d8bd96a7..c5d65a8239ea 100644 --- a/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, pkg-config, gettext, runCommand, makeWrapper +{ lib, fetchgit, pkg-config, gettext, runCommand, makeWrapper , elfutils, kernel, gnumake, python2, python2Packages }: @@ -10,7 +10,6 @@ let version = "4.1"; inherit (kernel) stdenv; - inherit (stdenv) lib; ## stap binaries stapBuild = stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/development/tools/pup/default.nix b/nixpkgs/pkgs/development/tools/pup/default.nix index 13e8c233ec39..018232b3f40a 100644 --- a/nixpkgs/pkgs/development/tools/pup/default.nix +++ b/nixpkgs/pkgs/development/tools/pup/default.nix @@ -1,21 +1,22 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "pup"; - version = "0.4.0"; - rev = "v${version}"; + version = "unstable-2019-09-19"; - goPackagePath = "github.com/ericchiang/pup"; - - src = fetchgit { - inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0mnhw0yph5fvcnrcmj1kfbyw1a4lcg3k9f6y28kf44ihlq8h1dfz"; + src = fetchFromGitHub { + owner = "ericchiang"; + repo = "pup"; + rev = "681d7bb639334bf485476f5872c5bdab10931f9a"; + sha256 = "1hx1k0qlc1bq6gg5d4yprn4d7kvqzagg6mi5mvb39zdq6c4y17vr"; }; + vendorSha256 = null; + meta = with lib; { - description = "Streaming HTML processor/selector"; + description = "Parsing HTML at the command line"; + homepage = "https://github.com/ericchiang/pup"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yegortimoshenko SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix index 3f54a4f9c0ee..58458ea79aa2 100644 --- a/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix +++ b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix @@ -6,7 +6,7 @@ , http-conduit, http-types, lens-family-core, megaparsec, mtl , network-uri, open-browser, optparse-applicative, prettyprinter , process, QuickCheck, retry, rio, rio-orphans, safe, semver-range -, lib, stdenv, stm, stringsearch, tar, template-haskell, temporary, text +, lib, stm, stringsearch, tar, template-haskell, temporary, text , time, transformers, turtle, unliftio, unordered-containers , utf8-string, vector, versions, with-utf8, zlib }: diff --git a/nixpkgs/pkgs/development/tools/py-spy/default.nix b/nixpkgs/pkgs/development/tools/py-spy/default.nix index a9634ec53c72..7a93d5ecbe03 100644 --- a/nixpkgs/pkgs/development/tools/py-spy/default.nix +++ b/nixpkgs/pkgs/development/tools/py-spy/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "py-spy"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; rev = "v${version}"; - sha256 = "1w9nwsmazafr78ghif6njdcqjisr0f1jb6cm1w4ngvigx5qlrbkv"; + sha256 = "sha256-7282DGLNHpKorNTHvpMLmqF2DrEVMIiQIzf5nTuJ7lc="; }; NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { checkInputs = [ python3 ]; - cargoSha256 = "0hrzmpwd2k4l8gjbry8ddrkv9q9qh8ag096md4q0fyn5bgnxhkah"; + cargoSha256 = "sha256-qVnOuLNMAy+6MP+dh6vLiSXvwQBAwyzRnHzCP60BdWk="; meta = with lib; { description = "Sampling profiler for Python programs"; diff --git a/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 40e3e42d84cc..dc5699ed3739 100644 --- a/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -20,12 +20,12 @@ in mkDerivation rec { pname = "qtcreator"; - version = "4.11.0"; + version = "4.14.0"; baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version)); src = fetchurl { url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg"; + sha256 = "07i045mzwbfhwj2jlijhz9xs6ay03qs5dgcw2kzlcr79a69i0h6j"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ @@ -54,16 +54,14 @@ mkDerivation rec { preConfigure = '' substituteInPlace src/plugins/plugins.pro \ --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' + substituteInPlace src/libs/libs.pro \ + --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' '' + optionalString withClangPlugins '' # Fix paths for llvm/clang includes directories. substituteInPlace src/shared/clang/clang_defines.pri \ --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \ --replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin' - # Fix include path to find clang and clang-c include directories. - substituteInPlace src/plugins/clangtools/clangtools.pro \ - --replace 'INCLUDEPATH += $$LLVM_INCLUDEPATH' 'INCLUDEPATH += $$LLVM_INCLUDEPATH ${clang_qt_vendor}' - # Fix paths to libclang library. substituteInPlace src/shared/clang/clang_installation.pri \ --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang}/lib' \ diff --git a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix index 4edb60d11a15..4fe51d3e0463 100644 --- a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix +++ b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "quicktemplate"; diff --git a/nixpkgs/pkgs/development/tools/rdbtools/default.nix b/nixpkgs/pkgs/development/tools/rdbtools/default.nix index 5674876daba6..e2f053c1e816 100644 --- a/nixpkgs/pkgs/development/tools/rdbtools/default.nix +++ b/nixpkgs/pkgs/development/tools/rdbtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python }: +{ lib, python }: with python.pkgs; diff --git a/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index 06b5dd794015..d1c86d9248a3 100644 --- a/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -38,10 +38,10 @@ let ]; in stdenv.mkDerivation rec { pname = "react-native-debugger"; - version = "0.11.5"; + version = "0.11.7"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "0b917lihypx7ansy64dmwvgi943yy0n6fs8myam635bsr4l1srzb"; + sha256 = "sha256-UXKObJKk9UUgWtm8U+nXWvIJUr4NLm2f//pGTHJISYA="; }; buildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/tools/remarshal/default.nix b/nixpkgs/pkgs/development/tools/remarshal/default.nix index c37779a5293b..385db11d7ff4 100644 --- a/nixpkgs/pkgs/development/tools/remarshal/default.nix +++ b/nixpkgs/pkgs/development/tools/remarshal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "remarshal"; diff --git a/nixpkgs/pkgs/development/tools/renderizer/default.nix b/nixpkgs/pkgs/development/tools/renderizer/default.nix index 747e80adf4f2..22bf5fbe904a 100644 --- a/nixpkgs/pkgs/development/tools/renderizer/default.nix +++ b/nixpkgs/pkgs/development/tools/renderizer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "renderizer"; diff --git a/nixpkgs/pkgs/development/tools/reno/default.nix b/nixpkgs/pkgs/development/tools/reno/default.nix index 17a334aba205..ca01f6ebfa27 100644 --- a/nixpkgs/pkgs/development/tools/reno/default.nix +++ b/nixpkgs/pkgs/development/tools/reno/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , git , gnupg1 , python3Packages diff --git a/nixpkgs/pkgs/development/tools/richgo/default.nix b/nixpkgs/pkgs/development/tools/richgo/default.nix index 1013c4aa8b43..81a912171f33 100644 --- a/nixpkgs/pkgs/development/tools/richgo/default.nix +++ b/nixpkgs/pkgs/development/tools/richgo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "richgo"; diff --git a/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock index 74ae51427a95..d91fcdbb3e99 100644 --- a/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - ast (2.4.1) + ast (2.4.2) parallel (1.20.1) parser (3.0.0.0) ast (~> 2.4.1) rainbow (3.0.0) regexp_parser (2.0.3) rexml (3.2.4) - rubocop (1.8.0) + rubocop (1.9.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -17,7 +17,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.0) + rubocop-ast (1.4.1) parser (>= 2.7.1.5) ruby-progressbar (1.11.0) unicode-display_width (2.0.0) diff --git a/nixpkgs/pkgs/development/tools/rubocop/gemset.nix b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix index 4fc468a177d1..7de3fd53489e 100644 --- a/nixpkgs/pkgs/development/tools/rubocop/gemset.nix +++ b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; parallel = { groups = ["default"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12arfnsj32126ps6mxbn7dwrw43cy70sq45rm0ib7qfrmhp5qyid"; + sha256 = "06npybjypxsrz09z8ivxqfcwzpbgif6z3hwpp0ls8znqlgp3m922"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj"; + sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; ruby-progressbar = { groups = ["default"]; diff --git a/nixpkgs/pkgs/development/tools/run/default.nix b/nixpkgs/pkgs/development/tools/run/default.nix index a0c169d84661..45fb2b8f9578 100644 --- a/nixpkgs/pkgs/development/tools/run/default.nix +++ b/nixpkgs/pkgs/development/tools/run/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; version = "0.7.2"; diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index eef8a5e41fd2..f379e58ba16b 100644 --- a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin +{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin , runtimeShell , bash }: diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix index b79611ff5ecb..8b40d9b686d9 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, runCommand }: +{ lib, fetchFromGitHub, rustPlatform, runCommand }: rustPlatform.buildRustPackage rec { pname = "cargo-binutils"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index 7b9aa5cf6101..c468ad0f4e18 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.7.1"; + version = "0.7.2"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1a348ys4lbgsr23px81kw985i5bp8z75wgzl9l2jv9sdzirpb8k4"; + sha256 = "1rgwj3kf31n4rz0b7jw67wsgyapdycfic7plm5gm4n9rlslp5ax5"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "1f78wlid8jx26pqybmafzcl1656nnp87hdiib0v1p5k73mk4ymvy"; + sha256 = "0jnawnkf4m7cqcq9iahnxa53l61a5riax400n96vxrqf3fa752c6"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1nj54igm57h9d8hhqdgkay2nnblcdxhpnha68jqvjazd8a0bq3la"; + cargoSha256 = "0svmhq64aqw1vidq8jmw7w4xhhnyp04vcs9yzhjyz25c4cn9grsf"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix index 021e19b9cd97..71d4646c1a11 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "sha256-SqhGwm2VZW6ZUYyxN940fi/YLJGAZikjJCIq0GbljtY="; + sha256 = "sha256-qRwyNSAYuAnU17o/5zqKuvixQw7xfA6wNVzN6QRbZlY="; }; - cargoSha256 = "sha256-sZxkEQBZ2PJXSvwcA+IL7uW/gcnzuzRcDklNW5vpzWg="; + cargoSha256 = "sha256-OpqVP097GYiARq7gbsMGFFGkFaQz3qeux12aMJj7W3Y="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix index e4c5d8ab48c7..989885e99a74 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib +{ lib , rustPlatform, fetchFromGitHub , libusb1, pkg-config, rustfmt }: diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix index dbd79f179aa3..39b56c2d656d 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib +{ lib , rustPlatform, fetchFromGitHub , libusb1, pkg-config, rustfmt }: diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix index 904ba6efb52b..569c8f88da2f 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index 635f36ee834c..e4eb2965fd6f 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "0rq0anz0cawrgsinqyjh8wb3dgha09wx3ydrd3m9nfxs5dd3ij3k"; + sha256 = "sha256-RrDwq5VufMDsPlqRmBP3x2RUWU740L0L18noByO1IDY="; }; - cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld"; + cargoSha256 = "sha256-W6+RGzCYJF9f44QaFDOI414/vCfKIuIOXoH+GYY0GwY="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix new file mode 100644 index 000000000000..3b28af1097e2 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-limit"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "alopatindev"; + repo = "cargo-limit"; + rev = version; + sha256 = "sha256-GYdWKRgdS9gCQRu1C8ht0wC1eBTtIMg585OuAfDn/+4="; + }; + + cargoSha256 = "0381wgyb2xnsiick8invrkhcvp905rrfyikgv01w6qn9872z11s0"; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Cargo subcommand \"limit\": reduces the noise of compiler messages"; + homepage = "https://github.com/alopatindev/cargo-limit"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index e393184aebda..8e1c032cdafe 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,11 +4,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.10"; + version = "0.32.12"; src = fetchCrate { inherit pname version; - sha256 = "sha256-cDpEFw9uICB/4aZheTWwDqYGjLz+C6gLie/S3ehhifg="; + sha256 = "sha256-AaoLT5M1ut2Hlgw91On8AHRN/rrufbAp4I7bcCeG3cA="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "sha256-Qh14lks72bsetwyv0ALF7nZo3m3FDEmVxzFkHJoEuzE="; + cargoSha256 = "sha256-r64Y8TxYmzxuZOTncHUYm+KmKlbK+KnHCHyNups5kRw="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix index ae638cac8a9a..358c58bef4d4 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "cargo-readme"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix index 210449a72300..f20bdb9cc174 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-sweep"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix index 45ea6c430d15..54f21ab46270 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-sync-readme"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index dcbf539c1c14..e38afac76f27 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "1h89xq91gbnbagfmvig5lkxyl08qwgdaf9vr55p599pmv190xq8s"; + sha256 = "sha256-qVmp2DTnQjvN5QWchiGa6huM30+o41zLmby45APfxgk="; }; - cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c"; + cargoSha256 = "sha256-zuJbs25lyDRTQPJdI0QBzO3xrdH48+cVhLqIkP7nLbE="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix new file mode 100644 index 000000000000..50cffe74848e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, nix-update-script +, makeWrapper +, valgrind +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-valgrind"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "jfrimmel"; + repo = "cargo-valgrind"; + # repo lacks the 1.3.0 tag + # https://github.com/jfrimmel/cargo-valgrind/issues/33 + rev = "d47dd810e3971d676cde5757df8b2e05ed563e41"; + sha256 = "163ch5bpwny1di758rpfib1ddqclxm48j0lmmv741ji3l4nqid32"; + }; + + cargoSha256 = "008s1y3pkn8613kp1gqf494fs93ix0nrwhrkqi5q9bim2mixgccb"; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]} + ''; + + meta = with lib; { + description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner''; + homepage = "https://github.com/jfrimmel/cargo-valgrind"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix index 6c73b245e047..c4c079c523b1 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , nix-update-script diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix index 2e800402c1dd..8aa701779bc0 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; diff --git a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index d40145f163b2..b9c2e08ba142 100644 --- a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -1,26 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config -, darwin }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, dbus +, Security +}: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { - name = "maturin-${version}"; +rustPlatform.buildRustPackage rec { + pname = "maturin"; version = "0.9.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; + hash = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; }; - cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; + cargoHash = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gmp openssl ] - ++ lib.optional stdenv.isDarwin Security - ++ lib.optional stdenv.isLinux dbus; + buildInputs = lib.optional stdenv.isLinux dbus + ++ lib.optional stdenv.isDarwin Security; # Requires network access, fails in sandbox. doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 8ff596d475c8..3a4bd8f81269 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2021-01-18"; + rev = "2021-02-08"; version = "unstable-${rev}"; - sha256 = "sha256-eFiZdFBJZuBfwH8tqZTayNaWiq8fWUzlzBRRvdPbmW8="; - cargoSha256 = "sha256-rRoo0TrXa03okJ8wktzVSAn8tRO1d9kcDprotZ1hZ6w="; + sha256 = "sha256-Idaaw6d0lvBUyZxpHKQ94aMtgM0zb0P8QRh+3pctX4k="; + cargoSha256 = "sha256-J6Hia83biutScZt/BMO4/qXYi35/Ec9MeaHeDG8Lqmc="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix b/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix new file mode 100644 index 000000000000..c6f34a9e20d2 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -0,0 +1,29 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "sqlx-cli"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "launchbadge"; + repo = "sqlx"; + rev = "v${version}"; + sha256 = "1q6p4qly9qjn333nj72sar6nbyclfdw9i9l6rnimswylj0rr9n27"; + }; + + cargoSha256 = "1393mwx6iccnqrry4ia4prcnnjxhp4zjq1s3gzwzfyzsrqyad54g"; + + doCheck = false; + cargoBuildFlags = [ "-p sqlx-cli" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + meta = with lib; { + description = + "SQLx's associated command-line utility for managing databases, migrations, and enabling offline mode with sqlx::query!() and friends."; + homepage = "https://github.com/launchbadge/sqlx"; + license = licenses.asl20; + maintainers = with maintainers; [ greizgh ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index 97da80562905..6ec06fffe21f 100644 --- a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/nixpkgs/pkgs/development/tools/scry/default.nix b/nixpkgs/pkgs/development/tools/scry/default.nix index dcb8087372da..7346ace2ff37 100644 --- a/nixpkgs/pkgs/development/tools/scry/default.nix +++ b/nixpkgs/pkgs/development/tools/scry/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchFromGitHub, crystal_0_31, coreutils, shards, makeWrapper, which }: +{ lib, fetchFromGitHub, crystal_0_35, coreutils, makeWrapper }: +let + crystal = crystal_0_35; -let crystal = crystal_0_31; - -in crystal.buildCrystalPackage rec { +in +crystal.buildCrystalPackage rec { pname = "scry"; - version = "0.8.1"; + version = "unstable-2020-09-02"; # to make it work with crystal 0.35 src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = pname; - rev = "v${version}"; - sha256 = "0ii4k9l3dgm1c9lllc8ni9dar59lrxik0v9iz7gk3d6v62wwnq79"; + # rev = "v${version}"; + rev = "580a1879810a9f5d63d8a0d90fbdaa99d86b58da"; + sha256 = "sha256-WjpkkHfy38wDj/ejXyyMtd5rLfTRoj/7D+SAhRROnbU="; }; # we are already testing for this, so we can ignore the failures @@ -18,14 +20,12 @@ in crystal.buildCrystalPackage rec { rm spec/scry/executable_spec.cr ''; - format = "crystal"; + format = "shards"; nativeBuildInputs = [ makeWrapper ]; shardsFile = ./shards.nix; - crystalBinaries.scry.src = "src/scry.cr"; - postFixup = '' wrapProgram $out/bin/scry \ --prefix PATH : ${lib.makeBinPath [ crystal coreutils ]} diff --git a/nixpkgs/pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch b/nixpkgs/pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch deleted file mode 100644 index 909b790b81a8..000000000000 --- a/nixpkgs/pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/scry/completion_provider.cr b/src/scry/completion_provider.cr -index 29e0d36..f67438c 100644 ---- a/src/scry/completion_provider.cr -+++ b/src/scry/completion_provider.cr -@@ -1,4 +1,5 @@ - require "./log" -+require "compiler/crystal/codegen/target" - require "compiler/crystal/crystal_path" - require "./completion/*" - -diff --git a/src/scry/parse_analyzer.cr b/src/scry/parse_analyzer.cr -index d87eca4..bbe9ed5 100644 ---- a/src/scry/parse_analyzer.cr -+++ b/src/scry/parse_analyzer.cr -@@ -1,4 +1,5 @@ - require "compiler/crystal/syntax" -+require "compiler/crystal/codegen/target" - require "compiler/crystal/crystal_path" - require "./workspace" - require "./text_document" diff --git a/nixpkgs/pkgs/development/tools/sd-local/default.nix b/nixpkgs/pkgs/development/tools/sd-local/default.nix index b7e6021a6d8e..bfe496e3cbf7 100644 --- a/nixpkgs/pkgs/development/tools/sd-local/default.nix +++ b/nixpkgs/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.17"; + version = "1.0.20"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "13krr1zjh544swv4frfapvyi7bm8qf121x6qz9jqbw2cm3mid301"; + sha256 = "sha256-SKBSsS8WPsr5/42IMueLkfJCrOQIO/ODlhTp+xrmQ/4="; }; - vendorSha256 = "1y4nyw7rpgipblxqaps2zsd07cin8d0i0g9gvsnc3vifi6g29s8z"; + vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/so/default.nix b/nixpkgs/pkgs/development/tools/so/default.nix index 99f9cdcd936f..cd52f319bb94 100644 --- a/nixpkgs/pkgs/development/tools/so/default.nix +++ b/nixpkgs/pkgs/development/tools/so/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "so"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "samtay"; repo = pname; rev = "v${version}"; - sha256 = "09zswxxli9f5ayjwmvqhkp1yv2s4f435dcfp4cyia1zddbrh2zck"; + sha256 = "sha256-WAUPB4hhvroE1/8nQcgLVWgGyXcFh7qxdFg6UtQzM9A="; }; - cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; + cargoSha256 = "sha256-wt6ClN9fpEAETk3kYeQRieTXnZQe4JEnQiA8CG4ZLog="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix b/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix index fa25604f9fc5..2e1ca55dad3f 100644 --- a/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix +++ b/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix @@ -1,6 +1,6 @@ # Taken from a past commit of nixpkgs -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; diff --git a/nixpkgs/pkgs/development/tools/stagit/default.nix b/nixpkgs/pkgs/development/tools/stagit/default.nix index 1cabcfe044f3..f74698bb11ea 100644 --- a/nixpkgs/pkgs/development/tools/stagit/default.nix +++ b/nixpkgs/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "stagit"; - version = "0.9.1"; + version = "0.9.4"; src = fetchgit { url = "git://git.codemadness.org/stagit"; rev = version; - sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; + sha256 = "1n0f2pf4gmqnkx4kfn2c79zx2vk4xkg03h7wvdigijkkbhs7a3pm"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "git static site generator"; - homepage = "https://git.codemadness.org/stagit/"; + homepage = "https://git.codemadness.org/stagit/file/README.html"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jb55 ]; diff --git a/nixpkgs/pkgs/development/tools/summon/default.nix b/nixpkgs/pkgs/development/tools/summon/default.nix index 5d851adc5abc..5c811aaf2391 100644 --- a/nixpkgs/pkgs/development/tools/summon/default.nix +++ b/nixpkgs/pkgs/development/tools/summon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: +{ buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: with lib; diff --git a/nixpkgs/pkgs/development/tools/systemfd/default.nix b/nixpkgs/pkgs/development/tools/systemfd/default.nix index c25f0491c672..a1c93f46dcb7 100644 --- a/nixpkgs/pkgs/development/tools/systemfd/default.nix +++ b/nixpkgs/pkgs/development/tools/systemfd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, darwin, buildPlatform +{ lib, fetchgit, darwin, buildPlatform , buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }: ((import ./Cargo.nix { diff --git a/nixpkgs/pkgs/development/tools/textql/default.nix b/nixpkgs/pkgs/development/tools/textql/default.nix index 7dc899c4fc46..7b80192a75e7 100644 --- a/nixpkgs/pkgs/development/tools/textql/default.nix +++ b/nixpkgs/pkgs/development/tools/textql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, sqlite }: +{ lib, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { pname = "textql"; diff --git a/nixpkgs/pkgs/development/tools/the-way/default.nix b/nixpkgs/pkgs/development/tools/the-way/default.nix index 1e88cfcdcc11..e8f52fa83345 100644 --- a/nixpkgs/pkgs/development/tools/the-way/default.nix +++ b/nixpkgs/pkgs/development/tools/the-way/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "0lvkrfszmn594n9qkf518c38c0fwzm32y997wlf28l3hpj6yqddq"; + sha256 = "sha256-OqJceRO1RFOLgNi3SbTKLw62tSfJSO7T2/u0RTX89AM="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; - cargoSha256 = "1aiyfsvmrqcmlw0z1944i9s5g3yxc39na5mf16pb9a4bhw8zcwjr"; + cargoSha256 = "sha256-jTZso61Lyt6jprBxBAhvchgOsgM9y1qBleTxUx1jCnE="; checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ]; cargoParallelTestThreads = false; diff --git a/nixpkgs/pkgs/development/tools/tracy/default.nix b/nixpkgs/pkgs/development/tools/tracy/default.nix index 2dcc32e7389d..23d7f29dff1c 100644 --- a/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj"; + sha256 = "0qfb30k6a8vi8vn65vv927wd9nynwwvc9crbmi7a55kp20hzg06r"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/trellis/default.nix b/nixpkgs/pkgs/development/tools/trellis/default.nix index 6ce1ad9a38aa..8f9acd6c140c 100644 --- a/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { srcs = [ (fetchFromGitHub { - owner = "SymbiFlow"; + owner = "YosysHQ"; repo = "prjtrellis"; rev = "60c05b3f4e71fd78d4fba5c31f9974694245199e"; sha256 = "1k37mxwxv9fpm6xnrxlqqap7zqh2dvgqncphj3asi2rz0kh07ppf"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) (fetchFromGitHub { - owner = "SymbiFlow"; + owner = "YosysHQ"; repo = "prjtrellis-db"; rev = "2cf058e7a3ba36134d21e34823e9b2ecaaceac2c"; sha256 = "1hjaw5jkwiaiznm2z0smy88m2cdz63cd51z4nibajfih7ikvkj6g"; diff --git a/nixpkgs/pkgs/development/tools/unityhub/default.nix b/nixpkgs/pkgs/development/tools/unityhub/default.nix index 9a2c1d72caa3..dc2f80221172 100644 --- a/nixpkgs/pkgs/development/tools/unityhub/default.nix +++ b/nixpkgs/pkgs/development/tools/unityhub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: +{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let version = "2.3.2"; diff --git a/nixpkgs/pkgs/development/tools/vcstool/default.nix b/nixpkgs/pkgs/development/tools/vcstool/default.nix index 65f91b3324f5..f37b17057e59 100644 --- a/nixpkgs/pkgs/development/tools/vcstool/default.nix +++ b/nixpkgs/pkgs/development/tools/vcstool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages +{ lib, python3Packages , git, breezy, subversion }: with python3Packages; diff --git a/nixpkgs/pkgs/development/tools/vend/default.nix b/nixpkgs/pkgs/development/tools/vend/default.nix index cfadf694320e..0b037a9068c1 100644 --- a/nixpkgs/pkgs/development/tools/vend/default.nix +++ b/nixpkgs/pkgs/development/tools/vend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vend"; diff --git a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 23dda32b7232..22ac7a8f2c10 100644 --- a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vultr-cli"; - version = "2.0.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "14cl0rgkk2kw0qyanlm57nbcrnsnnx02ikd6b1mrsviamb6r1lz6"; + sha256 = "sha256-zt12LUKcsu/t2wNunIQhrNOqOABjyfL0MkSEPOQswFM="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/vultr/default.nix b/nixpkgs/pkgs/development/tools/vultr/default.nix index b9ca0febf971..1f101882b5b9 100644 --- a/nixpkgs/pkgs/development/tools/vultr/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "vultr"; diff --git a/nixpkgs/pkgs/development/tools/winpdb/default.nix b/nixpkgs/pkgs/development/tools/winpdb/default.nix index b7eaabe8693f..b5e0701c136e 100644 --- a/nixpkgs/pkgs/development/tools/winpdb/default.nix +++ b/nixpkgs/pkgs/development/tools/winpdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, makeDesktopItem }: +{ lib, fetchurl, pythonPackages, makeDesktopItem }: pythonPackages.buildPythonApplication rec { name = "winpdb-1.4.8"; diff --git a/nixpkgs/pkgs/development/tools/wire/default.nix b/nixpkgs/pkgs/development/tools/wire/default.nix index ff6d1e7ac5d0..a51252f56696 100644 --- a/nixpkgs/pkgs/development/tools/wire/default.nix +++ b/nixpkgs/pkgs/development/tools/wire/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wire"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "google"; repo = "wire"; rev = "v${version}"; - sha256 = "0fYXo/LnxKV/qoaP59XCyEtLLAysZm/WhRdm3RnLdvw="; + sha256 = "sha256-9xjymiyPFMKbysgZULmcBEMI26naUrLMgTA+d7Q+DA0="; }; - vendorSha256 = "ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; + vendorSha256 = "sha256-ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; subPackages = [ "cmd/wire" ]; diff --git a/nixpkgs/pkgs/development/tools/wllvm/default.nix b/nixpkgs/pkgs/development/tools/wllvm/default.nix index a3702f2e3e65..85dbc4f731a1 100644 --- a/nixpkgs/pkgs/development/tools/wllvm/default.nix +++ b/nixpkgs/pkgs/development/tools/wllvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.2.8"; diff --git a/nixpkgs/pkgs/development/tools/ws/default.nix b/nixpkgs/pkgs/development/tools/ws/default.nix index 3026289fec1e..bef8eb906cf1 100644 --- a/nixpkgs/pkgs/development/tools/ws/default.nix +++ b/nixpkgs/pkgs/development/tools/ws/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "ws"; diff --git a/nixpkgs/pkgs/development/tools/yaml2json/default.nix b/nixpkgs/pkgs/development/tools/yaml2json/default.nix index d707caaec5a7..77f884b82b6a 100644 --- a/nixpkgs/pkgs/development/tools/yaml2json/default.nix +++ b/nixpkgs/pkgs/development/tools/yaml2json/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { diff --git a/nixpkgs/pkgs/development/tools/yj/default.nix b/nixpkgs/pkgs/development/tools/yj/default.nix index 68ecaf6479eb..303f325dec18 100644 --- a/nixpkgs/pkgs/development/tools/yj/default.nix +++ b/nixpkgs/pkgs/development/tools/yj/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "yj"; diff --git a/nixpkgs/pkgs/development/tools/ytt/default.nix b/nixpkgs/pkgs/development/tools/ytt/default.nix index 67c8509fd70e..10804980041b 100644 --- a/nixpkgs/pkgs/development/tools/ytt/default.nix +++ b/nixpkgs/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l"; + sha256 = "sha256-GXnhI8nd4ciFd22989ypqGy5pozKJm+dzg8MaDDvuZg="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/web/cog/default.nix b/nixpkgs/pkgs/development/web/cog/default.nix index f1ddaea80d79..a3639e559f1c 100644 --- a/nixpkgs/pkgs/development/web/cog/default.nix +++ b/nixpkgs/pkgs/development/web/cog/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cog"; - version = "0.6.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "igalia"; repo = "cog"; rev = "v${version}"; - sha256 = "0a0zpdki1whm5gb6ycbazvwmm1fz094mkfwjfy4a7zz0pk54h1jw"; + sha256 = "sha256-E6rACj25rdV5dww91PzYEX1r2A9YLNgAVyiYceP1KI8="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/web/flyctl/default.nix b/nixpkgs/pkgs/development/web/flyctl/default.nix index 96893870fa9c..d6c56b0193c8 100644 --- a/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.161"; + version = "0.0.163"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-mM+jo1zKfA8u0IxtruQp4va0f7PldJQJV1/ypF1K0fI="; + sha256 = "sha256-cotv0EQKnrUgpBF7ibOHm8gKg6zXS2i19PTi29PajWc="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-8rzXltsAXF9qIX1BrBwwi+145nQcXjrEBdIXgSgVYRw="; + vendorSha256 = "sha256-KLqfP5XxR/ObnWZK4qACr0XRpCpa6CW7GLhV34i3CNY="; doCheck = false; diff --git a/nixpkgs/pkgs/development/web/lucky-cli/default.nix b/nixpkgs/pkgs/development/web/lucky-cli/default.nix index 5085346e3eb6..df343f30785b 100644 --- a/nixpkgs/pkgs/development/web/lucky-cli/default.nix +++ b/nixpkgs/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "sha256-/DKDg2lJO6PikF7+kbwRX8ClS8rflH8KdrZNx7AR36g="; + sha256 = "sha256-bZWyAZrAYG45fqmEQYXsk8YLKurpppaahOkALAQXGhY="; }; # the integration tests will try to clone a remote repos diff --git a/nixpkgs/pkgs/development/web/newman/node-composition.nix b/nixpkgs/pkgs/development/web/newman/node-composition.nix index 027a981ea57f..64326c6b2160 100644 --- a/nixpkgs/pkgs/development/web/newman/node-composition.nix +++ b/nixpkgs/pkgs/development/web/newman/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/development/web/newman/node-env.nix b/nixpkgs/pkgs/development/web/newman/node-env.nix index 04e3ee097fae..c2b723195b77 100644 --- a/nixpkgs/pkgs/development/web/newman/node-env.nix +++ b/nixpkgs/pkgs/development/web/newman/node-env.nix @@ -1,8 +1,11 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + python = if nodejs ? python then nodejs.python else python2; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise @@ -38,8 +41,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +103,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +164,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +186,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -242,8 +245,8 @@ let if(fs.existsSync("./package-lock.json")) { var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - if(packageLock.lockfileVersion !== 1) { - process.stderr.write("Sorry, I only understand lock file version 1!\n"); + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); process.exit(1); } @@ -344,8 +347,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +364,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +399,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -445,8 +448,8 @@ let ''; } // extraArgs); - # Builds a development shell - buildNodeShell = + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = { name , packageName , version @@ -465,13 +468,13 @@ let let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ + in + stdenv.mkDerivation ({ name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -491,7 +494,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -500,23 +503,44 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin ''; } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; in stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -529,14 +553,15 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeDependencies = lib.makeOverridable buildNodeDependencies; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/nixpkgs/pkgs/development/web/newman/node-packages.nix b/nixpkgs/pkgs/development/web/newman/node-packages.nix index 680be3d499c0..1a34612401b1 100644 --- a/nixpkgs/pkgs/development/web/newman/node-packages.nix +++ b/nixpkgs/pkgs/development/web/newman/node-packages.nix @@ -1,61 +1,61 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "@babel/code-frame-7.10.4" = { + "@babel/code-frame-7.12.11" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.10.4"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz"; - sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/core-7.12.3" = { + "@babel/core-7.12.10" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.3"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz"; - sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz"; + sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.12.5" = { + "@babel/generator-7.12.11" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.5"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz"; - sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz"; + sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA=="; }; }; - "@babel/helper-function-name-7.10.4" = { + "@babel/helper-function-name-7.12.11" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.10.4"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz"; + sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA=="; }; }; - "@babel/helper-get-function-arity-7.10.4" = { + "@babel/helper-get-function-arity-7.12.10" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.10.4"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz"; + sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag=="; }; }; - "@babel/helper-member-expression-to-functions-7.12.1" = { + "@babel/helper-member-expression-to-functions-7.12.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.12.1"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"; - sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; + sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw=="; }; }; "@babel/helper-module-imports-7.12.5" = { @@ -76,22 +76,22 @@ let sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; }; }; - "@babel/helper-optimise-call-expression-7.10.4" = { + "@babel/helper-optimise-call-expression-7.12.10" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.10.4"; + version = "7.12.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; - sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz"; + sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ=="; }; }; - "@babel/helper-replace-supers-7.12.5" = { + "@babel/helper-replace-supers-7.12.11" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.5"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; - sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz"; + sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA=="; }; }; "@babel/helper-simple-access-7.12.1" = { @@ -103,22 +103,22 @@ let sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; }; }; - "@babel/helper-split-export-declaration-7.11.0" = { + "@babel/helper-split-export-declaration-7.12.11" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.11.0"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; - sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz"; + sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g=="; }; }; - "@babel/helper-validator-identifier-7.10.4" = { + "@babel/helper-validator-identifier-7.12.11" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.10.4"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; }; }; "@babel/helpers-7.12.5" = { @@ -139,49 +139,49 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.12.5" = { + "@babel/parser-7.12.11" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.5"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz"; - sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz"; + sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg=="; }; }; - "@babel/template-7.10.4" = { + "@babel/template-7.12.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.10.4"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz"; - sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz"; + sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; }; }; - "@babel/traverse-7.12.5" = { + "@babel/traverse-7.12.12" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.5"; + version = "7.12.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz"; - sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz"; + sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w=="; }; }; - "@babel/types-7.12.6" = { + "@babel/types-7.12.12" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.6"; + version = "7.12.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz"; - sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz"; + sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ=="; }; }; - "@eslint/eslintrc-0.2.1" = { + "@eslint/eslintrc-0.3.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz"; - sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; + sha512 = "1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg=="; }; }; "@istanbuljs/load-nyc-config-1.1.0" = { @@ -220,13 +220,13 @@ let sha512 = "k57fzmAZ2PJGxfOA4SGR05ejorHbVAa/84Hxh/2nAztjNXc4ZjOm9NUIk6/Z6LCrBvJZqjRZbN8e/nROVUPVdg=="; }; }; - "@sinonjs/commons-1.8.1" = { + "@sinonjs/commons-1.8.2" = { name = "_at_sinonjs_slash_commons"; packageName = "@sinonjs/commons"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz"; - sha512 = "892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw=="; + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz"; + sha512 = "sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw=="; }; }; "@sinonjs/fake-timers-6.0.1" = { @@ -238,22 +238,13 @@ let sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA=="; }; }; - "@sinonjs/formatio-5.0.1" = { - name = "_at_sinonjs_slash_formatio"; - packageName = "@sinonjs/formatio"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz"; - sha512 = "KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ=="; - }; - }; - "@sinonjs/samsam-5.2.0" = { + "@sinonjs/samsam-5.3.1" = { name = "_at_sinonjs_slash_samsam"; packageName = "@sinonjs/samsam"; - version = "5.2.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.2.0.tgz"; - sha512 = "CaIcyX5cDsjcW/ab7HposFWzV1kC++4HNsfnEdFJa7cP1QIuILAKV+BgfeqRXhcnSAc76r/Rh/O5C+300BwUIw=="; + url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz"; + sha512 = "1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg=="; }; }; "@sinonjs/text-encoding-0.7.1" = { @@ -319,6 +310,15 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; + "ajv-7.0.4" = { + name = "ajv"; + packageName = "ajv"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-7.0.4.tgz"; + sha512 = "xzzzaqgEQfmuhbhAoqjJ8T/1okb6gAzXn/eQRNpAN1AEUoHJTNF9xCDRTtf/s3SKldtZfa+RJeTs+BQq+eZ/sw=="; + }; + }; "ansi-colors-4.1.1" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -472,6 +472,15 @@ let sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg=="; }; }; + "array-back-5.0.0" = { + name = "array-back"; + packageName = "array-back"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-back/-/array-back-5.0.0.tgz"; + sha512 = "kgVWwJReZWmVuWOQKEOohXKJX+nD02JAZ54D1RRWlv8L0NebauKAaFxACKzB74RTclt1+WNz5KHaLRDAPZbDEw=="; + }; + }; "array-uniq-1.0.3" = { name = "array-uniq"; packageName = "array-uniq"; @@ -508,13 +517,13 @@ let sha512 = "jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="; }; }; - "astral-regex-1.0.0" = { + "astral-regex-2.0.0" = { name = "astral-regex"; packageName = "astral-regex"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; - sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; }; "async-1.0.0" = { @@ -571,15 +580,6 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.10.1" = { - name = "aws4"; - packageName = "aws4"; - version = "1.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz"; - sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; - }; - }; "aws4-1.11.0" = { name = "aws4"; packageName = "aws4"; @@ -598,13 +598,13 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "base64-js-1.3.1" = { + "base64-js-1.5.1" = { name = "base64-js"; packageName = "base64-js"; - version = "1.3.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; }; "bcrypt-pbkdf-1.0.2" = { @@ -616,13 +616,13 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; - "binary-extensions-2.1.0" = { + "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; }; "bl-1.2.3" = { @@ -1030,22 +1030,22 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "commander-5.1.0" = { + "commander-6.2.0" = { name = "commander"; packageName = "commander"; - version = "5.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; - sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; + url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz"; + sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; }; }; - "commander-6.2.0" = { + "commander-6.2.1" = { name = "commander"; packageName = "commander"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz"; - sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; + url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"; + sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; }; }; "comment-parser-0.7.6" = { @@ -1129,13 +1129,13 @@ let sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; - "csv-parse-4.12.0" = { + "csv-parse-4.14.2" = { name = "csv-parse"; packageName = "csv-parse"; - version = "4.12.0"; + version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.12.0.tgz"; - sha512 = "wPQl3H79vWLPI8cgKFcQXl0NBgYYEqVnT1i6/So7OjMpsI540oD7p93r3w6fDSyPvwkTepG05F69/7AViX2lXg=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.14.2.tgz"; + sha512 = "YE2xlTKtM035/94llhgsp9qFQxGi47EkQJ1pZ+mLT/98GpIsbjkMGAb7Rmu9hNxVfYFOLf10hP+rPVqnoccLgw=="; }; }; "cycle-1.0.3" = { @@ -1174,13 +1174,13 @@ let sha1 = "32b4b3105e8861043a6f9ac755d80e542d365b31"; }; }; - "debug-3.2.6" = { + "debug-3.2.7" = { name = "debug"; packageName = "debug"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; "debug-4.2.0" = { @@ -1192,13 +1192,13 @@ let sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; - "debug-4.3.0" = { + "debug-4.3.2" = { name = "debug"; packageName = "debug"; - version = "4.3.0"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz"; - sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; "decamelize-1.2.0" = { @@ -1336,13 +1336,13 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; - "domelementtype-2.0.2" = { + "domelementtype-2.1.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz"; - sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; + sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; }; }; "domhandler-2.4.2" = { @@ -1435,13 +1435,13 @@ let sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="; }; }; - "entities-2.1.0" = { + "entities-2.2.0" = { name = "entities"; packageName = "entities"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; - sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; "es6-error-4.1.1" = { @@ -1489,22 +1489,22 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-7.12.1" = { + "eslint-7.19.0" = { name = "eslint"; packageName = "eslint"; - version = "7.12.1"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz"; - sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.19.0.tgz"; + sha512 = "CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg=="; }; }; - "eslint-plugin-jsdoc-30.7.6" = { + "eslint-plugin-jsdoc-30.7.13" = { name = "eslint-plugin-jsdoc"; packageName = "eslint-plugin-jsdoc"; - version = "30.7.6"; + version = "30.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.6.tgz"; - sha512 = "w18IOiS/9ahKgRfQOuHbce+EQYx3fwIkZhUZDEK+augNlhJkzgTSZkrBkzaflSbFNZ9/Tk4xzUABEaTbsBSzew=="; + url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz"; + sha512 = "YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ=="; }; }; "eslint-plugin-lodash-7.1.0" = { @@ -1570,13 +1570,13 @@ let sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; }; }; - "espree-7.3.0" = { + "espree-7.3.1" = { name = "espree"; packageName = "espree"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz"; - sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw=="; + url = "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; "esprima-4.0.1" = { @@ -1705,13 +1705,13 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "file-entry-cache-5.0.1" = { + "file-entry-cache-6.0.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; - sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; + sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA=="; }; }; "file-set-4.0.1" = { @@ -1804,22 +1804,13 @@ let sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; }; }; - "flat-cache-2.0.1" = { + "flat-cache-3.0.4" = { name = "flat-cache"; packageName = "flat-cache"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"; - sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; - }; - }; - "flatted-2.0.2" = { - name = "flatted"; - packageName = "flatted"; - version = "2.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; - sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; }; "flatted-3.1.0" = { @@ -1849,13 +1840,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "fromentries-1.3.1" = { + "fromentries-1.3.2" = { name = "fromentries"; packageName = "fromentries"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.1.tgz"; - sha512 = "w4t/zm2J+uAcrpeKyW0VmYiIs3aqe/xKQ+2qwazVNZSCklQHhaVjk6XzKw5GtImq5thgL0IVRjGRAOastb08RQ=="; + url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz"; + sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg=="; }; }; "fs-constants-1.0.0" = { @@ -2173,13 +2164,13 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "import-fresh-3.2.2" = { + "import-fresh-3.3.0" = { name = "import-fresh"; packageName = "import-fresh"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz"; - sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw=="; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; }; "imurmurhash-0.1.4" = { @@ -2254,13 +2245,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-core-module-2.0.0" = { + "is-core-module-2.2.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz"; - sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; + sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; }; }; "is-extglob-2.1.1" = { @@ -2479,6 +2470,15 @@ let sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; }; }; + "js-yaml-3.14.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; + }; + }; "js2xmlparser-4.0.1" = { name = "js2xmlparser"; packageName = "js2xmlparser"; @@ -2569,6 +2569,15 @@ let sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; + "json-schema-traverse-1.0.0" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; + }; + }; "json-stable-stringify-without-jsonify-1.0.1" = { name = "json-stable-stringify-without-jsonify"; packageName = "json-stable-stringify-without-jsonify"; @@ -2587,13 +2596,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json5-2.1.3" = { + "json5-2.2.0" = { name = "json5"; packageName = "json5"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz"; - sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; }; "jsonparse-1.3.1" = { @@ -2713,15 +2722,6 @@ let sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; }; }; - "lodash-4.17.19" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz"; - sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="; - }; - }; "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; @@ -2857,6 +2857,15 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; "make-dir-1.3.0" = { name = "make-dir"; packageName = "make-dir"; @@ -2902,13 +2911,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.2.0" = { + "marked-1.2.7" = { name = "marked"; packageName = "marked"; - version = "1.2.0"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.0.tgz"; - sha512 = "tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz"; + sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA=="; }; }; "mdurl-1.0.1" = { @@ -2920,13 +2929,13 @@ let sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; }; }; - "mime-db-1.44.0" = { + "mime-db-1.45.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.44.0"; + version = "1.45.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; - sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; + sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; }; }; "mime-format-2.0.0" = { @@ -2938,13 +2947,13 @@ let sha1 = "e29f8891e284d78270246f0050d6834bdbbe1332"; }; }; - "mime-types-2.1.27" = { + "mime-types-2.1.28" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.27"; + version = "2.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; - sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; + sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; }; }; "minimatch-3.0.4" = { @@ -3010,6 +3019,15 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; "nanoid-3.1.12" = { name = "nanoid"; packageName = "nanoid"; @@ -3046,13 +3064,13 @@ let sha512 = "bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A=="; }; }; - "nock-13.0.4" = { + "nock-13.0.7" = { name = "nock"; packageName = "nock"; - version = "13.0.4"; + version = "13.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/nock/-/nock-13.0.4.tgz"; - sha512 = "alqTV8Qt7TUbc74x1pKRLSENzfjp4nywovcJgi/1aXDiUxXdt7TkruSTF5MDWPP7UoPVgea4F9ghVdmX0xxnSA=="; + url = "https://registry.npmjs.org/nock/-/nock-13.0.7.tgz"; + sha512 = "WBz73VYIjdbO6BwmXODRQLtn7B5tldA9pNpWJe5QTtTEscQlY5KXU4srnGzBOK2fWakkXj69gfTnXGzmrsaRWw=="; }; }; "node-oauth1-1.3.0" = { @@ -3172,13 +3190,13 @@ let sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; - "p-limit-3.0.2" = { + "p-limit-3.1.0" = { name = "p-limit"; packageName = "p-limit"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz"; - sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; }; "p-locate-3.0.0" = { @@ -3325,13 +3343,13 @@ let sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA=="; }; }; - "pathval-1.1.0" = { + "pathval-1.1.1" = { name = "pathval"; packageName = "pathval"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; - sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; + url = "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz"; + sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; }; }; "performance-now-2.1.0" = { @@ -3379,22 +3397,22 @@ let sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; - "postman-collection-3.6.8" = { + "postman-collection-3.6.9" = { name = "postman-collection"; packageName = "postman-collection"; - version = "3.6.8"; + version = "3.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.8.tgz"; - sha512 = "TNPaK2dpVRhttUFo/WN0ReopXEtuSQMktwcvwJbQ0z8K+5hftvyx2ia40xgg9qFl/Ra78qoNTUmLL1s3lRqLMg=="; + url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.9.tgz"; + sha512 = "R3A4tM/Ll6ekkfsXqqefR2r/jSyubXc9Pa/DQSbocEUKzdT3QMMb0QR5SHNjDuR1qE+bywC5dyD2FO2+DFXJ6w=="; }; }; - "postman-collection-transformer-3.3.3" = { + "postman-collection-transformer-4.0.0" = { name = "postman-collection-transformer"; packageName = "postman-collection-transformer"; - version = "3.3.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/postman-collection-transformer/-/postman-collection-transformer-3.3.3.tgz"; - sha512 = "Ra0hfljwB6xnGJ7a638K0TkXTf5BuwGNo1Ahpa9ECehOTOlUFisE8dqX5VZl04QGbpvN5nmr0rwrtLXtK53Abg=="; + url = "https://registry.npmjs.org/postman-collection-transformer/-/postman-collection-transformer-4.0.0.tgz"; + sha512 = "AGNGiSvMR7uJpuf2PpYbteYTsE/xsutyuUTaIRCcBhw8h0PS4vyQHua15uNB+PRaNsV8wKFm30T6z23yUg0rKg=="; }; }; "postman-jsdoc-theme-0.0.3" = { @@ -3406,40 +3424,40 @@ let sha1 = "60e4fbf3b2175f772520b3c978c07a8bd32b5829"; }; }; - "postman-request-2.88.1-postman.27" = { + "postman-request-2.88.1-postman.28" = { name = "postman-request"; packageName = "postman-request"; - version = "2.88.1-postman.27"; + version = "2.88.1-postman.28"; src = fetchurl { - url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.27.tgz"; - sha512 = "4Qc7p3/cbp5S4Q6LcOzJ+K5N7loWDKjW0S9hj8M2AMJDUVcFUbdgvQb6ZfTERz2+34xP9ByCy7VhdnNCATe/bA=="; + url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.28.tgz"; + sha512 = "QjhC9tIuHZTlYJafzCz7u+Nq57NgtOhJmt94RjcNyzpIts1QbihmAgYm0OhNoqcOIU91sNi2aYw2PCyAJR3kcQ=="; }; }; - "postman-runtime-7.26.8" = { + "postman-runtime-7.26.10" = { name = "postman-runtime"; packageName = "postman-runtime"; - version = "7.26.8"; + version = "7.26.10"; src = fetchurl { - url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.8.tgz"; - sha512 = "ZMUZ7mQ2SMOX/C/ntgx2SAfRt3VV6wOy+aLyWbAqpQPo5Jfodxwv9QhxGj3S2km+IYzO6BT1luzE8X8fr2UafA=="; + url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.10.tgz"; + sha512 = "rYrSF/G0FoWHvOfbEuKVAgKYU8Nl6ow4+iYfdpRfJuTNcrHmfsdumzzdRJ8n0ZY0awAyrrtcAUr/NvSfdof3qA=="; }; }; - "postman-sandbox-4.0.0" = { + "postman-sandbox-4.0.1" = { name = "postman-sandbox"; packageName = "postman-sandbox"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-4.0.0.tgz"; - sha512 = "0j1VCDa5MHMTfZqv2XSYUyn+hgT9izoRdGFAvjtHCH+i+2TP1KxqXzjxXzOdx1pt26wpl9APdJ2hKKFpx9UlrQ=="; + url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-4.0.1.tgz"; + sha512 = "m0Jw95y5kzSdCY3yWf/hZlkqYxRyBG5sxqiI2D/48nKiHnYLkyMSHErRDJbMj7K4tjXBXn+BKWpWnRsf+iBdlw=="; }; }; - "postman-url-encoder-3.0.0" = { + "postman-url-encoder-3.0.1" = { name = "postman-url-encoder"; packageName = "postman-url-encoder"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.0.tgz"; - sha512 = "bk5wus5/5Ei9pbh+sQXaAxS5n4ZwiNAaIA8VBvRcXP6QyKcue2yF6xk1HqdtaZoH1G8+6509SVeOBojoFQ7nrA=="; + url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.1.tgz"; + sha512 = "dMPqXnkDlstM2Eya+Gw4MIGWEan8TzldDcUKZIhZUsJ/G5JjubfQPhFhVWKzuATDMvwvrWbSjF+8VmAvbu6giw=="; }; }; "prelude-ls-1.2.1" = { @@ -3712,6 +3730,15 @@ let sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; + "require-from-string-2.0.2" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; + }; + }; "require-main-filename-2.0.0" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -3730,13 +3757,13 @@ let sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ=="; }; }; - "resolve-1.18.1" = { + "resolve-1.19.0" = { name = "resolve"; packageName = "resolve"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz"; - sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; + sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; }; }; "resolve-from-4.0.0" = { @@ -3766,15 +3793,6 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; - "rimraf-2.6.3" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; - sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; - }; - }; "rimraf-3.0.2" = { name = "rimraf"; packageName = "rimraf"; @@ -3856,13 +3874,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.2" = { + "semver-7.3.4" = { name = "semver"; packageName = "semver"; - version = "7.3.2"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; - sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; + sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; }; }; "serialised-error-1.1.3" = { @@ -3946,31 +3964,31 @@ let sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; - "sinon-9.2.1" = { + "sinon-9.2.4" = { name = "sinon"; packageName = "sinon"; - version = "9.2.1"; + version = "9.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-9.2.1.tgz"; - sha512 = "naPfsamB5KEE1aiioaoqJ6MEhdUs/2vtI5w1hPAXX/UwvoPjXcwh1m5HiKx0HGgKR8lQSoFIgY5jM6KK8VrS9w=="; + url = "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz"; + sha512 = "zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg=="; }; }; - "slice-ansi-2.1.0" = { + "slice-ansi-4.0.0" = { name = "slice-ansi"; packageName = "slice-ansi"; - version = "2.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; }; }; - "sort-array-4.1.2" = { + "sort-array-4.1.3" = { name = "sort-array"; packageName = "sort-array"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/sort-array/-/sort-array-4.1.2.tgz"; - sha512 = "G5IUpM+OcVnyaWHMv84Y/RQYiFQoSu6eUtJZu840iM6nR7zeY/eOGny2epkr5VKqCGDkOj3UBzOluDZ7hFpljA=="; + url = "https://registry.npmjs.org/sort-array/-/sort-array-4.1.3.tgz"; + sha512 = "6auiM0DNob/zF+7Ae/SM4BFL5D7DPK/HVcllhVu5V+FgoCPs0A6b6ZwJDuvJpXQgFpxqLZUOD2kdxqO4Z59dkg=="; }; }; "source-map-0.5.7" = { @@ -4018,13 +4036,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.6" = { + "spdx-license-ids-3.0.7" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; - sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; }; }; "split-ca-1.0.1" = { @@ -4270,13 +4288,13 @@ let sha1 = "b6f9a900d496a57f02408f22198c109dda063041"; }; }; - "table-5.4.6" = { + "table-6.0.7" = { name = "table"; packageName = "table"; - version = "5.4.6"; + version = "6.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; - sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; + url = "https://registry.npmjs.org/table/-/table-6.0.7.tgz"; + sha512 = "rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g=="; }; }; "table-layout-0.4.5" = { @@ -4522,13 +4540,13 @@ let sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; }; }; - "uglify-js-3.11.5" = { + "uglify-js-3.12.6" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.5"; + version = "3.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz"; - sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz"; + sha512 = "aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw=="; }; }; "underscore-1.10.2" = { @@ -4549,13 +4567,13 @@ let sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; }; }; - "uri-js-4.4.0" = { + "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; - sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; "utcstring-0.1.0" = { @@ -4729,15 +4747,6 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "write-1.0.3" = { - name = "write"; - packageName = "write"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz"; - sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; - }; - }; "write-file-atomic-3.0.3" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -4801,13 +4810,13 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-4.0.0" = { + "y18n-4.0.1" = { name = "y18n"; packageName = "y18n"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; + sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; }; }; "yallist-2.1.2" = { @@ -4819,6 +4828,15 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -4864,55 +4882,67 @@ let sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA=="; }; }; + "yocto-queue-0.1.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; + }; + }; }; in { newman = nodeEnv.buildNodePackage { name = "newman"; packageName = "newman"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/newman/-/newman-5.2.1.tgz"; - sha512 = "kEuTMQCiORHZFx92sPVih8RHsJ40JxgxvlsrUe6MFXLQg2/UrO1KaUQCDabTy41tOu0a+dx6Mtg+x+uK1rCPcA=="; + url = "https://registry.npmjs.org/newman/-/newman-5.2.2.tgz"; + sha512 = "aRkh8eeRkKBlwxwBSdYQFZVLvSNMfRDmwPUfddlYR6PwZVKwukmoJmo9QTkRmo6vehgMmt2RTVkfwIIp73X1gg=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.12.3" // { + sources."@babel/code-frame-7.12.11" + (sources."@babel/core-7.12.10" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.2" + sources."ms-2.1.2" sources."semver-5.7.1" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.5" // { + (sources."@babel/generator-7.12.11" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-function-name-7.12.11" + sources."@babel/helper-get-function-arity-7.12.10" + sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-optimise-call-expression-7.12.10" + sources."@babel/helper-replace-supers-7.12.11" sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.5" - sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.12.5" // { + sources."@babel/parser-7.12.11" + sources."@babel/template-7.12.7" + (sources."@babel/traverse-7.12.12" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.2" sources."globals-11.12.0" + sources."ms-2.1.2" ]; }) - sources."@babel/types-7.12.6" - (sources."@eslint/eslintrc-0.2.1" // { + sources."@babel/types-7.12.12" + (sources."@eslint/eslintrc-0.3.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) (sources."@istanbuljs/load-nyc-config-1.1.0" // { @@ -4926,10 +4956,9 @@ in sources."@istanbuljs/schema-0.1.2" sources."@postman/form-data-3.1.1" sources."@postman/tunnel-agent-0.6.3" - sources."@sinonjs/commons-1.8.1" + sources."@sinonjs/commons-1.8.2" sources."@sinonjs/fake-timers-6.0.1" - sources."@sinonjs/formatio-5.0.1" - sources."@sinonjs/samsam-5.2.0" + sources."@sinonjs/samsam-5.3.1" sources."@sinonjs/text-encoding-0.7.1" sources."@ungap/promise-all-settled-1.1.2" sources."JSONStream-1.3.2" @@ -4954,15 +4983,15 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assertion-error-1.1.0" - sources."astral-regex-1.0.0" + sources."astral-regex-2.0.0" sources."async-3.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.1" + sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" (sources."bl-1.2.3" // { dependencies = [ (sources."readable-stream-2.3.7" // { @@ -5037,7 +5066,7 @@ in sources."array-back-2.0.0" ]; }) - sources."commander-6.2.0" + sources."commander-6.2.1" sources."comment-parser-0.7.6" sources."common-sequence-2.0.0" sources."commondir-1.0.1" @@ -5061,12 +5090,12 @@ in }) sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" - sources."csv-parse-4.12.0" + sources."csv-parse-4.14.2" sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."date-format-0.0.2" sources."dbug-0.4.2" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."decamelize-1.2.0" sources."deep-eql-3.0.1" sources."deep-extend-0.6.0" @@ -5097,8 +5126,8 @@ in sources."doctrine-3.0.0" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.2" - sources."entities-2.1.0" + sources."domelementtype-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" @@ -5108,7 +5137,9 @@ in (sources."editorconfig-0.15.3" // { dependencies = [ sources."commander-2.20.3" + sources."lru-cache-4.1.5" sources."semver-5.7.1" + sources."yallist-2.1.2" ]; }) sources."emoji-regex-8.0.0" @@ -5118,20 +5149,22 @@ in sources."es6-error-4.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.12.1" // { + (sources."eslint-7.19.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."debug-4.3.0" + sources."debug-4.3.2" sources."has-flag-4.0.0" + sources."ms-2.1.2" sources."supports-color-7.2.0" ]; }) - (sources."eslint-plugin-jsdoc-30.7.6" // { + (sources."eslint-plugin-jsdoc-30.7.13" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) sources."eslint-plugin-lodash-7.1.0" @@ -5144,7 +5177,7 @@ in ]; }) sources."eslint-visitor-keys-2.0.0" - (sources."espree-7.3.0" // { + (sources."espree-7.3.1" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" ]; @@ -5170,7 +5203,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."file-entry-cache-5.0.1" + sources."file-entry-cache-6.0.0" sources."file-set-4.0.1" sources."file-type-3.9.0" sources."filesize-6.1.0" @@ -5188,15 +5221,11 @@ in }) sources."find-up-5.0.0" sources."flat-5.0.2" - (sources."flat-cache-2.0.1" // { - dependencies = [ - sources."flatted-2.0.2" - ]; - }) + sources."flat-cache-3.0.4" sources."flatted-3.1.0" sources."foreground-child-2.0.0" sources."forever-agent-0.6.1" - sources."fromentries-1.3.1" + sources."fromentries-1.3.2" sources."fs-constants-1.0.0" sources."fs-then-native-2.0.0" sources."fs.realpath-1.0.0" @@ -5234,7 +5263,7 @@ in sources."httpreq-0.4.24" sources."iconv-lite-0.6.2" sources."ignore-4.0.6" - (sources."import-fresh-3.2.2" // { + (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -5255,7 +5284,7 @@ in sources."interpret-1.4.0" sources."ip-regex-2.1.0" sources."is-binary-path-2.1.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -5277,7 +5306,6 @@ in (sources."istanbul-lib-processinfo-2.0.2" // { dependencies = [ sources."make-dir-3.1.0" - sources."rimraf-3.0.2" sources."semver-6.3.0" ]; }) @@ -5291,13 +5319,14 @@ in }) (sources."istanbul-lib-source-maps-4.0.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) sources."istanbul-reports-3.0.2" sources."js-sha512-0.8.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.14.1" sources."js2xmlparser-4.0.1" sources."jsbn-0.1.1" (sources."jsdoc-3.6.6" // { @@ -5317,7 +5346,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.3" + sources."json5-2.2.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" (sources."junit-report-builder-2.1.0" // { @@ -5354,7 +5383,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."lru-cache-4.1.5" + sources."lru-cache-6.0.0" sources."make-dir-1.3.0" (sources."markdown-it-10.0.0" // { dependencies = [ @@ -5362,11 +5391,11 @@ in ]; }) sources."markdown-it-anchor-5.3.0" - sources."marked-1.2.0" + sources."marked-1.2.7" sources."mdurl-1.0.1" - sources."mime-db-1.44.0" + sources."mime-db-1.45.0" sources."mime-format-2.0.0" - sources."mime-types-2.1.27" + sources."mime-types-2.1.28" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" @@ -5376,17 +5405,20 @@ in sources."debug-4.2.0" sources."escape-string-regexp-4.0.0" sources."has-flag-4.0.0" + sources."js-yaml-3.14.0" + sources."ms-2.1.2" sources."supports-color-7.2.0" ]; }) - sources."ms-2.1.2" + sources."ms-2.1.3" sources."nanoid-3.1.12" sources."natural-compare-1.4.0" sources."neo-async-2.6.2" sources."nise-4.0.4" - (sources."nock-13.0.4" // { + (sources."nock-13.0.7" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) sources."node-oauth1-1.3.0" @@ -5404,7 +5436,6 @@ in sources."make-dir-3.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" - sources."rimraf-3.0.2" sources."semver-6.3.0" sources."wrap-ansi-6.2.0" sources."yargs-15.4.1" @@ -5418,7 +5449,7 @@ in sources."object-to-spawn-args-2.0.0" sources."once-1.4.0" sources."optionator-0.9.1" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-map-3.0.0" sources."p-try-2.2.0" @@ -5443,7 +5474,7 @@ in sources."isarray-0.0.1" ]; }) - sources."pathval-1.1.0" + sources."pathval-1.1.1" sources."performance-now-2.1.0" sources."picomatch-2.2.2" sources."pify-3.0.0" @@ -5460,27 +5491,25 @@ in sources."supports-color-6.1.0" ]; }) - sources."postman-collection-3.6.8" - (sources."postman-collection-transformer-3.3.3" // { + sources."postman-collection-3.6.9" + (sources."postman-collection-transformer-4.0.0" // { dependencies = [ - sources."commander-5.1.0" - sources."lodash-4.17.19" + sources."commander-6.2.0" ]; }) sources."postman-jsdoc-theme-0.0.3" - (sources."postman-request-2.88.1-postman.27" // { + (sources."postman-request-2.88.1-postman.28" // { dependencies = [ sources."tough-cookie-2.5.0" ]; }) - (sources."postman-runtime-7.26.8" // { + (sources."postman-runtime-7.26.10" // { dependencies = [ sources."async-2.6.3" - sources."aws4-1.10.1" ]; }) - sources."postman-sandbox-4.0.0" - sources."postman-url-encoder-3.0.0" + sources."postman-sandbox-4.0.1" + sources."postman-url-encoder-3.0.1" sources."prelude-ls-1.2.1" sources."pretty-ms-7.0.1" sources."process-nextick-args-2.0.1" @@ -5518,18 +5547,19 @@ in sources."regextras-0.7.1" sources."release-zalgo-1.0.0" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" sources."requizzle-0.2.3" - sources."resolve-1.18.1" + sources."resolve-1.19.0" sources."resolve-from-5.0.0" sources."ret-0.1.15" - sources."rimraf-2.6.3" + sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sanitize-html-1.20.1" sources."sax-1.2.4" - sources."semver-7.3.2" + sources."semver-7.3.4" (sources."serialised-error-1.1.3" // { dependencies = [ sources."stack-trace-0.0.9" @@ -5543,19 +5573,22 @@ in sources."shelljs-0.8.4" sources."sigmund-1.0.1" sources."signal-exit-3.0.3" - (sources."sinon-9.2.1" // { + (sources."sinon-9.2.4" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; }) - (sources."slice-ansi-2.1.0" // { + (sources."slice-ansi-4.0.0" // { dependencies = [ - sources."is-fullwidth-code-point-2.0.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) - (sources."sort-array-4.1.2" // { + (sources."sort-array-4.1.3" // { dependencies = [ + sources."array-back-5.0.0" sources."typical-6.0.1" ]; }) @@ -5563,13 +5596,12 @@ in (sources."spawn-wrap-2.0.0" // { dependencies = [ sources."make-dir-3.1.0" - sources."rimraf-3.0.2" sources."semver-6.3.0" ]; }) sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-ca-1.0.1" sources."sprintf-js-1.0.3" sources."srcset-1.0.0" @@ -5590,13 +5622,10 @@ in sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" sources."symbol-0.3.1" - (sources."table-5.4.6" // { + (sources."table-6.0.7" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ajv-7.0.4" + sources."json-schema-traverse-1.0.0" ]; }) (sources."table-layout-0.4.5" // { @@ -5639,9 +5668,9 @@ in sources."typedarray-to-buffer-3.1.5" sources."typical-2.6.1" sources."uc.micro-1.0.6" - sources."uglify-js-3.11.5" + sources."uglify-js-3.12.6" sources."underscore-1.7.0" - sources."uri-js-4.4.0" + sources."uri-js-4.4.1" sources."utcstring-0.1.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -5679,11 +5708,6 @@ in ]; }) sources."wrappy-1.0.2" - (sources."write-1.0.3" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) sources."write-file-atomic-3.0.3" (sources."xml2js-0.4.23" // { dependencies = [ @@ -5693,8 +5717,8 @@ in sources."xmlbuilder-15.1.1" sources."xmlcreate-2.0.3" sources."xtend-4.0.2" - sources."y18n-4.0.0" - sources."yallist-2.1.2" + sources."y18n-4.0.1" + sources."yallist-4.0.0" (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -5716,11 +5740,12 @@ in sources."decamelize-4.0.0" ]; }) + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { description = "Command-line companion utility for Postman"; - homepage = https://github.com/postmanlabs/newman; + homepage = "https://github.com/postmanlabs/newman"; license = "Apache-2.0"; }; production = false; diff --git a/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index 1af4024400a0..68232088fa9b 100644 --- a/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -132,7 +132,7 @@ in passthru.updateScript = import ./update.nix { inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell; - inherit (stdenv) lib; + inherit lib; inherit majorVersion; }; diff --git a/nixpkgs/pkgs/development/web/nodejs/v10.nix b/nixpkgs/pkgs/development/web/nodejs/v10.nix index fd1127028bcf..495ac311b88d 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v10.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v10.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.23.1"; - sha256 = "1ypddif8jc8qrw9n1f8zbpknjcbnjc9xhpm57hc5nqbrmzsidal8"; + version = "10.23.3"; + sha256 = "13za06bz17k71gcxyrx41l2j8al1kr3j627b8m7kqrf3l7rdfnsi"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/nixpkgs/pkgs/development/web/nodejs/v12.nix b/nixpkgs/pkgs/development/web/nodejs/v12.nix index 7afa3bfb6b5b..9c5975a6e490 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.20.1"; - sha256 = "0lqq6a2byw4qmig98j45gqnl0593xdhx1dr9k7x2nnvhblrfw3p0"; + version = "12.20.2"; + sha256 = "0g3dxip7b5j7fzkw4b82ln93fphxn1zpdizbj1ikjv3hy00dc6ln"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/nixpkgs/pkgs/development/web/nodejs/v14.nix b/nixpkgs/pkgs/development/web/nodejs/v14.nix index 410be6a2495d..ee8ea72c05ea 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.15.4"; - sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd"; + version = "14.15.5"; + sha256 = "0nv576mlmnf8pfs6yn7vsvwyg0a0xvs7m9pm4k131zjqx501v6z1"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/nixpkgs/pkgs/development/web/nodejs/v15.nix b/nixpkgs/pkgs/development/web/nodejs/v15.nix index 5f69cd59f541..2c2634959bdf 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v15.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.6.0"; - sha256 = "1liqkh1gz1h37fln8xr5krbs2mqjn38n3sws2ydvk84wrpfq3prr"; + version = "15.8.0"; + sha256 = "1a9h88zdzk98k618jascfrivq3v51viw60sfyxn0ci0l33vf4fp2"; } diff --git a/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix b/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix index 4964056055e7..beac26c5f007 100644 --- a/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix +++ b/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix @@ -1,43 +1,34 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "@sinonjs/commons-1.7.1" = { + "@sinonjs/commons-1.8.2" = { name = "_at_sinonjs_slash_commons"; packageName = "@sinonjs/commons"; - version = "1.7.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.1.tgz"; - sha512 = "Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ=="; + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz"; + sha512 = "sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw=="; }; }; - "@sinonjs/fake-timers-6.0.0" = { + "@sinonjs/fake-timers-6.0.1" = { name = "_at_sinonjs_slash_fake-timers"; packageName = "@sinonjs/fake-timers"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.0.tgz"; - sha512 = "atR1J/jRXvQAb47gfzSK8zavXy7BcpnYq21ALon0U99etu99vsir0trzIO3wpeLtW+LLVY6X7EkfVTbjGSH8Ww=="; + url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz"; + sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA=="; }; }; - "@sinonjs/formatio-5.0.1" = { - name = "_at_sinonjs_slash_formatio"; - packageName = "@sinonjs/formatio"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz"; - sha512 = "KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ=="; - }; - }; - "@sinonjs/samsam-5.0.3" = { + "@sinonjs/samsam-5.3.1" = { name = "_at_sinonjs_slash_samsam"; packageName = "@sinonjs/samsam"; - version = "5.0.3"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.0.3.tgz"; - sha512 = "QucHkc2uMJ0pFGjJUDP3F9dq5dx8QIaqISl9QgwLOh6P9yv877uONPGXh/OH/0zmM3tW1JjuJltAZV2l7zU+uQ=="; + url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz"; + sha512 = "1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg=="; }; }; "@sinonjs/text-encoding-0.7.1" = { @@ -49,13 +40,22 @@ let sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ=="; }; }; + "@ungap/promise-all-settled-1.1.2" = { + name = "_at_ungap_slash_promise-all-settled"; + packageName = "@ungap/promise-all-settled"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"; + sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; + }; + }; "JSONStream-1.3.5" = { name = "JSONStream"; packageName = "JSONStream"; version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"; - sha512 = "2lyrcp8yh09p0f000ng5q5r5xwm464cx60mnyjlaw9f0as75ifl27a22cyk61zpa7zilg9k5crblj9lbbnnsi42ndymbwcqsfwaps0k"; + sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; }; }; "abbrev-1.1.1" = { @@ -64,16 +64,16 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "acorn-7.1.1" = { + "acorn-7.4.1" = { name = "acorn"; packageName = "acorn"; - version = "7.1.1"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz"; - sha512 = "29c8jlhwnfbnqa2s1v593lcpksv4hl56lywss4gy6w0mwmhx4ydf2n7var8bhcf39nm9asph0ybnf1hkw0s0j91qi7r99ir01v7pmv9"; + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; "acorn-node-1.8.2" = { @@ -82,16 +82,16 @@ let version = "1.8.2"; src = fetchurl { url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz"; - sha512 = "3ja2k5v6p53920jdprvx0p83ycv68fdphfdmr72xmvg2450i37chn1f7mlvfxv4q8i14ypbnsbbyirii033qa6jkvcg5fa3r5z7wszj"; + sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; }; }; - "acorn-walk-7.1.1" = { + "acorn-walk-7.2.0" = { name = "acorn-walk"; packageName = "acorn-walk"; - version = "7.1.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz"; - sha512 = "10s7pz9c2jqw7sjmkkwfb6kyyfgb7qqpmz2gc0fq9phhmfknyw029x1jbw0cwi47wbacpwkw65601arnid2l95lmz0xbzv6ddilznf1"; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; }; "adm-zip-0.2.1" = { @@ -103,22 +103,13 @@ let sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; }; }; - "ajv-6.12.0" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g"; - }; - }; - "ansi-colors-3.2.3" = { + "ansi-colors-4.1.1" = { name = "ansi-colors"; packageName = "ansi-colors"; - version = "3.2.3"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; - sha512 = "2gpv8bq9jq550ygnnm5srza0w0lfg8mr8z39702l0rgxhf35sxmdzxpppvwcp50rpk0dgjz516nbkygm0fk4675kb9qsgb5x35cfh9c"; + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; "ansi-regex-3.0.0" = { @@ -136,7 +127,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; "ansi-styles-3.2.1" = { @@ -145,7 +136,16 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "ansi-styles-4.3.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; "anymatch-3.1.1" = { @@ -154,7 +154,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; - sha512 = "2776jrfn8kh9r6qhz6s43znnwvqmbqrjsch99hdv21j53sj4njyjhrya67drxk8y7hvi28mjvdjj277jy4qd2zfayrjli3cdbdkkkwq"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; }; }; "argparse-1.0.10" = { @@ -163,16 +163,16 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; - "asap-2.0.6" = { - name = "asap"; - packageName = "asap"; - version = "2.0.6"; + "array-filter-1.0.0" = { + name = "array-filter"; + packageName = "array-filter"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; - sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + url = "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz"; + sha1 = "baf79e62e6ef4c2a4c0b831232daffec251f9d83"; }; }; "asn1-0.1.11" = { @@ -184,22 +184,13 @@ let sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; - "asn1-0.2.4" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g"; - }; - }; - "asn1.js-4.10.1" = { + "asn1.js-5.4.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.10.1"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; - sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"; + sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; }; }; "assert-1.5.0" = { @@ -208,7 +199,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; - sha512 = "1n2xh5m359gm4my50j2206n32q2h044lqrl8h122gjn41fizlrh32j1lj7wqfix1iblyvi7zvdgvzbf97f840lr17vfk8ph1imj0fqh"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; }; }; "assert-plus-0.1.5" = { @@ -220,15 +211,6 @@ let sha1 = "ee74009413002d84cec7219c6ac811812e723160"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -238,13 +220,13 @@ let sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; }; }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; + "available-typed-arrays-1.0.2" = { + name = "available-typed-arrays"; + packageName = "available-typed-arrays"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz"; + sha512 = "XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ=="; }; }; "aws-sign2-0.5.0" = { @@ -256,24 +238,6 @@ let sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; }; }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; - }; - }; - "aws4-1.9.1" = { - name = "aws4"; - packageName = "aws4"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; - sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0"; - }; - }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -283,40 +247,40 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "base64-js-1.3.1" = { + "base64-js-1.5.1" = { name = "base64-js"; packageName = "base64-js"; - version = "1.3.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; }; - "bcrypt-pbkdf-1.0.2" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.2"; + "binary-extensions-2.2.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; }; - "binary-extensions-2.0.0" = { - name = "binary-extensions"; - packageName = "binary-extensions"; - version = "2.0.0"; + "bn.js-4.11.9" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha512 = "2izzpdg2m0av5pzbv1zyjfi15ddz5yk1d4h9cilzc8z6pzq5abcicnm2xx4b2jdrjk2l4h3zfawsxhnbzlgvlv4700q5930k796s69y"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz"; + sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="; }; }; - "bn.js-4.11.8" = { + "bn.js-5.1.3" = { name = "bn.js"; packageName = "bn.js"; - version = "4.11.8"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; - sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz"; + sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ=="; }; }; "boom-0.4.2" = { @@ -334,7 +298,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; "braces-3.0.2" = { @@ -343,7 +307,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "38dmhgggv4r7xf3chli957yj4gzfv9xhif8zzaqjnxavkrs1qbmj9m84vxh42n1jl9sddy16ryp4g93l1p8dvrc1pbcvk2ippwadjvg"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; "brorand-1.1.0" = { @@ -361,16 +325,16 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz"; - sha512 = "1cav0iv5irfvilx6x14zbxil5m012hxan16cgyp9yjs6fqfg6fny2cdjimfwgil9ma8n4w8g8wv4yn843sz257p44vkbaz8qn1jxdks"; + sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA=="; }; }; - "browser-resolve-1.11.3" = { + "browser-resolve-2.0.0" = { name = "browser-resolve"; packageName = "browser-resolve"; - version = "1.11.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz"; - sha512 = "1slq1pnm0b2903am1rl17iczlsl08sq4rckkr5fgkchgzfac13kiibwdk08yy2m62lgir8dmj9d61vil8q0vrm1d2mzw1qn2vaf443v"; + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz"; + sha512 = "7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ=="; }; }; "browser-stdout-1.3.1" = { @@ -379,7 +343,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; - sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; + sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; "browserify-aes-1.2.0" = { @@ -388,7 +352,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; - sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; }; }; "browserify-cipher-1.0.1" = { @@ -397,7 +361,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; - sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; }; "browserify-des-1.0.2" = { @@ -406,25 +370,25 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; - sha512 = "3j1gv3firnsbjppm47ldxbav9rmh3plq026zn728wvhgf19i4r7kxzyyj7hpibhjv61lcm9i4b869yy90c8hfj7w8rmr17p2zbhwah6"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; - "browserify-rsa-4.0.1" = { + "browserify-rsa-4.1.0" = { name = "browserify-rsa"; packageName = "browserify-rsa"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; + sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; }; }; - "browserify-sign-4.0.4" = { + "browserify-sign-4.2.1" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.0.4"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; - sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; }; }; "browserify-zlib-0.2.0" = { @@ -433,16 +397,16 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "buffer-5.5.0" = { + "buffer-5.2.1" = { name = "buffer"; packageName = "buffer"; - version = "5.5.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz"; - sha512 = "9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz"; + sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; "buffer-from-1.1.1" = { @@ -451,7 +415,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "3c0m16i3fdv3vlq2zz8dakrnhqvs16gvggj485f91fiaa5v0p7pyhamcdw5fggr7djzd8nshmvz4hgbp7714smqxlld2an28q8if1ri"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "buffer-xor-1.0.3" = { @@ -478,7 +442,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; - sha512 = "0icxxn530vx1cwkygvk52k2l9brpv2mdbyk0j4hyr224b23vxvh131l2m1gljpfvsikzib3x2zyiy2xngjjfz9k9n68lvq4ram8dgg6"; + sha512 = "5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg=="; + }; + }; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; "camelcase-5.3.1" = { @@ -487,34 +460,34 @@ let version = "5.3.1"; src = fetchurl { url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "0kg17fpj4c7akmpa9x0a3fi5glrc3y5k3ppjcpb3pd02ylg3fnzfdvz0pixd223crbs5980sjaxsk9q8kcqxm5d9cb7rlkv3m614vrg"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; + "camelcase-6.2.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; }; }; - "chalk-2.4.2" = { + "chalk-4.1.0" = { name = "chalk"; packageName = "chalk"; - version = "2.4.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j"; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; }; }; - "chokidar-3.3.0" = { + "chokidar-3.4.3" = { name = "chokidar"; packageName = "chokidar"; - version = "3.3.0"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; - sha512 = "3hbyi14x38mvx936wbajln4g1l8fcyi8fwvcrhf2jqn0yzcyda1d20q67k445j9bvs5kr7jdhd2s07srb2pnm7hxmjngp2k6wn8lsbl"; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; + sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; }; }; "cipher-base-1.0.4" = { @@ -523,7 +496,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; - sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; }; }; "cli-1.0.1" = { @@ -541,16 +514,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "1fg1afsij2xwc4gpqbyhrp3s7q19w7bmii0ghmdv6cdx6giz3v0yqn25i3g7fw2lpi388jpvaf6nf9z2c7xp7w7psrww7569548d1rx"; - }; - }; - "clone-2.1.2" = { - name = "clone"; - packageName = "clone"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; - sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; }; "color-convert-1.9.3" = { @@ -559,7 +523,16 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; }; "color-name-1.1.3" = { @@ -571,6 +544,15 @@ let sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; "combine-source-map-0.8.0" = { name = "combine-source-map"; packageName = "combine-source-map"; @@ -589,22 +571,13 @@ let sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "combined-stream-1.0.8" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm"; - }; - }; "commander-2.20.3" = { name = "commander"; packageName = "commander"; version = "2.20.3"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; }; "concat-map-0.0.1" = { @@ -622,7 +595,7 @@ let version = "1.6.2"; src = fetchurl { url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; "config-chain-1.1.12" = { @@ -631,7 +604,7 @@ let version = "1.1.12"; src = fetchurl { url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; - sha512 = "2hg7rni4gx8l765i8qzkp9dv69c8r06i8rxxkkkrsklbd8iz6ingxnp10r4fqqrm9jxy3gp8yp0lzpybwdf27kq49abkyxwrchqwmvb"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; "console-browserify-1.1.0" = { @@ -649,7 +622,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz"; - sha512 = "168x7bp4xr522yw92himv9xv14q336ps1kkg79qcmarg3q4yzpd52pa8x8zgq11b6996f8053799k6365437si3pk85w5z4y8xiijb4"; + sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="; }; }; "constants-browserify-1.0.0" = { @@ -670,6 +643,15 @@ let sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; }; }; + "copy-anything-2.0.1" = { + name = "copy-anything"; + packageName = "copy-anything"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz"; + sha512 = "lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g=="; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -679,13 +661,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "create-ecdh-4.0.3" = { + "create-ecdh-4.0.4" = { name = "create-ecdh"; packageName = "create-ecdh"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r"; + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; }; }; "create-hash-1.2.0" = { @@ -694,7 +676,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; - sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; }; }; "create-hmac-1.1.7" = { @@ -703,7 +685,7 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; - sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; "cryptiles-0.2.2" = { @@ -721,7 +703,7 @@ let version = "3.12.0"; src = fetchurl { url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; }; }; "ctype-0.5.3" = { @@ -739,16 +721,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz"; - sha512 = "182hz56w7yx6vplmlvvlqz57ckfvxch0nh5sj54074r7k3ydd8wwwajcgkvg7732hwgksm5b30jfr9c30wq8zq4f663gf9ap33isbjp"; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + sha512 = "Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="; }; }; "date-now-0.1.4" = { @@ -760,13 +733,22 @@ let sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; - "debug-3.2.6" = { + "debug-3.2.7" = { name = "debug"; packageName = "debug"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr"; + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + }; + }; + "debug-4.2.0" = { + name = "debug"; + packageName = "debug"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; + sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; "decamelize-1.2.0" = { @@ -778,13 +760,22 @@ let sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; }; + "decamelize-4.0.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz"; + sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; + }; + }; "define-properties-1.1.3" = { name = "define-properties"; packageName = "define-properties"; version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; }; "defined-1.0.0" = { @@ -805,22 +796,13 @@ let sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; }; }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; "deps-sort-2.0.1" = { name = "deps-sort"; packageName = "deps-sort"; version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz"; - sha512 = "1zsk235mlp9j7mkhw08fqx4rgn4r45mk4j54zf137nlyw4gs4irwwxjn6nllyv7jw30ihn1ad7xffg282zl394f52vqz9pr19fym2nn"; + sha512 = "1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw=="; }; }; "des.js-1.0.1" = { @@ -829,7 +811,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"; - sha512 = "085ljc5q2yk3jabd61p91n821q4prv13qalbfni9ybcb900b4mmcdnndi5b5prfs9wybp13asd13shlxgrbsgvyfx7nbgvby6jkhhj3"; + sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; }; }; "detective-5.2.0" = { @@ -838,16 +820,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz"; - sha512 = "0z7r2wfccs5i4n1v5ln5p5dkqvy3w97pmnl8kybcw1r7z1c067xr72nqn48j65nk435cpc261m6gdyfyhxjlqabs25bnlflx73hhaz9"; - }; - }; - "diff-3.5.0" = { - name = "diff"; - packageName = "diff"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; - sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; + sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; "diff-4.0.2" = { @@ -856,7 +829,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; - sha512 = "3ndiq7a8qsn2j6vlq5c6d38ynlydlhvk6q01rj321lcarrh0z7721w6cbrdw7lkx6pyfms59y1jkqcl6g2ir1rz5xr17q40lk26djg7"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; "diffie-hellman-5.0.3" = { @@ -865,7 +838,7 @@ let version = "5.0.3"; src = fetchurl { url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; - sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; "dom-serializer-0.2.2" = { @@ -874,7 +847,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; - sha512 = "3v6s9yk4g6cw8chgrba79rbahiqw782013df898df7k7d81n69x2135qashgf23q59zr3w42qncyf4hszlll8knkhv0xccifdplzz6v"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; "domain-browser-1.2.0" = { @@ -883,7 +856,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; - sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; }; }; "domelementtype-1.3.1" = { @@ -892,16 +865,16 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; - sha512 = "3gmb8frh13hzm986ggv14h63h5033jp045mvy1wrcj9j56j822a86arwq7x743i6glkv1bw6qwqriivypd0icbkzi492cm96kwq28h5"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; - "domelementtype-2.0.1" = { + "domelementtype-2.1.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz"; - sha512 = "00vkhxlz4gkgfqzkp7faclfand3fr36zi4lpr50rjwbx54nfpr2fy612p2ixzpysqi28nfyzznngx5gvgcd13b52iy6ar8q7d88fwz4"; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; + sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; }; }; "domhandler-2.3.0" = { @@ -931,22 +904,13 @@ let sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; }; }; - "ecc-jsbn-0.1.2" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; - }; - }; - "elliptic-6.5.2" = { + "elliptic-6.5.3" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz"; - sha512 = "33kzl02iwbq3pl33ihcdq9nm48yzhfj96183zzra06hp3z6bacz3d99pl74jziwygys4npxbxwnvszz12wl8lpkjw8b4r9ki797p33z"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz"; + sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw=="; }; }; "emoji-regex-7.0.3" = { @@ -955,7 +919,7 @@ let version = "7.0.3"; src = fetchurl { url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "2s4i22ccvwa2l4xwl9yz6mkyn2kpf58hp1nqiwmmgqlpyr57345i3ll0l4656ryik6a6wz1lgk4vbl6y0dwj5hx2kcbpv0h8924n00b"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; }; "entities-1.0.0" = { @@ -967,31 +931,31 @@ let sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; }; }; - "entities-2.0.0" = { + "entities-2.2.0" = { name = "entities"; packageName = "entities"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz"; - sha512 = "0pqz0h0aafqad2dm3qs73sqk6nhgr7icrfqwnxbzysbdkh11grcbssa7m1nkyzc22g9zwpi752fpw5r58rrldhjjlqh4isj89bzpmqg"; + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; - "errno-0.1.7" = { + "errno-0.1.8" = { name = "errno"; packageName = "errno"; - version = "0.1.7"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; - sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; + url = "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz"; + sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="; }; }; - "es-abstract-1.17.4" = { + "es-abstract-1.18.0-next.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.4"; + version = "1.18.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz"; - sha512 = "24sx605c7x5di53nzw0x2brrfvy4nw76ws0gsd1hskdifrcxafn8fwk0n11si002zxhfs9c8nba1acaj2zkrqrgp8k5vw0vz2dyxv81"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz"; + sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw=="; }; }; "es-to-primitive-1.2.1" = { @@ -1000,16 +964,16 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; - "escape-string-regexp-1.0.5" = { + "escape-string-regexp-4.0.0" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; - version = "1.0.5"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; "esprima-4.0.1" = { @@ -1018,16 +982,16 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "events-2.1.0" = { + "events-3.2.0" = { name = "events"; packageName = "events"; - version = "2.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-2.1.0.tgz"; - sha512 = "059cw923gab3r2d2nk9nafd3h9skxvimn2k4qhnhss6j5vwwgvqaac3668299zdc634q9r8by6vidhjnkf052ir1vyw6xx7nyhs56fx"; + url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz"; + sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="; }; }; "evp_bytestokey-1.0.3" = { @@ -1036,7 +1000,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; "exit-0.1.2" = { @@ -1048,49 +1012,13 @@ let sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }; }; - "extend-3.0.2" = { - name = "extend"; - packageName = "extend"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky"; - }; - }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - }; - "fast-deep-equal-3.1.1" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi"; - }; - }; - "fast-json-stable-stringify-2.1.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn"; - }; - }; "fast-safe-stringify-2.0.7" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; version = "2.0.7"; src = fetchurl { url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; - sha512 = "1ab0spv3wadhidsh9x8qar1ryn7ahv308yzc5cl32wssk99rr7vrkcs00vn2kggz6drps08vk24gi9gmqpg39jd1rnaryykvh4vmnaj"; + sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; "fill-range-7.0.1" = { @@ -1099,7 +1027,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "2jrai6ri6sni8xyi8yji49ai8vkczbbiw6pb3pd9bcdizb58ncgnhnfmghhw87flm8y96y2z16738lwdyshby665nv60ljcwwbkvsm8"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; "find-up-3.0.0" = { @@ -1108,16 +1036,34 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "find-up-5.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"; + sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; }; }; - "flat-4.1.0" = { + "flat-5.0.2" = { name = "flat"; packageName = "flat"; - version = "4.1.0"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; - sha512 = "0bj2zrb5x98lffdcjsvaf2hns9ih2jzj4dz9yg9k8zqrak4x0i93dvf01qp458mr6d1x4dsqsxc3ag00g2mskrr23h7x71kna4d67rz"; + url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"; + sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; + }; + }; + "foreach-2.0.5" = { + name = "foreach"; + packageName = "foreach"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; + sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; }; }; "forever-agent-0.5.2" = { @@ -1129,15 +1075,6 @@ let sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; }; }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; "form-data-0.1.4" = { name = "form-data"; packageName = "form-data"; @@ -1147,15 +1084,6 @@ let sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; }; }; - "form-data-2.3.3" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn"; - }; - }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -1165,13 +1093,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-2.1.2" = { + "fsevents-2.1.3" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz"; - sha512 = "1j5ssfzy4xklkj74z7q64dpcld4zicsva1ihfys8dwa9l5apv7q350g4vg65nfp58c7aqkai1qmjlc3xshb97p5h3lsrl0r3j407327"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; "function-bind-1.1.1" = { @@ -1180,7 +1108,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; "get-assigned-identifiers-1.2.0" = { @@ -1189,7 +1117,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz"; - sha512 = "1snk8irwshrwijh05cwxsdvjc5p2aqr8mk6qdcwxaka3llypkyibdz2mdkzw67g9l2vzhidfqg0ahdrzyknjk4a7c613bwkw6cp044q"; + sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; }; }; "get-caller-file-2.0.5" = { @@ -1198,25 +1126,16 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "0b7da6kb3xqk26cw4i6kb1lk911z06z53if2g8l23hmfpbhl6vfbn8iip55j1yplbqnly2abb9d349r6ky2z570839q3p9z2gf4y88g"; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "glob-7.1.3" = { - name = "glob"; - packageName = "glob"; - version = "7.1.3"; + "get-intrinsic-1.1.0" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "30h0j9f3xj7mwciwmi9q9ilhlc0l391jrvv0xws0yxgh389ynin3qqrw8xiyfy5w3f667bwn9p0i3f01s2ir0ai1rwbb038ij4fxixx"; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz"; + sha512 = "M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg=="; }; }; "glob-7.1.6" = { @@ -1225,25 +1144,25 @@ let version = "7.1.6"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; - "glob-parent-5.1.0" = { + "glob-parent-5.1.1" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz"; - sha512 = "23qivv79xv6rvb8fsi8hj0ic91ijfkw6dynzp8716bzafazq27dqc9ibxxlkfs7wqnhyzzimaa3xn8i22838ds157kyg60mfa152fxa"; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; "growl-1.10.5" = { @@ -1252,25 +1171,7 @@ let version = "1.10.5"; src = fetchurl { url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"; - sha512 = "146i7if4fjml1p6xw1ybb7vm22k6i8yc7r8wcw8yia7qy385w1s6j18ip91g5mv47zvv5fw5m8kpzlaayjs183fkpg174hbw4xgh6m8"; - }; - }; - "har-schema-2.0.0" = { - name = "har-schema"; - packageName = "har-schema"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - }; - "har-validator-5.1.3" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh"; + sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="; }; }; "has-1.0.3" = { @@ -1279,16 +1180,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz"; - }; - }; - "has-flag-3.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; "has-flag-4.0.0" = { @@ -1297,7 +1189,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "0ylry8j6wanggw1786jw36k056caw516fasjfz5jl945p7g0zl2aqxsjd5fxxfah3hlhrbflnsb88vx42080sfsfbb38aimyi7hja8k"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; "has-symbols-1.0.1" = { @@ -1306,16 +1198,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; }; }; - "hash-base-3.0.4" = { + "hash-base-3.1.0" = { name = "hash-base"; packageName = "hash-base"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"; + sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; }; "hash.js-1.1.7" = { @@ -1324,7 +1216,7 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; - sha512 = "1f5xc15zpy3b7hssv57xnd92ja5r073zvd2pczvncxmy1jnbjcx716riyr2syvah88qk7328a6fz049mziv2k837093xqxd86r9m8xm"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; "hawk-1.0.0" = { @@ -1342,7 +1234,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; - sha512 = "0dwml2q9r97ga11qbbn5sb46v4g47lx174dz9g1jgxpycknhg1d5dlsij2vja905p8h243jj51hfa5cmzh8n9rdcs8r78lg86fl7z8p"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; "hmac-drbg-1.0.1" = { @@ -1390,15 +1282,6 @@ let sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; }; }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - }; "https-browserify-1.0.0" = { name = "https-browserify"; packageName = "https-browserify"; @@ -1408,13 +1291,22 @@ let sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; - "ieee754-1.1.13" = { + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ieee754-1.2.1" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.13"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; - sha512 = "179jm8fhl2advz4j63klrp57sm99wvyb5jcxwfr9rhi730ybcxkyfqrr0pmwvir12zjzpkwwvjjkjclwrss7lpab7dg2myqc8izpxz2"; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; "image-size-0.5.5" = { @@ -1453,22 +1345,13 @@ let sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; }; }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; "inherits-2.0.4" = { name = "inherits"; packageName = "inherits"; version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; "ini-1.1.0" = { @@ -1480,13 +1363,13 @@ let sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; }; }; - "ini-1.3.5" = { + "ini-1.3.8" = { name = "ini"; packageName = "ini"; - version = "1.3.5"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; "inline-source-map-0.6.2" = { @@ -1498,31 +1381,31 @@ let sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; }; }; - "insert-module-globals-7.2.0" = { + "insert-module-globals-7.2.1" = { name = "insert-module-globals"; packageName = "insert-module-globals"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz"; - sha512 = "15ks7a4jsdgwd9cpql86xignkdz7wf7jxz7r8pyyqgfr3n51nc6y3m271cxzwm4ccaajb6y9sc5hw80ga7pg37306zps6lndyaqskjl"; + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz"; + sha512 = "ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg=="; }; }; - "interpret-1.2.0" = { + "interpret-1.4.0" = { name = "interpret"; packageName = "interpret"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; - sha512 = "1pibn9f6dn61lmilqiv8hb4aix4b78xf9sdws3rnl060vvv6l4qrw6gfmncq5n0f0rah2yj1ssfg80chaw9y5aa860wfdcccb4ghgcr"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"; + sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; }; }; - "ip-regex-2.1.0" = { - name = "ip-regex"; - packageName = "ip-regex"; - version = "2.1.0"; + "is-arguments-1.1.0" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; - sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz"; + sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg=="; }; }; "is-binary-path-2.1.0" = { @@ -1531,7 +1414,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "1gldm4swvg3612pg55yjza8dvpv4daf374dijjg8kcmndlq55933pdd7gw4gq4c2aa5fn9vnasz3h9spg3pd8p1rafkr91sxdhi3hb4"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; "is-buffer-1.1.6" = { @@ -1540,25 +1423,25 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-buffer-2.0.4" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "2.0.4"; + "is-callable-1.2.3" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz"; - sha512 = "3c1f1cy2867lfdcfxpy91qxbjxizlwa2dhz3mgckg17xd4xcx284ylzvfk3v7l6mdynrk7xc2rg31avi6caj053p7bgaf4p8ni6pb9a"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; + sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; }; }; - "is-callable-1.1.5" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.1.5"; + "is-core-module-2.2.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi"; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; + sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; }; }; "is-date-object-1.0.2" = { @@ -1567,7 +1450,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; "is-extglob-2.1.1" = { @@ -1588,13 +1471,31 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; + "is-generator-function-1.0.8" = { + name = "is-generator-function"; + packageName = "is-generator-function"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz"; + sha512 = "2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ=="; + }; + }; "is-glob-4.0.1" = { name = "is-glob"; packageName = "is-glob"; version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-negative-zero-2.0.1" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; }; }; "is-number-7.0.0" = { @@ -1603,16 +1504,25 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "2g7332xqrb0cm36cn6rwdmgq7sllf9w19sf6jy4w0s4vgqdq1kngsnpz0z49i3vnknk8ms442yjllrdbqxbap9ajprc8yrs91za4l73"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-regex-1.0.5" = { + "is-plain-obj-2.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="; + }; + }; + "is-regex-1.1.2" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.5"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz"; + sha512 = "axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg=="; }; }; "is-symbol-1.0.3" = { @@ -1621,16 +1531,25 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; }; }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; + "is-typed-array-1.1.4" = { + name = "is-typed-array"; + packageName = "is-typed-array"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.4.tgz"; + sha512 = "ILaRgn4zaSrVNXNGtON6iFNotXW3hAPF3+0fB1usg2jFlWqo5fEDdmJkz0zBfoi7Dgskr8Khi2xZ8cXqZEfXNA=="; + }; + }; + "is-what-3.12.0" = { + name = "is-what"; + packageName = "is-what"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz"; + sha512 = "2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw=="; }; }; "isarray-0.0.1" = { @@ -1660,58 +1579,13 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "js-yaml-3.13.1" = { + "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1"; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "json-schema-traverse-0.4.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5"; - }; - }; - "json-stable-stringify-0.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; - sha1 = "611c23e814db375527df851193db59dd2af27f45"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; + sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; }; }; "json-stringify-safe-5.0.1" = { @@ -1723,15 +1597,6 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; - }; - }; "jsonparse-1.3.1" = { name = "jsonparse"; packageName = "jsonparse"; @@ -1741,22 +1606,13 @@ let sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; }; }; - "jsprim-1.4.1" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - }; - "just-extend-4.1.0" = { + "just-extend-4.1.1" = { name = "just-extend"; packageName = "just-extend"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz"; - sha512 = "ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA=="; + url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz"; + sha512 = "aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA=="; }; }; "kew-0.1.7" = { @@ -1774,7 +1630,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz"; - sha512 = "01ili1w037l9b1l99ljcygi8xwcirjndh89qb1ja448vpfv6b0ixcp05cj8z9c0646bwrjabb8q0xy60pkshnn4977lhra5f54hpbh9"; + sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; }; }; "locate-path-3.0.0" = { @@ -1783,16 +1639,25 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; - "lodash-4.17.15" = { + "locate-path-6.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"; + sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; + }; + }; + "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; - version = "4.17.15"; + version = "4.17.20"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; + sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; }; }; "lodash.get-4.4.2" = { @@ -1813,13 +1678,22 @@ let sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "log-symbols-3.0.0" = { + "log-symbols-4.0.0" = { name = "log-symbols"; packageName = "log-symbols"; - version = "3.0.0"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz"; + sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA=="; + }; + }; + "make-dir-2.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; - sha512 = "2fmk82kxm1wkgm5kgxx84nsf7pvyspj47axslj3sfcyx69hx1vymrgbqj00jfnmrjc80wb87xs3kyfa37k55wzhgvk6v21vw8d0sabm"; + url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; + sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; "md5.js-1.3.5" = { @@ -1828,7 +1702,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; - sha512 = "29ds70y468n42xivsz4vrgy8rp2x4nxz52z1vkd1k49556gvn74pq998s510g3jgz9972m9yxs6yk1kw752blq97b9w8gaddkwlyay6"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; }; }; "miller-rabin-4.0.1" = { @@ -1837,7 +1711,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; }; }; "mime-1.2.11" = { @@ -1855,25 +1729,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; - }; - }; - "mime-db-1.43.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.43.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv"; - }; - }; - "mime-types-2.1.26" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.26"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; "minimalistic-assert-1.0.1" = { @@ -1882,7 +1738,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -1900,16 +1756,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; "minimist-1.2.5" = { @@ -1918,7 +1765,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; "mkdirp-0.3.5" = { @@ -1930,13 +1777,13 @@ let sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; + "mkdirp-classic-0.5.3" = { + name = "mkdirp-classic"; + packageName = "mkdirp-classic"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; }; "mocha-phantomjs-core-1.3.1" = { @@ -1948,22 +1795,40 @@ let sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; }; }; - "module-deps-6.2.2" = { + "module-deps-6.2.3" = { name = "module-deps"; packageName = "module-deps"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.2.tgz"; - sha512 = "3gkwqnfbsjlh9sswxyiqwv4hzvph69yfaj8c2kibsc9xs6nvys3s2yvjyb41p1qqprlzrr9pqm1l5qpx8wis3z20cw95fzr7g4bmp3b"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz"; + sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA=="; }; }; - "ms-2.1.1" = { + "ms-2.1.2" = { name = "ms"; packageName = "ms"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; + "nanoid-3.1.12" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; + sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; }; }; "ncp-0.4.2" = { @@ -1975,22 +1840,22 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "nise-4.0.3" = { - name = "nise"; - packageName = "nise"; - version = "4.0.3"; + "needle-2.6.0" = { + name = "needle"; + packageName = "needle"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/nise/-/nise-4.0.3.tgz"; - sha512 = "EGlhjm7/4KvmmE6B/UFsKh7eHykRl9VH+au8dduHLCyWUO/hr7+N+WtTvDUwc9zHuM1IaIJs/0lQ6Ag1jDkQSg=="; + url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz"; + sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg=="; }; }; - "node-environment-flags-1.0.6" = { - name = "node-environment-flags"; - packageName = "node-environment-flags"; - version = "1.0.6"; + "nise-4.0.4" = { + name = "nise"; + packageName = "nise"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; - sha512 = "0gis4xp1wacn31j3p8vdd32ykzs2pskf8pgfjkm092zcx72v03dphpsayrls8bmmi91s6ic4718lgi28mm40hj96f9ywbvfxbcz4jz4"; + url = "https://registry.npmjs.org/nise/-/nise-4.0.4.tgz"; + sha512 = "bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A=="; }; }; "node-uuid-1.4.8" = { @@ -2017,7 +1882,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "0n301s7qa4645iyk3zpcgin8r19p0p8h8g50c3mnnrl9n3m9rpyxv79hjl6miix9daq12s69am1sbskhqnzbabmn2id0nippgj6rrp9"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; "npmconf-0.0.24" = { @@ -2038,15 +1903,6 @@ let sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; }; }; - "oauth-sign-0.9.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x"; - }; - }; "object-assign-4.1.1" = { name = "object-assign"; packageName = "object-assign"; @@ -2056,13 +1912,13 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "object-inspect-1.7.0" = { + "object-inspect-1.9.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.7.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb"; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"; + sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; }; }; "object-keys-1.1.1" = { @@ -2071,25 +1927,16 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; - "object.assign-4.1.0" = { + "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; - }; - }; - "object.getownpropertydescriptors-2.1.0" = { - name = "object.getownpropertydescriptors"; - packageName = "object.getownpropertydescriptors"; - version = "2.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "1b08dy2xs3gqhwviks5245b0m3fa6kkdcqi8wldr5cfvkpgwbvdx474k9y5cjnsf2z075gysifxsc39i59fslxrl55kgpa03xmcx7b7"; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; }; "once-1.1.1" = { @@ -2128,13 +1975,22 @@ let sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; }; }; - "p-limit-2.2.2" = { + "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; - sha512 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q"; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + }; + "p-limit-3.1.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; }; "p-locate-3.0.0" = { @@ -2143,7 +1999,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-locate-5.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"; + sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; }; }; "p-try-2.2.0" = { @@ -2152,7 +2017,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; "pako-1.0.11" = { @@ -2161,7 +2026,7 @@ let version = "1.0.11"; src = fetchurl { url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; - sha512 = "1imm2ygnj1himskq6lblzdh3ngc6p9gkvhrbzivalqf3nwafzfglpmbh8wkaz0rsiaxh67jzxbb16m2ygapfcnfwqg9gkdqzkqc24p2"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; }; }; "parents-1.0.1" = { @@ -2173,22 +2038,31 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.5" = { + "parse-asn1-5.1.6" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha512 = "16n59f599pq8832a6c5wyxnqdf4vrqrdnclzs6vp9m2z2h9qmxamjk6xcrl1aal758jyba0pvyz1bkf7npm7achfxxa29jwaygihhwf"; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; }; }; - "path-browserify-0.0.1" = { + "parse-node-version-1.0.1" = { + name = "parse-node-version"; + packageName = "parse-node-version"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"; + sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="; + }; + }; + "path-browserify-1.0.1" = { name = "path-browserify"; packageName = "path-browserify"; - version = "0.0.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"; - sha512 = "2avzhwqw37c6l7a0f276z7qzchzhwppinxhgg6q7by5bskwb7q7sfhwijb6fx4ingbdzb4i1pw6la5pg0izb5s4z69268278gil1ah5"; + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz"; + sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="; }; }; "path-exists-3.0.0" = { @@ -2200,6 +2074,15 @@ let sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -2215,7 +2098,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-platform-0.11.15" = { @@ -2233,25 +2116,16 @@ let version = "1.8.0"; src = fetchurl { url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; - sha512 = "1a1s16c1sx28yq8nh8sqkj9izaypszmxfk27x5hl1wid9611b5viffw9vbwqw6sik20ksgmh18dqndglbvq82dii4jl0aal353ck3cz"; + sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA=="; }; }; - "pbkdf2-3.0.17" = { + "pbkdf2-3.1.1" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.17"; - src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz"; - sha512 = "2s4nd3yv3kkyywvh5rkrvbr6w2h6a4q786v548w895ralcq9cllqzyxr0jgxf911k3zpmzycimsg3ggww3lkrhd3bk9wribrgjaby2k"; - }; - }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz"; + sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg=="; }; }; "phantomjs-1.9.7-15" = { @@ -2263,13 +2137,22 @@ let sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b"; }; }; - "picomatch-2.2.1" = { + "picomatch-2.2.2" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz"; - sha512 = "12a2jzmkj24c6k3x71z0knzflw9qqhqx0lk27nrryjs6m7gjmszvgz5pp29xx1h7h7xxaj8cl3i5h98hlx3mpif5h26qdjhrh1ml811"; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + }; + }; + "pify-4.0.1" = { + name = "pify"; + packageName = "pify"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; }; }; "process-0.11.10" = { @@ -2287,7 +2170,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; "progress-1.1.8" = { @@ -2299,15 +2182,6 @@ let sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; - "promise-7.3.1" = { - name = "promise"; - packageName = "promise"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; - sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy"; - }; - }; "proto-list-1.2.4" = { name = "proto-list"; packageName = "proto-list"; @@ -2326,13 +2200,13 @@ let sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; }; }; - "psl-1.7.0" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "0whj0m29370fn3imrlj2dw0xmr33j2gn30kn96xpxckz7i1b21pj6vlgsn4ggxl79mz2ckng5mdxbkczcwkjry497s8xkgw7c815nz4"; + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "public-encrypt-4.0.3" = { @@ -2341,7 +2215,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; - sha512 = "3qnsvs746b98ifyv12qj1g6hl6fq25vip5mswhvn3gnl7r32fids6mw3jb0gdcqrrl5x9ik475sf0vx6mbhmif49idkwjwrhbr5lnnd"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; }; }; "punycode-1.3.2" = { @@ -2368,7 +2242,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; "qs-0.6.6" = { @@ -2380,15 +2254,6 @@ let sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; }; }; - "qs-6.5.2" = { - name = "qs"; - packageName = "qs"; - version = "6.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; - }; - }; "querystring-0.2.0" = { name = "querystring"; packageName = "querystring"; @@ -2413,7 +2278,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "2cimbs750ysa2wxsiw9mmc1xqjb8w0c4s22p2mv2n676s8hchvzcl1l5p78jnk62d2jzacpr9zbl9w64kaqnipcbaa25q7ywn47g2dx"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomfill-1.0.4" = { @@ -2422,7 +2287,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; - sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; }; }; "read-only-stream-2.0.0" = { @@ -2449,7 +2314,7 @@ let version = "2.3.7"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; "readable-stream-3.6.0" = { @@ -2458,16 +2323,16 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "1s8hs6ax9jwmmw558j3hyfx5lfn7qf66xg0giplz9jci7d8zp2d8vh96dzlis6xzpxfa5b2zbm8nm4mgsr71r6rl3w3qyfanb5qfn05"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "readdirp-3.2.0" = { + "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.2.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; - sha512 = "0chzz12q3inpmwm6b4gi7g9n39jp24ah3mmjgss87hfsbx86vnxf49bx9wk2ng66037x2fh0cjf5rgx00c1m86lqlh7r6g9xm13ifbj"; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; }; }; "rechoir-0.6.2" = { @@ -2488,15 +2353,6 @@ let sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; }; }; - "request-2.88.2" = { - name = "request"; - packageName = "request"; - version = "2.88.2"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj"; - }; - }; "request-progress-0.3.1" = { name = "request-progress"; packageName = "request-progress"; @@ -2521,25 +2377,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "2d0gd2x49nz3hgfwms6326sjw5fx7gqf997dnggc7l084cibgang6wr6ryksky32fvdz1bq72xm73kfxd3lj2qnfyjsp57jq287k8rl"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "resolve-1.1.7" = { + "resolve-1.19.0" = { name = "resolve"; packageName = "resolve"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; - }; - }; - "resolve-1.15.1" = { - name = "resolve"; - packageName = "resolve"; - version = "1.15.1"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; + sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; }; }; "rimraf-2.2.8" = { @@ -2557,7 +2404,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; - sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; }; "safe-buffer-5.1.2" = { @@ -2566,16 +2413,16 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "safe-buffer-5.2.0" = { + "safe-buffer-5.2.1" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; "safer-buffer-2.1.2" = { @@ -2584,7 +2431,16 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; "semver-1.1.4" = { @@ -2602,7 +2458,16 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "serialize-javascript-5.0.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; }; }; "set-blocking-2.0.0" = { @@ -2620,16 +2485,7 @@ let version = "2.4.11"; src = fetchurl { url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; - sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0"; - }; - }; - "shasum-1.0.2" = { - name = "shasum"; - packageName = "shasum"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; - sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; }; "shasum-object-1.0.0" = { @@ -2638,7 +2494,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz"; - sha512 = "1bdc4kbk4jy4crxvf36kwbf91ya8xy2xap7mlrdxz44j51y77mhfgzp846w2bxwiw3rrj9lbcylc636ffm7j8c66fx5iigpkyp3kai2"; + sha512 = "Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg=="; }; }; "shell-quote-1.7.2" = { @@ -2647,7 +2503,7 @@ let version = "1.7.2"; src = fetchurl { url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"; - sha512 = "11a56bai83fzl9zdqp594aypy7f31mkm2whi4ar94wf0w6lzmzfmbw4qd6bn1bibkmb9407wkff5k3d7xvsi3ycj2mw1camyadzy74r"; + sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="; }; }; "shelljs-0.3.0" = { @@ -2704,13 +2560,13 @@ let sha512 = "oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g=="; }; }; - "simple-concat-1.0.0" = { + "simple-concat-1.0.1" = { name = "simple-concat"; packageName = "simple-concat"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz"; - sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; }; }; "sntp-0.2.4" = { @@ -2737,7 +2593,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; "sprintf-js-1.0.3" = { @@ -2749,22 +2605,13 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; - "sshpk-1.16.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x"; - }; - }; - "stream-browserify-2.0.2" = { + "stream-browserify-3.0.0" = { name = "stream-browserify"; packageName = "stream-browserify"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; - sha512 = "2mfvadpwj9mzxps4arl1frxlkz96hfp0sc5pvq76s0ijf8fgw26mm3a721zq3iz1f8155w3a41wkixbdlwn1cavv0mzics796da2zlx"; + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz"; + sha512 = "H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA=="; }; }; "stream-combiner2-1.1.1" = { @@ -2776,13 +2623,13 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "stream-http-3.1.0" = { + "stream-http-3.1.1" = { name = "stream-http"; packageName = "stream-http"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.0.tgz"; - sha512 = "cuB6RgO7BqC4FBYzmnvhob5Do3wIdIsXAgGycHJnW+981gHqoYcYz9lqjJrk8WXRddbwPuqPYRl+bag6mYv4lw=="; + url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.1.tgz"; + sha512 = "S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg=="; }; }; "stream-splicer-2.0.1" = { @@ -2791,7 +2638,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz"; - sha512 = "275m2xn6ygpp4iw0mjl0a2x39m333xxmr3qlk47mymsqxn8wg8czyv608nbg89w7vyn483ik8f7vlmx107yx4vw06r89fagygiy2b2y"; + sha512 = "Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg=="; }; }; "string-width-2.1.1" = { @@ -2800,7 +2647,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; "string-width-3.1.0" = { @@ -2809,25 +2656,25 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "3bix3jva53vcp1im3aa1y2v1lywkm7ix81gkwkj4915s2675pmw1c9n5x98q1m985hzgwkk1fnc2q78qz7s0fixhf994md3lazxr9xx"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string.prototype.trimleft-2.1.1" = { - name = "string.prototype.trimleft"; - packageName = "string.prototype.trimleft"; - version = "2.1.1"; + "string.prototype.trimend-1.0.3" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha512 = "013lf0f398s2xb9jhq9acspdnnk52k7whcga9am4b8a2wrgpc2w7xgkydg4sg4ah9z3i1syimzqs7dc89390xmwlx8zxf6gvlcq1vca"; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz"; + sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw=="; }; }; - "string.prototype.trimright-2.1.1" = { - name = "string.prototype.trimright"; - packageName = "string.prototype.trimright"; - version = "2.1.1"; + "string.prototype.trimstart-1.0.3" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha512 = "3x2qc2fc2fh9sj3vw9w45h246vspjfn88b0k356ldazylhap91vg825bppg73s9n63kwpql3gpw24lv8zx0b2arblcqhh7ygwpxcnx8"; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz"; + sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg=="; }; }; "string_decoder-0.10.31" = { @@ -2845,7 +2692,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; "string_decoder-1.3.0" = { @@ -2854,7 +2701,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "1w0mz57mvmqykm0jwma6lr4i9pip8p8c1ldaax7sxnrl6j0jbrkwggs037r1psmac0w04i9mb2rc1gzj1n2f0xvy1fr332n9pqmfi46"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; "strip-ansi-4.0.0" = { @@ -2872,7 +2719,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; "strip-json-comments-1.0.4" = { @@ -2884,13 +2731,13 @@ let sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; }; }; - "strip-json-comments-2.0.1" = { + "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; - version = "2.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; }; "subarg-1.0.0" = { @@ -2902,31 +2749,13 @@ let sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }; }; - "supports-color-5.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2"; - }; - }; - "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 = "0p5l02lyminbqmcpm7257093sd8w5ca7q5xnnym2z71bwbhmisnyzn2jh5xma418sx29m8yinka6f7rphc7dl76lc88bm2w4z14lzx2"; - }; - }; - "supports-color-7.1.0" = { + "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; - sha512 = "3k12babask2rk5v9n9wdgng00rqac2w5wwvkawlx3brjpqvfpy4j70650ggw5pa7bm5hnn1ppsppsqrcwrvjsk1mxb3vi993yjqh551"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; "syntax-error-1.4.0" = { @@ -2935,7 +2764,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz"; - sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0"; + sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; "throttleit-0.0.2" = { @@ -2962,7 +2791,7 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; - sha512 = "14xi6lbly1f37015ny2pzcnf5kaksjmpnhm61gfhwn686w5ac519qb1icxdda974n84f342g0y15kysj1hci2vl40z91aiivyhx2spy"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; "timers-browserify-1.4.2" = { @@ -2980,34 +2809,25 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "2qkrna8q80arai14s6f17djc3cgwiilnhibfykwzkif4gs9ny3fmqmxqf56fvc7fjwyr01p97nk1ckd67s8476cslmj3rwp7s5zp4zb"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; - "tough-cookie-2.5.0" = { + "tough-cookie-4.0.0" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly"; - }; - }; - "tough-cookie-3.0.1" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "3.0.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz"; - sha512 = "2raf12jixrfcagphh9s0fagbfk5va7m0jpj9dbc5dk5b5rr8xbxz4j1af4ppvillqnbi39yiicwnj1qpppc89c71zywnri9xv98j369"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; }; }; - "tslib-1.11.1" = { + "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; "tty-browserify-0.0.1" = { @@ -3016,7 +2836,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz"; - sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b"; + sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; }; }; "tunnel-agent-0.4.3" = { @@ -3028,31 +2848,13 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - }; "type-detect-4.0.8" = { name = "type-detect"; packageName = "type-detect"; version = "4.0.8"; src = fetchurl { url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; - sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni"; + sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; "typedarray-0.0.6" = { @@ -3070,7 +2872,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz"; - sha512 = "2iz3bypw716y5lgdg89d7jwnkqnla4sid3l5hr2259ypf8h6sbkw3n0xa51ckzkkayf0c39ksaiax2j6ighj36p5ipwh5p1wx50d1z0"; + sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; }; }; "undeclared-identifiers-1.1.3" = { @@ -3079,16 +2881,16 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz"; - sha512 = "0xp0ipldz5gsxzh6lm1gj69ab3y6pwn9yq68b8lqg4f3jsl8kr0wkn0kd3fqvs0i71kzhp6g3z0q9rdy4xy6i0a53q6g5k3gki9d4x4"; + sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; }; }; - "uri-js-4.2.2" = { - name = "uri-js"; - packageName = "uri-js"; - version = "4.2.2"; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9"; + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; "url-0.11.0" = { @@ -3109,13 +2911,13 @@ let sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; }; }; - "util-0.10.4" = { + "util-0.12.3" = { name = "util"; packageName = "util"; - version = "0.10.4"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz"; - sha512 = "3sbbgsya51i86ih8bn3nfwi3f9556xlnwh32z4k54dwcpi0jibhfa5dpbfmpzyla63yh2zlxs9chl6wkhc8bqjmjxjyxc9p6j2vvyfh"; + url = "https://registry.npmjs.org/util/-/util-0.12.3.tgz"; + sha512 = "I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog=="; }; }; "util-deprecate-1.0.2" = { @@ -3127,31 +2929,13 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "uuid-3.4.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y"; - }; - }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - }; "vm-browserify-1.1.2" = { name = "vm-browserify"; packageName = "vm-browserify"; version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz"; - sha512 = "00japcjqx1df1bgck837ds0xvg5dr7g4j30a38zhbmanqss2kyxs4p7pgmldlnxpa31js50gydy8x9qi89s4x74iidf6k6nfgqsc5ns"; + sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; "which-1.0.9" = { @@ -3163,13 +2947,13 @@ let sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; }; }; - "which-1.3.1" = { + "which-2.0.2" = { name = "which"; packageName = "which"; - version = "1.3.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz"; + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; "which-module-2.0.0" = { @@ -3181,13 +2965,31 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; + "which-typed-array-1.1.4" = { + name = "which-typed-array"; + packageName = "which-typed-array"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz"; + sha512 = "49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA=="; + }; + }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "workerpool-6.0.2" = { + name = "workerpool"; + packageName = "workerpool"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz"; + sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q=="; }; }; "wrap-ansi-5.1.0" = { @@ -3196,7 +2998,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "3nmsfqfd98a7bgjyhd334y5gzc98nnkipfkmk2z1v4m0acagmpq951d8brmrsxvpnk256fbrp7zkn5n8v02pn4q4zai7zgnvy47yba0"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; "wrappy-1.0.2" = { @@ -3214,43 +3016,52 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; - sha512 = "08w1d6fg23v422cfwd55306pfs9n9cqpz6hycahq3adm3n29wmhl9bmpn4vk75rlzgwn7hp4n3idqxvw8c53zbr04h7a98p43b199ic"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-4.0.0" = { + "y18n-4.0.1" = { name = "y18n"; packageName = "y18n"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g"; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; + sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; }; }; - "yargs-13.3.0" = { + "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; - version = "13.3.0"; + version = "13.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; - sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; + url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; + sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; - "yargs-parser-13.1.1" = { + "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "13.1.1"; + version = "13.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; }; - "yargs-unparser-1.6.0" = { + "yargs-unparser-2.0.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; - version = "1.6.0"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz"; + sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA=="; + }; + }; + "yocto-queue-0.1.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; - sha512 = "17qgbcv8wypl4qr620558qd8ff03nqqiq84mp200mizrbsfj4nyil345iny8zx4ia5hfpjmk2mnhqp7y54qpsypd993ml57cj14mnsv"; + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; }; }; }; @@ -3259,15 +3070,15 @@ in marked = nodeEnv.buildNodePackage { name = "marked"; packageName = "marked"; - version = "0.8.0"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.8.0.tgz"; - sha512 = "MyUe+T/Pw4TZufHkzAfDj6HarCBWia2y27/bhuYkTaiUnfDYFnCP3KUN+9oM7Wi6JA2rymtVYbQu3spE0GCmxQ=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.8.tgz"; + sha512 = "lzmFjGnzWHkmbk85q/ILZjFoHHJIQGF+SxGEfIdGk/XhiTPhqGs37gbru6Kkd48diJnEyYwnG67nru0Z2gQtuQ=="; }; buildInputs = globalBuildInputs; meta = { description = "A markdown parser built for speed"; - homepage = "https://marked.js.org/"; + homepage = "https://marked.js.org"; license = "MIT"; }; production = true; @@ -3277,45 +3088,52 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.5.0"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz"; - sha512 = "6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw=="; + url = "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz"; + sha512 = "SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-7.1.1" + sources."acorn-7.4.1" sources."acorn-node-1.8.2" - sources."acorn-walk-7.1.1" - sources."asn1.js-4.10.1" + sources."acorn-walk-7.2.0" + sources."array-filter-1.0.0" + (sources."asn1.js-5.4.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" sources."util-0.10.3" ]; }) + sources."available-typed-arrays-1.0.2" sources."balanced-match-1.0.0" - sources."base64-js-1.3.1" - sources."bn.js-4.11.8" + sources."base64-js-1.5.1" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."browser-pack-6.1.0" - (sources."browser-resolve-1.11.3" // { - dependencies = [ - sources."resolve-1.1.7" - ]; - }) + sources."browser-resolve-2.0.0" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" - sources."browserify-rsa-4.0.1" - sources."browserify-sign-4.0.4" + sources."browserify-rsa-4.1.0" + (sources."browserify-sign-4.2.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."browserify-zlib-0.2.0" - sources."buffer-5.5.0" + sources."buffer-5.2.1" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.2" + sources."call-bind-1.0.2" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" @@ -3324,70 +3142,106 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.3" + (sources."create-ecdh-4.0.4" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."dash-ast-1.0.0" + sources."define-properties-1.1.3" sources."defined-1.0.0" sources."deps-sort-2.0.1" sources."des.js-1.0.1" - (sources."detective-5.2.0" // { + sources."detective-5.2.0" + (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."minimist-1.2.5" + sources."bn.js-4.11.9" ]; }) - sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."elliptic-6.5.2" - sources."events-2.1.0" + (sources."elliptic-6.5.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."es-abstract-1.18.0-next.2" + sources."es-to-primitive-1.2.1" + sources."events-3.2.0" sources."evp_bytestokey-1.0.3" sources."fast-safe-stringify-2.0.7" + sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" + sources."get-intrinsic-1.1.0" sources."glob-7.1.6" sources."has-1.0.3" - sources."hash-base-3.0.4" + sources."has-symbols-1.0.1" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.2.0" + sources."insert-module-globals-7.2.1" + sources."is-arguments-1.1.0" sources."is-buffer-1.1.6" + sources."is-callable-1.2.3" + sources."is-core-module-2.2.0" + sources."is-date-object-1.0.2" + sources."is-generator-function-1.0.8" + sources."is-negative-zero-2.0.1" + sources."is-regex-1.1.2" + sources."is-symbol-1.0.3" + sources."is-typed-array-1.1.4" sources."isarray-1.0.0" - sources."json-stable-stringify-0.0.1" - sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.5" - sources."miller-rabin-4.0.1" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" - sources."module-deps-6.2.2" + sources."minimist-1.2.5" + sources."mkdirp-classic-0.5.3" + sources."module-deps-6.2.3" sources."object-assign-4.1.1" + sources."object-inspect-1.9.0" + sources."object-keys-1.1.1" + sources."object.assign-4.1.2" sources."once-1.4.0" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parents-1.0.1" - sources."parse-asn1-5.1.5" - sources."path-browserify-0.0.1" + sources."parse-asn1-5.1.6" + sources."path-browserify-1.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."path-platform-0.11.15" - sources."pbkdf2-3.0.17" + sources."pbkdf2-3.1.1" sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."public-encrypt-4.0.3" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -3400,29 +3254,31 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.19.0" sources."ripemd160-2.0.2" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."sha.js-2.4.11" - sources."shasum-1.0.2" sources."shasum-object-1.0.0" sources."shell-quote-1.7.2" - sources."simple-concat-1.0.0" + sources."simple-concat-1.0.1" sources."source-map-0.5.7" - sources."stream-browserify-2.0.2" - sources."stream-combiner2-1.1.1" - (sources."stream-http-3.1.0" // { + (sources."stream-browserify-3.0.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; }) - sources."stream-splicer-2.0.1" - sources."string_decoder-1.3.0" - (sources."subarg-1.0.0" // { + sources."stream-combiner2-1.1.1" + (sources."stream-http-3.1.1" // { dependencies = [ - sources."minimist-1.2.5" + sources."readable-stream-3.6.0" ]; }) + sources."stream-splicer-2.0.1" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" + sources."string_decoder-1.3.0" + sources."subarg-1.0.0" sources."syntax-error-1.4.0" sources."through-2.3.8" sources."through2-2.0.5" @@ -3436,13 +3292,10 @@ in sources."punycode-1.3.2" ]; }) - (sources."util-0.10.4" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."util-0.12.3" sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" + sources."which-typed-array-1.1.4" sources."wrappy-1.0.2" sources."xtend-4.0.2" ]; @@ -3459,19 +3312,15 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.8.0"; + version = "3.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz"; - sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz"; + sha512 = "aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw=="; }; - dependencies = [ - sources."commander-2.20.3" - sources."source-map-0.6.1" - ]; buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; - homepage = "https://github.com/mishoo/UglifyJS2#readme"; + homepage = "https://github.com/mishoo/UglifyJS#readme"; license = "BSD-2-Clause"; }; production = true; @@ -3481,76 +3330,36 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.11.1"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.11.1.tgz"; - sha512 = "3p1iabzyyzdnvvqfmi17bs5i1mbwpbq4mh9ahz503jwjyarjqxzlq7yzbp0b499yzz6v1pn9s7hlyx98pxj40zs7a9jn42iipgrfmdn"; + url = "https://registry.npmjs.org/less/-/less-4.1.1.tgz"; + sha512 = "w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw=="; }; dependencies = [ - sources."ajv-6.12.0" - sources."asap-2.0.6" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" - sources."bcrypt-pbkdf-1.0.2" - sources."caseless-0.12.0" - sources."clone-2.1.2" - sources."combined-stream-1.0.8" - sources."core-util-is-1.0.2" - sources."dashdash-1.14.1" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."errno-0.1.7" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" - sources."fast-json-stable-stringify-2.1.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."http-signature-1.2.0" + sources."copy-anything-2.0.1" + sources."debug-3.2.7" + sources."errno-0.1.8" + sources."graceful-fs-4.2.4" + sources."iconv-lite-0.4.24" sources."image-size-0.5.5" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."is-what-3.12.0" + sources."make-dir-2.1.0" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" - sources."oauth-sign-0.9.0" - sources."performance-now-2.1.0" - sources."promise-7.3.1" + sources."ms-2.1.3" + sources."needle-2.6.0" + sources."parse-node-version-1.0.1" + sources."pify-4.0.1" sources."prr-1.0.1" - sources."psl-1.7.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."request-2.88.2" - sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" sources."source-map-0.6.1" - sources."sshpk-1.16.1" - sources."tough-cookie-2.5.0" - sources."tslib-1.11.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" - sources."uuid-3.4.0" - sources."verror-1.10.0" + sources."tslib-1.14.1" ]; buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = "http://lesscss.org/"; + homepage = "http://lesscss.org"; license = "Apache-2.0"; }; production = true; @@ -3560,29 +3369,26 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "7.1.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz"; - sha512 = "MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; + sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; }; dependencies = [ - sources."ansi-colors-3.2.3" + sources."@ungap/promise-all-settled-1.1.2" + sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."argparse-1.0.10" sources."balanced-match-1.0.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" sources."camelcase-5.3.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."chokidar-3.3.0" + sources."chalk-4.1.0" + sources."chokidar-3.4.3" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -3590,100 +3396,98 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."debug-3.2.6" + sources."debug-4.2.0" sources."decamelize-1.2.0" - sources."define-properties-1.1.3" - sources."diff-3.5.0" + sources."diff-4.0.2" sources."emoji-regex-7.0.3" - sources."es-abstract-1.17.4" - sources."es-to-primitive-1.2.1" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."fill-range-7.0.1" - sources."find-up-3.0.0" - sources."flat-4.1.0" + sources."find-up-5.0.0" + sources."flat-5.0.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" - sources."function-bind-1.1.1" + sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" - sources."glob-7.1.3" - sources."glob-parent-5.1.0" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" sources."growl-1.10.5" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" + sources."has-flag-4.0.0" sources."he-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" - sources."is-callable-1.1.5" - sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."is-regex-1.0.5" - sources."is-symbol-1.0.3" + sources."is-plain-obj-2.1.0" sources."isexe-2.0.0" - sources."js-yaml-3.13.1" - sources."locate-path-3.0.0" - sources."lodash-4.17.15" - sources."log-symbols-3.0.0" + sources."js-yaml-3.14.0" + sources."locate-path-6.0.0" + sources."log-symbols-4.0.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" - sources."ms-2.1.1" - sources."node-environment-flags-1.0.6" + sources."ms-2.1.2" + sources."nanoid-3.1.12" sources."normalize-path-3.0.0" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-try-2.2.0" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."picomatch-2.2.1" - sources."readdirp-3.2.0" + sources."picomatch-2.2.2" + sources."randombytes-2.1.0" + sources."readdirp-3.5.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."semver-5.7.1" + sources."safe-buffer-5.2.1" + sources."serialize-javascript-5.0.1" sources."set-blocking-2.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" sources."strip-ansi-4.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-6.0.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" - sources."which-1.3.1" + sources."which-2.0.2" sources."which-module-2.0.0" sources."wide-align-1.1.3" + sources."workerpool-6.0.2" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) sources."wrappy-1.0.2" - sources."y18n-4.0.0" - (sources."yargs-13.3.0" // { + sources."y18n-4.0.1" + (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) - sources."yargs-parser-13.1.1" - sources."yargs-unparser-1.6.0" + sources."yargs-parser-13.1.2" + (sources."yargs-unparser-2.0.0" // { + dependencies = [ + sources."camelcase-6.2.0" + sources."decamelize-4.0.0" + ]; + }) + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -3715,7 +3519,7 @@ in sources."commander-2.20.3" (sources."config-chain-1.1.12" // { dependencies = [ - sources."ini-1.3.5" + sources."ini-1.3.8" ]; }) sources."cryptiles-0.2.2" @@ -3728,7 +3532,6 @@ in sources."http-signature-0.10.1" sources."inherits-1.0.2" sources."ini-1.1.0" - sources."ip-regex-2.1.0" sources."json-stringify-safe-5.0.1" sources."kew-0.1.7" sources."mime-1.2.11" @@ -3744,7 +3547,7 @@ in sources."phantomjs-1.9.7-15" sources."progress-1.1.8" sources."proto-list-1.2.4" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-0.6.6" sources."request-2.36.0" @@ -3753,8 +3556,9 @@ in sources."semver-1.1.4" sources."sntp-0.2.4" sources."throttleit-0.0.2" - sources."tough-cookie-3.0.1" + sources."tough-cookie-4.0.0" sources."tunnel-agent-0.4.3" + sources."universalify-0.1.2" sources."which-1.0.9" ]; buildInputs = globalBuildInputs; @@ -3794,25 +3598,24 @@ in sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "9.0.1"; + version = "9.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-9.0.1.tgz"; - sha512 = "iTTyiQo5T94jrOx7X7QLBZyucUJ2WvL9J13+96HMfm2CGoJYbIPqRfl6wgNcqmzk0DI28jeGx5bUTXizkrqBmg=="; + url = "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz"; + sha512 = "zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg=="; }; dependencies = [ - sources."@sinonjs/commons-1.7.1" - sources."@sinonjs/fake-timers-6.0.0" - sources."@sinonjs/formatio-5.0.1" - sources."@sinonjs/samsam-5.0.3" + sources."@sinonjs/commons-1.8.2" + sources."@sinonjs/fake-timers-6.0.1" + sources."@sinonjs/samsam-5.3.1" sources."@sinonjs/text-encoding-0.7.1" sources."diff-4.0.2" sources."has-flag-4.0.0" sources."isarray-0.0.1" - sources."just-extend-4.1.0" + sources."just-extend-4.1.1" sources."lodash.get-4.4.2" - sources."nise-4.0.3" + sources."nise-4.0.4" sources."path-to-regexp-1.8.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."type-detect-4.0.8" ]; buildInputs = globalBuildInputs; @@ -3828,10 +3631,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.11.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz"; - sha512 = "ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.12.0.tgz"; + sha512 = "TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -3843,8 +3646,8 @@ in sources."date-now-0.1.4" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" - sources."entities-2.0.0" + sources."domelementtype-2.1.0" + sources."entities-2.2.0" ]; }) sources."domelementtype-1.3.1" @@ -3858,7 +3661,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-0.0.1" - sources."lodash-4.17.15" + sources."lodash-4.17.20" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -3872,7 +3675,7 @@ in meta = { description = "Static analysis tool for JavaScript"; homepage = "http://jshint.com/"; - license = "(MIT AND JSON)"; + license = "MIT"; }; production = true; bypassCache = true; @@ -3881,26 +3684,29 @@ in shelljs = nodeEnv.buildNodePackage { name = "shelljs"; packageName = "shelljs"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; - sha512 = "3ndzzikwq0c0084xy1s0v9q2msc8wc7qrmi0bi1llshsmlhfz4dn1k9i2r666ls7xmq62idmify0ksc1vq3mrjqcrqbm20na0m03kbx"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz"; + sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ=="; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."glob-7.1.6" + sources."has-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."interpret-1.2.0" + sources."interpret-1.4.0" + sources."is-core-module-2.2.0" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."rechoir-0.6.2" - sources."resolve-1.15.1" + sources."resolve-1.19.0" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; diff --git a/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix b/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix index b565c6d2f5d9..baacee29ff20 100644 --- a/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ../../node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/development/web/shopify-themekit/default.nix b/nixpkgs/pkgs/development/web/shopify-themekit/default.nix index 60a3d330ab82..bf0a8c6d8161 100644 --- a/nixpkgs/pkgs/development/web/shopify-themekit/default.nix +++ b/nixpkgs/pkgs/development/web/shopify-themekit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "shopify-themekit"; diff --git a/nixpkgs/pkgs/development/web/wml/default.nix b/nixpkgs/pkgs/development/web/wml/default.nix index 2b882ccc8418..a6ffe6e84e3f 100644 --- a/nixpkgs/pkgs/development/web/wml/default.nix +++ b/nixpkgs/pkgs/development/web/wml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: +{ lib, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: perlPackages.buildPerlPackage { pname = "wml"; diff --git a/nixpkgs/pkgs/games/0verkill/default.nix b/nixpkgs/pkgs/games/0verkill/default.nix new file mode 100644 index 000000000000..69a371f09d9f --- /dev/null +++ b/nixpkgs/pkgs/games/0verkill/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, xorgproto +, libX11 +, libXpm +}: + +stdenv.mkDerivation rec { + pname = "0verkill"; + version = "unstable-2011-01-13"; + + src = fetchFromGitHub { + owner = "hackndev"; + repo = pname; + rev = "522f11a3e40670bbf85e0fada285141448167968"; + sha256 = "WO7PN192HhcDl6iHIbVbH7MVMi1Tl2KyQbDa9DWRO6M="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 xorgproto libXpm ]; + + configureFlags = [ "--with-x" ]; + + preAutoreconf = '' + autoupdate + ''; + + hardeningDisable = [ "all" ]; # Someday the upstream will update the code... + + meta = with lib; { + homepage = "https://github.com/hackndev/0verkill"; + description = "ASCII-ART bloody 2D action deathmatch-like game"; + license = with licenses; gpl2Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/games/20kly/default.nix b/nixpkgs/pkgs/games/20kly/default.nix index e8778d7bebcf..092e0e4eac27 100644 --- a/nixpkgs/pkgs/games/20kly/default.nix +++ b/nixpkgs/pkgs/games/20kly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , python }: diff --git a/nixpkgs/pkgs/games/abuse/abuse.sh b/nixpkgs/pkgs/games/abuse/abuse.sh new file mode 100644 index 000000000000..de837d27181f --- /dev/null +++ b/nixpkgs/pkgs/games/abuse/abuse.sh @@ -0,0 +1,18 @@ +#! @shell@ + +if grep datadir ~/.abuse/abuserc &>/dev/null; then + if [ ! -d "$(grep datadir ~/.abuse/abuserc | cut -d= -f2)" ]; then + echo "Warning: ~/.abuse/abuserc references a datadir which is not existent." >&2 + echo "Try removing ~/.abuse/abuserc, else abuse will most likely not run." >&2 + echo >&2 + # This can happen if the build hash of abuse changes and the older version + # is garbage-collected. The correct path of the datadir is compiled into + # the binary, but unfortunately abuse writes out the path into abuserc on + # first start. This entry may later become stale. + fi +fi + +# The timidity bundled into SDL_mixer looks in . and in several global places +# like /etc for its configuration file. +cd @out@/etc +exec @out@/bin/.abuse-bin "$@" diff --git a/nixpkgs/pkgs/games/abuse/default.nix b/nixpkgs/pkgs/games/abuse/default.nix new file mode 100644 index 000000000000..2e863022a68b --- /dev/null +++ b/nixpkgs/pkgs/games/abuse/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, SDL, SDL_mixer, freepats }: + +stdenv.mkDerivation rec { + pname = "abuse"; + version = "0.8"; + + src = fetchurl { + url = "http://abuse.zoy.org/raw-attachment/wiki/download/${pname}-${version}.tar.gz"; + sha256 = "0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488"; + }; + + configureFlags = [ + "--with-x" + "--with-assetdir=$(out)/orig" + # The "--enable-debug" is to work around a segfault on start, see https://bugs.archlinux.org/task/52915. + "--enable-debug" + ]; + + desktopItems = [ (makeDesktopItem { + name = "abuse"; + exec = "abuse"; + icon = "abuse"; + desktopName = "Abuse"; + comment = "Side-scroller action game that pits you against ruthless alien killers"; + categories = "Game;ActionGame;"; + }) ]; + + postInstall = '' + mkdir $out/etc + echo -e "dir ${freepats}\nsource ${freepats}/freepats.cfg" > $out/etc/timidity.cfg + + mv $out/bin/abuse $out/bin/.abuse-bin + substituteAll "${./abuse.sh}" $out/bin/abuse + chmod +x $out/bin/abuse + + install -Dm644 doc/abuse.png $out/share/pixmaps/abuse.png + ''; + + nativeBuildInputs = [ copyDesktopItems ]; + buildInputs = [ SDL SDL_mixer freepats ]; + + meta = with lib; { + description = "Side-scroller action game that pits you against ruthless alien killers"; + homepage = "http://abuse.zoy.org/"; + license = with licenses; [ unfree ]; + # Most of abuse is free (public domain, GPL2+, WTFPL), however the creator + # of its sfx and music only gave Debian permission to redistribute the + # files. Our friends from Debian thought about it some more: + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648272 + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/nixpkgs/pkgs/games/alephone/default.nix b/nixpkgs/pkgs/games/alephone/default.nix index efd26d1c4f0a..6562a60a5be4 100644 --- a/nixpkgs/pkgs/games/alephone/default.nix +++ b/nixpkgs/pkgs/games/alephone/default.nix @@ -96,5 +96,5 @@ in self // { license = lib.licenses.free; hydraPlatforms = [ ]; } // meta; - }); + } // extraArgs); } diff --git a/nixpkgs/pkgs/games/armagetronad/default.nix b/nixpkgs/pkgs/games/armagetronad/default.nix index e271db867340..27f509c3f72a 100644 --- a/nixpkgs/pkgs/games/armagetronad/default.nix +++ b/nixpkgs/pkgs/games/armagetronad/default.nix @@ -1,30 +1,42 @@ -{ lib, stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib }: +{ lib, stdenv, fetchurl +, pkg-config, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib +, dedicatedServer ? false }: let - versionMajor = "0.2.8"; - versionMinor = "3.5"; + versionMajor = "0.2.9"; + versionMinor = "1.0"; version = "${versionMajor}.${versionMinor}"; in - stdenv.mkDerivation { - pname = "armagetron"; + pname = if dedicatedServer then "armagetronad-dedicated" else "armagetronad"; inherit version; src = fetchurl { - url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2"; - sha256 = "1vyja7mzivs3pacxb7kznndsgqhq4p0f7x2zg55dckvzqwprdhqx"; + url = "https://launchpad.net/armagetronad/${versionMajor}/${version}/+download/armagetronad-${version}.tbz"; + sha256 = "sha256-WbbHwBzj+MylQ34z+XSmN1KVQaEapPUsGlwXSZ4m9qE"; }; - NIX_LDFLAGS = "-lSDL_image"; - enableParallelBuilding = true; - configureFlags = [ "--disable-etc" ]; - buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL zlib ]; + configureFlags = [ + "--enable-memmanager" + "--enable-automakedefaults" + "--disable-useradd" + "--disable-initscripts" + "--disable-etc" + "--disable-uninstall" + "--disable-sysinstall" + ] ++ lib.optional dedicatedServer "--enable-dedicated"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libxml2 zlib ] + ++ lib.optionals (!dedicatedServer) [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL ]; meta = with lib; { homepage = "http://armagetronad.org"; - description = "An multiplayer networked arcade racing game in 3D similar to Tron"; - license = licenses.gpl2; + description = "A multiplayer networked arcade racing game in 3D similar to Tron"; + maintainers = with maintainers; [ numinit ]; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/games/boohu/default.nix b/nixpkgs/pkgs/games/boohu/default.nix index 9b46420d5fff..831893536453 100644 --- a/nixpkgs/pkgs/games/boohu/default.nix +++ b/nixpkgs/pkgs/games/boohu/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, buildGoPackage}: +{lib, fetchurl, buildGoPackage}: buildGoPackage rec { diff --git a/nixpkgs/pkgs/games/chessx/default.nix b/nixpkgs/pkgs/games/chessx/default.nix index f63f6362558e..fb7c7fddf095 100644 --- a/nixpkgs/pkgs/games/chessx/default.nix +++ b/nixpkgs/pkgs/games/chessx/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, lib, stdenv +, lib , pkg-config , zlib , qtbase diff --git a/nixpkgs/pkgs/games/chiaki/default.nix b/nixpkgs/pkgs/games/chiaki/default.nix index 33abfe644651..ef454e500064 100644 --- a/nixpkgs/pkgs/games/chiaki/default.nix +++ b/nixpkgs/pkgs/games/chiaki/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "chiaki"; - version = "2.0.1"; + version = "2.1.0"; src = fetchgit { url = "https://git.sr.ht/~thestr4ng3r/chiaki"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0l532i9j6wmzbxqx7fg69kgfd1zy1r1wlw6f756vpxpgswivi892"; + sha256 = "1hgh2j71rch53cnpm3f195gpfgrb4hd0yqa810k3ikar8zl4h7sd"; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://git.sr.ht/~thestr4ng3r/chiaki"; description = "Free and Open Source PlayStation Remote Play Client"; - license = licenses.gpl3Plus; + license = licenses.agpl3Only; maintainers = with maintainers; [ delroth ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/games/cockatrice/default.nix b/nixpkgs/pkgs/games/cockatrice/default.nix index d47e0d5521db..a657913aad76 100644 --- a/nixpkgs/pkgs/games/cockatrice/default.nix +++ b/nixpkgs/pkgs/games/cockatrice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation, cmake, protobuf +{ lib, fetchFromGitHub, mkDerivation, cmake, protobuf , qtbase, qtmultimedia, qttools, qtwebsockets, wrapQtAppsHook }: diff --git a/nixpkgs/pkgs/games/crawl/default.nix b/nixpkgs/pkgs/games/crawl/default.nix index 8d16b2fe59cc..7b644aa71476 100644 --- a/nixpkgs/pkgs/games/crawl/default.nix +++ b/nixpkgs/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi"; + sha256 = "sha256-lh0lCMZRH+c6jSHjLFDU3wjy6Oyp59ZcPaqg5PWVrkk="; }; # Patch hard-coded paths and remove force library builds diff --git a/nixpkgs/pkgs/games/eidolon/default.nix b/nixpkgs/pkgs/games/eidolon/default.nix index 3192976b0f62..dcb72d53b328 100644 --- a/nixpkgs/pkgs/games/eidolon/default.nix +++ b/nixpkgs/pkgs/games/eidolon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, rustPlatform, pkg-config, openssl }: +{ lib, fetchgit, rustPlatform, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "eidolon"; diff --git a/nixpkgs/pkgs/games/endgame-singularity/default.nix b/nixpkgs/pkgs/games/endgame-singularity/default.nix index f220a85e0eb6..d6b153018723 100644 --- a/nixpkgs/pkgs/games/endgame-singularity/default.nix +++ b/nixpkgs/pkgs/games/endgame-singularity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , fetchFromGitHub , unzip diff --git a/nixpkgs/pkgs/games/enyo-doom/default.nix b/nixpkgs/pkgs/games/enyo-doom/default.nix index 10cce9f3bf81..eeb4086f924e 100644 --- a/nixpkgs/pkgs/games/enyo-doom/default.nix +++ b/nixpkgs/pkgs/games/enyo-doom/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitLab, cmake, qtbase }: +{ mkDerivation, lib, fetchFromGitLab, cmake, qtbase }: mkDerivation rec { pname = "enyo-doom"; diff --git a/nixpkgs/pkgs/games/factorio/default.nix b/nixpkgs/pkgs/games/factorio/default.nix index 9db8a95746d4..356cedd3507e 100644 --- a/nixpkgs/pkgs/games/factorio/default.nix +++ b/nixpkgs/pkgs/games/factorio/default.nix @@ -42,7 +42,7 @@ let releaseType=alpha version=0.17.74 - nix-prefetch-url file://$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz + nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz Note the ultimate "_" is replaced with "-" in the --name arg! ''; diff --git a/nixpkgs/pkgs/games/factorio/mods.nix b/nixpkgs/pkgs/games/factorio/mods.nix index 8d9976689cc4..7327b9e22870 100644 --- a/nixpkgs/pkgs/games/factorio/mods.nix +++ b/nixpkgs/pkgs/games/factorio/mods.nix @@ -2,7 +2,7 @@ # mods. It will eventually be replaced by a nixos-channel that will provide # derivations for most or all of the mods tracked through the official mod # manager site. -{ lib, stdenv, fetchurl +{ lib, fetchurl , factorio-utils , allRecommendedMods ? true , allOptionalMods ? false diff --git a/nixpkgs/pkgs/games/factorio/versions.json b/nixpkgs/pkgs/games/factorio/versions.json index 10a3e55a94fe..a8f49d599548 100644 --- a/nixpkgs/pkgs/games/factorio/versions.json +++ b/nixpkgs/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.12.tar.xz", + "name": "factorio_alpha_x64-1.1.21.tar.xz", "needsAuth": true, - "sha256": "1b6rccm3vvvgs1sky0nrm001hsrzahrd8hc0pgldgyk0i6g5bmss", + "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.12/alpha/linux64", - "version": "1.1.12" + "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", + "version": "1.1.21" }, "stable": { - "name": "factorio_alpha_x64-1.0.0.tar.xz", + "name": "factorio_alpha_x64-1.1.21.tar.xz", "needsAuth": true, - "sha256": "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464", + "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/alpha/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", + "version": "1.1.21" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.12.tar.xz", + "name": "factorio_demo_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "037lipqxgfxycjsjffgd6rnx3xv62r40fmkyarcclww3yi596zrw", + "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.12/demo/linux64", - "version": "1.1.12" + "url": "https://factorio.com/get-download/1.1.21/demo/linux64", + "version": "1.1.21" }, "stable": { - "name": "factorio_demo_x64-1.0.0.tar.xz", + "name": "factorio_demo_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn", + "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/demo/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.21/demo/linux64", + "version": "1.1.21" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.12.tar.xz", + "name": "factorio_headless_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "0chgv7ymsiz4rrjmp04ckdhk2yzgi4ly7rwl0nv2fswajhl7ngmf", + "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.12/headless/linux64", - "version": "1.1.12" + "url": "https://factorio.com/get-download/1.1.21/headless/linux64", + "version": "1.1.21" }, "stable": { - "name": "factorio_headless_x64-1.0.0.tar.xz", + "name": "factorio_headless_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1", + "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/headless/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.21/headless/linux64", + "version": "1.1.21" } } } diff --git a/nixpkgs/pkgs/games/freeciv/default.nix b/nixpkgs/pkgs/games/freeciv/default.nix index de5f2751fd19..647a87d571b5 100644 --- a/nixpkgs/pkgs/games/freeciv/default.nix +++ b/nixpkgs/pkgs/games/freeciv/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.2.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1nra6b6sk2gciaw1fpwx7qa20hky8cwcdwlshcl1zsikg577hyg5"; + sha256 = "sha256-tRjik2LONwKFZOcIuyFDoE1fD23UnZHMdNLo0DdYyOc="; }; postPatch = '' @@ -28,7 +28,8 @@ in stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ] + ++ optional qtClient [ qt5.wrapQtAppsHook ]; buildInputs = [ lua5_3 zlib bzip2 curl lzma gettext libiconv ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] diff --git a/nixpkgs/pkgs/games/freedroid/default.nix b/nixpkgs/pkgs/games/freedroid/default.nix new file mode 100644 index 000000000000..266407d17dba --- /dev/null +++ b/nixpkgs/pkgs/games/freedroid/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv +, fetchFromGitHub +, makeDesktopItem, copyDesktopItems +, imagemagick +, autoreconfHook +, SDL, SDL_mixer, SDL_image, SDL_gfx +, libvorbis +, libjpeg, libpng +, zlib +}: + +stdenv.mkDerivation rec { + pname = "freedroid"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "ReinhardPrix"; + repo = "FreedroidClassic"; + rev = "release-${version}"; + sha256 = "027wns25nyyc8afyhyp5a8wn13x9nlzmnqzqyyma1055xjy5imis"; + }; + + nativeBuildInputs = [ copyDesktopItems imagemagick autoreconfHook ]; + buildInputs = [ SDL SDL_image SDL_gfx SDL_mixer libjpeg libpng libvorbis zlib ]; + + postPatch = '' + touch NEWS + ''; + + postInstall = '' + mkdir -p $out/share/icons/hicolor/32x32/apps + convert graphics/paraicon.bmp $out/share/icons/hicolor/32x32/apps/freedroid.png + ''; + + desktopItems = [ (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Freedroid Classic"; + comment = "A clone of the classic game 'Paradroid' on Commodore 64"; + categories = "Game;ArcadeGame;"; + }) ]; + + meta = with lib; { + description = "A clone of the classic game 'Paradroid' on Commodore 64"; + homepage = "https://github.com/ReinhardPrix/FreedroidClassic"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + # Builds but fails to render to the screen at runtime. + broken = stdenv.isDarwin; + }; +} diff --git a/nixpkgs/pkgs/games/frogatto/default.nix b/nixpkgs/pkgs/games/frogatto/default.nix index fb09847908da..69d5282aedca 100644 --- a/nixpkgs/pkgs/games/frogatto/default.nix +++ b/nixpkgs/pkgs/games/frogatto/default.nix @@ -1,4 +1,4 @@ -{ buildEnv, lib, stdenv, callPackage, makeWrapper, makeDesktopItem }: +{ buildEnv, lib, callPackage, makeWrapper, makeDesktopItem }: let description = "Action-adventure game, starring a certain quixotic frog"; diff --git a/nixpkgs/pkgs/games/frozen-bubble/default.nix b/nixpkgs/pkgs/games/frozen-bubble/default.nix index d1521dae3c4e..f9dd3fd61592 100644 --- a/nixpkgs/pkgs/games/frozen-bubble/default.nix +++ b/nixpkgs/pkgs/games/frozen-bubble/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib }: - +{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib +, copyDesktopItems, makeDesktopItem +}: perlPackages.buildPerlModule { pname = "frozen-bubble"; version = "2.212"; @@ -10,13 +11,24 @@ perlPackages.buildPerlModule { }; patches = [ ./fix-compilation.patch ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ copyDesktopItems pkg-config ]; buildInputs = [ glib SDL SDL_mixer SDL_Pango perlPackages.SDL perlPackages.FileSlurp ]; propagatedBuildInputs = with perlPackages; [ AlienSDL CompressBzip2 FileShareDir FileWhich IPCSystemSimple LocaleMaketextLexicon ]; perlPreHook = "export LD=$CC"; + desktopItems = [ + (makeDesktopItem { + name = "frozen-bubble"; + exec = "frozen-bubble"; + desktopName = "Frozen Bubble"; + genericName = "Frozen Bubble"; + comment = "Arcade/reflex colour matching game"; + categories = "Game;"; + }) + ]; + meta = { description = "Puzzle with Bubbles"; license = lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/games/gimx/default.nix b/nixpkgs/pkgs/games/gimx/default.nix new file mode 100644 index 000000000000..727945ff2b46 --- /dev/null +++ b/nixpkgs/pkgs/games/gimx/default.nix @@ -0,0 +1,72 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, xorg, libxml2 +, ncurses5, bluez, libmhash, gimxAuth ? "" }: + +let + gimx-config = fetchFromGitHub { + owner = "matlo"; + repo = "GIMX-configurations"; + rev = "f31bba7d3be57519540be290cd69ba6a8dc4e4d4"; + sha256 = "0wpxx2qxyiiblz2qrl5swg00ls1aq7i5vzlk0qlnqdq8ss8jssax"; + }; + +in stdenv.mkDerivation rec { + pname = "gimx"; + version = "8.0"; + + src = fetchFromGitHub { + owner = "matlo"; + repo = "GIMX"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0265gg6q7ymg76fb4pjrfdwjd280b3zzry96qy92w0h411slph85"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + curl libusb1 bluez libxml2 ncurses5 libmhash + xorg.libX11 xorg.libXi xorg.libXext + ]; + + patches = [ ./env.patch ]; + prePatch = (if gimxAuth == "afterglow" then (import ./variant.nix).afterglow + else ""); + + makeFlags = "build-core"; + installPhase = '' + runHook preInstall + + mkdir -p $out + substituteInPlace ./core/Makefile --replace "chmod ug+s" "echo" + + export DESTDIR="$out" + make install-shared install-core + mv $out/usr/lib $out/lib + mv $out/usr/bin $out/bin + rmdir $out/usr + + runHook postInstall + ''; + + postInstall = '' + mkdir -p $out/share + cp -r ./loader/firmware $out/share/firmware + cp -r ${gimx-config}/Linux $out/share/config + patch ${gimx-config}/Linux/Dualshock4.xml ${./ds4.patch} -o $out/share/DS4_noff.xml + + makeWrapper $out/bin/gimx $out/bin/gimx-with-confs \ + --set GIMXCONF $out/share + + makeWrapper $out/bin/gimx $out/bin/gimx-test-ds4 \ + --set GIMXCONF $out/share \ + --add-flags "--nograb" --add-flags "--curses" \ + --add-flags "-p /dev/ttyUSB0" --add-flags "-c DS4_noff.xml" + ''; + + meta = with lib; { + homepage = "https://github.com/matlo/GIMX"; + description = "Game Input Multiplexer"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ bb2020 ]; + }; +} diff --git a/nixpkgs/pkgs/games/gimx/ds4.patch b/nixpkgs/pkgs/games/gimx/ds4.patch new file mode 100644 index 000000000000..86b36adda231 --- /dev/null +++ b/nixpkgs/pkgs/games/gimx/ds4.patch @@ -0,0 +1,16 @@ +diff --git a/Linux/Dualshock4.xml b/Linux/Dualshock4.xml +index 5e53ed3..45ee5ed 100644 +--- a/Linux/Dualshock4.xml ++++ b/Linux/Dualshock4.xml +@@ -94,6 +94,11 @@ + </axis> + </axis_map> + <joystick_corrections_list/> ++ <force_feedback> ++ <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> ++ <inversion enable="no"/> ++ <gain rumble="0" constant="0" spring="0" damper="0"/> ++ </force_feedback> + </configuration> + </controller> + </root> diff --git a/nixpkgs/pkgs/games/gimx/env.patch b/nixpkgs/pkgs/games/gimx/env.patch new file mode 100644 index 000000000000..e1f8ed8bb6f1 --- /dev/null +++ b/nixpkgs/pkgs/games/gimx/env.patch @@ -0,0 +1,30 @@ +--- a/core/config_reader.c ++++ b/core/config_reader.c +@@ -1353,8 +1353,10 @@ static int read_file(char* file_path) + int read_config_file(const char* file) + { + char file_path[PATH_MAX]; +- +- snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file); ++ char* e = getenv("GIMXCONF"); if (e) { snprintf(file_path, sizeof(file_path), "%s/%s", e, file); } ++ else { ++ snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file); ++ } + + if(read_file(file_path) == -1) + { +--- a/core/gimx.c ++++ b/core/gimx.c +@@ -190,8 +190,10 @@ void show_config() + } + + char file_path[PATH_MAX]; +- +- snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file); ++ char* e = getenv("GIMXCONF"); if (e) { snprintf(file_path, sizeof(file_path), "%s/%s", e, gimx_params.config_file); } ++ else { ++ snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file); ++ } + + FILE * fp = gfile_fopen(file_path, "r"); + if (fp == NULL) diff --git a/nixpkgs/pkgs/games/gimx/variant.nix b/nixpkgs/pkgs/games/gimx/variant.nix new file mode 100644 index 000000000000..8396f72b4e77 --- /dev/null +++ b/nixpkgs/pkgs/games/gimx/variant.nix @@ -0,0 +1,14 @@ +{ + afterglow = '' + substituteInPlace ./shared/gimxcontroller/include/x360.h \ + --replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213" + + HEX="./loader/firmware/EMU360.hex" + sed -i '34s|1B2100|1B2110|' "$HEX" + sed -i '38s|092100|092110|' "$HEX" + sed -i '40s|5E048E021001|6F0E13020001|' "$HEX" + sed -i '34s|1C\r|0C\r|' "$HEX" + sed -i '38s|FE\r|EE\r|' "$HEX" + sed -i '40s|6D\r|DD\r|' "$HEX" + ''; +} diff --git a/nixpkgs/pkgs/games/gscrabble/default.nix b/nixpkgs/pkgs/games/gscrabble/default.nix index 7d63510aa991..74411d63d3eb 100644 --- a/nixpkgs/pkgs/games/gscrabble/default.nix +++ b/nixpkgs/pkgs/games/gscrabble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub +{ lib, buildPythonApplication, fetchFromGitHub , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection , python3Packages, gnome3 }: diff --git a/nixpkgs/pkgs/games/gshogi/default.nix b/nixpkgs/pkgs/games/gshogi/default.nix index 5ed4bf5a3763..c3479f6758af 100644 --- a/nixpkgs/pkgs/games/gshogi/default.nix +++ b/nixpkgs/pkgs/games/gshogi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub +{ lib, buildPythonApplication, fetchFromGitHub , gtk3, gobject-introspection , wrapGAppsHook, python3Packages }: diff --git a/nixpkgs/pkgs/games/gzdoom/default.nix b/nixpkgs/pkgs/games/gzdoom/default.nix index 9cf93176b9a6..8ab54468c001 100644 --- a/nixpkgs/pkgs/games/gzdoom/default.nix +++ b/nixpkgs/pkgs/games/gzdoom/default.nix @@ -6,12 +6,12 @@ let zmusic-src = fetchFromGitHub { owner = "coelckers"; repo = "zmusic"; - rev = "2d0ea861174f9e2031400ab29f5bcc8425521cc6"; - sha256 = "1ac7lhbzwfr0fsyv7n70hvb8imzngxn1qyanmv9j26j0h90hhl8a"; + rev = "bff02053bea30bd789e45f60b90db3ffc69c8cc8"; + sha256 = "0vpr79gpdbhslg5qxyd1qxlv5akgli26skm1vb94yd8v69ymdcy2"; }; zmusic = stdenv.mkDerivation { pname = "zmusic"; - version = "1.1.0"; + version = "1.1.3"; src = zmusic-src; @@ -28,13 +28,13 @@ let gzdoom = stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.4.2"; + version = "4.5.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1xkkmbsdv64wyb9r2fv5mwyqw0bjryk528jghdrh47pndmjs9a38"; + sha256 = "0kmqnyhdi5psi7zwrx9j3pz0cplypsvhg4cr8w2jbawh6jb71sk9"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/games/harmonist/default.nix b/nixpkgs/pkgs/games/harmonist/default.nix index 0705da6bfe94..4609f7d732cc 100644 --- a/nixpkgs/pkgs/games/harmonist/default.nix +++ b/nixpkgs/pkgs/games/harmonist/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, buildGoPackage}: +{lib, fetchurl, buildGoPackage}: buildGoPackage rec { diff --git a/nixpkgs/pkgs/games/hhexen/default.nix b/nixpkgs/pkgs/games/hhexen/default.nix new file mode 100644 index 000000000000..0306c54ef4ee --- /dev/null +++ b/nixpkgs/pkgs/games/hhexen/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchurl, SDL, stdenv }: + +stdenv.mkDerivation rec { + name = "hhexen"; + version = "1.6.3"; + src = fetchurl { + url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz"; + sha256 = "1jwccqawbdn0rjn5p59j21rjy460jdhps7zwn2z0gq9biggw325b"; + }; + + buildInputs = [ SDL ]; + installPhase = '' + install -Dm755 hhexen-gl -t $out/bin + ''; + + meta = with lib; { + description = "Linux port of Raven Game's Hexen"; + homepage = "http://hhexen.sourceforge.net/hhexen.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/nixpkgs/pkgs/games/legendary-gl/default.nix b/nixpkgs/pkgs/games/legendary-gl/default.nix index edf8b853c3c6..eb2f3f38cea4 100644 --- a/nixpkgs/pkgs/games/legendary-gl/default.nix +++ b/nixpkgs/pkgs/games/legendary-gl/default.nix @@ -7,23 +7,28 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.1"; + version = "0.20.6"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = version; - sha256 = "0kdrhdvh9gxq1zinh5w852f5fjls9902pcrkhkhm2c0vvq7jfass"; + sha256 = "1v6jbnasz2ilcafs6qyl6na4a8cxy2lgwr0hqsja6d846rfqa8ad"; }; propagatedBuildInputs = [ requests ]; disabled = pythonOlder "3.8"; + # no tests + doCheck = false; + + pythonImportsCheck = [ "legendary" ]; + meta = with lib; { description = "A free and open-source Epic Games Launcher alternative"; homepage = "https://github.com/derrod/legendary"; license = licenses.gpl3; - maintainers = with maintainers; [ wchresta ]; + maintainers = with maintainers; [ equirosa ]; }; } diff --git a/nixpkgs/pkgs/games/lunar-client/default.nix b/nixpkgs/pkgs/games/lunar-client/default.nix index f5c0e3faf77a..0635ab8aed83 100644 --- a/nixpkgs/pkgs/games/lunar-client/default.nix +++ b/nixpkgs/pkgs/games/lunar-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appimageTools, lib, fetchurl, makeDesktopItem }: +{ appimageTools, lib, fetchurl, makeDesktopItem }: let name = "lunar-client"; version = "2.4.0"; diff --git a/nixpkgs/pkgs/games/mindustry/default.nix b/nixpkgs/pkgs/games/mindustry/default.nix index b9969b84fb76..6f3cdab9ab45 100644 --- a/nixpkgs/pkgs/games/mindustry/default.nix +++ b/nixpkgs/pkgs/games/mindustry/default.nix @@ -3,7 +3,6 @@ , makeDesktopItem , copyDesktopItems , fetchFromGitHub -, fetchpatch , gradleGen , jdk , perl @@ -30,45 +29,31 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "122.1"; + version = "124.1"; buildVersion = makeBuildVersion version; Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y"; + sha256 = "1k4k559y8l6wmj9m4980f7xmaaxzx84x86rqc77j4nd3y3x53546"; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - sha256 = "0inzyj01442da7794cpxlaab7di9gv1snc97cbffqsdxgin16i7d"; + sha256 = "08v929sgxy1pclzc00p7l7fak2h9l306447w5k5db3719kacj059"; }; soloud = fetchFromGitHub { owner = "Anuken"; repo = "soloud"; # this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39 - rev = "8553049c6fb0d1eaa7f57c1793b96219c84e8ba5"; - sha256 = "076vnjs2qxd65qq5i37gbmj5v5i04a1vw0kznq986gv9190jj531"; + rev = "b33dfc5178fcb2613ee68136f4a4869cadc0b06a"; + sha256 = "1vf68i3pnsixch37285ib7afkwmlrc05v783395jsdjzj9i67lj3"; }; patches = [ ./0001-fix-include-path-for-SDL2-on-linux.patch - # upstream fix for https://github.com/Anuken/Arc/issues/40, remove on next release - (fetchpatch { - url = "https://github.com/Anuken/Arc/commit/b2f3d212c1a88a62f140f5cb04f4c86e61332d1c.patch"; - sha256 = "1yjp4drv7lk3kinzy47g8jhb2qazr92b85vbc79vsqrs8sycskan"; - extraPrefix = "Arc/"; - stripLen = 1; - }) - # add resolveDependencies task, remove when and if it gets added upstream in a future release - (fetchpatch { - url = "https://github.com/Anuken/Mindustry/pull/4302.patch"; - sha256 = "0yp42sray4fxkajhpdljal0wss8jh9rvmclysw6cixsa94pw5khq"; - extraPrefix = "Mindustry/"; - stripLen = 1; - }) ]; unpackPhase = '' @@ -103,7 +88,7 @@ let ''; # The default one still uses jdk8 (#89731) - gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_7; + gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_8; # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { @@ -129,7 +114,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "09rwyrg2yv8r499b0dk1bzvymsf98d4j5b95bwd9s4xvrz71is3l"; + outputHash = "18yfchv55f0fza6gdxd3f6gm0m4wy2a9jkw5wgl84id518jal6la"; }; in diff --git a/nixpkgs/pkgs/games/minecraft/default.nix b/nixpkgs/pkgs/games/minecraft/default.nix index 1c700de7b435..3d0b53035edd 100644 --- a/nixpkgs/pkgs/games/minecraft/default.nix +++ b/nixpkgs/pkgs/games/minecraft/default.nix @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.2.1262"; + version = "2.2.1441"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "09fklcnqmpvwykbfwg4lgwl82khr2wimvgyz7ssficm802xkicnc"; + sha256 = "03q579hvxnsh7d00j6lmfh53rixdpf33xb5zlz7659pvb9j5w0cm"; }; icon = fetchurl { diff --git a/nixpkgs/pkgs/games/multimc/default.nix b/nixpkgs/pkgs/games/multimc/default.nix index 81fc1b98f366..5a1f42ee130b 100644 --- a/nixpkgs/pkgs/games/multimc/default.nix +++ b/nixpkgs/pkgs/games/multimc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }: +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }: let jdk = jdk8; diff --git a/nixpkgs/pkgs/games/openmw/default.nix b/nixpkgs/pkgs/games/openmw/default.nix index 23572998d034..7c8f4990a619 100644 --- a/nixpkgs/pkgs/games/openmw/default.nix +++ b/nixpkgs/pkgs/games/openmw/default.nix @@ -6,6 +6,7 @@ let src = fetchFromGitHub { owner = "OpenMW"; repo = "osg"; + # commit does not exist on any branch on the target repository rev = "1556cd7966ebc1c80b6626988d2b25fb43a744cf"; sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; }; diff --git a/nixpkgs/pkgs/games/openra/common.nix b/nixpkgs/pkgs/games/openra/common.nix index 306c5de3b43a..41c903e10116 100644 --- a/nixpkgs/pkgs/games/openra/common.nix +++ b/nixpkgs/pkgs/games/openra/common.nix @@ -1,7 +1,7 @@ /* The reusable code, and package attributes, between OpenRA engine packages (engine.nix) and out-of-tree mod packages (mod.nix). */ -{ lib, stdenv, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper +{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper , lua, mono, dotnetPackages, python , libGL, freetype, openal, SDL2 , zenity diff --git a/nixpkgs/pkgs/games/openra/mods.nix b/nixpkgs/pkgs/games/openra/mods.nix index 4a79125dc181..cf8cd433c294 100644 --- a/nixpkgs/pkgs/games/openra/mods.nix +++ b/nixpkgs/pkgs/games/openra/mods.nix @@ -123,6 +123,7 @@ in { src = fetchFromGitHub { owner = "IceReaper"; repo = "OpenRA" ; + # commit does not exist on any branch on the target repository rev = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; sha256 = "1yyqparf93x8yzy1f46gsymgkj5jls25v2yc7ighr3f7mi3igdvq"; name = "engine"; diff --git a/nixpkgs/pkgs/games/osu-lazer/default.nix b/nixpkgs/pkgs/games/osu-lazer/default.nix index b1437ac46af5..e3c22ae73283 100644 --- a/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs -, dotnet-sdk, dotnet-netcore, dotnetPackages +, dotnetCorePackages, dotnetPackages, cacert , ffmpeg_4, alsaLib, SDL2, lttng-ust, numactl, alsaPlugins }: @@ -8,24 +8,31 @@ let ffmpeg_4 alsaLib SDL2 lttng-ust numactl ]; + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-net = dotnetCorePackages.net_5_0; + # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids runtimeId = "linux-x64"; in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.1225.0"; + version = "2021.205.1"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "BISczC4xYcF6m5l3ye/bdZxs/aK0Jz6sFVFOgNDo0v0="; + sha256 = "US8auytRXqtYGGNi+vxIzxCxpetWYeUkBRjgtJkPpMs="; }; patches = [ ./bypass-tamper-detection.patch ]; patchFlags = [ "--binary" "-p1" ]; - nativeBuildInputs = [ dotnet-sdk dotnetPackages.Nuget makeWrapper ]; + nativeBuildInputs = [ + dotnet-sdk dotnetPackages.Nuget makeWrapper + # FIXME: Without `cacert`, we will suffer from https://github.com/NuGet/Announcements/issues/49 + cacert + ]; nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { fetchNuGet = { name, version, sha256 }: fetchurl { @@ -75,7 +82,7 @@ in stdenv.mkDerivation rec { --output $out/lib/osu makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \ - --set DOTNET_ROOT "${dotnet-netcore}" \ + --set DOTNET_ROOT "${dotnet-net}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" for i in 16 32 48 64 96 128 256 512 1024; do install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png diff --git a/nixpkgs/pkgs/games/osu-lazer/deps.nix b/nixpkgs/pkgs/games/osu-lazer/deps.nix index cebdde1f7c6d..b670ce0c5ed8 100644 --- a/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -1,10 +1,5 @@ { fetchNuGet }: [ (fetchNuGet { - name = "Dapper"; - version = "2.0.78"; - sha256 = "13xgi8prsa3y67hx644yflamwakjv8vsk5m15v407clsl2r4g0bp"; - }) - (fetchNuGet { name = "DeltaCompressionDotNet"; version = "2.0.0.0"; sha256 = "0zhj7m3zaf9wcg51385in9qg1xgkvp8yyzgq3r5k4sagm7y68aqy"; @@ -16,8 +11,8 @@ }) (fetchNuGet { name = "DiscordRichPresence"; - version = "1.0.169"; - sha256 = "0rs9fjr65432qckmzx4djlwsnc2yqwwwnjszqwnm3z2pv8dm7zrf"; + version = "1.0.175"; + sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; @@ -25,6 +20,21 @@ sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { + name = "Humanizer"; + version = "2.8.26"; + sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak"; + }) + (fetchNuGet { + name = "Humanizer.Core"; + version = "2.2.0"; + sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; + }) + (fetchNuGet { + name = "Humanizer.Core"; + version = "2.8.26"; + sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; + }) + (fetchNuGet { name = "Humanizer.Core.af"; version = "2.8.26"; sha256 = "0znrq4frlkq1qi20301hlzxa6mdc275fa1i1a1i8ldgk9cjq94k9"; @@ -85,14 +95,14 @@ sha256 = "1pgs0j5ri50a6vhljplhrlc8jj1hrd9ggxkj60d9v5kk9xibzzyd"; }) (fetchNuGet { - name = "Humanizer.Core.fr-BE"; + name = "Humanizer.Core.fr"; version = "2.8.26"; - sha256 = "13spcx07hph366qk073pz63s56nadaac7l4mr4a66gbpqd3814kb"; + sha256 = "0kkhgy3yn8vfqlx3dhb9m3cazkgfxarknam4macng9y17l7wj83m"; }) (fetchNuGet { - name = "Humanizer.Core.fr"; + name = "Humanizer.Core.fr-BE"; version = "2.8.26"; - sha256 = "0kkhgy3yn8vfqlx3dhb9m3cazkgfxarknam4macng9y17l7wj83m"; + sha256 = "13spcx07hph366qk073pz63s56nadaac7l4mr4a66gbpqd3814kb"; }) (fetchNuGet { name = "Humanizer.Core.he"; @@ -145,14 +155,14 @@ sha256 = "0iai35pzka9g6c3sgswki06fk6gdnq8kc88wyb4pcciivazz31px"; }) (fetchNuGet { - name = "Humanizer.Core.nb-NO"; + name = "Humanizer.Core.nb"; version = "2.8.26"; - sha256 = "160c98wfh7d2xlvlra4x5rdj4klgcjwcy3gkb4ipg655byn2m1j2"; + sha256 = "0xprhiyjyq6mpha2lrav59n1f48508ddvm9nmdk5sm5k26ff3l90"; }) (fetchNuGet { - name = "Humanizer.Core.nb"; + name = "Humanizer.Core.nb-NO"; version = "2.8.26"; - sha256 = "0xprhiyjyq6mpha2lrav59n1f48508ddvm9nmdk5sm5k26ff3l90"; + sha256 = "160c98wfh7d2xlvlra4x5rdj4klgcjwcy3gkb4ipg655byn2m1j2"; }) (fetchNuGet { name = "Humanizer.Core.nl"; @@ -190,14 +200,14 @@ sha256 = "060xbzwb7p9ypbqfklih2zal2rh6h55gq4hv3i6alvlbd3vsx29n"; }) (fetchNuGet { - name = "Humanizer.Core.sr-Latn"; + name = "Humanizer.Core.sr"; version = "2.8.26"; - sha256 = "1911a69sqssh9f007vmxbgyj4ym2ym4423xvw6cmbfhjcrhkfpbi"; + sha256 = "0i2c24qmqnhp85b088qlbagxd48hcl0v1ly4m7hfbvx5s7fg8riv"; }) (fetchNuGet { - name = "Humanizer.Core.sr"; + name = "Humanizer.Core.sr-Latn"; version = "2.8.26"; - sha256 = "0i2c24qmqnhp85b088qlbagxd48hcl0v1ly4m7hfbvx5s7fg8riv"; + sha256 = "1911a69sqssh9f007vmxbgyj4ym2ym4423xvw6cmbfhjcrhkfpbi"; }) (fetchNuGet { name = "Humanizer.Core.sv"; @@ -245,29 +255,14 @@ sha256 = "1rhzbiqbx04l3kvzjklix90fxyc6vvmmw0p564ajdiximivs0pbh"; }) (fetchNuGet { - name = "Humanizer.Core"; - version = "2.2.0"; - sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; - }) - (fetchNuGet { - name = "Humanizer.Core"; - version = "2.8.26"; - sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; - }) - (fetchNuGet { - name = "Humanizer"; - version = "2.8.26"; - sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak"; - }) - (fetchNuGet { name = "JetBrains.Annotations"; version = "2020.3.0"; sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; }) (fetchNuGet { - name = "managed-midi"; - version = "1.9.14"; - sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; + name = "ManagedBass"; + version = "2.0.4"; + sha256 = "13hwd0yany4j52abbaaqsgq8lag2w9vjxxsj4qfbgwp4qs39x003"; }) (fetchNuGet { name = "ManagedBass.Fx"; @@ -275,69 +270,84 @@ sha256 = "1rbjpgpm0ri7l2gqdy691rsv3visna2nbxawgvhdqljw068r8a8d"; }) (fetchNuGet { - name = "ManagedBass"; - version = "2.0.4"; - sha256 = "13hwd0yany4j52abbaaqsgq8lag2w9vjxxsj4qfbgwp4qs39x003"; + name = "managed-midi"; + version = "1.9.14"; + sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; }) (fetchNuGet { name = "Markdig"; - version = "0.22.0"; - sha256 = "0k7v4xlhfgyca8bb1g85062m22skmk6ay0hcyqlpi2cnvy7f61qf"; + version = "0.22.1"; + sha256 = "1m62kjwz93h323w8qvwmld2g8dy17a3ny5wyy29pwqj7ig4y8ymj"; + }) + (fetchNuGet { + name = "MessagePack"; + version = "2.2.85"; + sha256 = "1y0h8bd0drnlsqf1bvrdiv9j1892zqf1rmyclfjzs49klpf0xphk"; + }) + (fetchNuGet { + name = "MessagePack.Annotations"; + version = "2.2.85"; + sha256 = "00wajml6iy3wid8mixh3jmm6dapfjbccwq95m8qciika4pyd4lq9"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + version = "5.0.0"; + sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; - version = "3.1.9"; - sha256 = "0vsnc87fqh61mjl2zgv7nfx6wkrg055cq12ql6cxmcawv6qsl0lw"; + version = "5.0.2"; + sha256 = "0qy4wamhcpxi9aqwq9kivhsj4rvhbch2wfwv11610psygb5457vk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; - version = "3.1.9"; - sha256 = "1m5w8pmm4bn7w1ml2xcs43kfr2hkicch46zr616ml8j6fsks6wmw"; + version = "5.0.2"; + sha256 = "0295a87ilrdg43sil5wli74x7jy4apibqdk1fxam8kzj99whl5sk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; - version = "3.1.9"; - sha256 = "0ppzxfgnhn0jpn0rg72gcwb0hcjk1qbzpzk9aiykp8vnfvqlmb20"; + version = "5.0.2"; + sha256 = "094zjf6h5dh87kznmmz7w4s1y37rw52vaz2h4jk4i4ik7hpijd0w"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; - version = "3.1.9"; - sha256 = "0xg0psas8k38yfd72q7m5sm00yyxj51j1fqg473za2kxf8z4p2wx"; + version = "5.0.2"; + sha256 = "1rprpj1aw9z501rpb9415maqcqnk6pirbdl8yv5n9wpqgcnjizk8"; }) (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Client.Core"; - version = "3.1.9"; - sha256 = "0ld7hch240z7zc7ckrppd4yrwwdhx3nbc8fgf4qql8ld8bih223y"; + name = "Microsoft.AspNetCore.SignalR.Client"; + version = "5.0.2"; + sha256 = "18pdw4h1j93wzcvlj87jy7n5sxkwlj69nnb7a2qxkc40jvm18ran"; }) (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Client"; - version = "3.1.9"; - sha256 = "1yn5y3b51jcpw7szj3pfz79hk84kmypy465cm22khh5z34wy41jx"; + name = "Microsoft.AspNetCore.SignalR.Client.Core"; + version = "5.0.2"; + sha256 = "1rg3cpqr3yx5hn233c6cmmiry5v49fglfii7ryi1cf6rwqpdqn5l"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Common"; - version = "3.1.9"; - sha256 = "1kvp8y3fnhvfm7fpg1qsymwzch7jcfc9337zybwryfyzxjxq7aaj"; + version = "5.0.2"; + sha256 = "1sbwp00hq0ng891wdj6yhah8hr9hw34zvqr1xzs86g3gpmssgcj5"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; - version = "3.1.9"; - sha256 = "1gp6wjidhbbpibnam2fimm3pc5p70wv17zhis5qf6an49xvlmmmb"; + version = "5.0.2"; + sha256 = "0p9kv2iayhz8y68r30mhzssv0m087v243ai7aax7jd44rqiv1w5i"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; + version = "5.0.2"; + sha256 = "1f0mjw0swiaxk4iqf7n598d51w40lwdbap4nlc0sv0vw3nklnlzp"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; - version = "3.1.9"; - sha256 = "1hdmsfk5ymp2vi4saxiw19j83ykvz5jzv0f4060cgc8bafndakrr"; + version = "5.0.2"; + sha256 = "01wi2q5sjazvax8d4gbcggsr7n801m4cx6jcqljv0r4cmz4y478a"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.1.0"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + version = "1.0.0"; + sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; @@ -345,6 +355,11 @@ sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "5.0.0"; + sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; + }) + (fetchNuGet { name = "Microsoft.Build.Framework"; version = "15.3.409"; sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; @@ -361,8 +376,8 @@ }) (fetchNuGet { name = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; - version = "3.3.1"; - sha256 = "0xh23x91xg8qwfam70wsn039sn5li0pkay36lds9dl15p1vbfasm"; + version = "3.3.2"; + sha256 = "1r8mfbpfy8jdinhfviwhv2vjsz950wn2vwz17lfw5kya1n13nj56"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; @@ -370,24 +385,24 @@ sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) (fetchNuGet { - name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; + name = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; - sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb"; + sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) (fetchNuGet { - name = "Microsoft.CodeAnalysis.CSharp"; + name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.8.0"; - sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; + sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; - version = "3.3.1"; - sha256 = "0wkrxymb9si2v0rzqnr8mdi89fi7swd1vbbclccjp8645ha1nif0"; + version = "3.3.2"; + sha256 = "02apz67f1gbp4p0wy7r593m10mhjm0rwp9q1n96p9avhdc3dwmv5"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer"; - version = "3.3.1"; - sha256 = "010fadvngp21yz1b4vk0bbx79p5yr6nji19w56ma9zp1hj7fn2y1"; + version = "3.3.2"; + sha256 = "1wxfkn16bqay7z64yxx50y9qkyznbfrv269h19fd60dy0vflwlfv"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.Common"; @@ -401,8 +416,8 @@ }) (fetchNuGet { name = "Microsoft.CodeQuality.Analyzers"; - version = "3.3.1"; - sha256 = "1ng91xf3shjl74xvckygh9aqccwqapia46gilddkb5kiqj847bik"; + version = "3.3.2"; + sha256 = "0hfsjqg4kz5ylx461ssvbx64wgaiy8gcalb760jc53lvbd8qrq5r"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -426,8 +441,8 @@ }) (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; - version = "2.0.156101"; - sha256 = "1k9f6x95mscq484f4sywpb84016v9yb9bz6ha77wsjbsarl96my0"; + version = "2.0.161401"; + sha256 = "02qcm8nv1ch07g8b0i60ynrjn33b8y5ivyk4rxal3vd9zfi6pvwi"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; @@ -435,6 +450,11 @@ sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) (fetchNuGet { + name = "Microsoft.EntityFrameworkCore"; + version = "2.2.6"; + sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; + }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; version = "2.2.6"; sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3"; @@ -455,19 +475,14 @@ sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z"; }) (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "2.2.6"; - sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; - }) - (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite"; version = "2.2.6"; sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam"; }) (fetchNuGet { - name = "Microsoft.EntityFrameworkCore"; + name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "2.2.6"; - sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; + sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; @@ -480,14 +495,14 @@ sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; }) (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; + name = "Microsoft.Extensions.Configuration"; version = "2.2.0"; - sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; + sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.9"; - sha256 = "0skilj4gfzyn05mn74w2q4jp1ww2wwbsxw2i7v8bwk73nymsqpr8"; + version = "2.2.0"; + sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; @@ -495,19 +510,14 @@ sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.9"; - sha256 = "1n8fndd9vrd3d7041p42li8v129mgl3gi8sl1x8whhycy0ahqr78"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; + name = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; - sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; + sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "3.1.9"; - sha256 = "01ci8nhv3ki93aa7a3vh9icl3jav7ikizq43kcgdjgsssi6xvdf9"; + name = "Microsoft.Extensions.DependencyInjection"; + version = "5.0.1"; + sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; @@ -516,18 +526,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.9"; - sha256 = "1l7ng71y18fwdlyq2ycl12hmv9wrf7k7knz2jwv9w9w7spmp8jv6"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "2.2.0"; - sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.9"; - sha256 = "1ifjjzwfvd5igxaaxm124qv8afs1nb06rgdqy7l3jcfqr30xykbb"; + version = "5.0.0"; + sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; @@ -535,29 +535,29 @@ sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; + name = "Microsoft.Extensions.Logging"; version = "2.2.0"; - sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; + sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.9"; - sha256 = "1i24mz3v677bmdysxklm9a3qc87j72lpkfp0l16gh6yqpmhwg7vp"; + name = "Microsoft.Extensions.Logging"; + version = "5.0.0"; + sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) (fetchNuGet { - name = "Microsoft.Extensions.Logging"; + name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; - sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; + sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "3.1.9"; - sha256 = "1x1bbkcq7ph9jgwv3yidipfqwdh6q3bsa2rxhfzmy64l7hc7r1wl"; + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "5.0.0"; + sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "5.0.0"; - sha256 = "0m0r7avz4ygxa1pyj5sai25y0n42y7kz9iznl7m3146csxi1paf0"; + version = "5.0.1"; + sha256 = "012klayhnnygncdi9zzq32vballb2wbknk91g2ziz5mhdhg38lr8"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -566,8 +566,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Options"; - version = "3.1.9"; - sha256 = "0rpix172cmwwbddh4gm0647x1ql0ly5n68bpz71v915j97anwg90"; + version = "5.0.0"; + sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; @@ -576,18 +576,18 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; - version = "3.1.9"; - sha256 = "0538fvjz9c27nvc6kv83b0912qvc71wz2w60svl0mscj86ds49wc"; + version = "5.0.0"; + sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { name = "Microsoft.NetCore.Analyzers"; - version = "3.3.1"; - sha256 = "16cx0x5hcjs2ml5zjalfsp7n3rfyz75ihnvh1p10z96yaz43gdwn"; + version = "3.3.2"; + sha256 = "1h1bjiiw64qncs61p2idwxswv4kzq06bbl2rlghiagv6sbjk4pnq"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + version = "5.0.0"; + sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -606,28 +606,23 @@ }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; - version = "3.1.1"; - sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { name = "Microsoft.NETCore.Targets"; - version = "1.0.1"; - sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + version = "3.1.0"; + sha256 = "04cc2wl90p7g9zscnxgyj55vzl7srrrjwadl2dxgicfb2x2499ca"; }) (fetchNuGet { name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + version = "5.0.0"; + sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) (fetchNuGet { name = "Microsoft.NetFramework.Analyzers"; - version = "3.3.1"; - sha256 = "06vjmjmqhrmfc57ndsc8jaybc8np06s797nhg40bf44603bx6159"; + version = "3.3.2"; + sha256 = "0samfc6c3mm7c4g6b0m01c8c37ip5ywy1i2my02xsbf9vygkal89"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -680,214 +675,89 @@ sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { - name = "NUnit"; - version = "3.12.0"; - sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; + name = "NuGet.Common"; + version = "5.8.0"; + sha256 = "17l1gqxfcpazadg6wqgwkzg37x8c97sgmk9nr4f9yn3d50zj9hlm"; }) (fetchNuGet { - name = "ppy.osu.Framework.NativeLibs"; - version = "2020.923.0"; - sha256 = "1sy98s0dxcfxxslm1q503qhd9fl8d3idf47qi4561j5fds4dpdsv"; + name = "NuGet.Configuration"; + version = "5.8.0"; + sha256 = "02cxqaaxmspv6x0xjwkqr1s0b858cw5gn6lgqa8zhsknnhs6rl41"; }) (fetchNuGet { - name = "ppy.osu.Framework"; - version = "2020.1222.0"; - sha256 = "0xdfgl4hykrbwhdmhhy7rxp055jhq1rwg2mldbbaf1v43s0vkyfj"; + name = "NuGet.DependencyResolver.Core"; + version = "5.8.0"; + sha256 = "0w0hr10gzf0hvh400ybd6h606zal0mi0i1lq5q3yj7kdhy93wb6j"; }) (fetchNuGet { - name = "ppy.osu.Game.Resources"; - version = "2020.1202.0"; - sha256 = "1m5156gkyyhf52ii6y7yqmsgpwcxn6zgji3nnyny6lk9glmc9vvs"; - }) - (fetchNuGet { - name = "ppy.osuTK.NS20"; - version = "1.0.165"; - sha256 = "0ryb483i0jqy94mhvrh0xicv43h4r4amzgpmfrrmzrfvp9ajjar6"; - }) - (fetchNuGet { - name = "ppy.SDL2-CS"; - version = "1.0.53"; - sha256 = "0x52pq6xdg4qcgi8cnqlijifqjpszbi8z4nkmsym0xgd9m5bmd7k"; - }) - (fetchNuGet { - name = "ppy.squirrel.windows"; - version = "1.9.0.4"; - sha256 = "1m8shcmgs0fs225qd0navr1qr6csqjin9sg2x0d7xpfk04nd2hi7"; - }) - (fetchNuGet { - name = "Remotion.Linq"; - version = "2.2.0"; - sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; - }) - (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.0.11"; - sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; - }) - (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.3.0"; - sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; - }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "0qcpm90hrm9gx9pmxlvfml65jm0bwpr5dg3r7l7xm9nvmibvc7n7"; - }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; - }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; - }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; - }) - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "007iw5wnl046wznasbqxjxm949djdbsi9vwz6zhz4lmzviqcpl58"; - }) - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; - }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.0.11"; - sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; - }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) - (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.1.0"; - sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; - }) - (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.3.0"; - sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "05k34ijz9g9csh0vbbv3g3lrxl163izwcfncmbcl7k073h32rzkr"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + name = "NuGet.Frameworks"; + version = "5.8.0"; + sha256 = "16awpn2p8sbzvqpri2hjbjzpnl3ad2klr8d82yd0hrd6s2yyii9j"; }) (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.1.0"; - sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + name = "NuGet.LibraryModel"; + version = "5.8.0"; + sha256 = "1fwh6iam6cp9pgz4gqlwj287vfrz8nabmzfmgkbnylrxki0pnwi0"; }) (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; - }) - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; + name = "NuGet.Packaging"; + version = "5.8.0"; + sha256 = "05ba9aj6hyb5x28c7sn24b7fkzn7g1869x4b2xpbq8r37mfswfw9"; }) (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + name = "NuGet.ProjectModel"; + version = "5.8.0"; + sha256 = "1b2brybxg997095b9w2jbgnhadppdrxlkqmwx84dy6snq2blcwhc"; }) (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; + name = "NuGet.Protocol"; + version = "5.8.0"; + sha256 = "151x6b085vsznfsi7ak97086hlc0g3d3mv9xdla974z1qyh6q5a9"; }) (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + name = "NuGet.Versioning"; + version = "5.8.0"; + sha256 = "16awcl6czs6nyhfaf0ixi25flka1y653q4bjmm4rnz3ssi832mi5"; }) (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.1.0"; - sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; - }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "0d1rxxpvg9v7wlibsfgz0r4hwigpadas822qf8m8fs1gma9gs877"; + name = "NUnit"; + version = "3.12.0"; + sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; }) (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + name = "ppy.osu.Framework"; + version = "2021.128.0"; + sha256 = "19c0bj9d0hjcyhaf04aapyzyd4yrzhc61k89z2il7y32841vnzg6"; }) (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.0.11"; - sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; + name = "ppy.osu.Framework.NativeLibs"; + version = "2021.115.0"; + sha256 = "00cxrnc78wb8l7d4x7m39g73y85kbgnsnx3qdvv0a9p77lf7lx7z"; }) (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + name = "ppy.osu.Game.Resources"; + version = "2020.1202.0"; + sha256 = "1m5156gkyyhf52ii6y7yqmsgpwcxn6zgji3nnyny6lk9glmc9vvs"; }) (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; + name = "ppy.osuTK.NS20"; + version = "1.0.173"; + sha256 = "11rrxakrgq5lriv09qlz26189nyc9lh0fjidn5h70labyp2gpa4y"; }) (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + name = "ppy.SDL2-CS"; + version = "1.0.53"; + sha256 = "0x52pq6xdg4qcgi8cnqlijifqjpszbi8z4nkmsym0xgd9m5bmd7k"; }) (fetchNuGet { - name = "runtime.any.System.Threading.Timer"; - version = "4.0.1"; - sha256 = "14p9qc9y8ay6kgz363xlxy5c75ilq3r7zw4ddx7348iir0m140ir"; + name = "ppy.squirrel.windows"; + version = "1.9.0.5"; + sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) (fetchNuGet { - name = "runtime.any.System.Threading.Timer"; - version = "4.3.0"; - sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + name = "Remotion.Linq"; + version = "2.2.0"; + sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; @@ -905,6 +775,16 @@ sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; @@ -925,29 +805,19 @@ sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) (fetchNuGet { - name = "runtime.native.System"; + name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; @@ -990,99 +860,9 @@ sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) (fetchNuGet { - name = "runtime.unix.Microsoft.Win32.Primitives"; - version = "4.0.1"; - sha256 = "1i47c440zlibzhyh2dr45jgbsmn3a7ki1paappdf9af4qrlaas63"; - }) - (fetchNuGet { - name = "runtime.unix.Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; - }) - (fetchNuGet { - name = "runtime.unix.System.Console"; - version = "4.0.0"; - sha256 = "0q96nlj42yj0b020j22z6j3qiza7lz7sb1r34dy4r1f3cq9s5zp6"; - }) - (fetchNuGet { - name = "runtime.unix.System.Console"; - version = "4.3.0"; - sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; - }) - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; - }) - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; - }) - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "02wnlydnbhai0zy7c3kihg0cis0l1b2z78kyi1ci47c5v0jklwha"; - }) - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; - }) - (fetchNuGet { - name = "runtime.unix.System.Net.Primitives"; - version = "4.0.11"; - sha256 = "1fy9hy30bs3pv6jr2ci2vscgycz64r1bgl91s51psidzh64i1gp9"; - }) - (fetchNuGet { - name = "runtime.unix.System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; - }) - (fetchNuGet { - name = "runtime.unix.System.Net.Sockets"; - version = "4.1.0"; - sha256 = "0vj5n45mm2k2khayvrp1lbz5djnp5lac1dna37g5c0nh7pmzgc4f"; - }) - (fetchNuGet { - name = "runtime.unix.System.Net.Sockets"; - version = "4.3.0"; - sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; - }) - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; - version = "4.0.1"; - sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; - }) - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; - version = "4.3.0"; - sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; - }) - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; - }) - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; - }) - (fetchNuGet { - name = "Sentry.PlatformAbstractions"; - version = "1.1.1"; - sha256 = "10mxyxmyjpr0y1ik2j55pp7ifn101sw319cbpf28i2xbfp0cvcaj"; - }) - (fetchNuGet { - name = "Sentry.Protocol"; - version = "2.1.8"; - sha256 = "04baw4yxc5lbcl83sfcdyjg5225719bf3sxpa3kjmhf58bjr143l"; - }) - (fetchNuGet { name = "Sentry"; - version = "2.1.8"; - sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn"; + version = "3.0.1"; + sha256 = "1nmqwprp2xv9d8llfncyw94nfws9nwb7zj0sqrd6lv1mfgaxraql"; }) (fetchNuGet { name = "SharpCompress"; @@ -1091,8 +871,8 @@ }) (fetchNuGet { name = "SharpCompress"; - version = "0.26.0"; - sha256 = "03cygf8p44j1bfn6z9cn2xrw6zhvhq17xac1sph5rgq7vq2m5iq5"; + version = "0.27.1"; + sha256 = "1lhljszs94i1ssl831ik1a51n2pshf27nsjm78acnw1y1qnkm5pd"; }) (fetchNuGet { name = "SharpFNT"; @@ -1175,6 +955,16 @@ sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; @@ -1200,16 +990,6 @@ sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; @@ -1220,6 +1000,11 @@ sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) (fetchNuGet { + name = "System.Composition"; + version = "1.0.31"; + sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; + }) + (fetchNuGet { name = "System.Composition.AttributedModel"; version = "1.0.31"; sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv"; @@ -1245,11 +1030,6 @@ sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; }) (fetchNuGet { - name = "System.Composition"; - version = "1.0.31"; - sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; - }) - (fetchNuGet { name = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; @@ -1285,6 +1065,11 @@ sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; }) (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "5.0.0"; + sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; + }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; @@ -1310,6 +1095,16 @@ sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; @@ -1330,29 +1125,19 @@ sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { name = "System.Interactive.Async"; version = "3.2.0"; sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d"; }) (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { - name = "System.IO.Compression.ZipFile"; + name = "System.IO"; version = "4.3.0"; - sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { name = "System.IO.Compression"; @@ -1365,14 +1150,14 @@ sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "System.IO.Compression.ZipFile"; version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "System.IO.Compression.ZipFile"; version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) (fetchNuGet { name = "System.IO.FileSystem"; @@ -1385,24 +1170,34 @@ sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { name = "System.IO.Packaging"; version = "5.0.0"; sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n"; }) (fetchNuGet { name = "System.IO.Pipelines"; - version = "4.7.3"; - sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; + version = "5.0.1"; + sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) (fetchNuGet { - name = "System.IO"; + name = "System.Linq"; version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { - name = "System.IO"; + name = "System.Linq"; version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { name = "System.Linq.Expressions"; @@ -1420,27 +1215,12 @@ sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) (fetchNuGet { - name = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }) - (fetchNuGet { name = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) (fetchNuGet { name = "System.Memory"; - version = "4.5.2"; - sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld"; - }) - (fetchNuGet { - name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) @@ -1460,16 +1240,6 @@ sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { - name = "System.Net.NameResolution"; - version = "4.0.0"; - sha256 = "0dj3pvpv069nyia28gkl4a0fb7q33hbxz2dg25qvpah3l7pbl0qh"; - }) - (fetchNuGet { - name = "System.Net.NameResolution"; - version = "4.3.0"; - sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; - }) - (fetchNuGet { name = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; @@ -1510,14 +1280,29 @@ sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { - name = "System.Private.Uri"; + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; version = "4.0.1"; - sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { - name = "System.Private.Uri"; + name = "System.Reflection.Emit"; version = "4.3.0"; - sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.6.0"; + sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; @@ -1541,18 +1326,8 @@ }) (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; - version = "4.7.0"; - sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + version = "4.6.0"; + sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) (fetchNuGet { name = "System.Reflection.Extensions"; @@ -1595,16 +1370,6 @@ sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; @@ -1615,6 +1380,16 @@ sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; @@ -1635,6 +1410,11 @@ sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "5.0.0"; + sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; + }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; @@ -1655,16 +1435,6 @@ sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.3.0"; - sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; - }) - (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; @@ -1675,6 +1445,16 @@ sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; @@ -1690,31 +1470,11 @@ sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { - name = "System.Security.Claims"; - version = "4.0.1"; - sha256 = "03dw0ls49bvsrffgwycyifjgz0qzr9r85skqhdyhfd51fqf398n6"; - }) - (fetchNuGet { - name = "System.Security.Claims"; - version = "4.3.0"; - sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; - }) - (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; @@ -1735,6 +1495,11 @@ sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "5.0.0-preview.3.20214.6"; + sha256 = "050xx94ki5zmclplfns1v463wlf97ha2knwnxp08vqkgy0bdg1mv"; + }) + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; @@ -1765,6 +1530,11 @@ sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) (fetchNuGet { + name = "System.Security.Cryptography.Pkcs"; + version = "5.0.0-preview.3.20214.6"; + sha256 = "1q38rzpzhzpc8l75m06g6swq23qbl22ijzd9k76jfq08px3wq09k"; + }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; @@ -1775,6 +1545,11 @@ sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { + name = "System.Security.Cryptography.ProtectedData"; + version = "4.4.0"; + sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; + }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; @@ -1786,28 +1561,18 @@ }) (fetchNuGet { name = "System.Security.Principal.Windows"; - version = "4.0.0"; - sha256 = "1d3vc8i0zss9z8p4qprls4gbh7q4218l9845kclx7wvw41809k6z"; - }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.3.0"; - sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; - }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { - name = "System.Security.Principal"; - version = "4.0.1"; - sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { - name = "System.Security.Principal"; + name = "System.Text.Encoding"; version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; @@ -1816,8 +1581,8 @@ }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; - version = "4.7.1"; - sha256 = "1y1hdap9qbl7vp74j8s9zcbh3v1rnrrvcc55wj1hl6has2v3qh1r"; + version = "5.0.0"; + sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; @@ -1830,24 +1595,19 @@ sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + name = "System.Text.Encodings.Web"; + version = "5.0.0"; + sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; }) (fetchNuGet { - name = "System.Text.Encodings.Web"; - version = "4.7.1"; - sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb"; + name = "System.Text.Json"; + version = "5.0.0"; + sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; }) (fetchNuGet { name = "System.Text.Json"; - version = "4.7.2"; - sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; + version = "5.0.1"; + sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3"; }) (fetchNuGet { name = "System.Text.RegularExpressions"; @@ -1860,24 +1620,19 @@ sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { - name = "System.Threading.Channels"; - version = "4.7.1"; - sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; + name = "System.Threading"; version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.5.4"; - sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; + name = "System.Threading.Channels"; + version = "5.0.0"; + sha256 = "11z28x3cawry60l5phkqrvavm0mshz84n4c79hrz0p65lq8jpxgs"; }) (fetchNuGet { name = "System.Threading.Tasks"; @@ -1890,19 +1645,29 @@ sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { - name = "System.Threading.Thread"; + name = "System.Threading.Tasks.Extensions"; version = "4.0.0"; - sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.0.10"; - sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.3.0"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + name = "System.Threading.Tasks.Extensions"; + version = "4.5.3"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.4"; + sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) (fetchNuGet { name = "System.Threading.Timer"; @@ -1915,16 +1680,6 @@ sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; diff --git a/nixpkgs/pkgs/games/osu-lazer/osu.runtimeconfig.json b/nixpkgs/pkgs/games/osu-lazer/osu.runtimeconfig.json index ec942fede66e..a1a197b1b671 100644 --- a/nixpkgs/pkgs/games/osu-lazer/osu.runtimeconfig.json +++ b/nixpkgs/pkgs/games/osu-lazer/osu.runtimeconfig.json @@ -1,9 +1,9 @@ { "runtimeOptions": { - "tfm": "netcoreapp3.1", + "tfm": "net5.0", "framework": { "name": "Microsoft.NETCore.App", - "version": "3.1.0" + "version": "5.0.0" } } } diff --git a/nixpkgs/pkgs/games/osu-lazer/update.sh b/nixpkgs/pkgs/games/osu-lazer/update.sh index 3c78ae8a50a8..44a4bb3821db 100755 --- a/nixpkgs/pkgs/games/osu-lazer/update.sh +++ b/nixpkgs/pkgs/games/osu-lazer/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3 +#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5 set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/nixpkgs/pkgs/games/papermc/default.nix b/nixpkgs/pkgs/games/papermc/default.nix index f06d41495a81..e32ec946b2d7 100644 --- a/nixpkgs/pkgs/games/papermc/default.nix +++ b/nixpkgs/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let - mcVersion = "1.16.4"; - buildNum = "296"; + mcVersion = "1.16.5"; + buildNum = "457"; jar = fetchurl { url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "0885417w7qahk2fwlzvggbwrhvwgpd7xas8lzzb7ar469vyvd9dz"; + sha256 = "1xkjaj5wgm9rmzk8mz20n9vd674fynvdgqsy96c9bfifa03lsnmc"; }; in stdenv.mkDerivation { pname = "papermc"; @@ -31,6 +31,6 @@ in stdenv.mkDerivation { homepage = "https://papermc.io/"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ aaronjanse ]; + maintainers = with lib.maintainers; [ aaronjanse neonfuz ]; }; } diff --git a/nixpkgs/pkgs/games/performous/default.nix b/nixpkgs/pkgs/games/performous/default.nix index b0fc9483629e..dce771faec17 100644 --- a/nixpkgs/pkgs/games/performous/default.nix +++ b/nixpkgs/pkgs/games/performous/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext , glibmm, libxmlxx, pango, librsvg -, SDL2, glew, boost, libav, portaudio, epoxy +, SDL2, glew, boost, ffmpeg, portaudio, epoxy }: stdenv.mkDerivation rec { @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { buildInputs = [ glibmm libxmlxx pango librsvg - SDL2 glew boost libav portaudio epoxy + SDL2 glew boost ffmpeg portaudio epoxy ]; } diff --git a/nixpkgs/pkgs/games/pioneer/default.nix b/nixpkgs/pkgs/games/pioneer/default.nix index 0d348e3fa9e5..51eda72bdefc 100644 --- a/nixpkgs/pkgs/games/pioneer/default.nix +++ b/nixpkgs/pkgs/games/pioneer/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pioneer"; - version = "20200203"; + version = "20210203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "1011xsi94jhw98mhm8kryq8ajig0qfbrdx5xdasi92bd4nk7lcp8"; + sha256 = "sha256-51HXbX15uB1Xf9Re7Qi41BnJ9OW+GeXQhylJ+HwP0f8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/games/pokerth/default.nix b/nixpkgs/pkgs/games/pokerth/default.nix index 56f0d5a47f2c..59555a8ac240 100644 --- a/nixpkgs/pkgs/games/pokerth/default.nix +++ b/nixpkgs/pkgs/games/pokerth/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase +{ lib, mkDerivation, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase , SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite , wrapQtAppsHook , tinyxml2, target ? "client" }: diff --git a/nixpkgs/pkgs/games/portmod/default.nix b/nixpkgs/pkgs/games/portmod/default.nix index 07451b8dc2a4..ef535991c23b 100644 --- a/nixpkgs/pkgs/games/portmod/default.nix +++ b/nixpkgs/pkgs/games/portmod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, python3Packages, fetchFromGitLab, cacert, +{ lib, callPackage, python3Packages, fetchFromGitLab, cacert, rustPlatform, bubblewrap, git, perlPackages, imagemagick7, fetchurl, fetchzip, jre, makeWrapper, tr-patcher, tes3cmd }: diff --git a/nixpkgs/pkgs/games/pro-office-calculator/default.nix b/nixpkgs/pkgs/games/pro-office-calculator/default.nix index dbe2db363ea1..381a6e8742b0 100644 --- a/nixpkgs/pkgs/games/pro-office-calculator/default.nix +++ b/nixpkgs/pkgs/games/pro-office-calculator/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: +{ mkDerivation, lib, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: mkDerivation rec { version = "1.0.13"; pname = "pro-office-calculator"; diff --git a/nixpkgs/pkgs/games/pysolfc/default.nix b/nixpkgs/pkgs/games/pysolfc/default.nix index c765a1cbdf5b..925532bbbf53 100644 --- a/nixpkgs/pkgs/games/pysolfc/default.nix +++ b/nixpkgs/pkgs/games/pysolfc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, buildPythonApplication, python3Packages +{ lib, fetchzip, buildPythonApplication, python3Packages , desktop-file-utils, freecell-solver }: buildPythonApplication rec { diff --git a/nixpkgs/pkgs/games/snipes/default.nix b/nixpkgs/pkgs/games/snipes/default.nix index 66188ba0efe8..01b24ee434c3 100644 --- a/nixpkgs/pkgs/games/snipes/default.nix +++ b/nixpkgs/pkgs/games/snipes/default.nix @@ -13,13 +13,15 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "Davidebyzero"; repo = "Snipes"; - rev = "343e14104b7848eb1f882401888e685b7918ef9f"; - sha256 = "1rl70d5miak34warbwfv27z11vln4lvf7maqqc78z0gdc5zivdv2"; + rev = "594af45108e07aa4159c3babc9b5e53609c3fd6e"; + sha256 = "0gmh38swm74jmljy0bq27ipqzb4h8y9rzwc1j6harbd9qqz5knac"; }; postPatch = '' substitute config-sample.h config.h \ --replace SnipesConsole.ttf $out/share/snipes/SnipesConsole.ttf + substituteInPlace GNUmakefile \ + --replace 'CFLAGS=-Werror -Wall' 'CFLAGS=-Wall' ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/games/steam/fhsenv.nix b/nixpkgs/pkgs/games/steam/fhsenv.nix index 4fa8960726bc..924714d802a9 100644 --- a/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -29,7 +29,7 @@ let # Needed by gdialog, including in the steam-runtime perl # Open URLs - xdg_utils + xdg-utils iana-etc # Steam Play / Proton python3 @@ -171,7 +171,7 @@ in buildFHSUserEnv rec { SDL2 libusb1 dbus-glib - libav + ffmpeg atk # Only libraries are needed from those two libudev0-shim diff --git a/nixpkgs/pkgs/games/stockfish/default.nix b/nixpkgs/pkgs/games/stockfish/default.nix index 075db08a5ce3..71c482fe7660 100644 --- a/nixpkgs/pkgs/games/stockfish/default.nix +++ b/nixpkgs/pkgs/games/stockfish/default.nix @@ -1,15 +1,22 @@ { lib, stdenv, fetchurl }: -let arch = if stdenv.isx86_64 then "x86-64" else +with lib; + +let + # The x86-64-modern may need to be refined further in the future + # but stdenv.hostPlatform CPU flags do not currently work on Darwin + # https://discourse.nixos.org/t/darwin-system-and-stdenv-hostplatform-features/9745 + archDarwin = if stdenv.isx86_64 then "x86-64-modern" else "x86-64"; + arch = if stdenv.isDarwin then archDarwin else + if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else "unknown"; - version = "12"; nnueFile = "nn-82215d0fd0df.nnue"; nnue = fetchurl { name = nnueFile; - url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; + url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; sha256 = "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2"; }; in @@ -23,18 +30,24 @@ stdenv.mkDerivation { sha256 = "16980aicm5i6i9252239q4f9bcxg1gnqkv6nphrmpz4drg8i3v6i"; }; + # This addresses a linker issue with Darwin + # https://github.com/NixOS/nixpkgs/issues/19098 + preBuild = optionalString stdenv.isDarwin '' + sed -i.orig '/^\#\#\# 3.*Link Time Optimization/,/^\#\#\# 3/d' Makefile + ''; + postUnpack = '' sourceRoot+=/src echo ${nnue} cp "${nnue}" "$sourceRoot/${nnueFile}" ''; - makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ]; + makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" "CXX=${stdenv.cc.targetPrefix}c++" ]; buildFlags = [ "build" ]; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://stockfishchess.org/"; description = "Strong open source chess engine"; longDescription = '' @@ -42,7 +55,7 @@ stdenv.mkDerivation { much stronger than the best human chess grandmasters. ''; maintainers = with maintainers; [ luispedro peti ]; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; license = licenses.gpl2; }; diff --git a/nixpkgs/pkgs/games/super-tux-kart/default.nix b/nixpkgs/pkgs/games/super-tux-kart/default.nix index 1729e2fc2853..961842e8701c 100644 --- a/nixpkgs/pkgs/games/super-tux-kart/default.nix +++ b/nixpkgs/pkgs/games/super-tux-kart/default.nix @@ -1,15 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkg-config, makeWrapper -, SDL2, glew, openal, libvorbis, libogg, curl, freetype, bluez, libjpeg, libpng, enet, harfbuzz -, mcpp, wiiuse, angelscript +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, fetchsvn +, cmake +, pkg-config +, makeWrapper +, SDL2 +, glew +, openal +, libvorbis +, libogg +, curl +, freetype +, bluez +, libjpeg +, libpng +, enet +, harfbuzz +, mcpp +, wiiuse +, angelscript }: - let dir = "stk-code"; assets = fetchsvn { - url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "18218"; + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "18218"; sha256 = "11iv3cqzvbjg33zz5i5gkl2syn6mlw9wqv0jc7h36vjnjqjv17xw"; - name = "stk-assets"; + name = "stk-assets"; }; # List of bundled libraries in stk-code/lib to keep @@ -36,19 +55,28 @@ let # Not packaged to this date "sheenbidi" ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "supertuxkart"; version = "1.2"; src = fetchFromGitHub { - owner = "supertuxkart"; - repo = "stk-code"; - rev = version; + owner = "supertuxkart"; + repo = "stk-code"; + rev = version; sha256 = "1f98whk0v45jgwcsbdsb1qfambvrnbbgwq0w28kjz4278hinwzq6"; - name = dir; + name = dir; }; + patches = [ + (fetchpatch { + # Fix build with SDL 2.0.14 + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch?id=288360dc7ce2f968a2f12099edeace3f3ed1a705"; + sha256 = "1jgab9393qan8qbqf5bf8cgw4mynlr5a6pggqhybzsmaczgnns3n"; + }) + ]; + # Deletes all bundled libs in stk-code/lib except those # That couldn't be replaced with system packages postPatch = '' @@ -58,12 +86,25 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ - SDL2 glew openal libvorbis libogg freetype curl bluez libjpeg libpng enet harfbuzz - mcpp wiiuse angelscript + SDL2 + glew + openal + libvorbis + libogg + freetype + curl + bluez + libjpeg + libpng + enet + harfbuzz + mcpp + wiiuse + angelscript ]; cmakeFlags = [ - "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs + "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 "-DCHECK_ASSETS=OFF" "-DUSE_SYSTEM_WIIUSE=ON" diff --git a/nixpkgs/pkgs/games/the-butterfly-effect/default.nix b/nixpkgs/pkgs/games/the-butterfly-effect/default.nix index c87d1bea1c73..f5330485eddc 100644 --- a/nixpkgs/pkgs/games/the-butterfly-effect/default.nix +++ b/nixpkgs/pkgs/games/the-butterfly-effect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }: +{ lib, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }: mkDerivation rec { pname = "tbe"; diff --git a/nixpkgs/pkgs/games/trackballs/default.nix b/nixpkgs/pkgs/games/trackballs/default.nix index 4c7d2ba6956e..8ebeab4b260b 100644 --- a/nixpkgs/pkgs/games/trackballs/default.nix +++ b/nixpkgs/pkgs/games/trackballs/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; platforms = platforms.linux; - license = licenses.gpl2; + # Music is licensed under Ethymonics Free Music License. + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/games/ue4/default.nix b/nixpkgs/pkgs/games/ue4/default.nix index 73b1cb38ca38..95f0d64f1975 100644 --- a/nixpkgs/pkgs/games/ue4/default.nix +++ b/nixpkgs/pkgs/games/ue4/default.nix @@ -1,8 +1,7 @@ -{ stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which, +{ lib, stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which, xorg, xdg-user-dirs }: let - inherit (stdenv) lib; deps = import ./cdn-deps.nix { inherit fetchurl; }; linkDeps = writeScript "link-deps.sh" (lib.concatMapStringsSep "\n" (hash: let prefix = lib.concatStrings (lib.take 2 (lib.stringToCharacters hash)); diff --git a/nixpkgs/pkgs/games/unciv/default.nix b/nixpkgs/pkgs/games/unciv/default.nix index 917cf328e7ed..0f04ebfe4daf 100644 --- a/nixpkgs/pkgs/games/unciv/default.nix +++ b/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.12.8"; + version = "3.12.13-patch1"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "178lasa6ahwg2s2hamm13yysg42qm13v6a9pgs6nm66np93nskc7"; + sha256 = "sha256-OwS1rn5mfU6cA6pvpp7Q407Kw2wBGvpqWmqlajgHtCI="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/games/vitetris/default.nix b/nixpkgs/pkgs/games/vitetris/default.nix index 2b9c77cd4679..99996ca5c324 100644 --- a/nixpkgs/pkgs/games/vitetris/default.nix +++ b/nixpkgs/pkgs/games/vitetris/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vitetris"; - version = "0.58.0"; + version = "0.59.1"; src = fetchFromGitHub { owner = "vicgeralds"; repo = "vitetris"; rev = "v${version}"; - sha256 = "1fvw9yqg1q25x6dlfi4bl3hrrcdgl6wwq29j89aycxwdfxrxs09w"; + sha256 = "sha256-Rbfa2hD67RGmInfWwYD4SthL8lm5bGSBi3oudV5hAao="; }; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/games/warzone2100/default.nix b/nixpkgs/pkgs/games/warzone2100/default.nix index 1f6e2995a2ae..ce330536b751 100644 --- a/nixpkgs/pkgs/games/warzone2100/default.nix +++ b/nixpkgs/pkgs/games/warzone2100/default.nix @@ -1,6 +1,33 @@ -{ lib, stdenv, mkDerivation, fetchurl, autoconf, automake -, perl, unzip, zip, which, pkg-config, qtbase, qtscript -, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr +{ lib +, mkDerivation +, fetchurl +, cmake +, ninja +, zip, unzip +, pkg-config +, asciidoctor +, gettext + +, qtbase +, qtscript +, SDL2 +, libtheora +, libvorbis +, openal +, openalSoft +, glew +, physfs +, fribidi +, libXrandr +, miniupnpc +, libsodium +, curl +, libpng +, freetype +, harfbuzz +, sqlite +, which + , withVideos ? false }: @@ -14,38 +41,61 @@ in mkDerivation rec { inherit pname; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/releases/${version}/${pname}-${version}_src.tar.xz"; - sha256 = "1s0n67rh32g0bgq72p4qzkcqjlw58gc70r4r6gl9k90pil9chj6c"; + url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; + sha256 = "0savalmw1kp1sf8vg5aqrl5hc77p4jacxy5y9qj8k2hi2vqdfb7a"; }; buildInputs = [ - qtbase qtscript SDL2 libtheora openal - glew physfs fribidi libXrandr + qtbase + qtscript + SDL2 + libtheora + libvorbis + openal + openalSoft + glew + physfs + fribidi + libXrandr + miniupnpc + libsodium + curl + libpng + freetype + harfbuzz + sqlite ]; + nativeBuildInputs = [ - perl zip unzip pkg-config autoconf automake + cmake + ninja + zip unzip + asciidoctor + gettext ]; - preConfigure = "./autogen.sh"; - postPatch = '' substituteInPlace lib/exceptionhandler/dumpinfo.cpp \ - --replace "which %s" "${which}/bin/which %s" + --replace '"which "' '"${which}/bin/which "' substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \ --replace "which %s" "${which}/bin/which %s" ''; - configureFlags = [ "--with-distributor=NixOS" ]; - - hardeningDisable = [ "format" ]; - - enableParallelBuilding = true; + cmakeFlags = [ + "-DWZ_DISTRIBUTOR=NixOS" + # The cmake builder automatically sets CMAKE_INSTALL_BINDIR to an absolute + # path, but this results in an error. + # By resetting it, we let the CMakeLists set it to an accepted value + # based on prefix. + "-DCMAKE_INSTALL_BINDIR=" + ]; - postInstall = lib.optionalString withVideos - "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; + postInstall = lib.optionalString withVideos '' + cp ${sequences_src} $out/share/warzone2100/sequences.wz + ''; meta = with lib; { description = "A free RTS game, originally developed by Pumpkin Studios"; @@ -62,7 +112,7 @@ mkDerivation rec { ''; homepage = "http://wz2100.net"; license = licenses.gpl2Plus; - maintainers = [ maintainers.astsmtl ]; + maintainers = with maintainers; [ astsmtl fgaz ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/games/wesnoth/default.nix b/nixpkgs/pkgs/games/wesnoth/default.nix index eda6dfb717c9..205937028a73 100644 --- a/nixpkgs/pkgs/games/wesnoth/default.nix +++ b/nixpkgs/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.14"; + version = "1.14.15"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "0rawcm3d1qwf4wxqcbjipl6h30sfv7z70viji28q4givi5hysvka"; + sha256 = "sha256-HbQy5yhNe6HFydipqh2wWcyLfIjbdRjcBQaqAOtBJsY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/games/widelands/default.nix b/nixpkgs/pkgs/games/widelands/default.nix index ba7ce241b868..8b96dcc04e2e 100644 --- a/nixpkgs/pkgs/games/widelands/default.nix +++ b/nixpkgs/pkgs/games/widelands/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "widelands"; - version = "20"; + version = "21"; meta = with lib; { description = "RTS with multiple-goods economy"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://launchpad.net/widelands/build${version}/build${version}/+download/widelands-build${version}.tar.bz2"; - sha256 = "1cmwfwk7j6yi2pwmm4rm57s23sdzasqf53nx6567sdagqyc4sn9q"; + url = "https://launchpad.net/widelands/build${version}/build${version}/+download/widelands-build${version}-source.tar.gz"; + sha256 = "sha256-YB4OTG+Rs/sOzizRuD7PsCNEobkZT7tw7z9w4GmU41c="; }; preConfigure = '' @@ -45,12 +45,8 @@ stdenv.mkDerivation rec { SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf ]; - prePatch = '' - substituteInPlace ./debian/org.widelands.widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/" - ''; - postInstall = '' mkdir -p "$out/share/applications/" - cp -v "../debian/org.widelands.widelands.desktop" "$out/share/applications/" + cp -v "../xdg/org.widelands.Widelands.desktop" "$out/share/applications/" ''; } diff --git a/nixpkgs/pkgs/games/wyvern/default.nix b/nixpkgs/pkgs/games/wyvern/default.nix index 5a6bc34fea5e..f99faa282fdc 100644 --- a/nixpkgs/pkgs/games/wyvern/default.nix +++ b/nixpkgs/pkgs/games/wyvern/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchgit , rustPlatform , unzip diff --git a/nixpkgs/pkgs/misc/base16-builder/node-packages-generated.nix b/nixpkgs/pkgs/misc/base16-builder/node-packages-generated.nix index 7ccb5cab835a..3c03a5f0c08d 100644 --- a/nixpkgs/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/nixpkgs/pkgs/misc/base16-builder/node-packages-generated.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -10,7 +10,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; "ansi-regex-2.1.1" = { @@ -46,7 +46,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; }; "are-we-there-yet-1.1.5" = { @@ -55,7 +55,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; }; }; "argparse-1.0.10" = { @@ -64,7 +64,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; "array-find-index-1.0.2" = { @@ -100,7 +100,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; "bulk-replace-0.0.1" = { @@ -136,7 +136,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; - sha512 = "2mv8dgq8fr86zs5mam6bkp0j241lpb5rbwpq8zc5gkj7f8zir1cd71m0yyy8zy46hvf86b9k7pbhvkz08ii4mhxh14xshkrgik0p14r"; + sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; }; }; "chalk-1.1.3" = { @@ -154,7 +154,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; "code-point-at-1.1.0" = { @@ -229,13 +229,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "debug-3.2.6" = { + "debug-3.2.7" = { name = "debug"; packageName = "debug"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr"; + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; "decamelize-1.2.0" = { @@ -253,7 +253,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; "delegates-1.0.0" = { @@ -298,7 +298,7 @@ let version = "2.7.4"; src = fetchurl { url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz"; - sha512 = "2ad39acbba96hqbgf714pacri515xjn8jd43bkfb1wwp04vflpjj0qhnnmsq074g7d1kycyj1bmf620s43qb3x74hrfb4ky3v5axygf"; + sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; "error-ex-1.3.2" = { @@ -307,7 +307,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; "escape-string-regexp-1.0.5" = { @@ -325,7 +325,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "filled-array-1.1.0" = { @@ -352,7 +352,7 @@ let version = "1.2.7"; src = fetchurl { url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; "fs-promise-0.3.1" = { @@ -373,6 +373,15 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -397,7 +406,7 @@ let version = "7.1.6"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; "got-5.7.1" = { @@ -409,13 +418,22 @@ let sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; "has-ansi-2.0.0" = { @@ -436,13 +454,13 @@ let sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; }; }; - "hepburn-1.1.1" = { + "hepburn-1.2.0" = { name = "hepburn"; packageName = "hepburn"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hepburn/-/hepburn-1.1.1.tgz"; - sha512 = "3vc0v8438m2a8yw40nfhqw4ldddxkzjsimpq24c9la9ik0mnr5g8wbhnxpvlf1j39m2x5fin2d82kzjdpzf22shb0wfkpadqacdjk9s"; + url = "https://registry.npmjs.org/hepburn/-/hepburn-1.2.0.tgz"; + sha512 = "xWjHb03dN/ivNcqG2vqA//sHQ0oapYGZ9QV/2TR7m2+cggxzoVpbDxZn9s/Zm1tF88/7a1IpdZyn00tNP5oABA=="; }; }; "hosted-git-info-2.8.8" = { @@ -451,7 +469,7 @@ let version = "2.8.8"; src = fetchurl { url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha512 = "19a25b4xb3hg00d1nsirc3xfcc07rplbh6msa49rgc8xg5rg38y1z8rfrf0dmll8k4jaml8z337bi6y2cgah66jnwxinn0sch5k7z3z"; + sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; }; }; "iconv-lite-0.4.24" = { @@ -460,7 +478,7 @@ let version = "0.4.24"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; "ignore-walk-3.0.3" = { @@ -469,7 +487,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha512 = "0mlk9s23jc3avly1bv6s5j7hs0aafxabmgn7iqi0bjag4b03nqckvcdrgnarpmysdq8yr1rgxh6k7p82vzjj1z6hnm5ckwswg33mflv"; + sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; }; }; "imurmurhash-0.1.4" = { @@ -505,16 +523,16 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ini-1.3.5" = { + "ini-1.3.8" = { name = "ini"; packageName = "ini"; - version = "1.3.5"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; "is-arrayish-0.2.1" = { @@ -526,13 +544,22 @@ let sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; }; }; + "is-core-module-2.2.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; + sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; + }; + }; "is-finite-1.1.0" = { name = "is-finite"; packageName = "is-finite"; version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz"; - sha512 = "3gj0k3vlpbc7zg5xkl8yjnilqs2dmk3ks67shchrfmnzkj6r4aad994xwfczx99ccjx6cixdqg4sawk2m92lqhh6jmfl17zlnv8rp3i"; + sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -577,7 +604,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; - sha512 = "134jdgzg4p15g5jvwsmb0bmglmymn1pyk6r2w8q1fm728f15l7k12sqmfngn0mg3vs34gzg12v684fp9c99l6jnv737b6rgmiwd8ij5"; + sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; }; }; "is-stream-1.1.0" = { @@ -607,13 +634,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "js-yaml-3.13.1" = { + "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.13.1"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; "keypress-0.1.0" = { @@ -640,7 +667,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/limax/-/limax-1.7.0.tgz"; - sha512 = "1y0l6pib2v3nrpa6n9axb2mmjd5s50a2kqbvm7jp2zhr7dpdz0ym73kvi7h1g9i9fw6jqaiwxkas7av1fn7qjk2rgmrnkwpag50ddw9"; + sha512 = "ibcGylOXT5vry2JKfKwLWx2tZudRYWm4SzG9AE/cc5zqwW+3nQy/uPLUvfAUChRdmqxVrK6SNepmO7ZY8RoKfA=="; }; }; "load-json-file-1.1.0" = { @@ -667,7 +694,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; }; "map-obj-1.0.1" = { @@ -694,16 +721,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; "minimist-1.2.5" = { @@ -712,7 +730,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; "minipass-2.9.0" = { @@ -721,7 +739,7 @@ let version = "2.9.0"; src = fetchurl { url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; - sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3"; + sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; "minizlib-1.3.3" = { @@ -730,43 +748,43 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; - sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9"; + sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "ms-2.1.2" = { + "ms-2.1.3" = { name = "ms"; packageName = "ms"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "nan-2.14.0" = { - name = "nan"; - packageName = "nan"; - version = "2.14.0"; + "needle-2.6.0" = { + name = "needle"; + packageName = "needle"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "115f4m91pjscflwskc29clsspd2z02gdbz0dbj63ja8bf67nraw14gvppl4872y9z2f5vbjlkpg1i4625zvalx3gp04vvn2gs7qblr0"; + url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz"; + sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg=="; }; }; - "needle-2.4.0" = { - name = "needle"; - packageName = "needle"; - version = "2.4.0"; + "node-addon-api-3.1.0" = { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; - sha512 = "1k9220dhvc3m78hzd1xh2135p19z15y964hmhsajayvj11j2p3rv5w0gii7lmgr8w57bqkjg0xby5f1gkcph60kxvyr52z6pp7g0yg0"; + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz"; + sha512 = "flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw=="; }; }; "node-pre-gyp-0.14.0" = { @@ -775,7 +793,7 @@ let version = "0.14.0"; src = fetchurl { url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha512 = "32drv6q9sh4i2ff2djd1dhxxxiaiymmgycbm12wpkz9vxspnldxgmppf9sazp3c72771a1p5s4kkzgwn4w1csyz9bn4zdbdnq5w6azq"; + sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; }; }; "node-status-codes-1.0.0" = { @@ -787,13 +805,13 @@ let sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; }; }; - "nodejieba-2.4.1" = { + "nodejieba-2.5.1" = { name = "nodejieba"; packageName = "nodejieba"; - version = "2.4.1"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.4.1.tgz"; - sha512 = "2w90xh2sxyp6mkyr4jp6pp72q6vv95ly3a12fzyfv5rc0xinivplz98vnpb8fx92pdxf9aj7wavl9qcl1kl6rva0s1vdrcfhsb5a6bz"; + url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.5.1.tgz"; + sha512 = "VnJBQSl2G8swDf3ZAXMbXrMCrGFO+kVKbkB93OaBthGbEG5BrxfD8I2m7auaRX8E5C1t+hlwo3HCmQOWKkiZ9A=="; }; }; "nopt-4.0.3" = { @@ -802,7 +820,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"; - sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha"; + sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; }; }; "normalize-package-data-2.5.0" = { @@ -811,7 +829,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha512 = "1wbwhlsm965n61y23wrm50ric9l7rig90wvx7hjdl34np6n1bbqcc67wgm494z303s6y5aj4xjyism3n6kikp40iz9qaizlfhvqr47z"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; "npm-bundled-1.1.1" = { @@ -820,7 +838,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha512 = "1yb9l8jnxwicz0fsdv434y395b0x11mlc1mgbbhnx21pvs58a4p43f0swvi6q0rakdgzdiyf0yylnmb3i41hb052903m1cgcy01zac2"; + sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; }; }; "npm-normalize-package-bin-1.0.1" = { @@ -829,7 +847,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; - sha512 = "149ypqf1mxqw0gcjr4xf4h65q6vx41z1abm27cwbsj7fn07wsx588f9gsykjzfybwrn4mmr6lyaj825w3yyhbgaagmrybw9brzdmxqh"; + sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; }; }; "npm-packlist-1.4.8" = { @@ -838,7 +856,7 @@ let version = "1.4.8"; src = fetchurl { url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha512 = "3s585jx92awjb52bs1jwq8r4swv8mgfl685if5wwpbsigwb362adizzpi58a5kgqfpf605mf6a0v7074mc9qpcn2ypqgr7f1a1ikq77"; + sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; }; }; "npmlog-4.1.2" = { @@ -847,7 +865,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; "number-is-nan-1.0.1" = { @@ -910,7 +928,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; - sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; "package-json-2.4.0" = { @@ -955,7 +973,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-type-1.1.0" = { @@ -994,13 +1012,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pinyin-2.9.0" = { + "pinyin-2.9.1" = { name = "pinyin"; packageName = "pinyin"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.0.tgz"; - sha512 = "3fjgppnlcvcbx314q2q32amxyvda5xzj8bgi7s131n15r8wwi94w5bnb7q2lbgag0qc4d5fhg0a14ipwvh0j7si1fmndmw4dgxi15jd"; + url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.1.tgz"; + sha512 = "U7kHlVP6yUYl2DV2bX4brlYWdgaAlwtqJrdkboiyri9ixRDVqVO3LD98te3PT5deN5EA9W8ywuG9GaYZfiiIlw=="; }; }; "prepend-http-1.0.4" = { @@ -1018,7 +1036,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; "rc-1.2.8" = { @@ -1027,7 +1045,7 @@ let version = "1.2.8"; src = fetchurl { url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; "read-all-stream-3.1.0" = { @@ -1063,7 +1081,7 @@ let version = "2.3.7"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; "redent-1.0.0" = { @@ -1081,7 +1099,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; - sha512 = "3w8zjx5s044i7wr9bqqgjfkjawg0cajc9j9gmzkqs0i420algjvkd5k27j9pvhx1yq7nvdchsl96zcyjf64n14765q0f18y1wbkmcz0"; + sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; "registry-url-3.1.0" = { @@ -1102,13 +1120,13 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; - "resolve-1.15.1" = { + "resolve-1.19.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; + sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; }; }; "rimraf-2.7.1" = { @@ -1117,7 +1135,7 @@ let version = "2.7.1"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; "safe-buffer-5.1.2" = { @@ -1126,7 +1144,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; "safer-buffer-2.1.2" = { @@ -1135,7 +1153,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "sax-1.2.4" = { @@ -1144,7 +1162,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; "semver-5.7.1" = { @@ -1153,7 +1171,7 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; "semver-diff-2.1.0" = { @@ -1174,13 +1192,13 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "signal-exit-3.0.2" = { + "signal-exit-3.0.3" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; "slide-1.1.6" = { @@ -1192,40 +1210,40 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "spdx-correct-3.1.0" = { + "spdx-correct-3.1.1" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha512 = "3qslnh3c2x2g8lar94rladm2rz692d5ds1bp1cpl223jf67jnazl9ipy4n17n7vqvgwimij36gz740nfqr5pyxq8x6n02rd4xj89gcn"; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; }; }; - "spdx-exceptions-2.2.0" = { + "spdx-exceptions-2.3.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha512 = "12c442riig2hk7014ahh40chwirmmsl9dr4cnm2dr2bdbv1lnal8xxwsfx403pqkx7ib06gm2hyyd98kn30kxanjm92yai5y44h0x6r"; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; }; }; - "spdx-expression-parse-3.0.0" = { + "spdx-expression-parse-3.0.1" = { name = "spdx-expression-parse"; packageName = "spdx-expression-parse"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2"; + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.5" = { + "spdx-license-ids-3.0.7" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.5"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "3sk6sk6r05ikn5qslbh04h54mv4a34wn4d76s800h94padnjydfvvq73ij6jh81yrigspyr50ay878jjwpj2mcq38br371jkb6mdq97"; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; }; }; "speakingurl-14.0.1" = { @@ -1234,7 +1252,7 @@ let version = "14.0.1"; src = fetchurl { url = "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz"; - sha512 = "2nmh1645i59b0ij75rjrps837iipz5m67bwbv5hfn34wjcvzwsrysvdwd1ykdbd1njwazh8prbqsm0dm4lh8sb1r3l0bnmgpfzriwyl"; + sha512 = "1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ=="; }; }; "sprintf-js-1.0.3" = { @@ -1261,7 +1279,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; "strip-ansi-3.0.1" = { @@ -1315,7 +1333,7 @@ let version = "4.4.13"; src = fetchurl { url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3"; + sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; }; }; "timed-out-3.1.3" = { @@ -1387,7 +1405,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha512 = "09vn7gn5jp2c07pxplc11lvk7ybfaz0rp3qzflyiyhnahkfgh76bij31ll5rg01ranlmljrky2q25d1f6bbd0h23pzxxi5z93csd4hf"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; "wide-align-1.1.3" = { @@ -1396,7 +1414,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; "widest-line-1.0.0" = { @@ -1441,7 +1459,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; }; }; @@ -1481,7 +1499,7 @@ in sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."currently-unhandled-0.4.1" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" sources."delegates-1.0.0" @@ -1497,14 +1515,16 @@ in sources."fs-minipass-1.2.7" sources."fs-promise-0.3.1" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."get-stdin-4.0.1" sources."glob-7.1.6" sources."got-5.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-unicode-2.0.1" - sources."hepburn-1.1.1" + sources."hepburn-1.2.0" sources."hosted-git-info-2.8.8" sources."iconv-lite-0.4.24" sources."ignore-walk-3.0.3" @@ -1512,8 +1532,9 @@ in sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-arrayish-0.2.1" + sources."is-core-module-2.2.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-npm-1.0.0" @@ -1523,7 +1544,7 @@ in sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" - sources."js-yaml-3.13.1" + sources."js-yaml-3.14.1" sources."keypress-0.1.0" sources."latest-version-2.0.0" sources."limax-1.7.0" @@ -1531,22 +1552,18 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."map-obj-1.0.1" - (sources."meow-3.7.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."meow-3.7.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" - sources."ms-2.1.2" - sources."nan-2.14.0" - sources."needle-2.4.0" + sources."mkdirp-0.5.5" + sources."ms-2.1.3" + sources."needle-2.6.0" + sources."node-addon-api-3.1.0" sources."node-pre-gyp-0.14.0" sources."node-status-codes-1.0.0" - sources."nodejieba-2.4.1" + sources."nodejieba-2.5.1" sources."nopt-4.0.3" sources."normalize-package-data-2.5.0" sources."npm-bundled-1.1.1" @@ -1569,14 +1586,10 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pinyin-2.9.0" + sources."pinyin-2.9.1" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."rc-1.2.8" sources."read-all-stream-3.1.0" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -1585,7 +1598,7 @@ in sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."repeating-2.0.1" - sources."resolve-1.15.1" + sources."resolve-1.19.0" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -1593,12 +1606,12 @@ in sources."semver-5.7.1" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."slide-1.1.6" - sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" - sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.5" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.7" sources."speakingurl-14.0.1" sources."sprintf-js-1.0.3" sources."string-width-1.0.2" diff --git a/nixpkgs/pkgs/misc/base16-builder/node-packages.nix b/nixpkgs/pkgs/misc/base16-builder/node-packages.nix index 396f2b2657d2..79748949ff72 100644 --- a/nixpkgs/pkgs/misc/base16-builder/node-packages.nix +++ b/nixpkgs/pkgs/misc/base16-builder/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -7,15 +7,15 @@ let globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix { inherit nodeEnv; - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) stdenv lib nix-gitignore fetchurl fetchgit; }); nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages-generated.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv globalBuildInputs; } diff --git a/nixpkgs/pkgs/misc/base16-builder/supplement.nix b/nixpkgs/pkgs/misc/base16-builder/supplement.nix index 3d4c43d5e709..104cda58dc0a 100644 --- a/nixpkgs/pkgs/misc/base16-builder/supplement.nix +++ b/nixpkgs/pkgs/misc/base16-builder/supplement.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -10,7 +10,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; "ansi-regex-2.1.1" = { @@ -28,7 +28,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; }; "are-we-there-yet-1.1.5" = { @@ -37,7 +37,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; }; }; "balanced-match-1.0.0" = { @@ -55,7 +55,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; "chownr-1.1.4" = { @@ -64,7 +64,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; "code-point-at-1.1.0" = { @@ -103,13 +103,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "debug-3.2.6" = { + "debug-3.2.7" = { name = "debug"; packageName = "debug"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr"; + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; "deep-extend-0.6.0" = { @@ -118,7 +118,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; "delegates-1.0.0" = { @@ -145,7 +145,7 @@ let version = "1.2.7"; src = fetchurl { url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; "fs.realpath-1.0.0" = { @@ -172,7 +172,7 @@ let version = "7.1.6"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; "has-unicode-2.0.1" = { @@ -190,7 +190,7 @@ let version = "0.4.24"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; "ignore-walk-3.0.3" = { @@ -199,7 +199,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha512 = "0mlk9s23jc3avly1bv6s5j7hs0aafxabmgn7iqi0bjag4b03nqckvcdrgnarpmysdq8yr1rgxh6k7p82vzjj1z6hnm5ckwswg33mflv"; + sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; }; }; "inflight-1.0.6" = { @@ -217,16 +217,16 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ini-1.3.5" = { + "ini-1.3.8" = { name = "ini"; packageName = "ini"; - version = "1.3.5"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -253,16 +253,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; "minimist-1.2.5" = { @@ -271,7 +262,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; "minipass-2.9.0" = { @@ -280,7 +271,7 @@ let version = "2.9.0"; src = fetchurl { url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; - sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3"; + sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; "minizlib-1.3.3" = { @@ -289,34 +280,34 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; - sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9"; + sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "ms-2.1.2" = { + "ms-2.1.3" = { name = "ms"; packageName = "ms"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "needle-2.4.0" = { + "needle-2.6.0" = { name = "needle"; packageName = "needle"; - version = "2.4.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; - sha512 = "1k9220dhvc3m78hzd1xh2135p19z15y964hmhsajayvj11j2p3rv5w0gii7lmgr8w57bqkjg0xby5f1gkcph60kxvyr52z6pp7g0yg0"; + url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz"; + sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg=="; }; }; "nopt-4.0.3" = { @@ -325,7 +316,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"; - sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha"; + sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; }; }; "npm-bundled-1.1.1" = { @@ -334,7 +325,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha512 = "1yb9l8jnxwicz0fsdv434y395b0x11mlc1mgbbhnx21pvs58a4p43f0swvi6q0rakdgzdiyf0yylnmb3i41hb052903m1cgcy01zac2"; + sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; }; }; "npm-normalize-package-bin-1.0.1" = { @@ -343,7 +334,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; - sha512 = "149ypqf1mxqw0gcjr4xf4h65q6vx41z1abm27cwbsj7fn07wsx588f9gsykjzfybwrn4mmr6lyaj825w3yyhbgaagmrybw9brzdmxqh"; + sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; }; }; "npm-packlist-1.4.8" = { @@ -352,7 +343,7 @@ let version = "1.4.8"; src = fetchurl { url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha512 = "3s585jx92awjb52bs1jwq8r4swv8mgfl685if5wwpbsigwb362adizzpi58a5kgqfpf605mf6a0v7074mc9qpcn2ypqgr7f1a1ikq77"; + sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; }; }; "npmlog-4.1.2" = { @@ -361,7 +352,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; "number-is-nan-1.0.1" = { @@ -415,7 +406,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; - sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; "path-is-absolute-1.0.1" = { @@ -433,7 +424,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; "rc-1.2.8" = { @@ -442,7 +433,7 @@ let version = "1.2.8"; src = fetchurl { url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; "readable-stream-2.3.7" = { @@ -451,7 +442,7 @@ let version = "2.3.7"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; "rimraf-2.7.1" = { @@ -460,7 +451,7 @@ let version = "2.7.1"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; "safe-buffer-5.1.2" = { @@ -469,7 +460,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; "safer-buffer-2.1.2" = { @@ -478,7 +469,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "sax-1.2.4" = { @@ -487,7 +478,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; "semver-5.7.1" = { @@ -496,7 +487,7 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; "set-blocking-2.0.0" = { @@ -508,13 +499,13 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "signal-exit-3.0.2" = { + "signal-exit-3.0.3" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; "string-width-1.0.2" = { @@ -532,7 +523,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; "strip-ansi-3.0.1" = { @@ -559,7 +550,7 @@ let version = "4.4.13"; src = fetchurl { url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3"; + sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; }; }; "util-deprecate-1.0.2" = { @@ -577,7 +568,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; "wrappy-1.0.2" = { @@ -595,7 +586,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; }; }; @@ -604,10 +595,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.14.0"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha512 = "32drv6q9sh4i2ff2djd1dhxxxiaiymmgycbm12wpkz9vxspnldxgmppf9sazp3c72771a1p5s4kkzgwn4w1csyz9bn4zdbdnq5w6azq"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.17.0.tgz"; + sha512 = "abzZt1hmOjkZez29ppg+5gGqdPLUuJeAEwVPtHYEJgx0qzttCbcKFpxrCQn2HYbwCv2c+7JwH4BgEzFkUGpn4A=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -621,7 +612,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."deep-extend-0.6.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" @@ -634,16 +625,16 @@ in sources."ignore-walk-3.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" + sources."ini-1.3.8" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" - sources."ms-2.1.2" - sources."needle-2.4.0" + sources."mkdirp-0.5.5" + sources."ms-2.1.3" + sources."needle-2.6.0" sources."nopt-4.0.3" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" @@ -657,11 +648,7 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" @@ -669,7 +656,7 @@ in sources."sax-1.2.4" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."signal-exit-3.0.3" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" diff --git a/nixpkgs/pkgs/misc/cups/default.nix b/nixpkgs/pkgs/misc/cups/default.nix index 0d740e071e11..3812ae500e5c 100644 --- a/nixpkgs/pkgs/misc/cups/default.nix +++ b/nixpkgs/pkgs/misc/cups/default.nix @@ -9,7 +9,7 @@ , pam , dbus , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl -, systemd ? null +, systemd , acl , gmp , darwin @@ -20,8 +20,6 @@ , coreutils }: -assert enableSystemd -> systemd != null; - ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test ### works at least for your platform. diff --git a/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix b/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix index eccbae601043..97dcbde2b8b5 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "CUPS Linux drivers and SDK for DYMO printers"; - homepage = "http://www.dymo.com/"; + homepage = "https://www.dymo.com/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ makefu ]; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix deleted file mode 100644 index 6503571eb6b6..000000000000 --- a/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, python2, python2Packages, file, makeWrapper, cups }: - -# Setup instructions can be found at https://github.com/simoncadman/CUPS-Cloud-Print#configuration -# So the nix version is something like: -# nix run nixpkgs.cups-googlecloudprint -c sudo setupcloudprint -# nix run nixpkgs.cups-googlecloudprint -c sudo listcloudprinters - -let pythonEnv = python2.buildEnv.override { - extraLibs = with python2Packages; [ - six - httplib2 - pycups - ]; -}; - -in stdenv.mkDerivation rec { - pname = "cups-googlecloudprint"; - version = "20160502"; - - src = fetchFromGitHub { - owner = "simoncadman"; - repo = "CUPS-Cloud-Print"; - rev = version; - sha256 = "0760i12w7jrhq7fsgyz3yqla5cvpjb45n6m2jz96wsy3p3xf6dzz"; - }; - - buildInputs = [ cups makeWrapper ]; - - cupsgroup = "nonexistantgroup"; - NOPERMS = 1; - - postConfigure = '' - substituteInPlace Makefile --replace "${cups}" "$out" - ''; - - postInstall = '' - pushd "$out" - for s in lib/cups/backend/gcp lib/cups/driver/cupscloudprint - do - echo "Wrapping $s..." - wrapProgram "$out/$s" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups" - done - - mkdir bin - - for s in share/cloudprint-cups/*.py - do - if [ -x "$s" ] # Only wrapping those Python scripts marked as executable - then - o="bin/$(echo $s | sed 's,share/cloudprint-cups/\(.*\).py,\1,')" - echo "Wrapping $o -> $s..." - makeWrapper "$out/$s" "$o" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups" - fi - done - popd - ''; - - meta = with lib; { - description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print"; - homepage = "http://ccp.niftiestsoftware.com"; - platforms = platforms.linux; - license = licenses.gpl3; - }; -} diff --git a/nixpkgs/pkgs/misc/doge/default.nix b/nixpkgs/pkgs/misc/doge/default.nix index 8334444ec4c9..911917e6d2fa 100644 --- a/nixpkgs/pkgs/misc/doge/default.nix +++ b/nixpkgs/pkgs/misc/doge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv , python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "doge"; diff --git a/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index f0289c222724..04cf6c3d96c2 100644 --- a/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.24"; + version = "1.1.25"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" - "https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm" + "https://web.archive.org/web/20210212220538if_/https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm" ]; - sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co="; + sha256 = "sha256-8hgafO/1qOTVdfAdx7FpOOSLqfTl0sBFunuN/2q7KHw="; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix b/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix index 77a2e03d1618..db5c8e5d903b 100644 --- a/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix +++ b/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders +{ lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders , GyroplotSupport ? false }: diff --git a/nixpkgs/pkgs/misc/emulators/citra/default.nix b/nixpkgs/pkgs/misc/emulators/citra/default.nix index d092a8786838..e1a31d208e48 100644 --- a/nixpkgs/pkgs/misc/emulators/citra/default.nix +++ b/nixpkgs/pkgs/misc/emulators/citra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: +{ mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: mkDerivation { pname = "citra"; diff --git a/nixpkgs/pkgs/misc/emulators/commander-x16/emulator.nix b/nixpkgs/pkgs/misc/emulators/commander-x16/emulator.nix new file mode 100644 index 000000000000..73442215ff1e --- /dev/null +++ b/nixpkgs/pkgs/misc/emulators/commander-x16/emulator.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "x16-emulator"; + version = "38"; + + src = fetchFromGitHub { + owner = "commanderx16"; + repo = pname; + rev = "r${version}"; + sha256 = "WNRq/m97NpOBWIk6mtxBAKmkxCGWacWjXeOvIhBrkYE="; + }; + + dontConfigure = true; + + buildInputs = [ SDL2 ]; + + installPhase = '' + runHook preInstall + install -D --mode 755 --target-directory $out/bin/ x16emu + install -D --mode 444 --target-directory $out/share/doc/${pname} README.md + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.commanderx16.com/forum/index.php?/home/"; + description = "The official emulator of CommanderX16 8-bit computer"; + license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = SDL2.meta.platforms; + }; + + passthru = { + # upstream project recommends emulator and rom synchronized; + # passing through the version is useful to ensure this + inherit version; + }; +} diff --git a/nixpkgs/pkgs/misc/emulators/commander-x16/rom.nix b/nixpkgs/pkgs/misc/emulators/commander-x16/rom.nix new file mode 100644 index 000000000000..5da77ebceefe --- /dev/null +++ b/nixpkgs/pkgs/misc/emulators/commander-x16/rom.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromGitHub +, cc65 +}: + +stdenv.mkDerivation rec { + pname = "x16-rom"; + version = "38"; + + src = fetchFromGitHub { + owner = "commanderx16"; + repo = pname; + rev = "r${version}"; + sha256 = "xaqF0ppB7I7ST8Uh3jPbC14uRAb/WH21tHlNeTvYpoI="; + }; + + nativeBuildInputs = [ cc65 ]; + + postPatch = '' + patchShebangs scripts/ + ''; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + install -D --mode 444 --target-directory $out/share/${pname} build/x16/rom.bin + install -D --mode 444 --target-directory $out/share/doc/${pname} README.md + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.commanderx16.com/forum/index.php?/home/"; + description = "ROM file for CommanderX16 8-bit computer"; + license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = cc65.meta.platforms; + }; + + passthru = { + # upstream project recommends emulator and rom synchronized; + # passing through the version is useful to ensure this + inherit version; + }; +} diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix index 9112293db58a..c2d73d3e7fff 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix @@ -4,7 +4,7 @@ , pkg-config , cmake , bluez -, ffmpeg_3 +, ffmpeg , libao , gtk2 , glib @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez - ffmpeg_3 + ffmpeg libao libGLU libGL diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index 4a1fca0e7c5c..cec004e24694 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake -, wrapQtAppsHook, qtbase, bluez, ffmpeg_3, libao, libGLU, libGL, pcre, gettext +, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , miniupnpc, enet, mbedtls, soundtouch, sfml @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ - curl ffmpeg_3 libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio + curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase diff --git a/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix b/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix index 236eff8610cc..c766df9e3c03 100644 --- a/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix +++ b/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qtdeclarative }: mkDerivation rec { pname = "firebird-emu"; diff --git a/nixpkgs/pkgs/misc/emulators/hatari/default.nix b/nixpkgs/pkgs/misc/emulators/hatari/default.nix index be80b9bc351a..de98278b8325 100644 --- a/nixpkgs/pkgs/misc/emulators/hatari/default.nix +++ b/nixpkgs/pkgs/misc/emulators/hatari/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hatari"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://download.tuxfamily.org/hatari/${version}/${pname}-${version}.tar.bz2"; - sha256 = "19dqadi32hgi78hyxxcm8v2vh28vyn9w5nd1xiq683wk0ccicj5z"; + sha256 = "sha256-RKL2LKmV442eCHSAaVbwucPMhOqJ4BaaY4SbY807ZL0="; }; # For pthread_cancel diff --git a/nixpkgs/pkgs/misc/emulators/mame/default.nix b/nixpkgs/pkgs/misc/emulators/mame/default.nix index c7ac7a65ccd3..b50181a4d98d 100644 --- a/nixpkgs/pkgs/misc/emulators/mame/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mame/default.nix @@ -1,10 +1,8 @@ -{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper +{ lib, stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper , python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: -with stdenv; - let majorVersion = "0"; minorVersion = "226"; diff --git a/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix index dbbbe4da5572..7d0d6c6f68e3 100644 --- a/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mednaffe"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; rev = version; - sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; + sha256 = "sha256-BS/GNnRYj9klc4RRj7LwNikgApNttv4IyWPL694j+gM="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/misc/emulators/melonDS/default.nix b/nixpkgs/pkgs/misc/emulators/melonDS/default.nix index dbf658b8fcea..a53d2bfc339e 100644 --- a/nixpkgs/pkgs/misc/emulators/melonDS/default.nix +++ b/nixpkgs/pkgs/misc/emulators/melonDS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , mkDerivation , cmake @@ -12,13 +12,13 @@ mkDerivation rec { pname = "melonDS"; - version = "0.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "0m45m1ch0az8l3d3grjbqvi5vvydbffxwka9w3k3qiia50m7fnph"; + sha256 = "sha256-bvi0Y+zwfEcsZMNxoH85hxwIGn0UIYlg/ZaE6yJ7vlo="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/misc/emulators/nestopia/default.nix b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix index 956161209fcb..d1b18f12a844 100644 --- a/nixpkgs/pkgs/misc/emulators/nestopia/default.nix +++ b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 -, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils +, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils , epoxy, gdk-pixbuf, gnome3, wrapGAppsHook }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libarchive libao unzip - xdg_utils + xdg-utils gnome3.adwaita-icon-theme ]; diff --git a/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix index 87dacd46d576..a50bc3eb3ec8 100644 --- a/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix @@ -16,14 +16,14 @@ mkDerivation rec { pname = "ppsspp"; - version = "1.10.3"; + version = "1.11"; src = fetchFromGitHub { owner = "hrydgard"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-W41Poq5S+opkasIGYo13SQZWQF1HjfFnH7u9DW5HNA0="; + sha256 = "19948jzqpclf8zfzp3k7s580xfjgqcyfwlcp7x7xj8h8lyypzymx"; }; postPatch = '' diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix index c1b60ad63b2f..7d0ba259dc51 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix @@ -925,8 +925,8 @@ in with lib.licenses; src = fetchFromGitHub { owner = "snes9xgit"; repo = core; - rev = "6db918cfe32b157239da44096091c212fdfb3b60"; - sha256 = "0y3jhy50qdhhfglybys9m0fgk9r24ksdcgv5iqpyxy5a4cjvhv8j"; + rev = "bd9246ddd75a5e9f78d6189c8c57754d843630f7"; + sha256 = "10fm7ah3aha9lf4k9hgw0dlhdvshzpig2d0ylcb12gf9zz0i22ns"; }; description = "Port of SNES9x git to libretro"; license = "Non-commercial"; diff --git a/nixpkgs/pkgs/misc/emulators/ruffle/default.nix b/nixpkgs/pkgs/misc/emulators/ruffle/default.nix index 475e54076fc2..9e1f986341f7 100644 --- a/nixpkgs/pkgs/misc/emulators/ruffle/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ruffle/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , rustPlatform -, lib, stdenv +, lib , wayland , xorg , vulkan-loader diff --git a/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index 79d71301163a..60e595bc51ba 100644 --- a/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs -, dotnet-sdk_3, dotnetPackages, dotnetCorePackages -, SDL2, libX11, openal -, gtk3, gobject-introspection, wrapGAppsHook +, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert +, SDL2, libX11, ffmpeg, openal, libsoundio +, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook }: let @@ -9,20 +9,22 @@ let SDL2 gtk3 libX11 + ffmpeg openal + libsoundio ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.5551"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.6498"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "2dcc6333f8cbb959293832f52857bdaeab1918bf"; - sha256 = "1hfa498fr9mdxas9s02y25ncb982wa1sqhl06jpnkhqsiicbkgcf"; + rev = "67033ed8e05eb70860ac6af2b83deab0256c11eb"; + sha256 = "1lg0cybbrf0x3jl10jwdwcg1zyhxsqfdnwnsvdm1lah75xg15ymw"; }; - nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { fetchNuGet = { name, version, sha256 }: fetchurl { @@ -32,7 +34,10 @@ in stdenv.mkDerivation rec { }; }); - patches = [ ./log.patch ]; # Without this, Ryujinx tries to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. + patches = [ + ./log.patch # Without this, Ryujinx attempts to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. + ./disable-updater.patch # This disables the auto-updater, which does not work as it attempts to modify the nix store. + ]; configurePhase = '' runHook preConfigure @@ -73,12 +78,12 @@ in stdenv.mkDerivation rec { shopt -s extglob makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \ - --set DOTNET_ROOT "${dotnetCorePackages.netcore_3_1}" \ + --set DOTNET_ROOT "${dotnetCorePackages.net_5_0}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ ''${gappsWrapperArgs[@]} for i in 16 32 48 64 96 128 256 512 1024; do - install -D ${src}/Ryujinx/Ui/assets/Icon.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png + install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png done cp -r ${makeDesktopItem { desktopName = "Ryujinx"; diff --git a/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix b/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix index 4f30b159a280..737bd876e135 100644 --- a/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix +++ b/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix @@ -1,13 +1,13 @@ { fetchNuGet }: [ (fetchNuGet { name = "AtkSharp"; - version = "3.22.25.56"; - sha256 = "069fm4wplxb4s1i6mdj00b22zqpz6pg9miglcj8mkf1b4lnn09g0"; + version = "3.22.25.128"; + sha256 = "0fg01zi7v6127043jzxzihirsdp187pyj83gfa6p79cx763l7z94"; }) (fetchNuGet { name = "CairoSharp"; - version = "3.22.25.56"; - sha256 = "0b7p4yj88wgayh464j3rkbc4js8z57wxy3mprgvx86i3rc2v5jd9"; + version = "3.22.25.128"; + sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9"; }) (fetchNuGet { name = "Concentus"; @@ -21,8 +21,8 @@ }) (fetchNuGet { name = "DiscordRichPresence"; - version = "1.0.150"; - sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79"; + version = "1.0.166"; + sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; @@ -31,18 +31,18 @@ }) (fetchNuGet { name = "GdkSharp"; - version = "3.22.25.56"; - sha256 = "0f708dwy6i9hghxs711scwkww28lvfjd6gykk7xv921vich5xvy6"; + version = "3.22.25.128"; + sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7"; }) (fetchNuGet { name = "GioSharp"; - version = "3.22.25.56"; - sha256 = "1i7x1bakv5sq27ppl6w79c1wbvnfhf1713plc9ixaznh1fclcnwr"; + version = "3.22.25.128"; + sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; }) (fetchNuGet { name = "GLibSharp"; - version = "3.22.25.56"; - sha256 = "12czfm0lgjcy9hgqsiycwfv124dq619svrnsi036246i5hycj37w"; + version = "3.22.25.128"; + sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { name = "GLWidget"; @@ -51,8 +51,8 @@ }) (fetchNuGet { name = "GtkSharp"; - version = "3.22.25.56"; - sha256 = "18dbn834wimdmxmgsqd81hyvjyyzgbnayzvz9f714cgw4yjkjyqs"; + version = "3.22.25.128"; + sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { name = "GtkSharp.Dependencies"; @@ -66,23 +66,23 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + version = "5.0.0"; + sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "3.1.8"; - sha256 = "0dkib4r4v5wqxsi6zca6x3zin1x4lha53dqbgsaiah961h1yhpp4"; + version = "5.0.0"; + sha256 = "1mmklq1fwq4km9y9jgk63wmwjlarx4npkpvjaiwdzv83vdv104ja"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "3.1.8"; - sha256 = "05sv39b6sc8fhh3m8kwq0lp58n8mrv5ivxa60rfqk6v6i7gs8b0f"; + version = "5.0.0"; + sha256 = "0k7q89w3nky4m0j5jsk95c8gczlyp5jl9982gf1hli3gqpl2q4jr"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.7.0"; - sha256 = "10f6y1q8w61vc8ffqd7jsndwfskkfqbdzfqswyxnrr0qkkqx29v1"; + version = "16.8.0"; + sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -96,28 +96,28 @@ }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; - version = "3.1.8"; - sha256 = "1ip8pgra9z6ha3yc4xqkb85cl9kx2jbwhwzdi3dp8bkqbvlirvkb"; + version = "5.0.0"; + sha256 = "1nirb155gzn2ws1ayaqspjmjaizw87jq2684mzkn18jv4si0hbpf"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; - version = "3.1.8"; - sha256 = "1d7wlnibf9fgq57hwnjqhlh33hxg417ljf1djb9yan4xik1wl4hb"; + version = "5.0.0"; + sha256 = "0nghghcapc28ixg21wb30ccjirc9wz83h0y3bn5zyfanxv2m2ypx"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + version = "5.0.0"; + sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "3.1.8"; - sha256 = "1iabp5czrz9wmsqcl0gi8r580vlhky3aak5ndz9fw065wlsqpv7w"; + version = "5.0.0"; + sha256 = "0lvpf4zz617y94zz3zsmzrg6zcdd6z3z9gz2bd5kq1l8y1pmq77y"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "3.1.8"; - sha256 = "010c514ls1q9gdnyj0kvknx7a0z034lfbbcxqa8cjiv0snax4pqz"; + version = "5.0.0"; + sha256 = "1486654z369857h45v73jz8pwr8ibb97fiw5mfm7f01kdbyjdsdd"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -140,6 +140,11 @@ sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "5.0.0"; + sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; + }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; @@ -151,18 +156,18 @@ }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.7.0"; - sha256 = "1vkp6b82566z2pxn9035wrh4339kz3ki17g5qlwmwdbn4br6lcfy"; + version = "16.8.0"; + sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.7.0"; - sha256 = "0nmw80ap2rn9h4i1x7qb15n763sh3wy8hjp1i5n0av7100g0yjqz"; + version = "16.8.0"; + sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.7.0"; - sha256 = "0485nv0wcwdwjhif5a7d1i0znaf9acqyawhpqcwschw827chqzrs"; + version = "16.8.0"; + sha256 = "1rh8cga1km3jfafkwfjr0dwqrxb4306hf7fipwba9h02w7vlhb9a"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -190,6 +195,11 @@ sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "5.0.0"; + sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; + }) + (fetchNuGet { name = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; @@ -241,13 +251,13 @@ }) (fetchNuGet { name = "OpenTK.NetStandard"; - version = "1.0.5.22"; - sha256 = "10bdhc4qbffac862zg03ab5j3iqrr33bydxmnmrxn82brldahm23"; + version = "1.0.5.32"; + sha256 = "12y8kg73llmq3zibcp6j3hhiw04g7mqlm1nslmb74gfkzx0b4m9f"; }) (fetchNuGet { name = "PangoSharp"; - version = "3.22.25.56"; - sha256 = "12b0761nfsci4rvzcba4hrh5rcn6q24qaxwwz66myb82c999qj8w"; + version = "3.22.25.128"; + sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; }) (fetchNuGet { name = "runtime.any.System.Collections"; @@ -490,14 +500,19 @@ sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) (fetchNuGet { + name = "Ryujinx.Audio.OpenAL.Dependencies"; + version = "1.21.0.1"; + sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; + }) + (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.3.0"; sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll"; }) (fetchNuGet { name = "SharpZipLib"; - version = "1.2.0"; - sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5"; + version = "1.3.0"; + sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4"; }) (fetchNuGet { name = "System.AppContext"; @@ -521,8 +536,8 @@ }) (fetchNuGet { name = "System.CodeDom"; - version = "4.7.0"; - sha256 = "1lch8gwmw420wsvbv9ir4v5g1ij2ag23cbgi3c9gramj1h4vhlz2"; + version = "5.0.0"; + sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; }) (fetchNuGet { name = "System.Collections"; @@ -701,8 +716,8 @@ }) (fetchNuGet { name = "System.Management"; - version = "4.7.0"; - sha256 = "0aw61jl6l78liiq04afxplz0ad5qbyg6vmyjaqrlnrv7whb58n66"; + version = "5.0.0"; + sha256 = "09hyv3p0zd549577clydlb2szl84m4gvdjnsry73n8b12ja7d75s"; }) (fetchNuGet { name = "System.Net.Http"; @@ -831,11 +846,6 @@ }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.6.0"; - sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0-preview.7.20364.11"; sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m"; }) @@ -900,6 +910,11 @@ sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) (fetchNuGet { + name = "System.Security.AccessControl"; + version = "5.0.0"; + sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; + }) + (fetchNuGet { name = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; @@ -960,6 +975,11 @@ sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "5.0.0"; + sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; + }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; diff --git a/nixpkgs/pkgs/misc/emulators/ryujinx/disable-updater.patch b/nixpkgs/pkgs/misc/emulators/ryujinx/disable-updater.patch new file mode 100644 index 000000000000..e233aec7ca13 --- /dev/null +++ b/nixpkgs/pkgs/misc/emulators/ryujinx/disable-updater.patch @@ -0,0 +1,33 @@ +diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs +index 29043bb8..d3973c7c 100644 +--- a/Ryujinx/Program.cs ++++ b/Ryujinx/Program.cs +@@ -54,9 +54,6 @@ namespace Ryujinx + } + } + +- // Delete backup files after updating. +- Task.Run(Updater.CleanupUpdate); +- + Toolkit.Init(new ToolkitOptions + { + Backend = PlatformBackend.PreferNative +@@ -146,11 +143,6 @@ namespace Ryujinx + mainWindow.LoadApplication(launchPathArg); + } + +- if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false)) +- { +- _ = Updater.BeginParse(mainWindow, false); +- } +- + Application.Run(); + } + +@@ -200,4 +192,4 @@ namespace Ryujinx + Logger.Shutdown(); + } + } +-} +\ No newline at end of file ++} diff --git a/nixpkgs/pkgs/misc/emulators/ryujinx/fetch-deps.sh b/nixpkgs/pkgs/misc/emulators/ryujinx/fetch-deps.sh index ce9873a16929..35de197b626e 100755 --- a/nixpkgs/pkgs/misc/emulators/ryujinx/fetch-deps.sh +++ b/nixpkgs/pkgs/misc/emulators/ryujinx/fetch-deps.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3 +#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5 set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -36,6 +36,3 @@ while read pkg_spec; do EOF done < <(find ./nuget_tmp.packages -name '*.nuspec' | sort) echo "]" >>"$deps_file" - -popd -rm -r "$src" diff --git a/nixpkgs/pkgs/misc/emulators/stella/default.nix b/nixpkgs/pkgs/misc/emulators/stella/default.nix index 458922bdc1da..f6a3d65c4bde 100644 --- a/nixpkgs/pkgs/misc/emulators/stella/default.nix +++ b/nixpkgs/pkgs/misc/emulators/stella/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2 }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, SDL2 +}: stdenv.mkDerivation rec { pname = "stella"; - version = "6.4"; + version = "6.5.1"; src = fetchFromGitHub { owner = "stella-emu"; repo = pname; rev = version; - sha256 = "0gva6pw5c1pplcf2g48zmm24h1134v0vr705rbzj4v6ifp3adrsl"; + sha256 = "2O7pN0xByEbWVL32VZw9191tG+kCMOuivJZRpXssQIw="; }; nativeBuildInputs = [ pkg-config ]; @@ -17,15 +22,19 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib;{ + homepage = "https://stella-emu.github.io/"; description = "An open-source Atari 2600 VCS emulator"; longDescription = '' - Stella is a multi-platform Atari 2600 VCS emulator released under - the GNU General Public License (GPL). Stella was originally - developed for Linux by Bradford W. Mott, and is currently - maintained by Stephen Anthony. - As of its 3.5 release, Stella is officially donationware. + Stella is a multi-platform Atari 2600 VCS emulator released under the GNU + General Public License (GPL). Stella was originally developed for Linux by + Bradford W. Mott, and is currently maintained by Stephen Anthony. Since + its original release several people have joined the development team to + port Stella to other operating systems such as AcornOS, AmigaOS, DOS, + FreeBSD, IRIX, Linux, OS/2, MacOS, Unix, and Windows. The development team + is working hard to perfect the emulator and we hope you enjoy our effort. + + As of its 3.5 release, Stella is officially donationware. ''; - homepage = "https://stella-emu.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/wine/cert-path-stable.patch b/nixpkgs/pkgs/misc/emulators/wine/cert-path-stable.patch deleted file mode 100644 index da01a4778102..000000000000 --- a/nixpkgs/pkgs/misc/emulators/wine/cert-path-stable.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c -index f795181..fb4926a 100644 ---- a/dlls/crypt32/rootstore.c -+++ b/dlls/crypt32/rootstore.c -@@ -18,6 +18,7 @@ - #include "config.h" - #include <stdarg.h> - #include <stdio.h> -+#include <stdlib.h> /* getenv */ - #include <sys/types.h> - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> -@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) - - for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) - ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); -+ -+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); -+ if (nix_cert_file != NULL) -+ ret = import_certs_from_path(nix_cert_file, from, TRUE); -+ - check_and_store_certs(from, store); - } - CertCloseStore(from, 0); diff --git a/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/nixpkgs/pkgs/misc/emulators/wine/sources.nix index 3a5abe18d754..15e2f80aa4ea 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "5.0.3"; - url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "sha256-nBo1Ni/VE9/1yEW/dtpj6hBaeUrHFEqlA/cTYa820i8="; + version = "6.0"; + url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; + sha256 = "sha256-tJMGXy+D7kKcYuLsWGmKPPY+94ci4bIHZYIxUuhYLFY="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -38,15 +38,15 @@ in rec { patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE - ./cert-path-stable.patch + ./cert-path.patch ]; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.0-rc4"; - url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU="; + version = "6.1"; + url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; + sha256 = "sha256-qSwkMIxIuFG13CKh01aWpXMRxEezHsn6VD7FsKpzoUk="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c="; + sha256 = "sha256-uu6wvWT54Zvp86KfUcKepGxjQ6JHRQ7Yuu4yeROdHeo="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/misc/emulators/wine/staging.nix b/nixpkgs/pkgs/misc/emulators/wine/staging.nix index 24da1d86bbfd..abfc4f832a3b 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/staging.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, wineUnstable }: +{ lib, callPackage, wineUnstable }: with callPackage ./util.nix {}; diff --git a/nixpkgs/pkgs/misc/emulators/yabause/default.nix b/nixpkgs/pkgs/misc/emulators/yabause/default.nix index 43f077227dbf..17b7b563c15f 100644 --- a/nixpkgs/pkgs/misc/emulators/yabause/default.nix +++ b/nixpkgs/pkgs/misc/emulators/yabause/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL +{ mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL , freeglut ? null, openal ? null, SDL2 ? null }: mkDerivation rec { diff --git a/nixpkgs/pkgs/misc/emulators/yuzu/base.nix b/nixpkgs/pkgs/misc/emulators/yuzu/base.nix new file mode 100644 index 000000000000..89c8f2cd9474 --- /dev/null +++ b/nixpkgs/pkgs/misc/emulators/yuzu/base.nix @@ -0,0 +1,72 @@ +{ pname, version, src, branchName +, stdenv, lib, fetchFromGitHub, wrapQtAppsHook +, cmake, pkg-config +, libpulseaudio, libjack2, alsaLib, sndio, ecasound +, vulkan-loader, vulkan-headers +, qtbase, qtwebengine, qttools +, nlohmann_json, rapidjson +, zlib, zstd, libzip, lz4 +, glslang +, boost173 +, catch2 +, fmt +, SDL2 +, udev +, libusb1 +, ffmpeg +}: + +stdenv.mkDerivation rec { + inherit pname version src; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ + libpulseaudio libjack2 alsaLib sndio ecasound + vulkan-loader vulkan-headers + qtbase qtwebengine qttools + nlohmann_json rapidjson + zlib zstd libzip lz4 + glslang + boost173 + catch2 + fmt + SDL2 + udev + libusb1 + ffmpeg + ]; + + cmakeFlags = [ + "-DENABLE_QT_TRANSLATION=ON" + "-DYUZU_USE_QT_WEB_ENGINE=ON" + "-DUSE_DISCORD_PRESENCE=ON" + ]; + + # Trick the configure system. This prevents a check for submodule directories. + preConfigure = '' + rm -f .gitmodules + ''; + + # Fix vulkan detection + postFixup = '' + wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + + meta = with lib; { + homepage = "https://yuzu-emu.org"; + description = "The ${branchName} branch of an experimental Nintendo Switch emulator written in C++"; + longDescription = '' + An experimental Nintendo Switch emulator written in C++. + Using the mainline branch is recommanded for general usage. + Using the early-access branch is recommanded if you would like to try out experimental features, with a cost of stability. + ''; + license = with licenses; [ + gpl2Plus + # Icons + cc-by-nd-30 cc0 + ]; + maintainers = with maintainers; [ ivar joshuafern ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/misc/emulators/yuzu/default.nix b/nixpkgs/pkgs/misc/emulators/yuzu/default.nix index 5bb01b9fca08..89a500bb313c 100644 --- a/nixpkgs/pkgs/misc/emulators/yuzu/default.nix +++ b/nixpkgs/pkgs/misc/emulators/yuzu/default.nix @@ -1,47 +1,28 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config, wrapQtAppsHook -, boost173, catch2, fmt, lz4, nlohmann_json, rapidjson, zlib, zstd, SDL2 -, udev, libusb1, libzip, qtbase, qtwebengine, qttools, ffmpeg -, libpulseaudio, libjack2, alsaLib, sndio, ecasound -, useVulkan ? true, vulkan-loader, vulkan-headers -}: - -stdenv.mkDerivation rec { - pname = "yuzu"; - version = "482"; - - src = fetchFromGitHub { - owner = "yuzu-emu"; - repo = "yuzu-mainline"; # They use a separate repo for mainline “branch” - rev = "mainline-0-${version}"; - sha256 = "1bhkdbhj1dv33qv0np26gzsw65p4z88whjmd6bc7mh2b5lvrjwxm"; - fetchSubmodules = true; +{ branch ? "mainline", libsForQt5, fetchFromGitHub }: +let + inherit libsForQt5 fetchFromGitHub; +in { + mainline = libsForQt5.callPackage ./base.nix rec { + pname = "yuzu-mainline"; + version = "517"; + branchName = branch; + src = fetchFromGitHub { + owner = "yuzu-emu"; + repo = "yuzu-mainline"; + rev = "mainline-0-${version}"; + sha256 = "0i73yl2ycs8p9cqn25rw35cll0l6l68605f1mc1qvf4zy82jggbb"; + fetchSubmodules = true; + }; }; - - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase qtwebengine qttools boost173 catch2 fmt lz4 nlohmann_json rapidjson zlib zstd SDL2 udev libusb1 libpulseaudio alsaLib sndio ecasound libjack2 libzip ffmpeg ] - ++ lib.optionals useVulkan [ vulkan-loader vulkan-headers ]; - cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" ] - ++ lib.optionals (!useVulkan) [ "-DENABLE_VULKAN=No" ]; - - # Trick the configure system. This prevents a check for submodule directories. - preConfigure = "rm .gitmodules"; - - # Fix vulkan detection - postFixup = lib.optionals useVulkan '' - wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - ''; - - meta = with lib; { - homepage = "https://yuzu-emu.org"; - description = "An experimental Nintendo Switch emulator written in C++"; - license = with licenses; [ - gpl2Plus - # Icons - cc-by-nd-30 cc0 - ]; - maintainers = with maintainers; [ ivar joshuafern ]; - platforms = platforms.linux; + early-access = libsForQt5.callPackage ./base.nix rec { + pname = "yuzu-ea"; + version = "1377"; + branchName = branch; + src = fetchFromGitHub { + owner = "pineappleEA"; + repo = "pineapple-src"; + rev = "EA-${version}"; + sha256 = "0jjddmcqbkns5iqjwqh51hpjviw5j12n49jwfq7xwrsns6vbpqkf"; + }; }; -} +}.${branch} diff --git a/nixpkgs/pkgs/misc/jackaudio/default.nix b/nixpkgs/pkgs/misc/jackaudio/default.nix index f10b5a6718d6..24d2b5e135cf 100644 --- a/nixpkgs/pkgs/misc/jackaudio/default.nix +++ b/nixpkgs/pkgs/misc/jackaudio/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { name = "${prefix}jack2-${version}"; - version = "1.9.16"; + version = "1.9.17"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; rev = "v${version}"; - sha256 = "0pzgrjy5fi2nif2j442fs3j2bbshxpnmq9kzwcqz54wx1w8fzdfr"; + sha256 = "sha256-T6UJpLsXrsIL3HaChfVP52w0v9DCs/sJqty2/kAWNfE="; }; nativeBuildInputs = [ pkg-config python makeWrapper wafHook ]; diff --git a/nixpkgs/pkgs/misc/lightspark/default.nix b/nixpkgs/pkgs/misc/lightspark/default.nix index fae02cdbcd9a..c45240982a76 100644 --- a/nixpkgs/pkgs/misc/lightspark/default.nix +++ b/nixpkgs/pkgs/misc/lightspark/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lightspark"; - version = "0.8.2"; + version = "0.8.4.1"; src = fetchFromGitHub { owner = "lightspark"; repo = "lightspark"; rev = version; - sha256 = "04wn6d6gmpf848x0yghw26m9syv0hm6q5dwqiw3fxhs155jjqfgv"; + sha256 = "sha256-pIiv5wEDLvTHjlYSicXUTTI6pVAsO6FC39Gie9Z/hZ4="; }; patchPhase = '' diff --git a/nixpkgs/pkgs/misc/lilypond/with-fonts.nix b/nixpkgs/pkgs/misc/lilypond/with-fonts.nix index c4de45421f24..2f3a95a33022 100644 --- a/nixpkgs/pkgs/misc/lilypond/with-fonts.nix +++ b/nixpkgs/pkgs/misc/lilypond/with-fonts.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, lndir, symlinkJoin, makeWrapper +{ lib, lndir, symlinkJoin, makeWrapper , lilypond, openlilylib-fonts }: diff --git a/nixpkgs/pkgs/misc/logging/beats/6.x.nix b/nixpkgs/pkgs/misc/logging/beats/6.x.nix index 1be14ecec9b8..ce80b174d327 100644 --- a/nixpkgs/pkgs/misc/logging/beats/6.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; diff --git a/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/nixpkgs/pkgs/misc/logging/beats/7.x.nix index d7416731e636..43ea85508c69 100644 --- a/nixpkgs/pkgs/misc/logging/beats/7.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; diff --git a/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix index ea68e147ba7e..74d9e3cffee0 100644 --- a/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, ffmpeg, lua5_1, curl , libpng, xorg, pkg-config, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL , glee }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - wxGTK30 libav lua5_1 curl libpng xorg.libXrender + wxGTK30 ffmpeg lua5_1 curl libpng xorg.libXrender flam3 libgtop boost tinyxml freeglut libGLU libGL glee ]; diff --git a/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 0d3a954b9b43..ef20bbaf66ec 100644 --- a/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -129,12 +129,12 @@ in rec { dracula = mkDerivation rec { pluginName = "dracula"; - version = "unstable-2020-12-28"; + version = "unstable-2021-02-09"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; - rev = "6757a5329948f00addd66b02ea94f61dd94456f5"; - sha256 = "0wwwzg3bwcrbr2nmf84prz7k4i79yq0960vs6zjp0x8nqn2fvziy"; + rev = "d1678a5834679d98ffac1dd7a0eaecff7868ab8e"; + sha256 = "rdy5NFkh5Yl2YOTnuMKZQGRqVb2Pk8Bpq3nbJp2rCtE="; }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 8fcc4a089d15..c4448194a9e7 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-01-25"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "3a1728297a915b6e41c6339d571e85bc3756e5ff"; - sha256 = "0zhpw9x97z430r9g73rchagznsxf1landlql42gzha64wsk5ihiw"; + rev = "8cb9f5ef515f73eb3cf3188cc20ff57a51d9217b"; + sha256 = "1ml2j5l91n1zwp7zxdg2cny48bbj1gw0dfa223bf5iq472c1ggk2"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,12 +89,12 @@ let aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-01-16"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "9d3a5e926a5708039abcaf552c8ab3d133c37f80"; - sha256 = "0waa122pk1mcbbhj7zrsb9ch0xmg0x3mpm627k7knpi4q8krgrzy"; + rev = "4fbb34ccc09354ec09033719133c32d531111934"; + sha256 = "0blpw88d0b7arxnz18glppwwgs0gynq0l7yd2a2jm45wqvlfh8ld"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -161,12 +161,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-12-23"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "e546095e4ac7a20d06bcf16d207275dd4d6b4115"; - sha256 = "0jq5qrlijlqpfgi89249whvpmm140smflpprlq8as0pfyhpjn1d1"; + rev = "4be3c16b33c27fce5372bf8bc74e42126c76fe61"; + sha256 = "1y5xlisby7a41naas7r09ins3k9arn5xc5bb6w8k7am6xz3vc3r6"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -207,6 +207,18 @@ let meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; + auto-session = buildVimPluginFrom2Nix { + pname = "auto-session"; + version = "2021-02-05"; + src = fetchFromGitHub { + owner = "rmagatti"; + repo = "auto-session"; + rev = "691155697a809af8797c1b935aa4e73187516d42"; + sha256 = "199rcp3wcqg40a6lsrk83lv2kxgmnbapd5zw16jcxg4svy30dhfg"; + }; + meta.homepage = "https://github.com/rmagatti/auto-session/"; + }; + autoload_cscope-vim = buildVimPluginFrom2Nix { pname = "autoload_cscope-vim"; version = "2011-01-28"; @@ -221,12 +233,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-01-05"; + version = "2021-01-29"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "ae48abdd39e24e187dac904c14caf6458b76838c"; - sha256 = "12a31l2ggzihl1m1bjgmpmvw8zlqgvql01ryz1zrrhwmgzk8jk1h"; + rev = "8f437c8960abbd4b29c05a19eaad8c3e792ace05"; + sha256 = "039xln6bwxa6mbwvzdfk32b3v8p4glghb3104nydscy9zbsmpick"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -305,12 +317,12 @@ let brainfuck-vim = buildVimPluginFrom2Nix { pname = "brainfuck-vim"; - version = "2021-01-10"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "fruit-in"; repo = "brainfuck-vim"; - rev = "d58b673eaa3dbc58975e9b23c09eac57c3e1e4b5"; - sha256 = "178m0ada1a0gijdwikycszls41kzgx6ysbd2aavlkbnrvclrkfa9"; + rev = "721bbe54df26906f79ed481069435596741f67f3"; + sha256 = "130njfiwbgd6gpy52xm5ayadh9q11ahsin1a60y54a99qd8jz6wi"; }; meta.homepage = "https://github.com/fruit-in/brainfuck-vim/"; }; @@ -341,12 +353,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2021-01-11"; + version = "2021-01-30"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "289fe67f9a20a88b93b570671cf8a5d258fc7b69"; - sha256 = "17201r2nvy3jxf0f29ihqrln37xr4h3f2z20igjhajl3ajkg60h1"; + rev = "4e454c2ca9a489f2631df24845615744bd594b61"; + sha256 = "12vmysyvavvf1173i0m7jfzh2jsfqx5p7mdm3iafg4iv0209rz66"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -377,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-01-25"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "0dad2908db0139de301035315c812b3fc2ccbd6e"; - sha256 = "175glq9iphr1xplqfcralp8xqn9i3d931s4z0mw3frhvfnrj6vi0"; + rev = "e3e679e077708ee8a4de6bdcdf4135ac1f1ebd9c"; + sha256 = "0i7wznlvamybbrz0qjvynkzk6alcxa327nrlw95la6qbw67vkbsl"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -413,12 +425,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-01-20"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "ba5e404ded9f5bcfae68a6ad440ba3909eb7baff"; - sha256 = "1377apvlwq3i755ply54yi7wz96fflwc4w4aash3hjbjmv0r6ff4"; + rev = "c7537d81a796b4559e03309aeec9cb8d6d7bda21"; + sha256 = "05p8viz5q7rknzyh7zp3k2qhl14nlamik5gvqy86bfgwmhbac350"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -473,12 +485,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-01-25"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "07b73e6e40951f4cecfc067dbf59dc9f34203802"; - sha256 = "0c1wl6n89f2cxchjakcipx7sajbsr5ab1zbsjabhpnlpp9sn65jc"; + rev = "8c839426885e290ff5f63d87778f6325339ecf1f"; + sha256 = "03ssv8b5pq44dnj9iplpc76js5mpwg0l77wg4zal5gx0ashgm39p"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -497,12 +509,12 @@ let coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-01-16"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "07a533b2b1202beda8e07e4d605584a8b7525e3d"; - sha256 = "1r8yijfm9m0g4r2d1q3ja05vjy7li578ix2c2wbq8iy3i10g8lkl"; + rev = "9fd7f97b9696e53066a8e62f528f26b6bc1858b0"; + sha256 = "0lnkz1janblic4a15lr9fm6r62691wpgggdq8hyc5dz0m32jr0hn"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -533,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-01-25"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "35935515f6cae76db5f5ab339bd0055291bf6453"; - sha256 = "1gkd37xjsv9msqs579f9fjqwpwsikkcx6qsdw9bgxfkhdmi3jmck"; + rev = "a336a8bc251702d9526a6818ae56e86d92fafc0c"; + sha256 = "0jh5ik1w6qyp9scr9qxi47n7b8xgznknhsriwcpw2axs9ff00zz8"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -604,6 +616,18 @@ let meta.homepage = "https://github.com/rhysd/committia.vim/"; }; + compe-tabnine = buildVimPluginFrom2Nix { + pname = "compe-tabnine"; + version = "2021-02-12"; + src = fetchFromGitHub { + owner = "tzachar"; + repo = "compe-tabnine"; + rev = "ea3e34dcbe09563c986bc60ec7d3c0db18ce9690"; + sha256 = "1gsi5ybkqxqv1q3yj2qdv5j2lhkwiabr3mrcj60ah5rb1qjvlmib"; + }; + meta.homepage = "https://github.com/tzachar/compe-tabnine/"; + }; + completion-buffers = buildVimPluginFrom2Nix { pname = "completion-buffers"; version = "2021-01-17"; @@ -666,12 +690,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-01-16"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "94a55a46ecbbd169436f4f937060c8d449a74c51"; - sha256 = "074ksnsisv1yvf3fcvgz9bl8s15q5z8h2hvfmymhf53rxbfh7dfk"; + rev = "88e7865b97737809d963b81b10737c41e90b4377"; + sha256 = "075rm1s1y1cklnsqf7845s3knfwyiqs1wd82d9rvbvc3gs12xlpf"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -702,12 +726,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-01-21"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "ff42b26f69634ed9fb3001887d80c65a759458e5"; - sha256 = "0b4pra6f83933kl1ys8k4q9y9mx6a7qc7z757s82b0jk92cs790b"; + rev = "f1deefb084b28197eaf988bbebff70dd86a99e03"; + sha256 = "1461h9qlfvvcvig4zrbylm4j11xkxmbnha1nk5829xm50pjkmca2"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -846,12 +870,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-01-23"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "09c8f1bff43b0cc607f7aeab872f04fcf26b150b"; - sha256 = "1sapg0az9vfd33vhxxi68hd23c01p8fy5yvx8fy0mvj5ak2gzbnn"; + rev = "4d2353619262fe487a052288859f3eea64cd229c"; + sha256 = "1nxh1pqrnvzdw02fb8bncb8gswfr3p2n1h8yfnfjlljqiapkvhdq"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -894,24 +918,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-01-23"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "9637bc88220c0117e0bc20b730348aaa744a78d6"; - sha256 = "1gwx6x584h98w31g1ynyqbjs6vypx121wcbsq1bq4npn71a9yvxv"; + rev = "2ea80dfe51974a21a7ec695c23fe86be3a8b10ac"; + sha256 = "0ilqw2jfrjq1h0camgqzf3h0p78gz5k4v8sgsixfbijv0syim2y0"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-01-19"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "bd8d4d03d81d03db13d4b6eeb40c8a5c422c3ce6"; - sha256 = "19kk5mpisbil3jarl93sjq97jxb29sxbw5s2zsh1gih6dfp659d5"; + rev = "907cf91cc491348bf383f3eb447c1be2a9330cb4"; + sha256 = "1xsri4chlzfr0zc93wl96fpy381maygc3dlvy58nz2yswdr0g103"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1040,12 +1064,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-12-26"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "760eb2f647a518144ca1dc1091cc449c0dbee71e"; - sha256 = "0dcq79xqfb5qnjinwni0bi3vn2sfsri8wmc75wgvw2114vyf2k9a"; + rev = "e526dbecda137e37c45492ce72fa92ea32314154"; + sha256 = "03dwis03zx88j4dan1y39b03rvf7f2q7hykhgqsfcx1zj8lp8s7n"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1112,12 +1136,12 @@ let deoplete-vim-lsp = buildVimPluginFrom2Nix { pname = "deoplete-vim-lsp"; - version = "2020-12-21"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = "deoplete-vim-lsp"; - rev = "0c5d9e6efd6a7bea503faa854c41a3e5af00ec57"; - sha256 = "1hckg9p7srw2d674is0wzilnwwvw1s2q8xapr6dawslm5j364xlk"; + rev = "fd80985bfd9f140c8e38b303ab325ec86c05b976"; + sha256 = "1h9xprfqrfnfs50hgiah0c2y9lafhc2lldvmc7cl8xa5p9bslxj3"; }; meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; }; @@ -1136,12 +1160,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-01-25"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "2e3f5b5c24152d9aa4a0299ce6d1b7a6b76327eb"; - sha256 = "0yf35ak46pnknas6isvi4gpyc9n757a46kjvwwyh32pznfqpl41p"; + rev = "27af4ab2de157f80c8a8391aebb60061318814ea"; + sha256 = "12gjf3pcds7ms568pxmwrlnfijrm18h3pnb1x1a1gmf7bwj7xyfc"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1220,12 +1244,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2021-01-21"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "1b657bccd69c0498a865b930959a36279e7213e0"; - sha256 = "1n9wa4p9ng04ckklca32xz9c8zlkmzlhmwva7sf8l217bcr3zb9y"; + rev = "c805de7e9811cd298861c7bc6ef455093dcdfaf5"; + sha256 = "1jhhscldckydzzjnl1jki3025brmlbmr7czhw1s30jx5wr00zc5w"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; @@ -1306,12 +1330,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2020-04-16"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "da3468536410eb1ea59a0dd3054edf28d4577d8c"; - sha256 = "1cvw3n8ysxnm3w0rvk1rks815ha5grca1p3c7bkas6klrplfhlsc"; + rev = "e2efdb0d0827f7ec417583b25142f19714ece2ea"; + sha256 = "1s4i9rv1kcpry1zldpml908xv1r5hn0darip701y14njbmk9fff8"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -1354,12 +1378,12 @@ let fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-01-20"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "4ec2a38578726daed584a161450b1ead05b0c9db"; - sha256 = "1k0cc39fb57hz9yv9w2bgbhciia91ls9931xqvr4jmvlx9z99b25"; + rev = "b71eaccd050f4f6422cf09594cd69067cacadd4c"; + sha256 = "0c8j6qd0aaa6cva1ca36rdybrv7zrvxip2k9w44f37gakrzgmh50"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1463,36 +1487,36 @@ let fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp-nvim"; - version = "2021-01-19"; + version = "2021-02-04"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "5b12d8de47608570b404270c00742e3977ed3103"; - sha256 = "0y23i1gj4y517qs4ff43fi3ivkz4gmidrvcf6n314nwjgzikff6w"; + rev = "1386cbae761415b9c7b45565d87283fb4d584aed"; + sha256 = "1ab4si6j6s6fimpr513mqbhc5nnlsqmazw26cl7r89lbq7jswhyv"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-01-20"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "36de5db9f0af1fb2e788f890d7f28f1f8239bd4b"; - sha256 = "02wpqvmsdl64f3xni46is8mydy4h9i41b432qa5z0bfc652ax43d"; + rev = "02a192ea0bed22a015e005b281e55e0da2a8e496"; + sha256 = "0znlzjni031vagj83d60nararb67cli5fpp2lc37k9p8xnff1mjv"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-01-24"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "22791e9aadfc2a24ccc22d21b4c50f6b52e12980"; - sha256 = "1dw9k5ql7h8mgj7ag34pxa2jr9b2k788csc2a0jmyp6qp0d0x5ad"; + rev = "e30c355aaf6d2ca9aaa3a246eb87c7ceb4c42855"; + sha256 = "09w6gvy9hg0cgrs6661g8kfyjd4waz0ajx983p5jqr6l9a96111k"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1511,24 +1535,24 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2020-12-16"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "4cc031a5d3384ee9cc3225ff038a633be6b7125f"; - sha256 = "0pdska6qkk734hplhyp2cw89xn2c897vgw72fgn2239pqryz5g4n"; + rev = "762f31ff620eb822ae4ca43c5dc2a62ca621f5fe"; + sha256 = "035nj257r2nkwriqq5l4qjn5z1a04l39k4i9s1yz0mgv902kmics"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-01-12"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "52883ef368c97b013dad5c9afcf6cd9bdae9875a"; - sha256 = "06mw3y3idzsbr2kb74vlrwjds4pzgp1fknjbabdpw38y90ax0j8c"; + rev = "298c69898c11c2da574a6d2c32e195b0adc6f356"; + sha256 = "1999c3x2bpif0ppv1i452fcklgmjdxrvj510sy7dv8aym93vpmax"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1547,12 +1571,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2020-12-27"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "a67de1d08cffa547183bbc2f95c4e29723504263"; - sha256 = "0pjw17z76yq873jh74pr01r3ay4blzb4j0ghax553fb0d8ni4lkl"; + rev = "ae0c39167c83507c6c257cd13268c98b8066cb50"; + sha256 = "1xggg0h7phjjdjpzp884z7xqniyk3ca4yjc86lyh9vhbww87xa9c"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1571,12 +1595,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-01-19"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "59f7091554378794229bccca1faef6cfcc662024"; - sha256 = "05s2ln800gxw0xk53gf8zsv01hxdznhrqrkprp4iki4k28lay5kd"; + rev = "317750d66a572588eef9a23fefce4aff1cbcad94"; + sha256 = "0nc52f0hkb701scvnas6my9i92ys1i9c5y9h4h42yk00ph83k2k1"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1847,12 +1871,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-11-27"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "a03953d4e89ebc372674f88303c5d4933709fea6"; - sha256 = "0yxx925wrxf3hyllvqnbyiy39bw075vmzzys9jx0aimk7dmf1w9l"; + rev = "5617a1cf7d315e6e6f84d825c85e3b669d220bfa"; + sha256 = "1ns3v4r5m6ckchmkaqkpk8dymh7hwj22d7x23hagmk4zv4hc2mhq"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -1931,12 +1955,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2021-01-03"; + version = "2021-01-30"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "960eaa8053e5516195966321e06568750b2feb28"; - sha256 = "1ap9h7a6ybv6yvvszizyhzmgjhxd5xzaw2f6x7wn8dcsk7isy0a5"; + rev = "5d4615707fc7bce8a4f1fdaa5f7f07c11637bc30"; + sha256 = "0m8dafwz76glmgi7jvc3sxsxill5a3prf5qi0r9266swdw4v8ah3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -1956,12 +1980,12 @@ let Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { pname = "Jenkinsfile-vim-syntax"; - version = "2021-01-23"; + version = "2021-01-26"; src = fetchFromGitHub { owner = "martinda"; repo = "Jenkinsfile-vim-syntax"; - rev = "7760006fc591e5a109432a0de0a705c92f7ffcd7"; - sha256 = "1cqqk25x7km4qy0qxhjnqn77911a9nzjdif5905b99n1n6yn36q0"; + rev = "0d05729168ea44d60862f17cffa80024ab30bcc9"; + sha256 = "05z30frs4f5z0l4qgxk08r7mb19bzhqs36hi213yin78cz62b9gy"; }; meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/"; }; @@ -1980,12 +2004,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-01-07"; + version = "2021-02-03"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "ce48f42f1fd1d4566503ae26307026c895905a10"; - sha256 = "08yk47pvyh550iqv6zvrxcjdinn0w9p5al1v49m7p49jfqck3h1m"; + rev = "e16cb07240903999e8c62e6d27b4aee8146d29fc"; + sha256 = "10ms35xl218kr5n02y353kg535icj0zzyrsxzzlmn99w90hbnkl7"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2112,12 +2136,12 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2020-11-19"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "72c5c03ea2fa8e3f0003c3dbdd5d6431bb2cb863"; - sha256 = "1niswynnsnl2fhfy2hlvqngikm87i49il92vaj83hnkn93p7jc83"; + rev = "3223bccf0ee4168aae6753a5cf0c0aa32a60c586"; + sha256 = "1qka3hqm2376wz5pbr8x2c3rqycv392lv34spkqayq0d0fs4sqq0"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -2160,12 +2184,12 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-12-28"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "510c8be3d78bb58f25976ff9e7415c8cdc2a3054"; - sha256 = "0bd44jkz07pdzzs1vh0lkkms1vw8cd96wlsh8sa37mkx8bk5js5n"; + rev = "936598633d19a2f171347494c3240e72da6db78a"; + sha256 = "0j0swcbvhhy5gajl42z6g1dwr62b68l4c913fdfvdhjngq26wbyw"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2194,14 +2218,26 @@ let meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lispdocs-nvim = buildVimPluginFrom2Nix { + pname = "lispdocs-nvim"; + version = "2021-01-27"; + src = fetchFromGitHub { + owner = "tami5"; + repo = "lispdocs.nvim"; + rev = "0c45512ffabc6997f74c26b9c87d4b3cb021ab19"; + sha256 = "0m4iscxwdglvlkxhzs9gzx1iqvnvgknqxgss5k00wr0nrax8q3pl"; + }; + meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; + }; + lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; - version = "2021-01-05"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "5215ea78a5949b42b86bf474d33608de6b7594a3"; - sha256 = "05h8n0ggi55g4ri9jsa4210knds0rxp8ym2knlq3njy40q0jjaxd"; + rev = "187c492c492f8b57c1a66b82904785141b01d5ac"; + sha256 = "0i8j37i2lkrsjlya9g5i8wr3gjlfkb9g9sqzq6a0132s6rpqdhmz"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; @@ -2218,26 +2254,38 @@ let meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; + lspkind-nvim = buildVimPluginFrom2Nix { + pname = "lspkind-nvim"; + version = "2021-02-06"; + src = fetchFromGitHub { + owner = "onsails"; + repo = "lspkind-nvim"; + rev = "953ca895203c095e13f97a8ece790bf546c82d1c"; + sha256 = "15rfzcmfwig7x8pbgc1maimqkqwqr4dbpf7498a0s16vng673bgk"; + }; + meta.homepage = "https://github.com/onsails/lspkind-nvim/"; + }; + lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-01-25"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "3e230bb8a5cd788d899d11b5528cd63ea47466a9"; - sha256 = "0pnq8nbllk6ghjxxhnb5rbvxcj04pyplp58p58cw4dch7p4f82h5"; + rev = "284b357137c3c57ff3716e07c865477788ab8e6d"; + sha256 = "1n737lqnkgvyjxnmxfg6hmbnjgdx0qyrqql0fxb85m1n06gsm2n7"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-01-21"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "a2a9193296414aea13efa3a02fafb115f0226276"; - sha256 = "1n3c7zmpqv3xr750b7nbk1q08abhx2frhvbqhpd28vi2lf075bxa"; + rev = "8a4baa804b7b2906eb8b9c325546dceabffdfcfd"; + sha256 = "1fq5aa4yg5r1dr2g18xnywg7pyid6s9vzm71zy3anmdp4g24amgx"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2302,14 +2350,26 @@ let meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; + minimap-vim = buildVimPluginFrom2Nix { + pname = "minimap-vim"; + version = "2021-02-11"; + src = fetchFromGitHub { + owner = "wfxr"; + repo = "minimap.vim"; + rev = "05a9ef7981ff6438e3de5e30323474092badccb8"; + sha256 = "1nr40222fcf1zfacwn2qdzzr074kvcp0p50ii8s6na99qp00nq78"; + }; + meta.homepage = "https://github.com/wfxr/minimap.vim/"; + }; + mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2020-12-10"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "c977b1feff1dd53fc876f107d5c1128354e3cfb5"; - sha256 = "15b0w9wabrp4mb4hj1zi3bf5ma0p2qkb7b93c9hzrqbimkzdy1db"; + rev = "602a78430aee47881f8c57f73ba96fdded9a3ace"; + sha256 = "1j4icyp3p20rlb8apyp7ixwxv59q2pdzjg7krh1mc6spr6m779jv"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -2592,16 +2652,28 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-01-20"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "c1d63f047c2fc1dba638a80c24d9b9b44ceb9f50"; - sha256 = "1q92lxdy8mgiv3ffp2gxsf0acp98hk3yh3lkvsaj6crdwbrq1ss9"; + rev = "a75d96054618c47fbafef964d4d705525e8e37b9"; + sha256 = "0c7k1fhw1fjgby4h99r22sbzn639v76r12dl66fhdrnkvrk0709n"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; + neogit = buildVimPluginFrom2Nix { + pname = "neogit"; + version = "2021-02-08"; + src = fetchFromGitHub { + owner = "TimUntersberger"; + repo = "neogit"; + rev = "53f22813fb3e60a4175ee44de55732b93c2903de"; + sha256 = "0441hafqkqz11666cwkrgp90zmxgx7pjcl6n4bshyp82x3glw1nj"; + }; + meta.homepage = "https://github.com/TimUntersberger/neogit/"; + }; + neoinclude-vim = buildVimPluginFrom2Nix { pname = "neoinclude-vim"; version = "2020-09-13"; @@ -2724,24 +2796,24 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-01-19"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "7be3292b8de5127a386bf20f1198704e90cf24e9"; - sha256 = "0bz6q80bbq1pl45ch37rcnnakljv6877qasqvdzb09w3jn6hz2vl"; + rev = "b83e9cdf835161b398e04e4c462103fd21801ee3"; + sha256 = "15x4qw0l9j228rrfqnwzg13j7cr0k69xd46rcsa4886lw8nmpsak"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-01-20"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "b134f6518b902c7e0482ae770b804fd47c2d2426"; - sha256 = "11gq7dcj8v6y1wlnyc6wfsh54qzd5am8lmjjk69jbbjsjzpb59xb"; + rev = "3a9d533f3de86a43b69f6c47d3394c0d866fdb08"; + sha256 = "032hn7p7kgvrj0qg4gmpvl072zz4p9s5n8mrbs3k8c3lln1n9wh6"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2842,6 +2914,18 @@ let meta.homepage = "https://github.com/roxma/nvim-cm-racer/"; }; + nvim-compe = buildVimPluginFrom2Nix { + pname = "nvim-compe"; + version = "2021-02-11"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "nvim-compe"; + rev = "bef454eecc11fb13e5bc3f29f443f495904470ef"; + sha256 = "0plhhwip0nwc0fhgx5f1i6qhfl6msxf43vhgrv2xihmb30zjf2qr"; + }; + meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; + }; + nvim-completion-manager = buildVimPluginFrom2Nix { pname = "nvim-completion-manager"; version = "2018-07-27"; @@ -2856,24 +2940,24 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-01-23"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "55833f58a65ab703bb1f34860f60a98ce601fc08"; - sha256 = "0sljqwm48p3i2ps3p5rh0vr7lxbzwd67npkqd9scbmgcmci6blvj"; + rev = "10a740b2364efc9acff78f4e7466902f153e584b"; + sha256 = "1w4dvdd9fmi8gmgdq4zkrhrwdii4k7ns782gv4abpkzss5v6s66h"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-01-23"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "ce5223283753f1583ebe547c197f2c52975d545f"; - sha256 = "1nrzkyfdy01rw52mlr1xpf01yf8kqdmv8z9wrkl27q9240hklq9y"; + rev = "3da747bbbaf3291838d984a26a423cc704794eca"; + sha256 = "1lmcjclvdhd4jq0lsgrzv7y7ry9yiqh6bsinwrla5fbh63rfwkzc"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -2892,16 +2976,28 @@ let nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2020-12-31"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "2fb6dc1b2a702a2f7ddd3dedff04b7fdfe66d9be"; - sha256 = "0sxyk1g82ycgx5mi21s1jyrqg3qd4cyjrzy6hbwil04kcadqkkc1"; + rev = "aa8e36bd4f34dd0157d725c74874dfa44841a5e7"; + sha256 = "1zrqd3ndlv3393xjmf1n3w6im24fyqmnpldqvph5ix9lfrrf5vzh"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; + nvim-hlslens = buildVimPluginFrom2Nix { + pname = "nvim-hlslens"; + version = "2021-02-11"; + src = fetchFromGitHub { + owner = "kevinhwang91"; + repo = "nvim-hlslens"; + rev = "90ac936055ba8432b532392835e0fbbd82e60836"; + sha256 = "1hfda95gwdglycs00a9rwvfar9w579234zn3sz4pngi5crdamr38"; + }; + meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; + }; + nvim-hs-vim = buildVimPluginFrom2Nix { pname = "nvim-hs-vim"; version = "2020-08-29"; @@ -2916,40 +3012,64 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-01-17"; + version = "2021-01-30"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "357d0b405235e3dfb0b15450f33ad6d10cbf2122"; - sha256 = "1gd4kjxpb73d6ixxgg4qyzj5alca590whx1i905j3m8j4sjb7vib"; + rev = "a35ce80f0e618da0eceb0d5f6874608d58d3ec26"; + sha256 = "1m87v27721zdplpfk0dd8mag416dxmnqja2smwb7z29n18qh81sn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; + nvim-lightbulb = buildVimPluginFrom2Nix { + pname = "nvim-lightbulb"; + version = "2021-02-05"; + src = fetchFromGitHub { + owner = "kosayoda"; + repo = "nvim-lightbulb"; + rev = "9198402f3417b0dbf26e73cac8cb53e074c163f1"; + sha256 = "17gqdrskr744b1z26fjf01a9nvfasd4fhaa9dmmi4g4br8556cyj"; + }; + meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; + }; + nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-01-24"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "9f3fee22c79c93610410cc81ddf3489c8ba1d007"; - sha256 = "05cdym1fvbzs98khi6dj08h5gwkmp737a3cs1zbbx3hajvv3c8i6"; + rev = "d3c178ac78f8930d4ca094685744f5c705b56b55"; + sha256 = "1mj761vxq3dd7m384ig6dhipg43qw1w3cpkkvq9aymnlsvfi5b1d"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-01-12"; + version = "2021-02-05"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "fae88180b573e935f4a0827eb096208a7c76b215"; - sha256 = "1i7gmh3zb2i8jig0j6drvknsx5p4dxm1v8b6bdrnjgs4pyrpy7si"; + rev = "b68862afee6dfb611d866818cafdba41cf51d749"; + sha256 = "0w4kff5jrg6i55nqjnp52vb2jng4zql9s2r1jz75jfv2khdrw7dm"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; + nvim-peekup = buildVimPluginFrom2Nix { + pname = "nvim-peekup"; + version = "2021-02-11"; + src = fetchFromGitHub { + owner = "gennaro-tedesco"; + repo = "nvim-peekup"; + rev = "d4276b9601c683ad802893fed0cfe12a8631e931"; + sha256 = "06sazbjcnv77c11b835b7n8p78vmzw9zl3lkqbfl6yarbbzniisi"; + }; + meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; + }; + nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; version = "2021-01-09"; @@ -2976,24 +3096,24 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-01-22"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "b2852578769b53430af678ae7a99482f2a4be0da"; - sha256 = "057w9nqn0xc207s7y7fcl84xi14251yhyjd6xsajv9hlh4zcgarv"; + rev = "c59831a5d11a35594dc4e379a89d276d5ac83cdf"; + sha256 = "0wf36dlg4hq2hfvyvm1i7z83ky1x4rr7vv249sk01clsy84nylql"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-01-22"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "6d2b1fc56679038fb839b7f7707b65808ff5d9e4"; - sha256 = "0jw5igzargbhxrim7256535n6z18ffbzng2qaxsz0mkzp1mr9kik"; + rev = "e5facde11bc8a2577dbfd56e2a4063320b09bc0b"; + sha256 = "1i1dn4akszkly6cjf3z9s17y1fdgsgk0fr5i50hs4mlnxy7al01i"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3036,24 +3156,24 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-01-24"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "aca42922425e80582f7e3bb77c87f914119fb664"; - sha256 = "0d7h5fc5kyd4i17s0xjfq7ifg7h2xbrsnspilbraxppyfj0xhdrs"; + rev = "3557b7baa9e773fff378235851cb3caac96fd4b9"; + sha256 = "14bz6xwwdypwxfxdxhmbwl0w04ys18l08s1dx40mm5l1627wh465"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2020-12-28"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "aaffb87b5a640d15a566d9af9e74baafcf9ec016"; - sha256 = "1qk2h8cwcb0v12lxayjdxka6wh5r1phn9cz5xkm5hvm1vcwrvlln"; + rev = "cadf0c30659acc8c60fec8100b81ea0fd92a8a9c"; + sha256 = "06d32z6rlz153vfbydcjvm6l2qrnjw0d6a60qxjpmbmby66nvcya"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -3096,16 +3216,28 @@ let oceanic-next = buildVimPluginFrom2Nix { pname = "oceanic-next"; - version = "2021-01-24"; + version = "2021-02-05"; src = fetchFromGitHub { owner = "mhartington"; repo = "oceanic-next"; - rev = "9f005681ce7c4664105832f23fc7c8516a13d8f5"; - sha256 = "1fp0yq93b161qrmx5vxkxvd56xa3x5iyxly99sv0llk8ib8g7gy6"; + rev = "5ef31a34204f84714885ae9036f66a626036c3dc"; + sha256 = "1wazbyxaq71mlpyvyxrbrpyb9vgkcsj2y2zf1sba9gfjjszph482"; }; meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; + one-nvim = buildVimPluginFrom2Nix { + pname = "one-nvim"; + version = "2021-01-30"; + src = fetchFromGitHub { + owner = "Th3Whit3Wolf"; + repo = "one-nvim"; + rev = "88916fbb81530a25f9a3f8bc02e1b4c91ff7be10"; + sha256 = "0glp8z6v53sff7vff6h6cxix40zwp1m305jsd50ji1i4913m08lw"; + }; + meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; + }; + onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; version = "2020-12-14"; @@ -3120,12 +3252,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2021-01-15"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "ba6c71ee99dce0b505c430f2c2706dc5f97ad3a0"; - sha256 = "10pbhaim4rcg0ljprfvqfw6k73jpp46yzhs8i9yn00bpi70frr89"; + rev = "141c775ace6b71992305f144a8ab68e9a8ca4a25"; + sha256 = "1p3kxf9abj0xpxwb8hrpy4h0457rvkfkv3zv7czh322vhma4hhd8"; }; meta.homepage = "https://github.com/sonph/onehalf/"; }; @@ -3156,12 +3288,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-01-22"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "3567ab93c60540407df7ce4faced7c454f89b941"; - sha256 = "14k6iajrari85cl3bi8vn193khhchxn62mq0j2f49gn47pl47f4k"; + rev = "75a254198770baffe11ed748338c82f4d2d71e9d"; + sha256 = "1vvkcpfvkkf14y7zxlp43ridx075y2hf14kc285mzwdhhb1ygcdi"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3252,12 +3384,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-01-24"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "81dde2c7faf34a8afa2127151b067ebc2983f7d8"; - sha256 = "0knz5xzsxpqjaybg6ywx0svdy91yjz1pbv3zm7y19avbks2jhd6f"; + rev = "b77fc46c5f35978c03277cd7261c07a36dafc8a4"; + sha256 = "0a38ma4kn6s75s286bdl5mhqlnbzzpir29gzjq7kxqi4y4zh9spc"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3276,12 +3408,12 @@ let popfix = buildVimPluginFrom2Nix { pname = "popfix"; - version = "2021-01-07"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "popfix"; - rev = "9ab0aa5f186a2a2429c55f1512e2fd8b536183f0"; - sha256 = "0ks9hxc506ybwrvk5qkl1qkj634ms5icy8cg0w3b1q5qzgz5k0wn"; + rev = "efcd82cbae750aa743619bfae7453fbec9366b87"; + sha256 = "0041c9xnnhw24ablwqw9p9vlcmbfrp9l9r6i4ayh8id666ylsln9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RishabhRD/popfix/"; @@ -3625,12 +3757,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2020-09-21"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "19c5a21206b6c9f999004256a10e7381450ea83f"; - sha256 = "14h8lf70wccafapifzf9c6cjprik9n1a1wmv5gpajyqqbvzh1yv6"; + rev = "6aae3517c612a96c59b5417984889bff388210b2"; + sha256 = "13d0jzzn7gr6c0zkpa5bkfp06246hbpfb6y7mmsw2waybw3hij9s"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -3782,12 +3914,12 @@ let sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-01-24"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "deab3730a5558c9b780c9e4f7ddb5252e44cb6e7"; - sha256 = "0yyz2g2i3dv0lziyj40px2f1yqg0q6snazzs1mq4yvabz1vq3zkk"; + rev = "96d000d9eff0165c7e0496f73787cc56d7c1581c"; + sha256 = "1n9j3wv5xifs7ppgjnnbvx9p4h4llshbzgrly5b7lx0nnb91yqg0"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -3914,12 +4046,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-01-25"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "7a968502d778ab86b01afd4c8b0d20f5af14fad0"; - sha256 = "1skszyhsbz4yv16nlrnhkdrrd51hpq1d2gn1h819m0vqgqz4qphn"; + rev = "7e8aeb69709b73cdbdaf50f4d26ab45d7920b7f0"; + sha256 = "02mlr9aw4ppi4cs6r1v3d39j3l85sy7q2xm1dxg1ld6k1p5imk94"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3950,24 +4082,24 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-11-18"; + version = "2021-02-03"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "2037d05870e10e03b2e157a09ae007c179efd253"; - sha256 = "1z7c95rzgpm1f2cdmx3yv3f0ai7kq0kx8wd6mp4aqpdysi1qh9jk"; + rev = "2de3885686e7011f7efe0e31c2b6e0c002f9dd1a"; + sha256 = "009x5bgj6grmwl35s0silkbnylpa5sjr4h0wyp6rl9xlj381vvn5"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; - version = "2021-01-20"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "a770d59b925ff4ff87036afff06c87d620cd6861"; - sha256 = "04kla2nyz1rh0b9iyi5nynyzpmyjiql2wvs2gdf964a79m86493l"; + rev = "ffa2027102f75e28dd8d8c2a97f3b9163dd80b56"; + sha256 = "1ipxqkfaqc75qzpj7vg3gr44r8fcx979pyf84wibxic3kby9qp7y"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -3999,12 +4131,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-01-24"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "951ede2a7007059cb4ebc6b6761030dfb52b6bc5"; - sha256 = "176gz1mj6finfzgf86ra111sb5jbx1v45i0aalgr2znrr29f1a9z"; + rev = "3a7fa41857394cd2d90d00891413c12fada039c3"; + sha256 = "0bn7jvwwaxfhcqd4l3wi9bshabbrcd4aws7d564kh1js8bklwx1b"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4106,6 +4238,18 @@ let meta.homepage = "https://github.com/markonm/traces.vim/"; }; + train-nvim = buildVimPluginFrom2Nix { + pname = "train-nvim"; + version = "2020-09-10"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "train.nvim"; + rev = "7b2e9a59af58385d88bf39c5311c08f839e2b1ce"; + sha256 = "1pbv8c2wb6b2h9czx7c0c8v0q7v0wc4w9s6qgw7hcbqdl3jv1svh"; + }; + meta.homepage = "https://github.com/tjdevries/train.nvim/"; + }; + tslime-vim = buildVimPluginFrom2Nix { pname = "tslime-vim"; version = "2020-09-09"; @@ -4144,12 +4288,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-12-14"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "c270950492d71bac0317d47d42cd0884eefe6490"; - sha256 = "1k58wp6y6i0xr4pnp2h7r31229ngp3zadyi374c5nlf2pa3zc1d8"; + rev = "66d81fc2c0bda30be69fffa46da0932ee8d5ddd5"; + sha256 = "0fzpl2fj5kig8kbcn65ph6y3h412ryx5mfa15822lnsf8cmkr5db"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -4168,24 +4312,24 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-11-19"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "631c0850dd0fa36d29c9cd20169735a60b41bd71"; - sha256 = "0ql1w6q8w48jxqf1fs1aphcjjfvh8br7sv26nk6kgsm9h4xamnp5"; + rev = "afb8db4f81580771c39967e89bc5772e72b9018e"; + sha256 = "05d15yr5r8265j3yr8yz1dxl8p4p4nack4ldn663rmp29wm1q5pi"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2021-01-08"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "c455008595a15c7ccc2c9f2ea309ba2bf5d3fe63"; - sha256 = "054h0yrb2wffmirvqql2v34rfr5q0rx20p2y2wbrpx2w1vcwr2rc"; + rev = "b08814362624ded3b462addba4711647879ca308"; + sha256 = "0hk5xhn9zfas074hgv0y6lbc1jyj5kqjg4zdix8am3s97aqr96ms"; }; meta.homepage = "https://github.com/Shougo/unite.vim/"; }; @@ -4492,12 +4636,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-01-14"; + version = "2021-02-05"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c7a633ce8f4547e680377efe8ea70493fcce1349"; - sha256 = "10n70bk6nsc5sgd95d80jna4v77dlla6x0886kb5lwzmiflfq31x"; + rev = "c01977d027de854c6a85ed5c57915a7e8848f4b9"; + sha256 = "0xvv1dymvgazs57phxbxljihz92zd4aa5yjqqf4g9xvl59vxc798"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4550,6 +4694,18 @@ let meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; }; + vim-apm = buildVimPluginFrom2Nix { + pname = "vim-apm"; + version = "2020-09-28"; + src = fetchFromGitHub { + owner = "ThePrimeagen"; + repo = "vim-apm"; + rev = "2da35c35febbe98a6704495cd4e0b9526a0651e3"; + sha256 = "09amrb7bzrnwga8cm21fm4ylp2l0jd7cyfsf43fcym3f1k0bycwb"; + }; + meta.homepage = "https://github.com/ThePrimeagen/vim-apm/"; + }; + vim-asterisk = buildVimPluginFrom2Nix { pname = "vim-asterisk"; version = "2020-02-03"; @@ -4576,12 +4732,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-10-28"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "ff16950ba5e07353f25ee33732982a67af451eb2"; - sha256 = "12h6dznfwpifyr6ahk1b45pb59nlm6wkrfhgh65g1clnpzvchkiw"; + rev = "2a6f931987c1cc5e5bc0c4c44f21ac9bd4c72f3b"; + sha256 = "17w0cjzppx9zxrqxaa975xazcnps4v1b93bmy19dccvc7z1gipby"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -4612,16 +4768,28 @@ let vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2020-08-22"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "85a044d854e5e48f72414726c255112be31e2cac"; - sha256 = "1hcfbl958v39w00kyfg75rcxs9xzaqnd98i4y322ayqfgrhd95n8"; + rev = "58c750d13ec2337ba3e5992f96891bbb843a9dbf"; + sha256 = "0xsgj1j8xamkri75cjnih5xzwp8y7g1i7hgbbbmknz5d8jm3p204"; }; meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; + vim-bbye = buildVimPluginFrom2Nix { + pname = "vim-bbye"; + version = "2018-03-03"; + src = fetchFromGitHub { + owner = "moll"; + repo = "vim-bbye"; + rev = "25ef93ac5a87526111f43e5110675032dbcacf56"; + sha256 = "0dlifpbd05fcgndpkgb31ww8p90pwdbizmgkkq00qkmvzm1ik4y4"; + }; + meta.homepage = "https://github.com/moll/vim-bbye/"; + }; + vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; version = "2020-08-06"; @@ -4744,12 +4912,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-01-23"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "890aaca21af5ce9569d4393f72240283c198a246"; - sha256 = "1n11vb609v6fxrv5vxzf9z1hkzlzky0lx9sf5hjzmf54kny77f3r"; + rev = "2e8538beaf1cef636deab2d40edcb270044485d1"; + sha256 = "1ay90j72sknqhp1rdlgzdb5rxs98mwc5ad7q3rgqj8hpsr21x991"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4936,12 +5104,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2020-08-16"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "4694c6ea03a065a3f6ddbebce56797a21e8241ef"; - sha256 = "12bzxrdvb9s0d8llkq6h63g86qxs0gv9x7401apl6qrs79prrb4a"; + rev = "8dd7f1bf25acee493a5114e627ea90a9850c5fa8"; + sha256 = "0pjq14i7w2snlbzsqhfdn0fkribjsyngg6fcmpgacm4jvx3iviql"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -5020,12 +5188,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-12-10"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "0d0bd57246b3285caec4737dc0f1c6b17ebb2787"; - sha256 = "1kkc3hgfz0qr84r873gjmjhgwph0nhyan6v69b55ph5qqsksrl42"; + rev = "0329d89c5114dc285939050fd5777dbcc450ddd7"; + sha256 = "0g8pipayg643xjs3dmpbwp91ycyg8b20qgr0mnmxzll0nan8zjny"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -5248,12 +5416,12 @@ let vim-erlang-tags = buildVimPluginFrom2Nix { pname = "vim-erlang-tags"; - version = "2021-01-09"; + version = "2021-02-03"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-tags"; - rev = "22f7fbf1e4b669a305d93cedd85baf63253f3b78"; - sha256 = "1dvk0dim8vam8xsqlz9pjky22mhqi9ca5criyz7zvgj46hqj1wy3"; + rev = "125d494953da1746bc16cb716019a3d855fd3536"; + sha256 = "1kaihn3bnw9pdr18vg09ya4ijjv0an6jzzva96v06lid2i66i9wi"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; }; @@ -5380,12 +5548,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-01-25"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "8cc3bd21080c027de91224e37d897293f1b14a0f"; - sha256 = "1fnkidkvp4m95hxlhn874wc0xy179ydqb3ia5y8ijj8dddny8d67"; + rev = "bd76979d17c28db94430dbfa4007e5aef667441a"; + sha256 = "0ih17mimpjkk9w81cpmzks63rd4k5v32i5y1anykcgn9nmmbp8qm"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5428,12 +5596,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-12-17"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "bebe504e38d0a20c30d6dd666c4c793b3cc66104"; - sha256 = "03w28pll83sj7g7ngif27mj81zmwik0iw8yc50yc3szk0lv816yc"; + rev = "5c821eb78d4018025a1a9f54a9ef2af2a5ddd365"; + sha256 = "0vzhc9dr166pn4xpznzxfyhfibas3m0an0z74gl3vih1qlg59h9y"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5500,12 +5668,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-12-11"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "512e2999ed7ff367580e0d6bc4d2daa81663221f"; - sha256 = "0229x71prknra1k2val78qpddy6w7wmla2j6cjk8fjvp1h2jvwxz"; + rev = "2e3cd54ed696500bb3722226f2103d4b279272c0"; + sha256 = "1cv9lapq6xb0fq5i1mfbhv5qlab868mvby60yhwzafni5b2p9l37"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5548,12 +5716,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-01-22"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "007d9bc7786d703dc778de7b69895b8c1907dde7"; - sha256 = "1r7jv3cbawh9n2d6nd3iwga6bgj8z0nx94c3dhn5286si1s3857c"; + rev = "cb4c622c97a39652151748c4dec70a46e93a9117"; + sha256 = "0pfd6vizjrynz4azx3fkz5nwm7k08jjhvy6ypkjzhhw2ql37l7i9"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5572,12 +5740,12 @@ let vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-12-20"; + version = "2021-02-03"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "c5169b2705f23cc4926606a7786d8e8fae138d5c"; - sha256 = "19nmdkbd4wcip18bb4inx64mc0awjj3bbahbhpsd8g6d889r9jha"; + rev = "553d125f7b0e56743e80e2439f5cd7f27771a8e3"; + sha256 = "0nfp411zxjda5k7mh9400rjipqg6liizdkfqcc887zicaw3pylkm"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -5680,12 +5848,12 @@ let vim-hexokinase = buildVimPluginFrom2Nix { pname = "vim-hexokinase"; - version = "2020-12-31"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-hexokinase"; - rev = "a7468f62a70d1da85b3fbe7f540a6dbd7a199536"; - sha256 = "1vx48gq0skjmcjrxc8qkvjbqdsap50jrh1gyiqmm9s9rqxzsi4hs"; + rev = "9f7f4bad24f23d5284543a02349a5114e8b8f032"; + sha256 = "1i435avz23mclf1ag7v273xmpbgp66msvmi7mljkbs8k6xxygaks"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; @@ -5813,12 +5981,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-01-24"; + version = "2021-02-05"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "a500e9fae73e433757c5d8a44da74e66373eb21e"; - sha256 = "1mxl0aziakvialk0qgm0mnpqdk9iwqnss9wqj7584nfxvz9zck20"; + rev = "1ce3c4de54d2f0115129b50c4b056620953336f4"; + sha256 = "1g6lfxvs4nqlkyj0f7gd5f297r20cjxs6m6mza3bymivl9lwbj8p"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -5909,12 +6077,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-01-04"; + version = "2021-01-31"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "c59ac683bd2fd6164e8ab772ab16c1f4c82130a5"; - sha256 = "04mk200wbgg007qm3qxzckcz1nxrmvr6da31bf82ilzjf5vwhr52"; + rev = "fb39c1e6ab815270b9d1ba07f7d34059710b5035"; + sha256 = "1n541shva0c7frihgv0ngg3vqm3d549wbqa15n2n6j1cfpsasbyd"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -6042,12 +6210,12 @@ let vim-LanguageTool = buildVimPluginFrom2Nix { pname = "vim-LanguageTool"; - version = "2021-01-24"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "dpelle"; repo = "vim-LanguageTool"; - rev = "f92e2577ab937f437c06d91639100952b540365b"; - sha256 = "09jw26mmbyvjlz5fw1gj9q0dwmv0aqwbl288h4hcliyx56snijhl"; + rev = "0372ffae78aa3eac3bfa48ba3bf2f4015a86385a"; + sha256 = "00476l49lczj1rw5gb6vs7s9r0zi1khw0g1v6bsfwl5r32699l7r"; }; meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; }; @@ -6186,24 +6354,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-01-24"; + version = "2021-02-04"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "c8d00fc7299d0ff73a37dcd7f6bb5564fb30d1a3"; - sha256 = "1axnrgldjkpqxxh6hpjmzjvk7af2n08kqb7205d5y307ya1rh5lw"; + rev = "25d625aa0274b4c9845afd49a5c8f21aceb25073"; + sha256 = "0pdmzv3rxdawxy4qy5p283nzrjs4lc0ki2j7xxiz5bhdgnznbkcc"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-01-23"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "7d5cd2763cbede18728e1254ed8d5e89fd500fd2"; - sha256 = "0hymc1ni3wrbwbn8iql4qy4gb1xvcx2qsxqzna0f861c8kc9v4y4"; + rev = "21a29936ed74b2212e1904cca6c22bff4e27b637"; + sha256 = "11jlqri1fyh1mbxrkihg1jj7g8mllh9w6gy64ah8gvpw505fws4c"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6283,12 +6451,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-01-13"; + version = "2021-01-29"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "c74467ea130f99bc97697f91b0e5369f958e6333"; - sha256 = "0w03l0iri8wsjm3fz3ysqqhl38gkfqci4b3dfkbshy2civpg2g7j"; + rev = "52b3ec1ee8d0f78c69bae6cc32f3c2d1a023a8c8"; + sha256 = "1hn3w4hzx444cz5z7g2lkpzr90r9ngjpy5jirgs3c947njc24kr7"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6607,12 +6775,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-01-17"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "a70de0f7830ff7238d122908583faf50d73a9f26"; - sha256 = "0q00wqv4kbnwmnkawp4hm7mvk8p82mr4v5kf0m791gm7yy8gvb7x"; + rev = "fdbac11f36172d6e47e212385d2f4482e472f815"; + sha256 = "1mbs8v8k7698qnck5n38lqaz8sl07d1p31c84injb460l6jfv1s7"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -6739,12 +6907,12 @@ let vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2020-07-29"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-pencil"; - rev = "dad5a3626ab68039f2676c46e7a1635e0669cc63"; - sha256 = "1s1vxzqc5gvch2rfibn7ksmxj81gscfzg0bpvnq34jp430adzdc7"; + rev = "2135374d48a7cb89efd5e818c12bb0ff450dfbb4"; + sha256 = "17wgin33fj40brdb3zhm70qls2j2vssc4yrrv36y1qxwi7gdzn0f"; }; meta.homepage = "https://github.com/reedes/vim-pencil/"; }; @@ -6775,12 +6943,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-12-14"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "8b45742540f92ba902c97ad1d3d8862ba3305438"; - sha256 = "0ashl6qixnhgj5pnss9ri8w7fzixcsd0h4cmb2jpfrfma8s7xn3b"; + rev = "cffcfe150bda75177920530c5f1911b52f70a065"; + sha256 = "0sgfnxi1f5mnzcbklcmq6x17r1z1kz8s7h2h94girmd4aga3gcp0"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -6907,12 +7075,12 @@ let vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2021-01-15"; + version = "2021-01-30"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "a3af44488b00481f2a79dc7e4bb49e2767a4e6a4"; - sha256 = "07bspasgd38kj91x3c6nf7wwhbg1sqw8kwvn7c4z11q32ry4hmgk"; + rev = "b282072eb145c7719319bee1963c33ad876b0cea"; + sha256 = "1m6zbyg5hh3rhwq36836ldwhgcsmh4bl0lz5g4nzpc2ch83crrn8"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -6931,12 +7099,12 @@ let vim-qf = buildVimPluginFrom2Nix { pname = "vim-qf"; - version = "2020-11-18"; + version = "2021-02-01"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-qf"; - rev = "23c9d67cdd0739c9d74ac9e4a494b7cb7351170c"; - sha256 = "15kj1wvd3wlmn982l2v8sv2lc3q39bz3jw94jvmkh7nz51xvmfqc"; + rev = "0da85ff4270c2be10e24729dd42fb749ad1b69b7"; + sha256 = "0f8qnxy18qskbr3m8hn4vqv7bcvr2b0xqi64bxx078an5x8lbgx2"; }; meta.homepage = "https://github.com/romainl/vim-qf/"; }; @@ -6955,12 +7123,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2020-08-25"; + version = "2021-01-27"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "c688f336a4aeb002319994f4fb4a8873f204f0ab"; - sha256 = "1wzcvshwn4gvjbcmni1r473001m5ipamggkcpwsa7xr74sj4rn73"; + rev = "c980977f1d77b3285937b9d7b5baa964fc9ed7f5"; + sha256 = "00f1slgrjnh8m59sm3xmias3jvjlvw26yigv9fmy6zwcynlivc5x"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -7027,12 +7195,12 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2020-12-18"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "d865e427d067af57d85cf2b7d2bc1912eb84d0bf"; - sha256 = "1gcphxq52jx96fzf6xkq7mxvgyhjn6yzh7l5qc9h18lqmax9gqw2"; + rev = "964d48fd11db7c3a3246885993319d544c7c6fd5"; + sha256 = "09xpjd96xd0mkzfwyvinjhbza7xp6v66bdrxwkb0j0n1kgfgkx4l"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -7063,12 +7231,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-08-28"; + version = "2021-02-03"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "e367f7b33fe9159c943963f3f839e4d08b74090e"; - sha256 = "1pngmr6ww4fmn71rshi1npyswp48dq3p7m02s6s703bg83smvmc8"; + rev = "4788a08433c3c90e131fc7d110d82577e1234a86"; + sha256 = "1sq1li4s40xgy8ww4krsxqdqlwhcd9l67551iadccvsvjka16ynw"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -7181,6 +7349,18 @@ let meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; }; + vim-shellcheck = buildVimPluginFrom2Nix { + pname = "vim-shellcheck"; + version = "2019-07-25"; + src = fetchFromGitHub { + owner = "itspriddle"; + repo = "vim-shellcheck"; + rev = "4346419ac57ef341a15aa39c827c0848f17c6faf"; + sha256 = "0j28nqmfjxzhwylp2r1mp5v39fws5jvn7k9maam97mi3j66a9jz5"; + }; + meta.homepage = "https://github.com/itspriddle/vim-shellcheck/"; + }; + vim-signature = buildVimPluginFrom2Nix { pname = "vim-signature"; version = "2018-07-06"; @@ -7195,12 +7375,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2021-01-22"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "26e8c8d9cf27838cd13b45cb54118d74af34087d"; - sha256 = "11aahxvpxv6h2yl3dlcdfb2715d6m2m6f53xw13sir25hmwlj8k8"; + rev = "b2a0450e23c63b75bbeabf4f0c28f9b4b2480689"; + sha256 = "0fj9dwvkpg69v6ps56hrm0k2y4f9rvnj7hwic6ysxfx96wngfzcm"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -7255,12 +7435,12 @@ let vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2021-01-17"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "f83a157552a3bf393a7c034df1d21e3555123a4c"; - sha256 = "090rl4mfww5rmv04v25f58jfv3yx23bwi0pijkwxr442yhbg3rg2"; + rev = "10fd0aa57d176718bc2c570f121ab523c4429a25"; + sha256 = "18zn29mkgdiddn3il393xzg7hpa0x25yvais1l29jq2711sg4rdc"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -7303,12 +7483,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-01-20"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "d6f2d5728002456fac0075c2442695d25167f8d9"; - sha256 = "007jb9xmq5cz1lc79s8x1idknjfbzmikss0wmrfjqq5dbkibvv9s"; + rev = "8426857c1b8d1c00bbe0faa6dfff99acb1521042"; + sha256 = "16lvwd22813k38dbkfx4w46gmvbkfla4a0zyklpz7qa658phfprw"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -7520,12 +7700,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-01-03"; + version = "2021-01-28"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "d170b48bd167ff06ac83d71834135f42bf4dad4a"; - sha256 = "0pqh5zqn11fv0653zdkiad066clw29amhdqnm5nz1rcx8vmpparq"; + rev = "77d0b89fe5648d0881e8506d1949a9412201772b"; + sha256 = "14ny5gap1bij5fdwnxgwjpmjnw0xpydnjvvsf6525hbipxp258fr"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -7784,12 +7964,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-01-06"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "d95d4c31a7919f58e9bb89bfc0c3a272461d782d"; - sha256 = "1xnixwq6rddvs0za76sic3sf5fk0v10cdrsyaz3d6y0g0qmv9cz0"; + rev = "88f934f572efdbc73c7b4b23a9b96f710524a94d"; + sha256 = "0pk0vqns7269gi9jd8bdcg1qxlgdm55w9mf3nsrzc9z3d3j3vpw0"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7808,12 +7988,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-01-15"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "7d96014c899e92476a4d74dca010713d17507a2d"; - sha256 = "1fb7xcpjysix846vrz02mcx8bm2swzckxa54i0sf462ynckcvg4f"; + rev = "d840e1af9e680b384e8a28e62b46ad5148907fdd"; + sha256 = "0d6gmw38829ln6mvn5j3gyy6by3ks5g62qiyzapz3vw67zyblyjz"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7868,12 +8048,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-12-21"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "c5322b2f67bc627d467e527a530ff6695ccd3dbd"; - sha256 = "0j3pnbg0a2rcjfp691v7wzcp9bqan24qvdl4fxzljipl2lyim0qb"; + rev = "68bd1775277ad5677ebf5cdc774ca3ba4755d457"; + sha256 = "1pg179iz0xvd6r7xks7qrn1c7vh7zmp39s9axhdgp7jisqbhaaqx"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -8072,12 +8252,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-01-10"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "52eff3265181bbbe5338818dc5bc196e234cea45"; - sha256 = "1j4f3762zpw4qvqiyrq1ym4lk78w3r93ya70id7g6w4pviaqcv1j"; + rev = "e99ac0d65867f4d97e7b891ac21cd341de1ff53f"; + sha256 = "1jxl33svlymcwc3dsalabpy7px91rgfpalpb2bhxkqd4vgxwcjql"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8085,12 +8265,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-01-25"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "47e038635b98b21aa5d48e319f6058ba5a38e209"; - sha256 = "16hjn9dmv8n24dflircdfkx4iq4b5w2drbn745i77fn5a0s1n3nk"; + rev = "1319bca15f1e25cf8f0ca64818719c860d2d83ac"; + sha256 = "043x5x4pxhni2isjxh6x4klldyanhpks3pljc246ybiz9q372bsi"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -8099,12 +8279,12 @@ let pname = "vimux"; version = "2017-10-24"; src = fetchFromGitHub { - owner = "benmills"; + owner = "ostera"; repo = "vimux"; rev = "37f41195e6369ac602a08ec61364906600b771f1"; sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra"; }; - meta.homepage = "https://github.com/benmills/vimux/"; + meta.homepage = "https://github.com/ostera/vimux/"; }; vimwiki = buildVimPluginFrom2Nix { @@ -8133,12 +8313,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-01-17"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "a648aab8b35401bea2b9192efe171b3787264abd"; - sha256 = "15ib66lsx2wpbykv5pmr4ly2gkksml2dp6nmb2iv7zy70655whsf"; + rev = "05d1fb2e333caa2bf2717d4e8ff5ae8c2a1f971d"; + sha256 = "0zyq4fgi6i4gdn25ykpxsy7bpyzysny5qkg40r3493yqnp3rvnfw"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -8266,12 +8446,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-12-31"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "2434b104065be4590f07ad950d0943b7194f01e6"; - sha256 = "0hhwqb5w84bi28h27wmisx4mb91xc6jbdh004d5994bl2098yrf8"; + rev = "dbf67638cb7084883c7463b0d6226be9d9159b9a"; + sha256 = "1qxwgjfhzz7ymkbbnjm3xrp368rmcphdaj4lxrkkbp9d2pn9g8s7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -8315,12 +8495,12 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-01-13"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "bc1a7584b435b9921e245c3621ab7524be370b2d"; - sha256 = "0fvgky7i6m5n4h4l73xdisxhpcc8cv9pq8jrvz571gmyjsh1rrrv"; + rev = "e3646fc3124e33da4909e30caaad1167523e0c53"; + sha256 = "0a200497js325343prx638rkzg6544lxrrr3ij5g0i6dvazzwg21"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index fd77676949c5..9b1aa6cd0510 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -1,38 +1,82 @@ -{ lib, stdenv -, python, cmake, meson, vim, ruby -, which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch -, llvmPackages, rustPlatform, buildGoModule -, pkg-config, curl, openssl, libgit2, libiconv -, xkb-switch, fzf, skim, stylish-haskell -, python3, boost, icu, ncurses -, ycmd, rake -, gobject-introspection, glib, wrapGAppsHook +{ lib +, stdenv +, python +, cmake +, meson +, vim +, ruby +, which +, fetchFromGitHub +, fetchgit +, fetchurl +, fetchzip +, fetchpatch +, llvmPackages +, rustPlatform +, buildGoModule +, pkg-config +, curl +, openssl +, libgit2 +, libiconv +, xkb-switch +, fzf +, skim +, stylish-haskell +, python3 +, boost +, icu +, ncurses +, ycmd +, rake +, gobject-introspection +, glib +, wrapGAppsHook , substituteAll , languagetool , tabnine -, Cocoa, CoreFoundation, CoreServices + +, Cocoa +, CoreFoundation +, CoreServices + , buildVimPluginFrom2Nix , nodePackages , dasht , sqlite +, code-minimap -# deoplete-khard dependency + # deoplete-khard dependency , khard -# vim-go dependencies -, asmfmt, delve, errcheck, godef, golint -, gomodifytags, gotags, gotools, go-motion -, gnused, reftools, gogetdoc, golangci-lint -, impl, iferr, gocode, gocode-gomod, go-tools + # vim-go dependencies +, asmfmt +, delve +, errcheck +, godef +, golint +, gomodifytags +, gotags +, gotools +, go-motion +, gnused +, reftools +, gogetdoc +, golangci-lint +, impl +, iferr +, gocode +, gocode-gomod +, go-tools , gopls -# direnv-vim dependencies + # direnv-vim dependencies , direnv -# vCoolor dependency + # vCoolor dependency , gnome3 -# fruzzy dependency + # fruzzy dependency , nim }: @@ -60,42 +104,44 @@ self: super: { src = skim.vim; }; - LanguageClient-neovim = let - version = "0.1.160"; - LanguageClient-neovim-src = fetchFromGitHub { - owner = "autozimu"; - repo = "LanguageClient-neovim"; - rev = version; - sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58"; - }; - LanguageClient-neovim-bin = rustPlatform.buildRustPackage { - pname = "LanguageClient-neovim-bin"; + LanguageClient-neovim = + let + version = "0.1.160"; + LanguageClient-neovim-src = fetchFromGitHub { + owner = "autozimu"; + repo = "LanguageClient-neovim"; + rev = version; + sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58"; + }; + LanguageClient-neovim-bin = rustPlatform.buildRustPackage { + pname = "LanguageClient-neovim-bin"; + inherit version; + src = LanguageClient-neovim-src; + + cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a"; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + + # FIXME: Use impure version of CoreFoundation because of missing symbols. + # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" + preConfigure = lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" + ''; + }; + in + buildVimPluginFrom2Nix { + pname = "LanguageClient-neovim"; inherit version; src = LanguageClient-neovim-src; - cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a"; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + propagatedBuildInputs = [ LanguageClient-neovim-bin ]; - # FIXME: Use impure version of CoreFoundation because of missing symbols. - # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" - preConfigure = lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \ + --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'" ''; }; - in buildVimPluginFrom2Nix { - pname = "LanguageClient-neovim"; - inherit version; - src = LanguageClient-neovim-src; - - propagatedBuildInputs = [ LanguageClient-neovim-bin ]; - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \ - --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'" - ''; - }; - - clang_complete = super.clang_complete.overrideAttrs(old: { + clang_complete = super.clang_complete.overrideAttrs (old: { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). @@ -110,7 +156,7 @@ self: super: { ''; }); - direnv-vim = super.direnv-vim.overrideAttrs(oa: { + direnv-vim = super.direnv-vim.overrideAttrs (oa: { preFixup = oa.preFixup or "" + '' substituteInPlace $out/share/vim-plugins/direnv-vim/autoload/direnv.vim \ --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ @@ -118,14 +164,14 @@ self: super: { ''; }); - clighter8 = super.clighter8.overrideAttrs(old: { + clighter8 = super.clighter8.overrideAttrs (old: { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim ''; }); - command-t = super.command-t.overrideAttrs(old: { + command-t = super.command-t.overrideAttrs (old: { buildInputs = [ ruby rake ]; buildPhase = '' rake make @@ -133,7 +179,7 @@ self: super: { ''; }); - cpsm = super.cpsm.overrideAttrs(old: { + cpsm = super.cpsm.overrideAttrs (old: { buildInputs = [ python3 stdenv @@ -149,7 +195,7 @@ self: super: { ''; }); - ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs(old: { + ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: { buildInputs = [ python ]; buildPhase = '' patchShebangs . @@ -157,25 +203,25 @@ self: super: { ''; }); - defx-nvim = super.defx-nvim.overrideAttrs(old: { + defx-nvim = super.defx-nvim.overrideAttrs (old: { dependencies = with super; [ nvim-yarp ]; }); - deoplete-fish = super.deoplete-fish.overrideAttrs(old: { + deoplete-fish = super.deoplete-fish.overrideAttrs (old: { dependencies = with super; [ deoplete-nvim vim-fish ]; }); - deoplete-go = super.deoplete-go.overrideAttrs(old: { + deoplete-go = super.deoplete-go.overrideAttrs (old: { buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build popd find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; - ''; + ''; }); - deoplete-khard = super.deoplete-khard.overrideAttrs(old: { + deoplete-khard = super.deoplete-khard.overrideAttrs (old: { dependencies = [ self.deoplete-nvim ]; passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ]; meta = { @@ -186,52 +232,55 @@ self: super: { }; }); - ensime-vim = super.ensime-vim.overrideAttrs(old: { + ensime-vim = super.ensime-vim.overrideAttrs (old: { passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ]; }); - forms = super.forms.overrideAttrs(old: { + forms = super.forms.overrideAttrs (old: { dependencies = with super; [ super.self ]; }); - fruzzy = let # until https://github.com/NixOS/nixpkgs/pull/67878 is merged, there's no better way to install nim libraries with nix - nimpy = fetchFromGitHub { - owner = "yglukhov"; - repo = "nimpy"; - rev = "4840d1e438985af759ddf0923e7a9250fd8ea0da"; - sha256 = "0qqklvaajjqnlqm3rkk36pwwnn7x942mbca7nf2cvryh36yg4q5k"; - }; - binaryheap = fetchFromGitHub { - owner = "bluenote10"; - repo = "nim-heap"; - rev = "c38039309cb11391112571aa332df9c55f625b54"; - sha256 = "05xdy13vm5n8dw2i366ppbznc4cfhq23rdcklisbaklz2jhdx352"; - }; - in super.fruzzy.overrideAttrs(old: { - buildInputs = [ nim ]; - patches = [ - (substituteAll { - src = ./patches/fruzzy/get_version.patch; - version = old.version; - }) - ]; - configurePhase = '' - substituteInPlace Makefile \ - --replace \ - "nim c" \ - "nim c --nimcache:$TMP --path:${nimpy} --path:${binaryheap}" - ''; - buildPhase = '' - make build - ''; - }); + fruzzy = + let + # until https://github.com/NixOS/nixpkgs/pull/67878 is merged, there's no better way to install nim libraries with nix + nimpy = fetchFromGitHub { + owner = "yglukhov"; + repo = "nimpy"; + rev = "4840d1e438985af759ddf0923e7a9250fd8ea0da"; + sha256 = "0qqklvaajjqnlqm3rkk36pwwnn7x942mbca7nf2cvryh36yg4q5k"; + }; + binaryheap = fetchFromGitHub { + owner = "bluenote10"; + repo = "nim-heap"; + rev = "c38039309cb11391112571aa332df9c55f625b54"; + sha256 = "05xdy13vm5n8dw2i366ppbznc4cfhq23rdcklisbaklz2jhdx352"; + }; + in + super.fruzzy.overrideAttrs (old: { + buildInputs = [ nim ]; + patches = [ + (substituteAll { + src = ./patches/fruzzy/get_version.patch; + version = old.version; + }) + ]; + configurePhase = '' + substituteInPlace Makefile \ + --replace \ + "nim c" \ + "nim c --nimcache:$TMP --path:${nimpy} --path:${binaryheap}" + ''; + buildPhase = '' + make build + ''; + }); - ghcid = super.ghcid.overrideAttrs(old: { + ghcid = super.ghcid.overrideAttrs (old: { configurePhase = "cd plugins/nvim"; }); - vimsence = super.vimsence.overrideAttrs(old: { + vimsence = super.vimsence.overrideAttrs (old: { meta = with lib; { description = "Discord rich presence for Vim"; homepage = "https://github.com/hugolgst/vimsence"; @@ -239,75 +288,88 @@ self: super: { }; }); - vim-gist = super.vim-gist.overrideAttrs(old: { + vim-gist = super.vim-gist.overrideAttrs (old: { dependencies = with super; [ webapi-vim ]; }); + minimap-vim = super.minimap-vim.overrideAttrs (old: { + preFixup = '' + substituteInPlace $out/share/vim-plugins/minimap-vim/plugin/minimap.vim \ + --replace "code-minimap" "${code-minimap}/bin/code-minimap" + substituteInPlace $out/share/vim-plugins/minimap-vim/bin/minimap_generator.sh \ + --replace "code-minimap" "${code-minimap}/bin/code-minimap" + ''; + }); + meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; meta.maintainers = with lib.maintainers; [ vcunat ]; }; - ncm2 = super.ncm2.overrideAttrs(old: { + ncm2 = super.ncm2.overrideAttrs (old: { dependencies = with super; [ nvim-yarp ]; }); - ncm2-jedi = super.ncm2-jedi.overrideAttrs(old: { + ncm2-jedi = super.ncm2-jedi.overrideAttrs (old: { dependencies = with super; [ nvim-yarp ncm2 ]; passthru.python3Dependencies = ps: with ps; [ jedi ]; }); - ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs(old: { + ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs (old: { dependencies = with super; [ neoinclude-vim ]; }); - ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs(old: { + ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs (old: { dependencies = with super; [ neosnippet-vim ]; }); - ncm2-syntax = super.ncm2-syntax.overrideAttrs(old: { + ncm2-syntax = super.ncm2-syntax.overrideAttrs (old: { dependencies = with super; [ neco-syntax ]; }); - ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: { + ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs (old: { dependencies = with super; [ ultisnips ]; }); - nvim-lsputils = super.nvim-lsputils.overrideAttrs(old: { + nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { dependencies = with super; [ popfix ]; }); - fzf-vim = super.fzf-vim.overrideAttrs(old: { + fzf-vim = super.fzf-vim.overrideAttrs (old: { dependencies = [ self.fzfWrapper ]; }); - skim-vim = super.skim-vim.overrideAttrs(old: { + skim-vim = super.skim-vim.overrideAttrs (old: { dependencies = [ self.skim ]; }); - sql-nvim = super.sql-nvim.overrideAttrs(old: { - buildInputs = [ sqlite ]; + sql-nvim = super.sql-nvim.overrideAttrs (old: { + postPatch = '' + substituteInPlace lua/sql/defs.lua \ + --replace "vim.g.sql_clib_path or" "vim.g.sql_clib_path or '${sqlite.out}/lib/libsqlite3.so' or" + ''; }); - sved = let - # we put the script in its own derivation to benefit the magic of wrapGAppsHook - svedbackend = stdenv.mkDerivation { - name = "svedbackend-${super.sved.name}"; - inherit (super.sved) src; - nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ - gobject-introspection - glib - (python3.withPackages(ps: with ps; [ pygobject3 pynvim dbus-python ])) - ]; - preferLocalBuild = true; - installPhase = '' - install -Dt $out/bin ftplugin/evinceSync.py - ''; - }; - in - super.sved.overrideAttrs(old: { + sved = + let + # we put the script in its own derivation to benefit the magic of wrapGAppsHook + svedbackend = stdenv.mkDerivation { + name = "svedbackend-${super.sved.name}"; + inherit (super.sved) src; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ + gobject-introspection + glib + (python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ])) + ]; + preferLocalBuild = true; + installPhase = '' + install -Dt $out/bin ftplugin/evinceSync.py + ''; + }; + in + super.sved.overrideAttrs (old: { preferLocalBuild = true; postPatch = '' rm ftplugin/evinceSync.py @@ -318,7 +380,7 @@ self: super: { }; }); - vimacs = super.vimacs.overrideAttrs(old: { + vimacs = super.vimacs.overrideAttrs (old: { buildPhase = '' substituteInPlace bin/vim \ --replace '/usr/bin/vim' 'vim' \ @@ -334,73 +396,74 @@ self: super: { }; }); - vimshell-vim = super.vimshell-vim.overrideAttrs(old: { + vimshell-vim = super.vimshell-vim.overrideAttrs (old: { dependencies = with super; [ vimproc-vim ]; }); - vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: { + vim-addon-manager = super.vim-addon-manager.overrideAttrs (old: { buildInputs = lib.optional stdenv.isDarwin Cocoa; }); - vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: { + vim-addon-actions = super.vim-addon-actions.overrideAttrs (old: { dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); - vim-addon-async = super.vim-addon-async.overrideAttrs(old: { + vim-addon-async = super.vim-addon-async.overrideAttrs (old: { dependencies = with super; [ vim-addon-signs ]; }); - vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs(old: { + vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs (old: { dependencies = with super; [ vim-addon-mw-utils ]; }); - vim-addon-completion = super.vim-addon-completion.overrideAttrs(old: { + vim-addon-completion = super.vim-addon-completion.overrideAttrs (old: { dependencies = with super; [ tlib_vim ]; }); - vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs(old: { + vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs (old: { dependencies = with super; [ tlib_vim ]; }); - vim-addon-mru = super.vim-addon-mru.overrideAttrs(old: { + vim-addon-mru = super.vim-addon-mru.overrideAttrs (old: { dependencies = with super; [ vim-addon-other vim-addon-mw-utils ]; }); - vim-addon-nix = super.vim-addon-nix.overrideAttrs(old: { + vim-addon-nix = super.vim-addon-nix.overrideAttrs (old: { dependencies = with super; [ vim-addon-completion vim-addon-goto-thing-at-cursor vim-addon-errorformats vim-addon-actions - vim-addon-mw-utils tlib_vim + vim-addon-mw-utils + tlib_vim ]; }); - vim-addon-sql = super.vim-addon-sql.overrideAttrs(old: { + vim-addon-sql = super.vim-addon-sql.overrideAttrs (old: { dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ]; }); - vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs(old: { + vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs (old: { dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); - vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs(old: { + vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs (old: { dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); - vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs(old: { + vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs (old: { dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ]; }); - vim-bazel = super.vim-bazel.overrideAttrs(old: { + vim-bazel = super.vim-bazel.overrideAttrs (old: { dependencies = with super; [ vim-maktaba ]; }); - vim-beancount = super.vim-beancount.overrideAttrs(old: { + vim-beancount = super.vim-beancount.overrideAttrs (old: { passthru.python3Dependencies = ps: with ps; [ beancount ]; }); - vim-closer = super.vim-closer.overrideAttrs(old: { + vim-closer = super.vim-closer.overrideAttrs (old: { patches = [ # Fix duplicate tag in doc (fetchpatch { @@ -410,21 +473,22 @@ self: super: { ]; }); - vim-codefmt = super.vim-codefmt.overrideAttrs(old: { + vim-codefmt = super.vim-codefmt.overrideAttrs (old: { dependencies = with super; [ vim-maktaba ]; }); - vim-dasht = super.vim-dasht.overrideAttrs(old: { + vim-dasht = super.vim-dasht.overrideAttrs (old: { preFixup = '' substituteInPlace $out/share/vim-plugins/vim-dasht/autoload/dasht.vim \ --replace "['dasht']" "['${dasht}/bin/dasht']" ''; }); - vim-easytags = super.vim-easytags.overrideAttrs(old: { + vim-easytags = super.vim-easytags.overrideAttrs (old: { dependencies = with super; [ vim-misc ]; patches = [ - (fetchpatch { # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags + (fetchpatch { + # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags url = "https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch"; sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4"; }) @@ -434,36 +498,38 @@ self: super: { # change the go_bin_path to point to a path in the nix store. See the code in # fatih/vim-go here # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159 - vim-go = super.vim-go.overrideAttrs(old: let - binPath = lib.makeBinPath [ - asmfmt - delve - errcheck - go-motion - go-tools - gocode - gocode-gomod - godef - gogetdoc - golint - golangci-lint - gomodifytags - gopls - gotags - gotools - iferr - impl - reftools - ]; - in { - postPatch = '' - ${gnused}/bin/sed \ - -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \ - -i autoload/go/config.vim - ''; - }); + vim-go = super.vim-go.overrideAttrs (old: + let + binPath = lib.makeBinPath [ + asmfmt + delve + errcheck + go-motion + go-tools + gocode + gocode-gomod + godef + gogetdoc + golint + golangci-lint + gomodifytags + gopls + gotags + gotools + iferr + impl + reftools + ]; + in + { + postPatch = '' + ${gnused}/bin/sed \ + -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \ + -i autoload/go/config.vim + ''; + }); - vim-grammarous = super.vim-grammarous.overrideAttrs(old: { + vim-grammarous = super.vim-grammarous.overrideAttrs (old: { # use `:GrammarousCheck` to initialize checking # In neovim, you also want to use set # let g:grammarous#show_first_error = 1 @@ -476,7 +542,7 @@ self: super: { ]; }); - lens-vim = super.lens-vim.overrideAttrs(old: { + lens-vim = super.lens-vim.overrideAttrs (old: { # remove duplicate g:lens#animate in doc/lens.txt # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985 # https://github.com/camspiers/lens.vim/pull/40/files @@ -488,11 +554,11 @@ self: super: { ]; }); - vim-hier = super.vim-hier.overrideAttrs(old: { + vim-hier = super.vim-hier.overrideAttrs (old: { buildInputs = [ vim ]; }); - vim-isort = super.vim-isort.overrideAttrs(old: { + vim-isort = super.vim-isort.overrideAttrs (old: { postPatch = '' substituteInPlace ftplugin/python_vimisort.vim \ --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")' @@ -500,38 +566,39 @@ self: super: { }); vim-markdown-composer = - let - vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { - pname = "vim-markdown-composer-bin"; - inherit (super.vim-markdown-composer) src version; - cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc="; - }; - in super.vim-markdown-composer.overrideAttrs(oldAttrs: rec { - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \ - --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \ - "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']" - ''; - }); + let + vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { + pname = "vim-markdown-composer-bin"; + inherit (super.vim-markdown-composer) src version; + cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc="; + }; + in + super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \ + --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \ + "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']" + ''; + }); - vim-metamath = super.vim-metamath.overrideAttrs(old: { + vim-metamath = super.vim-metamath.overrideAttrs (old: { preInstall = "cd vim"; }); - vim-snipmate = super.vim-snipmate.overrideAttrs(old: { + vim-snipmate = super.vim-snipmate.overrideAttrs (old: { dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); - vim-wakatime = super.vim-wakatime.overrideAttrs(old: { + vim-wakatime = super.vim-wakatime.overrideAttrs (old: { buildInputs = [ python ]; }); - vim-xdebug = super.vim-xdebug.overrideAttrs(old: { + vim-xdebug = super.vim-xdebug.overrideAttrs (old: { postInstall = false; }); - vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: { + vim-xkbswitch = super.vim-xkbswitch.overrideAttrs (old: { patchPhase = '' substituteInPlace plugin/xkbswitch.vim \ --replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so @@ -539,14 +606,14 @@ self: super: { buildInputs = [ xkb-switch ]; }); - vim-yapf = super.vim-yapf.overrideAttrs(old: { + vim-yapf = super.vim-yapf.overrideAttrs (old: { buildPhase = '' substituteInPlace ftplugin/python_yapf.vim \ --replace '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"' ''; }); - vimproc-vim = super.vimproc-vim.overrideAttrs(old: { + vimproc-vim = super.vimproc-vim.overrideAttrs (old: { buildInputs = [ which ]; buildPhase = '' @@ -558,11 +625,11 @@ self: super: { ''; }); - YankRing-vim = super.YankRing-vim.overrideAttrs(old: { + YankRing-vim = super.YankRing-vim.overrideAttrs (old: { sourceRoot = "."; }); - YouCompleteMe = super.YouCompleteMe.overrideAttrs(old: { + YouCompleteMe = super.YouCompleteMe.overrideAttrs (old: { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ --replace "'ycm_path_to_python_interpreter', '''" \ @@ -581,7 +648,7 @@ self: super: { }; }); - jedi-vim = super.jedi-vim.overrideAttrs(old: { + jedi-vim = super.jedi-vim.overrideAttrs (old: { # checking for python3 support in vim would be neat, too, but nobody else seems to care buildInputs = [ python3.pkgs.jedi ]; meta = { @@ -590,8 +657,8 @@ self: super: { }; }); - lf-vim = super.lf-vim.overrideAttrs(old: { - dependencies = with super; [ bclose-vim ]; + lf-vim = super.lf-vim.overrideAttrs (old: { + dependencies = with super; [ vim-bbye ]; }); vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { @@ -602,7 +669,7 @@ self: super: { ''; }); - vCoolor-vim = super.vCoolor-vim.overrideAttrs(old: { + vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { # on linux can use either Zenity or Yad. propagatedBuildInputs = [ gnome3.zenity ]; meta = { @@ -611,12 +678,14 @@ self: super: { }; }); - unicode-vim = let - unicode-data = fetchurl { - url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; - sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; - }; - in super.unicode-vim.overrideAttrs(old: { + unicode-vim = + let + unicode-data = fetchurl { + url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; + sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; + }; + in + super.unicode-vim.overrideAttrs (old: { # redirect to /dev/null else changes terminal color buildPhase = '' @@ -624,51 +693,64 @@ self: super: { echo "Building unicode cache" ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null ''; - }); + }); - vim-hexokinase = super.vim-hexokinase.overrideAttrs(old: { - preFixup = let - hexokinase = buildGoModule { - name = "hexokinase"; - src = old.src + "/hexokinase"; - vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - }; - in '' - ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase - ''; + vim-hexokinase = super.vim-hexokinase.overrideAttrs (old: { + preFixup = + let + hexokinase = buildGoModule { + name = "hexokinase"; + src = old.src + "/hexokinase"; + vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + }; + in + '' + ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase + ''; meta.platforms = lib.platforms.all; }); - vim-clap = super.vim-clap.overrideAttrs(old: { - preFixup = let - maple-bin = rustPlatform.buildRustPackage { - name = "maple"; - src = old.src; + vim-clap = super.vim-clap.overrideAttrs (old: { + preFixup = + let + maple-bin = rustPlatform.buildRustPackage { + name = "maple"; + src = old.src; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + curl + libgit2 + libiconv + ]; + + cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c="; + }; + in + '' + ln -s ${maple-bin}/bin/maple $target/bin/maple + ''; - nativeBuildInputs = [ - pkg-config - ]; + meta.platforms = lib.platforms.all; + }); - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - CoreServices - curl - libgit2 - libiconv - ]; + compe-tabnine = super.compe-tabnine.overrideAttrs (old: { + buildInputs = [ tabnine ]; - cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c="; - }; - in '' - ln -s ${maple-bin}/bin/maple $target/bin/maple + postFixup = '' + mkdir $target/binaries + ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) ''; - - meta.platforms = lib.platforms.all; }); - completion-tabnine = super.completion-tabnine.overrideAttrs(old: { + completion-tabnine = super.completion-tabnine.overrideAttrs (old: { buildInputs = [ tabnine ]; postFixup = '' @@ -677,6 +759,10 @@ self: super: { ''; }); + telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: { + dependencies = [ self.sql-nvim ]; + }); + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { preFixup = let diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index e44b639a4dbe..416dc7fc722d 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -11,8 +11,8 @@ alx741/vim-stylishask amiorin/ctrlp-z andrep/vimacs andreshazard/vim-logreview -AndrewRadev/sideways.vim -AndrewRadev/splitjoin.vim +AndrewRadev/sideways.vim@main +AndrewRadev/splitjoin.vim@main andsild/peskcolor.vim andviro/flake8-vim andymass/vim-matchup @@ -27,7 +27,6 @@ bakpakin/fennel.vim bazelbuild/vim-bazel bbchung/clighter8 benizi/vim-automkdir -benmills/vimux bhurlow/vim-parinfer bitc/vim-hdevtools bkad/camelcasemotion @@ -129,6 +128,7 @@ fruit-in/vim-nong-theme fsharp/vim-fsharp fszymanski/deoplete-emoji garbas/vim-snipmate +gennaro-tedesco/nvim-peekup gentoo/gentoo-syntax GEverding/vim-hocon gfanto/fzf-lsp.nvim@main @@ -168,6 +168,7 @@ HerringtonDarkholme/yats.vim honza/vim-snippets hoob3rt/lualine.nvim hotwatermorning/auto-git-diff +hrsh7th/nvim-compe hrsh7th/vim-vsnip hrsh7th/vim-vsnip-integ hsanson/vim-android @@ -186,6 +187,7 @@ itchyny/lightline.vim itchyny/thumbnail.vim itchyny/vim-cursorword itchyny/vim-gitbranch +itspriddle/vim-shellcheck ivanov/vim-ipython jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim @@ -257,10 +259,12 @@ kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/investigate.vim keith/swift.vim +kevinhwang91/nvim-hlslens@main kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold konfekt/vim-DetectSpellLang +kosayoda/nvim-lightbulb kristijanhusak/defx-git kristijanhusak/defx-icons kristijanhusak/deoplete-phpactor @@ -354,6 +358,7 @@ milkypostman/vim-togglelist mindriot101/vim-yapf mk12/vim-lean mkasa/lushtags +moll/vim-bbye mopp/sky-color-clock.vim morhetz/gruvbox motus/pig.vim @@ -426,7 +431,9 @@ octol/vim-cpp-enhanced-highlight ojroques/vim-oscyank@main Olical/aniseed Olical/conjure +onsails/lspkind-nvim OrangeT/vim-csharp +ostera/vimux osyo-manga/shabadou.vim osyo-manga/vim-anzu osyo-manga/vim-over @@ -478,6 +485,7 @@ rhysd/vim-grammarous rhysd/vim-operator-surround RishabhRD/nvim-lsputils RishabhRD/popfix +rmagatti/auto-session@main rodjek/vim-puppet romainl/vim-cool romainl/vim-qf @@ -542,13 +550,16 @@ svermeulen/vim-subversive t9md/vim-choosewin t9md/vim-smalls takac/vim-hardtime +tami5/lispdocs.nvim tami5/sql.nvim tbodt/deoplete-tabnine ternjs/tern_for_vim terryma/vim-expand-region terryma/vim-multiple-cursors tex/vimpreviewpandoc +Th3Whit3Wolf/one-nvim@main theHamsta/nvim-dap-virtual-text +ThePrimeagen/vim-apm thinca/vim-ft-diff_fold thinca/vim-prettyprint thinca/vim-quickrun @@ -559,7 +570,9 @@ thirtythreeforty/lessspace.vim thosakwe/vim-flutter tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl +TimUntersberger/neogit tjdevries/nlua.nvim +tjdevries/train.nvim tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux @@ -610,6 +623,7 @@ Twinside/vim-hoogle tyru/caw.vim tyru/open-browser-github.vim tyru/open-browser.vim +tzachar/compe-tabnine@main uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look @@ -675,6 +689,7 @@ wbthomason/packer.nvim weirongxu/coc-explorer wellle/targets.vim wellle/tmux-complete.vim +wfxr/minimap.vim whonore/Coqtail will133/vim-dirdiff wincent/command-t diff --git a/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix index bb547b3d34d0..188da860530a 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, vscode-utils +{ lib, vscode-utils , fetchurl, unzip , mono, writeScript, runtimeShell , jq, clang-tools diff --git a/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/default.nix index f561755fc4bd..8c32ac2f5d19 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }: +{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8 }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -128,6 +128,18 @@ let }; }; + dbaeumer.vscode-eslint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-eslint"; + publisher = "dbaeumer"; + version = "2.1.14"; + sha256 = "sha256-bVGmp871yu1Llr3uJ+CCosDsrxJtD4b1+CR+omMUfIQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-markdownlint"; @@ -189,6 +201,23 @@ let }; }; + elmtooling.elm-ls-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "elm-ls-vscode"; + publisher = "Elmtooling"; + version = "2.0.1"; + sha256 = "06x5ld2r1hzns2s052mvhmfiaawjzcn0jf5lkfprhmrkxnmfdd43"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Elmtooling.elm-ls-vscode/changelog"; + description = "Elm language server"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Elmtooling.elm-ls-vscode"; + homepage = "https://github.com/elm-tooling/elm-language-client-vscode"; + license = licenses.mit; + maintainers = with maintainers; [ mcwitt ]; + }; + }; + esbenp.prettier-vscode = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -672,9 +701,7 @@ let }; }; - vadimcn.vscode-lldb = callPackage ./vscode-lldb { - lldb = llvmPackages_latest.lldb; - }; + vadimcn.vscode-lldb = callPackage ./vscode-lldb { }; vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix index 82924f369ae7..746bb4608ab8 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , vscode-utils , useLocalExtensions ? false}: # Note that useLocalExtensions requires that vscode-server is not running diff --git a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index d19027fa5762..0136bf4e5b1b 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -1,5 +1,5 @@ # Update script: pkgs/development/tools/rust/rust-analyzer/update.sh -{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages +{ lib, vscode-utils, jq, rust-analyzer, nodePackages , setDefaultServerPath ? true }: diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json index 6e73ee446d86..188fa67ede59 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -1,24 +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" - } + "name": "vscode-lldb", + "version": "1.6.1", + "dependencies": { + "string-argv": "^0.3.1", + "yaml": "^1.10.0", + "yauzl": "^2.10.0", + "@types/vscode": "^1.31.0", + "@types/node": "^8.10.50", + "@types/mocha": "^7.0.1", + "@types/yauzl": "^2.9.0", + "@types/json5": "^0.0.30", + "typescript": "^3.7.0", + "mocha": "^7.0.1", + "source-map-support": "^0.5.12", + "memory-streams": "^0.1.3", + "vscode-debugprotocol": "^1.35.0", + "vscode-debugadapter-testsupport": "^1.35.0", + "vsce": "^1.73.0", + "webpack": "^4.39.1", + "webpack-cli": "^3.3.7", + "ts-loader": "^6.2.1" + } } diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch index db62552b913b..30ab3f9b21c2 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch @@ -1,35 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 890abd4..157a8a1 100644 --- 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}") +@@ -16,13 +16,6 @@ endif() + set(VERSION "${VERSION}${VERSION_SUFFIX}") + message("Version ${VERSION}") + +-set(LLDB_PACKAGE $ENV{LLDB_PACKAGE} CACHE PATH "Zip archive containing LLDB files") +-if (LLDB_PACKAGE) +- message("Using LLDB_PACKAGE=${LLDB_PACKAGE}") -else() -- message(FATAL_ERROR "LLDB_ROOT not set." ) +- message(FATAL_ERROR "LLDB_PACKAGE not set." ) -endif() - + set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]") + # 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) +@@ -87,16 +80,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 @@ -42,4 +32,3 @@ - # 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/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index f22c9df36a1b..c4d228281038 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -1,100 +1,94 @@ -{ lib, stdenv, vscode-utils, fetchFromGitHub, rustPlatform, makeWrapper, jq -, nodePackages, cmake, nodejs, unzip, python3, lldb, breakpointHook -, setDefaultLldbPath ? true +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, jq, callPackage +, nodePackages, cmake, nodejs, unzip, python3 }: assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; - name = "vscode-lldb"; - version = "1.5.3"; - - dylibExt = stdenv.hostPlatform.extensions.sharedLibrary; + pname = "vscode-lldb"; + version = "1.6.1"; src = fetchFromGitHub { owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "1139945j3z0fxc3nlyvd81k0ypymqsj051idrbgbibwshpi86y93"; + sha256 = "sha256-mi+AeHg9zO0vjF0OZCufPkliInqxTvDGV350wqAwe90="; fetchSubmodules = true; }; + lldb = callPackage ./lldb.nix {}; + adapter = rustPlatform.buildRustPackage { - pname = "${name}-adapter"; + pname = "${pname}-adapter"; inherit version src; - cargoSha256 = "0jl4msf2jcjxddwqkx8fr0c35wg4vwvg5c19mihri1v34i09zc5r"; - # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; + cargoSha256 = "sha256-HPVbqYsst/iFrHn5wvmWtqeVHOHR7JT8lu+/xZq1lK0="; + 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" - ''; + cargoFlags = [ + "--lib" + "--bin=codelldb" + "--features=weak-linkage" + ]; + + # Tests are linked to liblldb but it is not available here. + doCheck = false; }; - build-deps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; + nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; - vsix = stdenv.mkDerivation { - name = "${name}-${version}-vsix"; - inherit src; +in stdenv.mkDerivation rec { + name = "vscode-extension-${pname}"; + inherit src; + vscodeExtUniqueId = "${publisher}.${pname}"; + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; - # Only build the extension. We handle `adapter` and `lldb` with nix. - patches = [ ./cmake-build-extension-only.patch ]; + nativeBuildInputs = [ cmake nodejs unzip makeWrapper ]; - nativeBuildInputs = [ cmake nodejs unzip breakpointHook ]; + patches = [ ./cmake-build-extension-only.patch ]; - postConfigure = '' - cp -r ${build-deps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} . - ''; + postConfigure = '' + cp -r ${nodeDeps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} . + ''; - makeFlags = [ "vsix_bootstrap" ]; + cmakeFlags = [ + # Do not append timestamp to version. + "-DVERSION_SUFFIX=" + ]; + makeFlags = [ "vsix_bootstrap" ]; - installPhase = '' - unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted - mv vsix-extracted/extension $out + installPhase = '' + ext=$out/$installPrefix + runHook preInstall - ln -s ${adapter}/adapter $out - # Mark that adapter and lldb are installed. - touch $out/platform.ok - ''; + unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted - dontStrip = true; - dontPatchELF = true; - }; + mkdir -p $ext/{adapter,formatters} + mv -t $ext vsix-extracted/extension/* + cp -t $ext/adapter ${adapter}/{bin,lib}/* ../adapter/*.py + cp -t $ext/formatters ../formatters/*.py + ln -s ${lldb} $ext/lldb + # Mark that all components are installed. + touch $ext/platform.ok -in vscode-utils.buildVscodeExtension { - inherit name; - src = vsix; + runHook postInstall + ''; - 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 + # `adapter` will find python binary and libraries at runtime. + fixupPhase = '' + wrapProgram $out/$installPrefix/adapter/codelldb \ + --prefix PATH : "${python3}/bin" \ + --prefix LD_LIBRARY_PATH : "${python3}/lib" ''; - vscodeExtUniqueId = "${publisher}.${name}"; + passthru = { + inherit lldb adapter; + }; meta = with lib; { description = "A native debugger extension for VSCode based on LLDB"; @@ -102,5 +96,6 @@ in vscode-utils.buildVscodeExtension { license = with licenses; [ mit ]; maintainers = with maintainers; [ oxalica ]; platforms = platforms.all; + broken = stdenv.isDarwin; # Build failed on x86_64-darwin currently. }; } diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix new file mode 100644 index 000000000000..2ec90b1931e8 --- /dev/null +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix @@ -0,0 +1,23 @@ +# Patched lldb for Rust language support. +{ lldb_11, fetchFromGitHub }: +let + llvmSrc = fetchFromGitHub { + owner = "vadimcn"; + repo = "llvm-project"; + rev = "dd7efd9ea2d38e3227bc2e83a99772aceeb44242"; + sha256 = "sha256-XY8J8Ie1cWb6ok72Gju/KUxZ4fIFQVitYVnuCezGRKQ="; + }; +in lldb_11.overrideAttrs (oldAttrs: { + src = "${llvmSrc}/lldb"; + + passthru = (oldAttrs.passthru or {}) // { + inherit llvmSrc; + }; + + doInstallCheck = true; + postInstallCheck = (oldAttrs.postInstallCheck or "") + '' + versionOutput="$($out/bin/lldb --version)" + echo "'lldb --version' returns: $versionOutput" + echo "$versionOutput" | grep -q 'rust-enabled' + ''; +}) diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh new file mode 100755 index 000000000000..0f3e407ddde4 --- /dev/null +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix-prefetch +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" +if [[ $# -ne 1 ]]; then + echo "Usage: ./update.sh <version>" + exit 1 +fi + +echo " +FIXME: This script doesn't update patched lldb. Please manually check branches +of https://github.com/vadimcn/llvm-project and update lldb with correct version of LLVM. +" + +nixpkgs=../../../.. +nixFile=./default.nix +owner=vadimcn +repo=vscode-lldb +version="$1" + +sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile" +srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version" --fetchSubmodules) +sed -E 's/\bsha256 = ".*?"/sha256 = "'$srcHash'"/' --in-place "$nixFile" +cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") +sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile" + +src="$(nix-build $nixpkgs -A vscode-extensions.vadimcn.vscode-lldb.src --no-out-link)" +jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies) }' \ + --arg version "$version" \ + "$src/package.json" \ + > build-deps/package.json + +# Regenerate nodePackages. +cd "$nixpkgs/pkgs/development/node-packages" +exec ./generate.sh diff --git a/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix index 336cd059f57a..86453b960cba 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , wakatime, vscode-utils }: let diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix index 9afd4b475de5..b53c5985a21c 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { dontBuild = true; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix index 3e5399dbb355..609cd579f9f6 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { installPhase = '' diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix index 2f6c8319b1cf..e3b3179d4a3b 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { prePatch = '' diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index cb54212f2176..0ba61ccb4915 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, IOKitSrcs, xnu, darwin-stubs }: +{ lib, appleDerivation, IOKitSrcs, xnu, darwin-stubs }: # Someday it'll make sense to split these out into their own packages, but today is not that day. appleDerivation { diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index 7f93a87837a2..1bf6396d47fd 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, developer_cmds }: +{ lib, appleDerivation, developer_cmds }: appleDerivation { buildInputs = [ developer_cmds ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index a5508b5ec12f..ad3f5dea9757 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo +{ lib, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto , copyfile, removefile, libresolv, Libnotify, libplatform, libpthread , mDNSResponder, launchd, libutil, hfs, darling, darwin-stubs }: diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix index 4f719ef84634..4855c532acb7 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc +{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, yacc }: # this derivation sucks diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 614bdf570f3f..6e659df4d620 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuild, ncurses, libutil }: +{ lib, appleDerivation, xcbuild, ncurses, libutil }: appleDerivation { # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index f7503dbb953c..5a3b17102161 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { dontBuild = true; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 8cff145661f6..7d011d2d8cc8 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook }: +{ lib, appleDerivation, xcbuildHook }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix index 5819101e10a7..27a7f7b3e7c5 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, yacc, flex }: +{ lib, appleDerivation, yacc, flex }: appleDerivation { nativeBuildInputs = [ yacc flex ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix index 5a5a603eae80..6f666019c3b3 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, makeWrapper }: +{ lib, appleDerivation, makeWrapper }: appleDerivation { nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index db57537bacbf..77de079e2f0f 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook, llvmPackages }: +{ lib, appleDerivation, xcbuildHook, llvmPackages }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index e46e826053fb..1daa49296104 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook +{ lib, appleDerivation, xcbuildHook , Libc, xnu, libutil }: appleDerivation { diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix index 4a72ea337ebf..01d44d22f5ef 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { installPhase = '' diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 407117f1dbd7..258d9785e704 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: +{ lib, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index ceb4b18df177..d9a9beaccfc8 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, libdispatch, xnu }: +{ lib, appleDerivation, libdispatch, xnu }: appleDerivation { propagatedBuildInputs = [ libdispatch xnu ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix index 24986e288524..5021d3cd7fec 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { buildPhase = ":"; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index f216a820dd41..dd3cf0309526 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook +{ lib, appleDerivation, xcbuildHook , openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation { diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index 771dd41b5754..e2e13a168f04 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook }: +{ lib, appleDerivation, xcbuildHook }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index d5dca4a30354..3f0c91db91ca 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: +{ lib, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/nixpkgs/pkgs/os-specific/darwin/goku/default.nix b/nixpkgs/pkgs/os-specific/darwin/goku/default.nix index b65547ff32fb..c729ee6010c5 100644 --- a/nixpkgs/pkgs/os-specific/darwin/goku/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/goku/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "goku"; - version = "0.1.11"; + version = "0.3.6"; src = fetchurl { url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.tar.gz"; - sha256 = "49562342be114c2656726c5c697131acd286965ab3903a1a1e157cc689e20b15"; + sha256 = "1pss1k2slbqzpfynik50pdk4jsaiag4abhmr6kadmaaj18mfz7ai"; }; sourceRoot = "."; installPhase = '' + chmod +x goku + chmod +x gokuw mkdir -p $out/bin cp goku $out/bin cp gokuw $out/bin diff --git a/nixpkgs/pkgs/os-specific/darwin/impure-cmds/default.nix b/nixpkgs/pkgs/os-specific/darwin/impure-cmds/default.nix new file mode 100644 index 000000000000..51e345f048bd --- /dev/null +++ b/nixpkgs/pkgs/os-specific/darwin/impure-cmds/default.nix @@ -0,0 +1,34 @@ +{ lib, runCommandLocal }: + +# On darwin, there are some commands neither opensource nor able to build in nixpkgs. +# We have no choice but to use those system-shipped impure ones. + +let + commands = { + ditto = "/usr/bin/ditto"; # ditto is not opensource + sudo = "/usr/bin/sudo"; # sudo must be owned by uid 0 and have the setuid bit set + }; + + mkImpureDrv = name: path: + runCommandLocal "${name}-impure-darwin" { + __impureHostDeps = [ path ]; + + meta = { + platforms = lib.platforms.darwin; + }; + } '' + if ! [ -x ${path} ]; then + echo Cannot find command ${path} + exit 1 + fi + + mkdir -p $out/bin + ln -s ${path} $out/bin + + manpage="/usr/share/man/man1/${name}.1" + if [ -f $manpage ]; then + mkdir -p $out/share/man/man1 + ln -s $manpage $out/share/man/man1 + fi + ''; +in lib.mapAttrs mkImpureDrv commands diff --git a/nixpkgs/pkgs/os-specific/darwin/stubs/default.nix b/nixpkgs/pkgs/os-specific/darwin/stubs/default.nix index e21f00beb5aa..862305a069d6 100644 --- a/nixpkgs/pkgs/os-specific/darwin/stubs/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/stubs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScriptBin, runtimeShell }: +{ lib, writeScriptBin, runtimeShell }: let fake = name: lib.overrideDerivation (writeScriptBin name '' #!${runtimeShell} diff --git a/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index cc485bb62c64..16ed52ea81e7 100644 --- a/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -2,7 +2,7 @@ , clang-unwrapped , binutils-unwrapped , runCommand -, stdenv + , wrapBintoolsWith , wrapCCWith , buildIosSdk, targetIosSdkPkgs diff --git a/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix b/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix index 87535b92e465..b79f0bd84f2f 100644 --- a/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nix-community"; repo = "acpi_call"; - rev = "3d7c9fe5ed3fc5ed5bafd39d54b1fdc7a09ce710"; - sha256 = "09kp8zl392h99wjwzqrdw2xcfnsc944hzmfwi8n1y7m2slpdybv3"; + rev = "fe4cd0124099b88b61f83006023bc0d95e742e75"; + sha256 = "1rksbg78i7y2wzam9p6kbhx8rmkaiq0kqg8nj7k0j6d25m79289s"; }; hardeningDisable = [ "pic" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/alsa-lib/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-lib/default.nix index cea266466723..2511c88f3f1b 100644 --- a/nixpkgs/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: +{ lib, stdenv, fetchurl, fetchpatch, alsa-ucm-conf, alsa-topology-conf }: stdenv.mkDerivation rec { pname = "alsa-lib"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { patches = [ ./alsa-plugin-conf-multilib.patch + (fetchpatch { + # plucked from upstream master, delete in next release + # without this patch alsa 1.2.4 fails to compile against musl-libc + # due to an overly conservative ifdef gate in a new feature + name = "fix-dlo.patch"; + url = "https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch"; + sha256 = "QQP4C1dSnJP1MNKt2el7Wn3KmtwtYzvyIHWdrHs+Jw4="; + }) ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix b/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix new file mode 100644 index 000000000000..015419ee07a6 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config, alsaLib, glib, json-glib }: + +stdenv.mkDerivation { + pname = "aseq2json"; + version = "unstable-2018-04-28"; + src = fetchFromGitHub { + owner = "google"; + repo = "midi-dump-tools"; + rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a"; + sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA="; + }; + sourceRoot = "source/aseq2json"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib glib json-glib ]; + + installPhase = '' + install -D --target-directory "$out/bin" aseq2json + ''; + + meta = with lib; { + description = "Listens for MIDI events on the Alsa sequencer and outputs as JSON to stdout"; + homepage = "https://github.com/google/midi-dump-tools"; + license = licenses.asl20; + maintainers = [ maintainers.queezle ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix index b2b3dab76a84..354f4b1bff2c 100644 --- a/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ fpletz ]; + maintainers = with lib.maintainers; [ fpletz hexa ]; platforms = with lib.platforms; linux; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix index d93f8a6c46ed..3a6ec67519e1 100644 --- a/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix +++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2020.4"; + version = "2021.0"; sha256 = { - batman-adv = "1cxr0zmn9nzisawkrfk0gzd9fx0pg6261c889kz47hwp4f545v6d"; - alfred = "1ay69nifzghpbvy11fdca5cllkn852h6rg045lci4vzgqf7b2bd2"; - batctl = "05rrpfbpdhxn5zgdps849qls2ifis6a94cjryb60d4y1nc2n0d7w"; + batman-adv = "1898y0m8sgca0dmhyfkpmx2g6qc0b1xvh5nm7cvnhwl9h2jrp62s"; + alfred = "0jr4wbz81ijd03ssfxb9mqlj3zbx2k495lsl0np262hyla6w0qm0"; + batctl = "1r01a8zxivq4slwc81dgg9qknqsli8qw17csfj95321gjpqqpv4w"; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/nixpkgs/pkgs/os-specific/linux/busybox/sandbox-shell.nix index 036ea0a0f486..f5db0b25f18f 100644 --- a/nixpkgs/pkgs/os-specific/linux/busybox/sandbox-shell.nix +++ b/nixpkgs/pkgs/os-specific/linux/busybox/sandbox-shell.nix @@ -1,4 +1,4 @@ -{ busybox, stdenv}: +{ busybox}: # Minimal shell for use as basic /bin/sh in sandbox builds busybox.override { diff --git a/nixpkgs/pkgs/os-specific/linux/compsize/default.nix b/nixpkgs/pkgs/os-specific/linux/compsize/default.nix index b1c6f5a8f956..f835b9a9ec9d 100644 --- a/nixpkgs/pkgs/os-specific/linux/compsize/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/compsize/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "compsize"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "kilobyte"; repo = pname; rev = "v${version}"; - sha256 = "0gk2vibfl9fh7biznlbr3dwknrwbm5q5602q95jbjvk185g9z126"; + sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8="; }; buildInputs = [ btrfs-progs ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "btrfs: Find compression type/ratio on a file or set of files"; homepage = "https://github.com/kilobyte/compsize"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ CrazedProgrammer ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix b/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix index d1a93e4247e9..e82e3f5901c1 100644 --- a/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchpatch , pythonPackages diff --git a/nixpkgs/pkgs/os-specific/linux/erofs-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/erofs-utils/default.nix index e1ff63bce773..73e50c5740bc 100644 --- a/nixpkgs/pkgs/os-specific/linux/erofs-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/erofs-utils/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "erofs-utils"; - version = "1.2"; + version = "1.2.1"; outputs = [ "out" "man" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"; rev = "v" + version; - sha256 = "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc"; + sha256 = "1vb4mxsb59g29x7l22cffsqa8x743sra4j5zbmx89hjwpwm9vvcg"; }; buildInputs = [ autoreconfHook pkg-config fuse libuuid lz4 ]; diff --git a/nixpkgs/pkgs/os-specific/linux/eudev/default.nix b/nixpkgs/pkgs/os-specific/linux/eudev/default.nix index 3d26fc3b0055..c8562cc5f3c0 100644 --- a/nixpkgs/pkgs/os-specific/linux/eudev/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.9"; + version = "3.2.10"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "1z6lfhhbjs6j7pbp6ybn17ywjsdl87ql6g1p3m2y26aa10cqcqc9"; + sha256 = "sha256-h7sCjUcP0bhRaTSbRMVdW3M3M9wtUN3xGW4CZyXq0DQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/os-specific/linux/ffado/default.nix b/nixpkgs/pkgs/os-specific/linux/ffado/default.nix index 25f541d7a003..e23591168f6e 100644 --- a/nixpkgs/pkgs/os-specific/linux/ffado/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ffado/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , dbus , dbus_cplusplus diff --git a/nixpkgs/pkgs/os-specific/linux/firejail/default.nix b/nixpkgs/pkgs/os-specific/linux/firejail/default.nix index 6c0b5117e9d8..95998c694fb9 100644 --- a/nixpkgs/pkgs/os-specific/linux/firejail/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firejail/default.nix @@ -1,25 +1,18 @@ -{lib, stdenv, fetchurl, fetchpatch, which, xdg-dbus-proxy, nixosTests}: -let - s = # Generated upstream information - rec { - baseName="firejail"; - version="0.9.64"; - name="${baseName}-${version}"; - url="mirror://sourceforge/firejail/firejail/firejail-${version}.tar.xz"; - sha256="1zgjwy2k57nx0r63fzr15gijah098ig0bll66jd615vc9q3snfz5"; - }; - buildInputs = [ - which - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - name = "${s.name}.tar.bz2"; +{ lib, stdenv, fetchFromGitHub, fetchpatch, which, xdg-dbus-proxy, nixosTests }: + +stdenv.mkDerivation rec { + pname = "firejail"; + version = "0.9.64.4"; + + src = fetchFromGitHub { + owner = "netblue30"; + repo = "firejail"; + rev = version; + sha256 = "sha256-q/XL8cznHlUXdubUEptEAVma1jRUqFb5XcLAV0RVCzs="; }; + buildInputs = [ which ]; + patches = [ # Adds the /nix directory when using an overlay. # Required to run any programs under this mode. @@ -79,12 +72,10 @@ stdenv.mkDerivation { passthru.tests = nixosTests.firejail; meta = { - inherit (s) version; description = "Namespace-based sandboxing tool for Linux"; - license = lib.licenses.gpl2Plus ; - maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; homepage = "https://firejail.wordpress.com/"; - downloadPage = "https://sourceforge.net/projects/firejail/files/firejail/"; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/firejail/default.upstream b/nixpkgs/pkgs/os-specific/linux/firejail/default.upstream deleted file mode 100644 index 0e6576c44a80..000000000000 --- a/nixpkgs/pkgs/os-specific/linux/firejail/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url https://sourceforge.net/projects/firejail/files/firejail/ -version_link '[-][0-9.]+[.]tar[.][a-z0-9]+/download$' -SF_redirect diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 4fd1cf7ef1ad..6801256c7d36 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2020-12-18"; + version = "2021-02-08"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = lib.replaceStrings ["-"] [""] version; - sha256 = "1rb5b3fzxk5bi6kfqp76q1qszivi0v1kdz1cwj2llp5sd9ns03b5"; + sha256 = "0c85cd659312isfz1r87qswsgfhy0rljagcwspnvjljqrh9bsgzq"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1p7vn2hfwca6w69jhw5zq70w44ji8mdnibm1z959aalax6ndy146"; + outputHash = "0l4xsgxdvjffad7a98n42nyqy3ihs6m6hy3qsfkqin9z10413x5n"; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index c4649557b111..f7f02037800b 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,13 +1,13 @@ { rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "firmware-manager"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw"; + sha256 = "sha256-aKatdjHa/k7j48upkR1O6PFxCUfJYE3KhhzZ9Ohe0Jc="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { installPhase = "make prefix='$(out)' install"; - cargoSha256 = "0byc0pqa1w2qnfrx3psrzdq1c8qjslbmzxg872b9v6fr5d4c9cvg"; + cargoSha256 = "sha256-TISYaSOu8c+74ie4QHLqflXfLWwcLHEOch/hAx3iu60="; doCheck = false; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index dce4af69aa20..cd42f2f44e20 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/data/meson.build b/data/meson.build -index 14454458..12a798c0 100644 +index 50154569..f8058a8e 100644 --- a/data/meson.build +++ b/data/meson.build @@ -17,7 +17,7 @@ endif @@ -73,10 +73,10 @@ index 826a3c1d..b78db663 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index a6fb55dd..aedb7530 100644 +index b075ca89..8d504d3c 100644 --- a/meson.build +++ b/meson.build -@@ -183,6 +183,12 @@ endif +@@ -194,6 +194,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -90,7 +90,7 @@ index a6fb55dd..aedb7530 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index 0a0e2853..198ae930 100644 +index bc76c0ab..8a67d012 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ @@ -98,19 +98,6 @@ index 0a0e2853..198ae930 100644 option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type') option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent') option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') -diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build -index f32b97fe..679ccc7b 100644 ---- a/plugins/ata/meson.build -+++ b/plugins/ata/meson.build -@@ -7,7 +7,7 @@ install_data([ - ) - - install_data(['ata.conf'], -- install_dir: join_paths(sysconfdir, 'fwupd') -+ install_dir: join_paths(sysconfdir_install, 'fwupd') - ) - - shared_module('fu_plugin_ata', diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build index ed4eee70..76dbdb1d 100644 --- a/plugins/dell-esrt/meson.build @@ -123,10 +110,10 @@ index ed4eee70..76dbdb1d 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 92762791..08bb37ea 100644 +index 205d1394..3223f404 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish', +@@ -27,7 +27,7 @@ shared_module('fu_plugin_redfish', ) install_data(['redfish.conf'], @@ -148,14 +135,14 @@ index 6b2368fb..2bd06fed 100644 ) # we use functions from 2.52 in the tests if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52') -diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build -index 2d1b2d22..c4217a72 100644 ---- a/plugins/uefi/meson.build -+++ b/plugins/uefi/meson.build +diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build +index 0b793a07..ebd3e5ea 100644 +--- a/plugins/uefi-capsule/meson.build ++++ b/plugins/uefi-capsule/meson.build @@ -97,7 +97,7 @@ if get_option('man') endif - install_data(['uefi.conf'], + install_data(['uefi_capsule.conf'], - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index 5c40a5540dc3..453d3ab9a47a 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -30,6 +30,7 @@ , docbook-xsl-nons , ninja , gcab +, gnutls , python3 , wrapGAppsHook , json-glib @@ -87,7 +88,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.5.3"; + version = "1.5.5"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -96,7 +97,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "005y5wicmm6f2v8i9m3axx7ivgj3z8mbqps4v9m71bsqmq298j86"; + sha256 = "0c2m9qz1g7zxqc6w90w9hksf8y9hvlh0vyvx06q01x893j5hzxh6"; }; patches = [ @@ -129,6 +130,7 @@ let shared-mime-info valgrind gcab + gnutls docbook_xml_dtd_43 docbook-xsl-nons help2man @@ -274,7 +276,6 @@ let passthru = { filesInstalledToEtc = [ - "fwupd/ata.conf" "fwupd/daemon.conf" "fwupd/redfish.conf" "fwupd/remotes.d/lvfs-testing.conf" @@ -283,7 +284,7 @@ let "fwupd/remotes.d/vendor-directory.conf" "fwupd/thunderbolt.conf" "fwupd/upower.conf" - "fwupd/uefi.conf" + "fwupd/uefi_capsule.conf" "pki/fwupd/GPG-KEY-Hughski-Limited" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix index 9baa4eee6219..15e53557126d 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let pname = "zd1211-firmware"; diff --git a/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix b/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix index 9c14fde319df..44bcbba205e0 100644 --- a/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix @@ -1,27 +1,32 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "flashbench"; - version = "2012-06-06"; + pname = "flashbench-unstable"; + version = "2020-01-23"; - src = fetchgit { - url = "https://github.com/bradfa/flashbench.git"; - rev = "2e30b1968a66147412f21002ea844122a0d5e2f0"; - sha256 = "037rhd2alwfip9qk78cy8fwwnc2kdyzccsyc7v2zpmvl4vvpvnhg"; + src = fetchFromGitHub { + owner = "bradfa"; + repo = "flashbench"; + rev = "d783b1bd2443812c6deadc31b081f043e43e4c1a"; + sha256 = "045j1kpay6x2ikz8x54ph862ymfy1nzpbmmqpf3nkapiv32fjqw5"; }; installPhase = '' + runHook preInstall + install -d -m755 $out/bin $out/share/doc/flashbench install -v -m755 flashbench $out/bin install -v -m755 erase $out/bin/flashbench-erase install -v -m644 README $out/share/doc/flashbench + + runHook postInstall ''; meta = with lib; { description = "Testing tool for flash based memory devices"; homepage = "https://github.com/bradfa/flashbench"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.rycee ]; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix b/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix index db4b70037c8f..b60a10c73ede 100644 --- a/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }: +{ lib, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }: # Don't use this for anything important yet! diff --git a/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix b/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix index 204ce6bf992c..bd1b414f4cba 100644 --- a/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix @@ -1,28 +1,38 @@ { lib, stdenv, fetchFromGitHub }: -# Don't use this for anything important yet! - stdenv.mkDerivation rec { - pname = "fscryptctl-unstable"; - version = "2017-10-23"; + pname = "fscryptctl"; + version = "1.0.0"; goPackagePath = "github.com/google/fscrypt"; src = fetchFromGitHub { owner = "google"; repo = "fscryptctl"; - rev = "142326810eb19d6794793db6d24d0775a15aa8e5"; - sha256 = "1853hlpklisbqnkb7a921dsf0vp2nr2im26zpmrs592cnpsvk3hb"; + rev = "v${version}"; + sha256 = "1hwj726mm0yhlcf6523n07h0yq1rvkv4km64h3ydpjcrcxklhw6l"; }; - makeFlags = [ "DESTDIR=$(out)/bin" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { - description = '' - A low-level tool that handles raw keys and manages policies for Linux - filesystem encryption + description = "Small C tool for Linux filesystem encryption"; + longDescription = '' + fscryptctl is a low-level tool written in C that handles raw keys and + manages policies for Linux filesystem encryption, specifically the + "fscrypt" kernel interface which is supported by the ext4, f2fs, and + UBIFS filesystems. + fscryptctl is mainly intended for embedded systems which can't use the + full-featured fscrypt tool, or for testing or experimenting with the + kernel interface to Linux filesystem encryption. fscryptctl does not + handle key generation, key stretching, key wrapping, or PAM integration. + Most users should use the fscrypt tool instead, which supports these + features and generally is much easier to use. + As fscryptctl is intended for advanced users, you should read the kernel + documentation for filesystem encryption before using fscryptctl. ''; inherit (src.meta) homepage; + changelog = "https://github.com/google/fscryptctl/releases/tag/v{version}"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/os-specific/linux/fscryptctl/legacy.nix b/nixpkgs/pkgs/os-specific/linux/fscryptctl/legacy.nix new file mode 100644 index 000000000000..64a409fb58bf --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/fscryptctl/legacy.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub }: + +# Don't use this for anything important! +# TODO: Drop fscryptctl-experimental after the NixOS 21.03/21.05 release. + +stdenv.mkDerivation rec { + pname = "fscryptctl"; + version = "0.1.0"; + + goPackagePath = "github.com/google/fscrypt"; + + src = fetchFromGitHub { + owner = "google"; + repo = "fscryptctl"; + rev = "v${version}"; + sha256 = "1853hlpklisbqnkb7a921dsf0vp2nr2im26zpmrs592cnpsvk3hb"; + }; + + makeFlags = [ "DESTDIR=$(out)/bin" ]; + + meta = with lib; { + description = "Small C tool for Linux filesystem encryption"; + longDescription = '' + fscryptctl is a low-level tool written in C that handles raw keys and + manages policies for Linux filesystem encryption, specifically the + "fscrypt" kernel interface which is supported by the ext4, f2fs, and + UBIFS filesystems. + fscryptctl is mainly intended for embedded systems which can't use the + full-featured fscrypt tool, or for testing or experimenting with the + kernel interface to Linux filesystem encryption. fscryptctl does not + handle key generation, key stretching, key wrapping, or PAM integration. + Most users should use the fscrypt tool instead, which supports these + features and generally is much easier to use. + As fscryptctl is intended for advanced users, you should read the kernel + documentation for filesystem encryption before using fscryptctl. + ''; + inherit (src.meta) homepage; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + knownVulnerabilities = [ '' + fscryptctl version 1.0.0 was released and now uses v2 encryption + policies. fscryptctl-experimental will remain at version 0.1.0 which + still supports the v1 encryption policies. Please try to switch from the + "fscryptctl-experimental" package to "fscryptctl". The v1 encryption + policies can be insecure, are hard to use correctly, and have different + semantics from v2 policies (which is why they are no longer supported in + fscryptctl 1.0.0+). + '' ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix index 0ed6f54a1dcc..02c46b9ba772 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.10.1"; - sha256Hash = "0bb22mac8m0z6qp0s6g4r0x4aj6gc19pfyqr6sdy4hkpwxicgmaf"; + version = "3.10.2"; + sha256Hash = "0m44hhk6jxkgkvk2jsjcwa3pqgzzqnpm606n3n8wn1ldypkvpsps"; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/hal-flash/default.nix b/nixpkgs/pkgs/os-specific/linux/hal-flash/default.nix deleted file mode 100644 index 70dab152c728..000000000000 --- a/nixpkgs/pkgs/os-specific/linux/hal-flash/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkg-config, udisks2 }: - -stdenv.mkDerivation { - name = "hal-flash-0.3.3"; - - src = fetchurl { - url = "https://github.com/cshorler/hal-flash/archive/v0.3.3.tar.gz"; - sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake dbus glib libtool udisks2 ]; - - preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; - - meta = with lib; { - homepage = "https://github.com/cshorler/hal-flash"; - description = "libhal stub library to satisfy the Flash Player DRM requirements"; - longDescription = - '' - Stub library based loosely upon libhal.[ch] from the hal-0.5.14 - package. Provides the minimum necessary functionality to enable - libflashplayer.so/libadobecp.so to play back DRM content. - ''; - license = with licenses; [ afl21 gpl2 ]; - maintainers = with maintainers; [ malyn ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/os-specific/linux/iotop/default.nix b/nixpkgs/pkgs/os-specific/linux/iotop/default.nix index 1924e326c1e5..a91175aa59f3 100644 --- a/nixpkgs/pkgs/os-specific/linux/iotop/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iotop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, fetchpatch }: +{ lib, fetchurl, python3Packages, fetchpatch }: python3Packages.buildPythonApplication rec { name = "iotop-0.6"; diff --git a/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix b/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix index 6505d1d80eea..7285e27ff36b 100644 --- a/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, iproute, fetchFromGitHub }: +{ lib, iproute, fetchFromGitHub }: iproute.overrideAttrs (oa: rec { pname = "iproute_mptcp"; diff --git a/nixpkgs/pkgs/os-specific/linux/ipset/default.nix b/nixpkgs/pkgs/os-specific/linux/ipset/default.nix index 220a08d993cb..6e64013464a0 100644 --- a/nixpkgs/pkgs/os-specific/linux/ipset/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.9"; + version = "7.10"; src = fetchurl { url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p"; + sha256 = "sha256-skkGukPi/jIr1BhjR2dh10mkvd9c5MImW6BLA7x+nPY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix index d6ed7bccba3b..7a81d9434e34 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix @@ -69,12 +69,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.10.4"; in + linuxHeaders = let version = "5.10.9"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh"; + sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch b/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch deleted file mode 100644 index 205497aee2da..000000000000 --- a/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 245e0f743d814c9ff2d1c748175e321301eb16cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Thu, 2 May 2019 05:28:08 +0100 -Subject: [PATCH] x86/fpu: Export __kernel_fpu_{begin,end}() - -This partially undo commit: - -12209993 x86/fpu: Don't export __kernel_fpu_{begin,end}() - -We need this symbol in zfs for AES-NI/AVX support. ---- - arch/x86/include/asm/fpu/api.h | 2 ++ - arch/x86/kernel/fpu/core.c | 6 ++++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h -index b56d504af6545..7d53388d266ea 100644 ---- a/arch/x86/include/asm/fpu/api.h -+++ b/arch/x86/include/asm/fpu/api.h -@@ -18,6 +18,8 @@ - * If you intend to use the FPU in softirq you need to check first with - * irq_fpu_usable() if it is possible. - */ -+extern void __kernel_fpu_begin(void); -+extern void __kernel_fpu_end(void); - extern void kernel_fpu_begin(void); - extern void kernel_fpu_end(void); - extern bool irq_fpu_usable(void); -diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c -index 2e5003fef51a9..2ea85b32421a0 100644 ---- a/arch/x86/kernel/fpu/core.c -+++ b/arch/x86/kernel/fpu/core.c -@@ -93,7 +93,7 @@ bool irq_fpu_usable(void) - } - EXPORT_SYMBOL(irq_fpu_usable); - --static void __kernel_fpu_begin(void) -+void __kernel_fpu_begin(void) - { - struct fpu *fpu = ¤t->thread.fpu; - -@@ -111,8 +111,9 @@ static void __kernel_fpu_begin(void) - __cpu_invalidate_fpregs_state(); - } - } -+EXPORT_SYMBOL(__kernel_fpu_begin); - --static void __kernel_fpu_end(void) -+void __kernel_fpu_end(void) - { - struct fpu *fpu = ¤t->thread.fpu; - -@@ -121,6 +122,7 @@ static void __kernel_fpu_end(void) - - kernel_fpu_enable(); - } -+EXPORT_SYMBOL(__kernel_fpu_end); - - void kernel_fpu_begin(void) - { diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch b/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch deleted file mode 100644 index dc9ca64bdc1f..000000000000 --- a/nixpkgs/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1e010beda2896bdf3082fb37a3e49f8ce20e04d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Thu, 2 May 2019 05:28:08 +0100 -Subject: [PATCH] x86/fpu: Export kernel_fpu_{begin,end}() with - EXPORT_SYMBOL_GPL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need these symbols in zfs as the fpu implementation breaks userspace: - -https://github.com/zfsonlinux/zfs/issues/9346 -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - arch/x86/kernel/fpu/core.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c -index 12c70840980e..352538b3bb5d 100644 ---- a/arch/x86/kernel/fpu/core.c -+++ b/arch/x86/kernel/fpu/core.c -@@ -102,7 +102,7 @@ void kernel_fpu_begin(void) - } - __cpu_invalidate_fpregs_state(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_begin); -+EXPORT_SYMBOL(kernel_fpu_begin); - - void kernel_fpu_end(void) - { -@@ -111,7 +111,7 @@ void kernel_fpu_end(void) - this_cpu_write(in_kernel_fpu, false); - preempt_enable(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_end); -+EXPORT_SYMBOL(kernel_fpu_end); - - /* - * Save the FPU state (mark it for reload if necessary): --- -2.23.0 - diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix index ffd710e632e0..bd0518650d6c 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -8,7 +8,7 @@ # # See also <nixos/modules/profiles/hardened.nix> -{ lib, stdenv, version }: +{ lib, version }: with lib; with lib.kernel; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 695477417aa8..aed631bee1b4 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,26 +1,26 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.217-hardened1.patch", - "sha256": "1hb5fa06xw9rn0f77lklrlhb6vajr1hjv64qxv5y03l7zqfsi7lx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.217-hardened1/linux-hardened-4.14.217-hardened1.patch" + "name": "linux-hardened-4.14.221-hardened1.patch", + "sha256": "167pazgz6xa0xmvkqdk0a9z1gp9ria0mm2wmq6g41wzhcy20zrfz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.221-hardened1/linux-hardened-4.14.221-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.170-hardened1.patch", - "sha256": "0wx1bhkxyiqk6r51922dhv29jfkx6kfwk4w3z2rc8shpm6krdngv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.170-hardened1/linux-hardened-4.19.170-hardened1.patch" + "name": "linux-hardened-4.19.175-hardened1.patch", + "sha256": "04pflpzb8fs2wlx2sm46r1lxn4vcmhsygzk088m8rg3jjygany3i", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.175-hardened1/linux-hardened-4.19.175-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.10-hardened1.patch", - "sha256": "0hm8ng073lzqcj5khgpxvr775z0jns9y00qj8b0n63yq0klm2pqh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.10-hardened1/linux-hardened-5.10.10-hardened1.patch" + "name": "linux-hardened-5.10.15-hardened1.patch", + "sha256": "1xd0qr58lz38swivhrbhjf1jz3y8y4i9ba1qcij7bydw125qvz14", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.15-hardened1/linux-hardened-5.10.15-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.92-hardened1.patch", - "sha256": "0qklpyrd20xsyrvw6ij8y337vjfnxlkyyvalzk96ngkvlfv5b7qh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.92-hardened1/linux-hardened-5.4.92-hardened1.patch" + "name": "linux-hardened-5.4.97-hardened1.patch", + "sha256": "1610lgvxxx6rmbi38q3pcaf9kcw8fqxspwmg2irgmvvzniv5p42x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.97-hardened1/linux-hardened-5.4.97-hardened1.patch" } } diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index d1d9e94e2a6b..787bc5accca5 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: with lib; buildLinux (args // rec { - version = "4.14.217"; + version = "4.14.221"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04adj8x7p1has4mh8ygxhqgwb1i08fz9izqw1y6xj5hh8cjnm8v2"; + sha256 = "1sf7sagy88p20310klbxdacyalg3q6zg870c709nz17lbw3m88nf"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 2bc5321ea7f6..390724b8a86f 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: with lib; buildLinux (args // rec { - version = "4.19.170"; + version = "4.19.175"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jjvwbxpfvmzj4z6gkd2mh3kz9vh8hsgsm0013866hzgz1j043fx"; + sha256 = "099b3dw9rj2z147dpjppd57g24paxw8x4fq1ir1ss5ibzy24pvnc"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9c04ee72238f..eba19be1c204 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: +{ buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.253"; + version = "4.4.257"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0nlqnfhrkaj2s582kc0wxqi0881hgp6l9z85qx4ckflc8jwrh7k6"; + sha256 = "0njb4gf77vix2xgnyhmrzf67czpqfng9np644l9j18dn4mb7q1iy"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index df298ade0842..f53d39b20b50 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: +{ buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.253"; + version = "4.9.257"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "065w35vb0qp4fvnwmcx7f92inmx64f9r04zzwcwbs0826nl52nws"; + sha256 = "0kynyqk62hkfmamhvfp98i9kyr395chnwghslcbq5pl1zkzq1rwm"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 0eaa148a49c0..0d37a8b435b4 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: with lib; buildLinux (args // rec { - version = "5.10.10"; + version = "5.10.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "06fvgkrn9127xw9kly6l4ws3yv80q8xfqdzaam92lljim5pqdvb0"; + sha256 = "00bf1v8zn4qngxhj6sca0lhv71xlnajw02iq6854s76my6y8flnq"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 0469b731b894..2e11688910dd 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: with lib; buildLinux (args // rec { - version = "5.4.92"; + version = "5.4.97"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1zcl4dadyfrgmx6rh0ncy403rsqb1qs092m6zr6b3i14i3wpz4y0"; + sha256 = "0gs856v3q3m0q245mf8b9ivds8dizqrgjw27s9kbq3v31886da3i"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index a272bd286f32..a64520ab8932 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args: +{ buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args: buildLinux (args // rec { version = "4.14.165-172"; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index a84828aa0c1a..25c8ee3a6546 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17812"; - sha256 = "150rh6qakyfzr6afzchf7c05z0dvc39gj0rpfb4ggr7xqpzhxrcc"; + rev = "17873"; + sha256 = "1r1c8wagbq3cgxys7ylvsg6bnxiky66xgx9l0282zsmnn3gh83l7"; } , ... }: @@ -35,6 +35,8 @@ in linux.override { ''; }; + extraMeta.broken = true; + passthru.updateScript = ./update-libre.sh; maintainers = [ lib.maintainers.qyliss ]; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix index 35df8e99ddca..e466b76867c9 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: +{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.10.9"; - suffix = "lqx1"; + version = "5.10.10"; + suffix = "lqx2"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1j0rz4j1br7kzg9zb5l2xz60ccr4iwjndxq3f4gml8s3fb4cpp6f"; + sha256 = "1cjgx9qjfkiaalqkcdmibsrq2frwd621rwcg6w05ms4w9lnwi3af"; }; extraMeta = { diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix index f7bca36481bf..cd661be1078c 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: +{ lib, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: let mptcpVersion = "0.95"; modDirVersion = "4.19.55"; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index d733f0bdfa43..85cc0d16eacb 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.8-rt24"; # updated by ./update-rt.sh + version = "5.10.12-rt26"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w"; + sha256 = "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "06fqwx9flcxzbjr9gb0d7v4hidypzz69r6p2mfzhqh7ii0p89f30"; + sha256 = "06sb7cj24v4kh7zghndpxv95pkihahc7653lxdw4wj9jhi58bs2k"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 5f0f513ff459..619bf48b736c 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: +{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { version = "5.9.0-2020.11.20"; @@ -7,6 +7,7 @@ buildLinux (args // { src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs"; + # commit does not exist on any branch on the target repository rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc"; sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index 98fafaadece7..1ed116cdfde4 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: with lib; buildLinux (args // rec { - version = "5.11-rc3"; + version = "5.11-rc5"; extraMeta.branch = "5.11"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "15dfgvicp7s9xqaa3w8lmfffzyjsqrq1fa2gs1a8awzs5rxgsn61"; + sha256 = "029nps41nrym5qz9lq832cys4rai04ig5xp9ddvrpazzh0lfnr4q"; }; # Should the testing kernels ever be built on Hydra? diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index aa73e7b8a3e8..b30ee9966491 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args: +{ lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.10.9"; + version = "5.10.10"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0p7w2ib8aac0cx16fksr8870kmijw86hbzdkjsq1ww07ifnb4qir"; + sha256 = "0jsi2q8k1w5zs5l6z1brm2mxpl9arv6n6linc8yj6xc75nydw6w4"; }; extraMeta = { diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix b/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix index e7667bf1bc29..f41cedca0f69 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix @@ -1,6 +1,19 @@ { lib, fetchpatch, fetchurl }: { + ath_regd_optional = rec { + name = "ath_regd_optional"; + patch = fetchpatch { + name = name + ".patch"; + url = "https://github.com/openwrt/openwrt/raw/ed2015c38617ed6624471e77f27fbb0c58c8c660/package/kernel/mac80211/patches/ath/402-ath_regd_optional.patch"; + sha256 = "1ssDXSweHhF+pMZyd6kSrzeW60eb6MO6tlf0il17RC0="; + postFetch = '' + sed -i 's/CPTCFG_/CONFIG_/g' $out + sed -i '/--- a\/local-symbols/,$d' $out + ''; + }; + }; + bridge_stp_helper = { name = "bridge-stp-helper"; patch = ./bridge-stp-helper.patch; @@ -79,17 +92,6 @@ patch = ./rtl8761b-support.patch; }; - export_kernel_fpu_functions = { - "4.14" = { - name = "export_kernel_fpu_functions"; - patch = ./export_kernel_fpu_functions_4_14.patch; - }; - "5.3" = { - name = "export_kernel_fpu_functions"; - patch = ./export_kernel_fpu_functions_5_3.patch; - }; - }; - export-rt-sched-migrate = { name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; diff --git a/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix b/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix index f8f9b5b80bad..615f376d79d4 100644 --- a/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libcap-ng"; # When updating make sure to test that the version with # all of the python bindings still works - version = "0.8"; + version = "0.8.2"; src = fetchurl { url = "${meta.homepage}/${pname}-${version}.tar.gz"; - sha256 = "08cy59iassiwbmfxa5v0kb374r80290vv32f5q1mnip11av26kgi"; + sha256 = "1sasp1n154aqy9fz0knlb966svm7xg1zjhg1vr4q839bgjvq7h2j"; }; nativeBuildInputs = [ swig ]; diff --git a/nixpkgs/pkgs/os-specific/linux/libcap/default.nix b/nixpkgs/pkgs/os-specific/linux/libcap/default.nix index 4c4238a7e0ea..246f02805f09 100644 --- a/nixpkgs/pkgs/os-specific/linux/libcap/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libcap/default.nix @@ -7,11 +7,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.44"; + version = "2.46"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "1qf80lifygbnxwvqjf8jz5j24n6fqqx4ixnkbf76xs2vrmcq664j"; + sha256 = "1d6q447wf0iagiyzhfdqcj4cv0dmzc49i0czwikrcv7s2cad3lsf"; }; patches = lib.optional isStatic ./no-shared-lib.patch; @@ -34,11 +34,8 @@ stdenv.mkDerivation rec { ]; prePatch = '' - # use relative bash path - substituteInPlace progs/capsh.c --replace "/bin/bash" "bash" - - # ensure capsh can find bash in $PATH - substituteInPlace progs/capsh.c --replace execve execvpe + # use full path to bash + substituteInPlace progs/capsh.c --replace "/bin/bash" "${stdenv.shell}" # set prefixes substituteInPlace Make.Rules \ diff --git a/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix b/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix index b1f9bada3150..b1ed0a724055 100644 --- a/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.11.1"; + version = "1.11.2"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "17qq96mlfhbkbmsvbazhxzkjnh6x37xlh3r0ngp0rfqbl05z2pcr"; + sha256 = "sha256-Xy7A1hjz4O13bMZ0RbOuxEzVkVW5+WKC+MOH5rcGzH0="; }; nativeBuildInputs = [ pkg-config autoreconfHook ] ; diff --git a/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix b/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix index d7255ac4587b..11a6f2755d4c 100644 --- a/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix @@ -30,6 +30,16 @@ stdenv.mkDerivation rec { "DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf" ]; + # The following turns the 'clobbered' error into a warning + # which should fix the following error: + # + # semanage_store.c: In function 'semanage_exec_prog': + # semanage_store.c:1278:6: error: variable 'i' might be clobbered by 'longjmp' or 'vfork' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wclobbered-Werror=clobbered8;;] + # 1278 | int i; + # | ^ + # cc1: all warnings being treated as errors + NIX_CFLAGS_COMPILE = [ "-Wno-error=clobbered" ]; + installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ]; meta = removeAttrs libsepol.meta ["outputsToInstall"] // { diff --git a/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix b/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix index c9de5f874a3a..4f58c9f3f2ad 100644 --- a/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux"; homepage = "http://linuxptp.sourceforge.net/"; maintainers = [ maintainers.markuskowa ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix b/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix index 76a74299ae52..3db9c5e9eb6b 100644 --- a/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix @@ -16,11 +16,11 @@ assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { pname = "lvm2" + lib.optionalString enableDmeventd "with-dmeventd"; - version = "2.03.10"; + version = "2.03.11"; src = fetchurl { url = "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz"; - sha256 = "1l0fkn9abrgk5mfn6jfh9qhdr86b59l1c5pk6lp8jh0491d69las"; + sha256 = "1m4xpda8vbyd89ca0w8nacvnl4j34yzsa625gn990fb5sh84ab44"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/os-specific/linux/net-tools/mptcp.nix b/nixpkgs/pkgs/os-specific/linux/net-tools/mptcp.nix index a9f99874367c..577b7c25311a 100644 --- a/nixpkgs/pkgs/os-specific/linux/net-tools/mptcp.nix +++ b/nixpkgs/pkgs/os-specific/linux/net-tools/mptcp.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nettools, fetchFromGitHub }: +{ lib, nettools, fetchFromGitHub }: nettools.overrideAttrs(oa: rec { name = "net-tools-mptcp"; diff --git a/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index e452e24d263d..38b5e3241c1c 100644 --- a/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -68,7 +68,7 @@ while [ "$#" -gt 0 ]; do j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--refresh|--no-net|--impure) + --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--refresh|--no-net|--offline|--impure) extraBuildFlags+=("$i") ;; --option) @@ -145,7 +145,7 @@ buildHostCmd() { if [ -z "$buildHost" ]; then "$@" elif [ -n "$remoteNix" ]; then - ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "${maybeSudo[@]}" "$@" + ssh $SSHOPTS "$buildHost" env PATH="$remoteNix":'$PATH' "${maybeSudo[@]}" "$@" else ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" "$@" fi diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh index 5baa4aa51e59..70fc5126a939 100755 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -20,7 +20,7 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES + make IGNORE_PREEMPT_RT_PRESENCE=1 SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES cd .. fi diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 004858964a71..73799a421ff0 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,11 +1,17 @@ -{ lib, callPackage, fetchpatch, fetchurl, stdenv }: +{ lib, callPackage, fetchpatch, fetchurl, stdenv, pkgsi686Linux }: let - -generic = args: -if ((!lib.versionOlder args.version "391") + generic = args: let + imported = import ./generic.nix args; + in if ((!lib.versionOlder args.version "391") && stdenv.hostPlatform.system != "x86_64-linux") then null - else callPackage (import ./generic.nix args) { }; + else callPackage imported { + lib32 = (pkgsi686Linux.callPackage imported { + libsOnly = true; + kernel = null; + }).out; + }; + kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; @@ -22,10 +28,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "460.32.03"; - sha256_64bit = "0qb0f8djys55b7qgvpbwafw5lkwvmcslqz3i2kr3jm354gy248ag"; - settingsSha256 = "0mfkw0s4gy1dx671cp1kbpkpkf9c4271w5dz0ykiacz22simi83l"; - persistencedSha256 = "1zrnmwlwqg3pgy1jvldy9iv994wr823rl7vjr1kqnngdmn7bflxl"; + version = "460.39"; + sha256_64bit = "0zx3v4xas9z18yv1z3irp626h8kvcg8aw344sqpacfh1g106dw0b"; + settingsSha256 = "15fa6lmfmgg02gya47ynx5d7cqsb73w4rbg4ly7lc1pnwl5f9qhm"; + persistencedSha256 = "1dj3w03fa1i32c9c7w9392bg3nr2dk8mm4qm0wv12cv587zml0gx"; } else legacy_390; diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix index 2543da74ca6d..75453d955ad0 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -25,6 +25,8 @@ , # don't include the bundled 32-bit libraries on 64-bit platforms, # even if it’s in downloaded binary disable32Bit ? false + # 32 bit libs only version of this package +, lib32 ? null }: with lib; @@ -93,6 +95,8 @@ let }; persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; inherit persistencedVersion settingsVersion; + } // optionalAttrs (!i686bundled) { + inherit lib32; }; meta = with lib; { diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/nvidia-setttings-parallel-build.patch b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/nvidia-setttings-parallel-build.patch new file mode 100644 index 000000000000..ed3fe7b6d6df --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/nvidia-setttings-parallel-build.patch @@ -0,0 +1,12 @@ +diff --git a/src/Makefile b/src/Makefile +index acbb1b8..fe97103 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -242,6 +242,7 @@ endif + + define BINARY_DATA_HEADER_RULE + $$(OUTPUTDIR)/$(notdir $(1)).h: ++ $(at_if_quiet)$(MKDIR) $$(OUTPUTDIR) + $(at_if_quiet){ \ + $$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_start[];\n"; \ + $$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_end[];\n"; \ diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix index d5bbf40e2b8a..f75e3aff1734 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -45,6 +45,12 @@ stdenv.mkDerivation { version = nvidia_x11.settingsVersion; inherit src; + patches = [ + # Fix a race condition in parallel builds. + # https://github.com/NVIDIA/nvidia-settings/issues/59#issuecomment-770302032 + ./nvidia-setttings-parallel-build.patch + ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] diff --git a/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index c74810d24d5a..cb5719c31a2f 100644 --- a/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , go-md2man @@ -10,15 +10,14 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "143x4daixzhhhpli1l14r7dr7dn3q42w8dddr16jzhhwighsirqw"; + sha256 = "0zbrpv6j4gd4l36zl2dljazdm85qlqwchf0xvmnaywcj8c8b49xw"; }; vendorSha256 = null; - doCheck = false; outputs = [ "out" "man" ]; nativeBuildInputs = [ @@ -31,6 +30,10 @@ buildGoModule rec { libseccomp ]; + checkPhase = '' + go test -v ./... + ''; + buildPhase = '' make ''; diff --git a/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix b/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix index 5894d4f506ed..f510c03d9990 100644 --- a/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext -, util-linux, openisns, openssl, kmod, perl, systemd, pkgconf +, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.1.3"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; - buildInputs = [ kmod openisns.lib openssl systemd util-linux ]; + buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; src = fetchFromGitHub { owner = "open-iscsi"; diff --git a/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix b/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix index 71cee65602c6..3f939024a48f 100644 --- a/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "open-isns"; - version = "0.99"; + version = "0.101"; src = fetchFromGitHub { - owner = "gonzoleeman"; + owner = "open-iscsi"; repo = "open-isns"; rev = "v${version}"; - sha256 = "0m294aiv80rkihacw5094093pc0kd5bkbxqgs6i32jsglxy33hvf"; + sha256 = "1g7kp1j2f8afsach6sbl4k05ybz1yz2s8yg073bv4gnv48gyxb2p"; }; propagatedBuildInputs = [ openssl ]; @@ -20,10 +20,11 @@ stdenv.mkDerivation rec { installFlags = [ "etcdir=$(out)/etc" "vardir=$(out)/var/lib/isns" ]; installTargets = [ "install" "install_hdrs" "install_lib" ]; - meta = { + meta = with lib; { description = "iSNS server and client for Linux"; - license = lib.licenses.lgpl21; - homepage = "https://github.com/gonzoleeman/open-isns"; - platforms = lib.platforms.linux; + license = licenses.lgpl21Only; + homepage = "https://github.com/open-iscsi/open-isns"; + platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix b/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix index 32c99a8be13a..4745ba818a90 100644 --- a/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix +++ b/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix @@ -7,7 +7,7 @@ }: let - common = import ../../../development/python-modules/openrazer/common.nix { inherit lib stdenv fetchFromGitHub; }; + common = import ../../../development/python-modules/openrazer/common.nix { inherit lib fetchFromGitHub; }; in stdenv.mkDerivation (common // { name = "openrazer-${common.version}-${kernel.version}"; diff --git a/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix b/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix index cbd1bbdf7633..f90c79661907 100644 --- a/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.14.0"; + version = "2.14.1"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0q52k6mq1jfsv0ix55mjd5ljlalhklhqfrma3l61dzhgihmfawa1"; + sha256 = "sha256-GAttQsCrSybyH1i4vzszdiA9dHWqeo7xUTZVFMNQiP4="; }; kernel = optional (_kernel != null) _kernel.dev; diff --git a/nixpkgs/pkgs/os-specific/linux/pam/default.nix b/nixpkgs/pkgs/os-specific/linux/pam/default.nix index 42b7ea910923..a697bb17a43c 100644 --- a/nixpkgs/pkgs/os-specific/linux/pam/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4 +{ lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext , nixosTests }: @@ -11,21 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; }; - patches = lib.optionals (stdenv.hostPlatform.libc == "musl") [ - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; - sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; - }) - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; - sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81"; - }) - ]; - outputs = [ "out" "doc" "man" /* "modules" */ ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ flex ]; + nativeBuildInputs = [ flex ] + ++ lib.optional stdenv.buildPlatform.isDarwin gettext; buildInputs = [ cracklib db4 ]; diff --git a/nixpkgs/pkgs/os-specific/linux/pcm/default.nix b/nixpkgs/pkgs/os-specific/linux/pcm/default.nix index f791661d2ef1..c0b8b59ebb51 100644 --- a/nixpkgs/pkgs/os-specific/linux/pcm/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pcm/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "202011"; + version = "202101"; pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "09p8drp9xvvs5bahgnr9xx6987fryz27xs2zaf1mr7a9wsh5j912"; + sha256 = "sha256-xiC9XDuFcAzD2lVuzBWUvHy1Z1shEXM2KPFabKvgh1Y="; }; installPhase = '' diff --git a/nixpkgs/pkgs/os-specific/linux/piper/default.nix b/nixpkgs/pkgs/os-specific/linux/piper/default.nix index 1ef304c617f7..839b3f1b78f5 100644 --- a/nixpkgs/pkgs/os-specific/linux/piper/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/piper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 +{ lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 , wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 , gobject-introspection }: diff --git a/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix new file mode 100644 index 000000000000..c477e6f36793 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, lib +, pkg-config +, meson +, ninja +, fetchFromGitLab +, libgudev +, glib +, gobject-introspection +, gettext +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_412 +, libxml2 +, libxslt +, upower +, systemd +}: + +stdenv.mkDerivation rec { + pname = "power-profiles-daemon"; + version = "0.1"; + + outputs = [ "out" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "hadess"; + repo = "power-profiles-daemon"; + rev = version; + sha256 = "012w3aryw5d43dr9jj5i6wy2a0n21jidr4ggs9ix7d4z9byr175w"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_412 + libxml2 # for xmllint for stripping GResources + libxslt # for xsltproc for building docs + gobject-introspection + ]; + + buildInputs = [ + libgudev + systemd + upower + glib + ]; + + mesonFlags = [ + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "-Dgtk_doc=true" + ]; + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon"; + description = "Makes user-selected power profiles handling available over D-Bus"; + platforms = platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mvnetbiz ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix b/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix index 0902ce3d612a..4cf3e1f7dd1b 100644 --- a/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "psmisc"; - version = "23.3"; + version = "23.4"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1132xvrldv0dar2mf221mv5kvajq0v6yrq8k3nl0wslnh5baa0r0"; + sha256 = "sha256-s7omgtsNooYqhr4JUTZ6WCtPaZVC1ujJGz6KxUBWIs8="; }; nativeBuildInputs = [ autoconf automake gettext ]; diff --git a/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index b001ce966a92..ad9deeb7a8c7 100644 --- a/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "33.0"; + version = "33.1"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "04q4z95nxxxjc674qnbwn19bv18nl3x7xwp6aql17h1cw3gdmhw4"; + sha256 = "1p97r8ngfx1d9aq8p3f027323m7kgmk30kfrikf3jlkpr30rksbv"; }; nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; @@ -46,7 +46,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "RDMA Core Userspace Libraries and Daemons"; homepage = "https://github.com/linux-rdma/rdma-core"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ markuskowa ]; }; diff --git a/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix b/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix index 81c129fae3eb..050830927e93 100644 --- a/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: + stdenv.mkDerivation rec { - name = "rtl8821ce-${kernel.version}-${version}"; - version = "5.5.2_34066.20200325"; + pname = "rtl8821ce-${kernel.version}"; + version = "unstable-2020-12-16"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "8d7edbe6a78fd79cfab85d599dad9dc34138abd1"; - sha256 = "1hsf8lqjnkrkvk0gps8yb3lx72mvws6xbgkbdmgdkz7qdxmha8bp"; + rev = "14b536f0c9ad2d0abbdab8afc7ade684900ca9cf"; + sha256 = "0z7r7spsgn22gwv9pcmkdjn9ingi8jj7xkxasph8118h46fw8ip2"; }; hardeningDisable = [ "pic" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix b/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix index ef71cd82541c..12f87f409552 100644 --- a/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -12,6 +12,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rtlwifi-linux"; repo = "rtlwifi_new"; + # commit does not exist on any branch on the target repository rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348"; sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix b/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix index 2fb6c9441edc..87cc098d07d4 100644 --- a/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, skawarePackages }: +{ lib, skawarePackages }: with skawarePackages; diff --git a/nixpkgs/pkgs/os-specific/linux/s6-linux-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/s6-linux-utils/default.nix index 209f596d273e..132a0b49574c 100644 --- a/nixpkgs/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, skawarePackages }: +{ lib, skawarePackages }: with skawarePackages; diff --git a/nixpkgs/pkgs/os-specific/linux/sd-switch/default.nix b/nixpkgs/pkgs/os-specific/linux/sd-switch/default.nix index 026488a24ded..a58b7efa7b30 100644 --- a/nixpkgs/pkgs/os-specific/linux/sd-switch/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sd-switch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, dbus }: +{ lib, fetchFromGitLab, rustPlatform, pkg-config, dbus }: rustPlatform.buildRustPackage rec { pname = "sd-switch"; diff --git a/nixpkgs/pkgs/os-specific/linux/setools/default.nix b/nixpkgs/pkgs/os-specific/linux/setools/default.nix index bcdb622866b8..0da84ab1cefd 100644 --- a/nixpkgs/pkgs/os-specific/linux/setools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/setools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 +{ lib, fetchFromGitHub, python3 , libsepol, libselinux, checkpolicy , withGraphics ? false }: diff --git a/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix b/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix index e4d374b0c41f..2801334688b0 100644 --- a/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix @@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec { version = "2.8"; src = fetchurl { - url = "http://excess.org/speedometer/speedometer-${version}.tar.gz"; + url = "https://excess.org/speedometer/speedometer-${version}.tar.gz"; sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm"; }; @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "Measure and display the rate of data across a network connection or data being stored in a file"; - homepage = "http://excess.org/speedometer/"; + homepage = "https://excess.org/speedometer/"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ Baughn ]; diff --git a/nixpkgs/pkgs/os-specific/linux/switcheroo-control/default.nix b/nixpkgs/pkgs/os-specific/linux/switcheroo-control/default.nix new file mode 100644 index 000000000000..38945c706221 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/switcheroo-control/default.nix @@ -0,0 +1,58 @@ +{ lib +, ninja +, meson +, fetchFromGitLab +, systemd +, libgudev +, pkg-config +, glib +, python3 +, gobject-introspection +}: + +python3.pkgs.buildPythonApplication rec { + pname = "switcheroo-control"; + version = "2.3"; + + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "hadess"; + repo = pname; + rev = version; + hash = "sha256-1Pze2TJ9mggfcpiLFwJ7/9WhsdJx4G3GoA7+Z47shuc="; + }; + + nativeBuildInputs = [ + ninja + meson + pkg-config + + # needed for glib-compile-resources + glib + ]; + + buildInputs = [ + systemd + libgudev + ]; + + propagatedBuildInputs = [ + python3.pkgs.pygobject3 + ]; + + mesonFlags = [ + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "-Dhwdbdir=${placeholder "out"}/etc/udev/hwdb.d" + ]; + + meta = with lib; { + description = "D-Bus service to check the availability of dual-GPU"; + homepage = "https://gitlab.freedesktop.org/hadess/switcheroo-control/"; + changelog = "https://gitlab.freedesktop.org/hadess/switcheroo-control/-/blob/${version}/NEWS"; + license = licenses.gpl3Plus; + maintainers = [ ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix b/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix index ba1c063cc054..4d3446d5a5d6 100644 --- a/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "targetcli"; diff --git a/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 4db4d64bc939..594cf6bfc42f 100644 --- a/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/nixpkgs/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: +{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: mkDerivation { pname = "kernelshark"; version = "1.1.0"; diff --git a/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix b/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix index 5f4ffb50c07b..cc9fb7374658 100644 --- a/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "0.3.0"; diff --git a/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix b/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix index 41ab1a0f539d..36223562578a 100644 --- a/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20201221"; + version = "1.0.20210124"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-8RPJEk+6NaJP3LNZYEncLlkdrw2jHxNekKwEr+YpHeQ="; + sha256 = "sha256-ZiHnKDYziiNvNV1/HjEluC83600RYCvgbUuPiRATRYE="; }; hardeningDisable = [ "pic" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix index 32b61b02beec..ee8b26c384d9 100644 --- a/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkg-config, libnl +{ lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl , dbus, readline ? null, pcsclite ? null }: @@ -19,6 +19,18 @@ stdenv.mkDerivation rec { url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch"; sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz"; }) + (fetchpatch { + # Expose OWE key management capability over DBus, remove >= 2.10 + name = "dbus-Export-OWE-capability-and-OWE-BSS-key_mgmt.patch"; + url = "https://w1.fi/cgit/hostap/patch/?id=7800725afb27397f7d6033d4969e2aeb61af4737"; + sha256 = "0c1la7inf4m5y9gzdjjdnhpkx32pm8vi6m5knih8p77q4mbrdgg8"; + }) + # P2P: Fix copying of secondary device types for P2P group client (https://w1.fi/security/2020-2/) + (fetchurl { + name = "CVE-2021-0326.patch"; + url = "https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch"; + sha256 = "19f4hx0p547mdx8y8arb3vclwyy4w9c8a6a40ryj7q33730mrmn4"; + }) ]; # TODO: Patch epoll so that the dbus actually responds @@ -32,6 +44,7 @@ stdenv.mkDerivation rec { CONFIG_EAP_SAKE=y CONFIG_EAP_GPSK=y CONFIG_EAP_GPSK_SHA256=y + CONFIG_OWE=y CONFIG_WPS=y CONFIG_WPS_ER=y CONFIG_WPS_NFS=y diff --git a/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/gui.nix index ab1cece0f339..d2d59ba21a5e 100644 --- a/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ lib, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; diff --git a/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 86deebb50140..202dc9091fd5 100644 --- a/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils -, perl, buildPackages +, perl, buildPackages, nixosTests , configFile ? "all" # Userspace dependencies @@ -8,8 +8,8 @@ , libtirpc , nfs-utils , gawk, gnugrep, gnused, systemd -, smartmontools, sysstat, sudo -, pkg-config +, smartmontools, enableMail ? false +, sysstat, sudo, pkg-config # Kernel dependencies , kernel ? null @@ -18,6 +18,8 @@ with lib; let + smartmon = smartmontools.override { inherit enableMail; }; + buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; @@ -148,7 +150,7 @@ let ''; postFixup = let - path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmontools sysstat ]}:$PATH"; + path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmon sysstat ]}:$PATH"; in '' for i in $out/libexec/zfs/zpool.d/*; do sed -i '2i${path}' $i @@ -157,6 +159,18 @@ let outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; + passthru = { + inherit enableMail; + + tests = + if isUnstable then [ + nixosTests.zfs.unstable + ] else [ + nixosTests.zfs.installer + nixosTests.zfs.stable + ]; + }; + meta = { description = "ZFS Filesystem Linux Kernel module"; longDescription = '' @@ -186,11 +200,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "2.0.1"; - - sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; + version = "2.0.2"; - extraPatches = [ ]; + sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; }; zfsUnstable = common { @@ -198,10 +210,8 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.1"; - - sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; + version = "2.0.2"; - extraPatches = [ ]; + sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; }; } diff --git a/nixpkgs/pkgs/os-specific/solo5/default.nix b/nixpkgs/pkgs/os-specific/solo5/default.nix index 2dbeca98051d..baba0ecdf0ab 100644 --- a/nixpkgs/pkgs/os-specific/solo5/default.nix +++ b/nixpkgs/pkgs/os-specific/solo5/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }: -let version = "0.6.7"; +let version = "0.6.8"; in stdenv.mkDerivation { pname = "solo5"; inherit version; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; - sha256 = "05k9adg3440zk5baa6ry8z5dj8d8r8hvzafh2469pdgcnr6h45gr"; + sha256 = "sha256-zrxNCXJIuEbtE3YNRK8Bxu2koHsQkcF+xItoIyhj9Uc="; }; hardeningEnable = [ "pie" ]; @@ -50,10 +50,11 @@ in stdenv.mkDerivation { homepage = "https://github.com/solo5/solo5"; license = licenses.isc; maintainers = [ maintainers.ehmry ]; - platforms = lib.crossLists (arch: os: "${arch}-${os}") [ - [ "aarch64" "x86_64" ] - [ "freebsd" "genode" "linux" "openbsd" ] - ]; + platforms = builtins.map ({arch, os}: "${arch}-${os}") + (cartesianProductOfSets { + arch = [ "aarch64" "x86_64" ]; + os = [ "freebsd" "genode" "linux" "openbsd" ]; + }); }; } diff --git a/nixpkgs/pkgs/servers/adminer/default.nix b/nixpkgs/pkgs/servers/adminer/default.nix index 2774c8d1f289..779f7312cacd 100644 --- a/nixpkgs/pkgs/servers/adminer/default.nix +++ b/nixpkgs/pkgs/servers/adminer/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, php }: stdenv.mkDerivation rec { - version = "4.7.8"; + version = "4.8.0"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; - sha256 = "0k794agvd8pa3mwl0076i7753fzxd41lhr23aih4l2lbdgnzi68z"; + sha256 = "sha256-T2LEUoIbFrMta+wP7PNci0QkFYrJZmWP3RP/JzgqUoc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/bazarr/default.nix b/nixpkgs/pkgs/servers/bazarr/default.nix index 375f33e5d601..d68646c42752 100644 --- a/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/nixpkgs/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.0.7"; + version = "0.9.0.8"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "1nskhdb1pcgwp39ld8zrnngzsq6g1pn59nb211qhf6rsj0nyahic"; + sha256 = "sha256-Ecbx7FHpcEkcWBAKCtZPtQKX5ibvU4tajSJ5pyEboKc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/caddy/default.nix b/nixpkgs/pkgs/servers/caddy/default.nix index d48bcad17946..3e6641b8d26f 100644 --- a/nixpkgs/pkgs/servers/caddy/default.nix +++ b/nixpkgs/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "caddy"; diff --git a/nixpkgs/pkgs/servers/cayley/default.nix b/nixpkgs/pkgs/servers/cayley/default.nix index 8ab171a2f437..c9d06d497714 100644 --- a/nixpkgs/pkgs/servers/cayley/default.nix +++ b/nixpkgs/pkgs/servers/cayley/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "cayley"; diff --git a/nixpkgs/pkgs/servers/cloud-print-connector/default.nix b/nixpkgs/pkgs/servers/cloud-print-connector/default.nix index 8e1ef8312691..f6f6a0fbd715 100644 --- a/nixpkgs/pkgs/servers/cloud-print-connector/default.nix +++ b/nixpkgs/pkgs/servers/cloud-print-connector/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: # TODO: Add a service for gcp-cups-connector and perhaps some other # kind of configuration for the same thing that gcp-connector-util diff --git a/nixpkgs/pkgs/servers/code-server/darwin-fsevents.patch b/nixpkgs/pkgs/servers/code-server/darwin-fsevents.patch new file mode 100644 index 000000000000..ec8fc68d5f67 --- /dev/null +++ b/nixpkgs/pkgs/servers/code-server/darwin-fsevents.patch @@ -0,0 +1,11 @@ +--- ./lib/vscode/node_modules/fsevents/install.js ++++ ./lib/vscode/node_modules/fsevents/install.js +@@ -1,7 +1,3 @@ + if (process.platform === 'darwin') { +- var spawn = require('child_process').spawn; +- var args = ['install', '--fallback-to-build']; +- var options = {stdio: 'inherit'}; +- var child = spawn(require.resolve('node-pre-gyp/bin/node-pre-gyp'), args, options); +- child.on('close', process.exit); ++ process.stdout.write('fsevents disabled on Darwin by Nix build script\n') + } diff --git a/nixpkgs/pkgs/servers/code-server/default.nix b/nixpkgs/pkgs/servers/code-server/default.nix index 939237f513ce..c5c27f530045 100644 --- a/nixpkgs/pkgs/servers/code-server/default.nix +++ b/nixpkgs/pkgs/servers/code-server/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand , moreutils, jq, git, zip, rsync, pkg-config, yarn, python2 -, nodejs-12_x, libsecret, xorg, ripgrep, nettools }: +, nodejs-12_x, libsecret, xorg, ripgrep +, AppKit, Cocoa, Security, cctools }: let system = stdenv.hostPlatform.system; @@ -12,29 +13,34 @@ let in stdenv.mkDerivation rec { pname = "code-server"; - version = "3.6.0"; - commit = "a4a03c14922ccaec2a9ff8d1b7b2af8522a4214d"; + version = "3.8.0"; + commit = "c4610f7829701aadb045d450013b84491c30580d"; src = fetchFromGitHub { owner = "cdr"; repo = "code-server"; rev = "v${version}"; - sha256 = "1c0p1s0bl3az5ysl97mz3gbynyndz6jd2jj7lx2snz6jqqd43y9p"; - fetchSubmodules = true; + sha256 = "1snc7dbqfz53337h6av2zhkrn54ypanxljs5by4jqczq96c2v6yk"; }; cloudAgent = buildGoModule rec { pname = "cloud-agent"; - version = "0.1.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "cdr"; repo = "cloud-agent"; - rev = version; - sha256 = "1p20cvgvs38604km9ixylz0r3k7blkd80lncmma3z05y5n5fqps1"; + rev = "v${version}"; + sha256 = "06fpiwxjz2cgzw4ks9sk3376rprkd02khfnb10hg7dhn3y9gp7x8"; }; - vendorSha256 = "0yky1v1ak3ysykjf3gm1hd7qyj5rm4fw7amga81sb31x0357jlzr"; + vendorSha256 = "0k9v10wkzx53r5syf6bmm81gr4s5dalyaa07y9zvx6vv5r2h0661"; + + postPatch = '' + # the cloud-agent release tag has an empty version string, so add it back in + substituteInPlace internal/version/version.go \ + --replace 'var Version string' 'var Version string = "v${version}"' + ''; }; yarnCache = stdenv.mkDerivation { @@ -45,11 +51,6 @@ in stdenv.mkDerivation rec { buildPhase = '' export HOME=$PWD - patchShebangs ./ci - - # apply code-server patches as code-server has patched vscode yarn.lock - yarn vscode:patch - yarn config set yarn-offline-mirror $out find "$PWD" -name "yarn.lock" -printf "%h\n" | \ xargs -I {} yarn --cwd {} \ @@ -61,8 +62,9 @@ in stdenv.mkDerivation rec { # to get hash values use nix-build -A code-server.prefetchYarnCache outputHash = { - x86_64-linux = "1443qwkllb714s4qw3b9y1mcc6p2ykgc02pw2k3z2gczvvr0g8qv"; - aarch64-linux = "1443qwkllb714s4qw3b9y1mcc6p2ykgc02pw2k3z2gczvvr0g8qv"; + x86_64-linux = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; + aarch64-linux = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; + x86_64-darwin = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; }.${system} or (throw "Unsupported system ${system}"); }; @@ -76,20 +78,22 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ nodejs yarn' python pkg-config zip makeWrapper git rsync jq moreutils ]; - buildInputs = [ libsecret xorg.libX11 xorg.libxkbfile ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + ++ (with xorg; [ libX11 libxkbfile ]) + ++ lib.optionals stdenv.isDarwin [ + AppKit Cocoa Security cctools + ]; + + patches = [ + # remove download of coder-cloud agent + ./remove-cloud-agent-download.patch + ]; postPatch = '' export HOME=$PWD patchShebangs ./ci - # apply code-server vscode patches - yarn vscode:patch - - # allow offline install for vscode - substituteInPlace lib/vscode/build/npm/postinstall.js \ - --replace '--ignore-optional' '--offline' - # remove unnecessary git config command substituteInPlace lib/vscode/build/npm/postinstall.js \ --replace "cp.execSync('git config pull.rebase true');" "" @@ -98,17 +102,13 @@ in stdenv.mkDerivation rec { grep -rl "yarn install" --include package.json lib/vscode/extensions \ | xargs sed -i 's/yarn install/yarn install --offline/g' - # remove download of coder-cloud agent - sed -i ':a;N;$!ba;s/OS=.*agent//' ci/build/npm-postinstall.sh + substituteInPlace ci/dev/postinstall.sh \ + --replace 'yarn' 'yarn --ignore-scripts' # use offline cache when installing release packages substituteInPlace ci/build/npm-postinstall.sh \ --replace 'yarn --production' 'yarn --production --offline' - # fix path to ifconfig, so vscode can get mac address - substituteInPlace lib/vscode/src/vs/base/node/macAddress.ts \ - --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig' - # disable automatic updates sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \ lib/vscode/src/vs/platform/update/common/update.config.contribution.ts @@ -129,6 +129,9 @@ in stdenv.mkDerivation rec { ''; configurePhase = '' + # run yarn offline by default + echo '--install.offline true' >> .yarnrc + # set default yarn opts ${lib.concatMapStrings (option: '' yarn --offline config set ${option} @@ -137,17 +140,14 @@ in stdenv.mkDerivation rec { # set offline mirror to yarn cache we created in previous steps yarn --offline config set yarn-offline-mirror "${yarnCache}" - # set nodedir, so we can build binaries later - npm config set nodedir "${nodeSources}" - # link coder-cloud agent from nix store ln -s "${cloudAgent}/bin/cloud-agent" ./lib/coder-cloud-agent - # skip browser downloads for playwright - export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD="true" - # skip unnecessary electron download export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + '' + lib.optionalString stdenv.isLinux '' + # set nodedir, so we can build binaries later + npm config set nodedir "${nodeSources}" ''; buildPhase = '' @@ -166,11 +166,20 @@ in stdenv.mkDerivation rec { -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; # patch shebangs of everything, also cached files, as otherwise postinstall - # will not be able to find /usr/bin/env, as it does not exists in sandbox + # will not be able to find /usr/bin/env, as it does not exist in sandbox patchShebangs . - # rebuild binaries, we use npm here, as yarn does not provider alternative - # that would not atempt to try to reinstall everything and break out + # Playwright is only needed for tests, we can disable it for builds. + # There's an environment variable to disable downloads, but the package makes a breaking call to + # sw_vers before that variable is checked. + patch -p1 -i ${./playwright.patch} + '' + lib.optionalString stdenv.isDarwin '' + # fsevents build fails on Darwin. It's an optional package that's only installed as part of Darwin + # builds, so the patch will fail if run on non-Darwin systems. + patch -p1 -i ${./darwin-fsevents.patch} + '' + '' + # rebuild binaries, we use npm here, as yarn does not provide an alternative + # that would not attempt to try to reinstall everything and break our # patching attempts npm rebuild --prefix lib/vscode --update-binary @@ -220,6 +229,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/cdr/code-server"; license = licenses.mit; maintainers = with maintainers; [ offline ]; - platforms = ["x86_64-linux"]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/servers/code-server/playwright.patch b/nixpkgs/pkgs/servers/code-server/playwright.patch new file mode 100644 index 000000000000..e247950173f5 --- /dev/null +++ b/nixpkgs/pkgs/servers/code-server/playwright.patch @@ -0,0 +1,10 @@ +--- ./lib/vscode/node_modules/playwright/install.js ++++ ./lib/vscode/node_modules/playwright/install.js +@@ -14,6 +14,4 @@ + * limitations under the License. + */ + +-const { installBrowsersWithProgressBar } = require('./lib/install/installer'); +- +-installBrowsersWithProgressBar(__dirname); ++process.stdout.write('Browser install disabled by Nix build script\n'); diff --git a/nixpkgs/pkgs/servers/code-server/remove-cloud-agent-download.patch b/nixpkgs/pkgs/servers/code-server/remove-cloud-agent-download.patch new file mode 100644 index 000000000000..76e9c4b8b912 --- /dev/null +++ b/nixpkgs/pkgs/servers/code-server/remove-cloud-agent-download.patch @@ -0,0 +1,16 @@ +--- ./ci/build/npm-postinstall.sh ++++ ./ci/build/npm-postinstall.sh +@@ -24,13 +24,6 @@ main() { + ;; + esac + +- OS="$(uname | tr '[:upper:]' '[:lower:]')" +- if curl -fsSL "https://storage.googleapis.com/coder-cloud-releases/agent/latest/$OS/cloud-agent" -o ./lib/coder-cloud-agent; then +- chmod +x ./lib/coder-cloud-agent +- else +- echo "Failed to download cloud agent; --link will not work" +- fi +- + if ! vscode_yarn; then + echo "You may not have the required dependencies to build the native modules." + echo "Please see https://github.com/cdr/code-server/blob/master/doc/npm.md" diff --git a/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix b/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix index 8e64185e71c6..454cdbb57e3d 100644 --- a/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { homepage = "https://github.com/hautreux/slurm-spank-x11"; description = "Plugin for SLURM to allow for interactive X11 sessions"; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ markuskowa ]; }; } diff --git a/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index 9c3b27f3d254..d9b237a60629 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "http://www.schedmd.com/"; description = "Simple Linux Utility for Resource Management"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ jagajaga markuskowa ]; }; } diff --git a/nixpkgs/pkgs/servers/consul/default.nix b/nixpkgs/pkgs/servers/consul/default.nix index 4c0ce8d511e8..9dc723417d60 100644 --- a/nixpkgs/pkgs/servers/consul/default.nix +++ b/nixpkgs/pkgs/servers/consul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "consul"; diff --git a/nixpkgs/pkgs/servers/demoit/default.nix b/nixpkgs/pkgs/servers/demoit/default.nix index 0c6fe8187756..4a499e7f878c 100644 --- a/nixpkgs/pkgs/servers/demoit/default.nix +++ b/nixpkgs/pkgs/servers/demoit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/servers/dict/dictd-db.nix b/nixpkgs/pkgs/servers/dict/dictd-db.nix index 5584e5e0ac63..0bc05bd1bb36 100644 --- a/nixpkgs/pkgs/servers/dict/dictd-db.nix +++ b/nixpkgs/pkgs/servers/dict/dictd-db.nix @@ -95,5 +95,5 @@ in rec { locale = "en_UK"; }; wordnet = callPackage ./dictd-wordnet.nix {}; - wiktionary = callPackage ./dictd-wiktionary.nix {}; + wiktionary = callPackage ./wiktionary {}; } diff --git a/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix b/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix deleted file mode 100644 index f591064a3c13..000000000000 --- a/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix +++ /dev/null @@ -1,31 +0,0 @@ -{lib, stdenv, fetchurl, python, dict, glibcLocales, writeScript}: - -stdenv.mkDerivation rec { - version = "20161001"; - pname = "dict-db-wiktionary"; - data = fetchurl { - url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m"; - }; - - convert = ./wiktionary2dict.py; - buildInputs = [python dict glibcLocales]; - - builder = writeScript "wiktionary-builder.sh" '' - source $stdenv/setup - - mkdir -p $out/share/dictd/ - cd $out/share/dictd - - python -O ${convert} ${data} - dictzip wiktionary-en.dict - echo en_US.UTF-8 > locale - ''; - - meta = { - description = "DICT version of English Wiktionary"; - homepage = "http://en.wiktionary.org/"; - maintainers = [ ]; - platforms = lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/servers/dict/wiktionary/builder.sh b/nixpkgs/pkgs/servers/dict/wiktionary/builder.sh new file mode 100644 index 000000000000..65652ad4bdbf --- /dev/null +++ b/nixpkgs/pkgs/servers/dict/wiktionary/builder.sh @@ -0,0 +1,8 @@ +source $stdenv/setup + +mkdir -p $out/share/dictd/ +cd $out/share/dictd + +python -O "$convert" "$src" +dictzip wiktionary-en.dict +echo en_US.UTF-8 > locale diff --git a/nixpkgs/pkgs/servers/dict/wiktionary/default.nix b/nixpkgs/pkgs/servers/dict/wiktionary/default.nix new file mode 100644 index 000000000000..cd0c9c6c24bc --- /dev/null +++ b/nixpkgs/pkgs/servers/dict/wiktionary/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, python, dict, glibcLocales }: + +stdenv.mkDerivation rec { + version = "20210201"; + pname = "dict-db-wiktionary"; + + src = fetchurl { + url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; + sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs"; + }; + + convert = ./wiktionary2dict.py; + buildInputs = [ python dict glibcLocales ]; + builder = ./builder.sh; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "DICT version of English Wiktionary"; + homepage = "http://en.wiktionary.org/"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.all; + license = with licenses; [ cc-by-sa-30 fdl11Plus ]; + }; +} diff --git a/nixpkgs/pkgs/servers/dict/wiktionary/latest_version.py b/nixpkgs/pkgs/servers/dict/wiktionary/latest_version.py new file mode 100644 index 000000000000..2833a1e05b03 --- /dev/null +++ b/nixpkgs/pkgs/servers/dict/wiktionary/latest_version.py @@ -0,0 +1,42 @@ +import subprocess + +from html.parser import HTMLParser +from os.path import abspath, dirname +from urllib.request import urlopen + +class WiktionaryLatestVersionParser(HTMLParser): + def __init__(self, current_version, *args, **kwargs): + self.latest_version = current_version + super().__init__(*args, **kwargs) + + + def handle_starttag(self, tag, attrs): + if tag != 'a': + return + + href = dict(attrs)['href'][0:-1] + if href == 'latest': + return + + self.latest_version = max(self.latest_version, href) + + +def nix_prefetch_url(url, algo='sha256'): + """Prefetches the content of the given URL.""" + print(f'nix-prefetch-url {url}') + out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) + return out.decode('utf-8').rstrip() + + +current_version = subprocess.check_output([ + 'nix', 'eval', '--raw', + '-f', dirname(abspath(__file__)) + '/../../../..', + 'dictdDBs.wiktionary.version', +]).decode('utf-8') + +parser = WiktionaryLatestVersionParser(current_version) + +with urlopen('https://dumps.wikimedia.org/enwiktionary/') as resp: + parser.feed(resp.read().decode('utf-8')) + +print(parser.latest_version) diff --git a/nixpkgs/pkgs/servers/dict/wiktionary/update.sh b/nixpkgs/pkgs/servers/dict/wiktionary/update.sh new file mode 100755 index 000000000000..ff5e0fc3551a --- /dev/null +++ b/nixpkgs/pkgs/servers/dict/wiktionary/update.sh @@ -0,0 +1,7 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p common-updater-scripts python3 + +set -ueo pipefail + +version="$(python "$(dirname "${BASH_SOURCE[0]}")"/latest_version.py)" +update-source-version dictdDBs.wiktionary "$version" diff --git a/nixpkgs/pkgs/servers/dict/wiktionary2dict.py b/nixpkgs/pkgs/servers/dict/wiktionary/wiktionary2dict.py index 8a0210e7254f..8a0210e7254f 100644 --- a/nixpkgs/pkgs/servers/dict/wiktionary2dict.py +++ b/nixpkgs/pkgs/servers/dict/wiktionary/wiktionary2dict.py diff --git a/nixpkgs/pkgs/servers/dns/bind/default.nix b/nixpkgs/pkgs/servers/dns/bind/default.nix index 55bc638d2f4d..3d78f4b4cdf9 100644 --- a/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.10"; + version = "9.16.11"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-vEf8AZxiBeamv7g5xUShRyMh3wU3upBbhGpMv/4zYrM="; + sha256 = "sha256-ARH2TdfY9RXPoSnhgczpb/ggcNGyfxGiH2hWEQ0GmcE="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/nixpkgs/pkgs/servers/dns/coredns/default.nix b/nixpkgs/pkgs/servers/dns/coredns/default.nix index adb1a7f329bc..cdfc78d62229 100644 --- a/nixpkgs/pkgs/servers/dns/coredns/default.nix +++ b/nixpkgs/pkgs/servers/dns/coredns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "coredns"; diff --git a/nixpkgs/pkgs/servers/dns/nsd/default.nix b/nixpkgs/pkgs/servers/dns/nsd/default.nix index 02a460219ec6..ddded73391d7 100644 --- a/nixpkgs/pkgs/servers/dns/nsd/default.nix +++ b/nixpkgs/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0l4ba80ihwg3s2ifhnkmk7rjabrcy5zw6sz4hn0vm9sif6lk9s1v"; + sha256 = "sha256-faK0PjCz1/MHcixgj3Gb+xafDZhcdko0+gZp3DNIRHI="; }; prePatch = '' diff --git a/nixpkgs/pkgs/servers/etebase/default.nix b/nixpkgs/pkgs/servers/etebase/default.nix new file mode 100644 index 000000000000..d16c6f011336 --- /dev/null +++ b/nixpkgs/pkgs/servers/etebase/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, python3, fetchFromGitHub }: + +let + py = python3.override { + packageOverrides = self: super: { + django = super.django_3; + }; + }; +in + with py.pkgs; + +buildPythonPackage rec { + pname = "etebase-server"; + version = "0.7.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "etesync"; + repo = "server"; + rev = "v${version}"; + sha256 = "1r2a7ki9w2h3l6rwqa3fzxjlqfj2lbgfrm8lynjhvcdv02s5abbi"; + }; + + patches = [ ./secret.patch ]; + + propagatedBuildInputs = with pythonPackages; [ + asgiref + cffi + django + django-cors-headers + djangorestframework + drf-nested-routers + msgpack + psycopg2 + pycparser + pynacl + pytz + six + sqlparse + ]; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp -r . $out/lib/etebase-server + ln -s $out/lib/etebase-server/manage.py $out/bin/etebase-server + wrapProgram $out/bin/etebase-server --prefix PYTHONPATH : "$PYTHONPATH" + chmod +x $out/bin/etebase-server + ''; + + meta = with lib; { + homepage = "https://github.com/etesync/server"; + description = "An Etebase (EteSync 2.0) server so you can run your own."; + license = licenses.agpl3Only; + maintainers = with maintainers; [ felschr ]; + broken = stdenv.isDarwin; + }; +} diff --git a/nixpkgs/pkgs/servers/etebase/secret.patch b/nixpkgs/pkgs/servers/etebase/secret.patch new file mode 100644 index 000000000000..182d3259248e --- /dev/null +++ b/nixpkgs/pkgs/servers/etebase/secret.patch @@ -0,0 +1,26 @@ +diff --git a/etebase_server/settings.py b/etebase_server/settings.py +index 9baf8d3..501d9f6 100644 +--- a/etebase_server/settings.py ++++ b/etebase_server/settings.py +@@ -23,11 +22,6 @@ + # Quick-start development settings - unsuitable for production + # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ + +-# SECURITY WARNING: keep the secret key used in production secret! +-# See secret.py for how this is generated; uses a file 'secret.txt' in the root +-# directory +-SECRET_FILE = os.path.join(BASE_DIR, "secret.txt") +- + # SECURITY WARNING: don't run with debug turned on in production! + DEBUG = True + +@@ -143,7 +137,7 @@ + + section = config["global"] + +- SECRET_FILE = section.get("secret_file", SECRET_FILE) ++ SECRET_FILE = section.get("secret_file", None) + STATIC_ROOT = section.get("static_root", STATIC_ROOT) + STATIC_URL = section.get("static_url", STATIC_URL) + MEDIA_ROOT = section.get("media_root", MEDIA_ROOT) + diff --git a/nixpkgs/pkgs/servers/fishnet/assets.nix b/nixpkgs/pkgs/servers/fishnet/assets.nix new file mode 100644 index 000000000000..6844db1b810c --- /dev/null +++ b/nixpkgs/pkgs/servers/fishnet/assets.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, xz +, autoPatchelfHook }: + +# Assets for fishnet: A collection of pre-built compressed stockfish binaries. +# We have to decompress them, patch them using auto-patchelf and compress them +# again so that a selection of them can be embedded into the fishnet binary. +stdenv.mkDerivation rec { + pname = "fishnet-assets"; + version = "unstable-2020-01-30"; + + src = fetchFromGitHub { + owner = "niklasf"; + repo = pname; + rev = "b4fa30e57ec8976fb1c10bd36737bc784351b93e"; + sha256 = "0gfs9lm4ih3h3fmgqylw05ii1h0d6mpjfxadnw3wymnjsspfb0m4"; + }; + + relAssetsPath = "share/${pname}"; + + nativeBuildInputs = [ xz autoPatchelfHook ]; + + postPatch = '' + # Delete packed .exe files and all non .xz files (documentation and readme) + rm *.exe.xz + find \! -name "*.xz" -delete + # Extract .xz files, except *.nnue.xz + # We don't have to unpack the latter and it takes ages to repack + find -name "*.xz" \! -name "*.nnue.xz" | xargs unxz -v + ''; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/${relAssetsPath} + cp ./* $out/${relAssetsPath} + ''; + + preFixup = '' + gatherLibraries '${stdenv.cc.cc.lib}' + ''; + + doDist = true; + distPhase = '' + # repack assets + find $out/${relAssetsPath} -type f \! -name "*.xz" | xargs xz -v + ''; + + meta = with lib; { + description = "Assets for fishnet, only required during build"; + homepage = "https://github.com/niklasf/fishnet-assets"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/nixpkgs/pkgs/servers/fishnet/default.nix b/nixpkgs/pkgs/servers/fishnet/default.nix new file mode 100644 index 000000000000..508068bd2d4b --- /dev/null +++ b/nixpkgs/pkgs/servers/fishnet/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, xz +, autoPatchelfHook }: + +let + assets = import ./assets.nix { + inherit lib stdenv fetchFromGitHub xz autoPatchelfHook; + }; +in +rustPlatform.buildRustPackage rec { + pname = "fishnet"; + version = "2.2.4"; + + src = fetchFromGitHub { + owner = "niklasf"; + repo = pname; + rev = "v${version}"; + sha256 = "19dh69b6mqx16195w9d20fah4jl8hhbxm84xq4zwsgl4khmw7zqz"; + }; + + cargoSha256 = "0zl2fnmqncyjd52wkn6dddx9lm9ywpw7swy895yq299z2bbbkv3h"; + + preBuild = '' + rmdir ./assets + ln -snf ${assets}/${assets.relAssetsPath} ./assets + ''; + + meta = with lib; { + description = "Distributed Stockfish analysis for lichess.org"; + homepage = "https://github.com/niklasf/fishnet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/nixpkgs/pkgs/servers/foundationdb/default.nix b/nixpkgs/pkgs/servers/foundationdb/default.nix index 0e608051a9ea..10d517179c2f 100644 --- a/nixpkgs/pkgs/servers/foundationdb/default.nix +++ b/nixpkgs/pkgs/servers/foundationdb/default.nix @@ -1,4 +1,4 @@ -{ gcc6Stdenv, stdenv, gccStdenv, llvmPackages +{ gcc6Stdenv, gccStdenv, llvmPackages , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk diff --git a/nixpkgs/pkgs/servers/gemini/agate/default.nix b/nixpkgs/pkgs/servers/gemini/agate/default.nix new file mode 100644 index 000000000000..be3012740f54 --- /dev/null +++ b/nixpkgs/pkgs/servers/gemini/agate/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: + +rustPlatform.buildRustPackage rec { + pname = "agate"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "mbrubeck"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mnatEvojma1+cOVllTAzDVxl5luRGleLE6GNPnQUNWQ="; + }; + + cargoSha256 = "sha256-B07itUftDj3yVMDc/2VetwYs74fZBa1tmeELbbQ39P0="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; + changelog = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; + description = "Very simple server for the Gemini hypertext protocol"; + longDescription = '' + Agate is a server for the Gemini network protocol, built with the Rust + programming language. Agate has very few features, and can only serve + static files. It uses async I/O, and should be quite efficient even when + running on low-end hardware and serving many concurrent requests. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/nixpkgs/pkgs/servers/gerbera/default.nix b/nixpkgs/pkgs/servers/gerbera/default.nix index f81cc6600f15..7736ed1a0146 100644 --- a/nixpkgs/pkgs/servers/gerbera/default.nix +++ b/nixpkgs/pkgs/servers/gerbera/default.nix @@ -2,18 +2,17 @@ , cmake, pkg-config # required , libupnp, libuuid, pugixml, libiconv, sqlite, zlib, spdlog, fmt -, pkgs # options -, enableDuktape ? true -, enableCurl ? true -, enableTaglib ? true -, enableLibmagic ? true -, enableLibmatroska ? true -, enableAvcodec ? false -, enableLibexif ? true -, enableExiv2 ? false -, enableFFmpegThumbnailer ? false -, enableInotifyTools ? true +, enableDuktape ? true, duktape +, enableCurl ? true, curl +, enableTaglib ? true, taglib +, enableLibmagic ? true, file +, enableLibmatroska ? true, libmatroska, libebml +, enableAvcodec ? false, ffmpeg +, enableLibexif ? true, libexif +, enableExiv2 ? false, exiv2 +, enableFFmpegThumbnailer ? false, ffmpegthumbnailer +, enableInotifyTools ? true, inotify-tools }: with lib; @@ -51,16 +50,16 @@ in stdenv.mkDerivation rec { libupnp libuuid pugixml libiconv sqlite zlib fmt.dev spdlog ] - ++ optionals enableDuktape [ pkgs.duktape ] - ++ optionals enableCurl [ pkgs.curl ] - ++ optionals enableTaglib [ pkgs.taglib ] - ++ optionals enableLibmagic [ pkgs.file ] - ++ optionals enableLibmatroska [ pkgs.libmatroska pkgs.libebml ] - ++ optionals enableAvcodec [ pkgs.libav.dev ] - ++ optionals enableLibexif [ pkgs.libexif ] - ++ optionals enableExiv2 [ pkgs.exiv2 ] - ++ optionals enableInotifyTools [ pkgs.inotify-tools ] - ++ optionals enableFFmpegThumbnailer [ pkgs.ffmpegthumbnailer ]; + ++ optionals enableDuktape [ duktape ] + ++ optionals enableCurl [ curl ] + ++ optionals enableTaglib [ taglib ] + ++ optionals enableLibmagic [ file ] + ++ optionals enableLibmatroska [ libmatroska libebml ] + ++ optionals enableAvcodec [ ffmpeg.dev ] + ++ optionals enableLibexif [ libexif ] + ++ optionals enableExiv2 [ exiv2 ] + ++ optionals enableInotifyTools [ inotify-tools ] + ++ optionals enableFFmpegThumbnailer [ ffmpegthumbnailer ]; meta = with lib; { diff --git a/nixpkgs/pkgs/servers/gonic/default.nix b/nixpkgs/pkgs/servers/gonic/default.nix index 343b3d2b19d1..e541027af702 100644 --- a/nixpkgs/pkgs/servers/gonic/default.nix +++ b/nixpkgs/pkgs/servers/gonic/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub +{ lib, buildGoModule, fetchFromGitHub , pkg-config, taglib, alsaLib # Disable on-the-fly transcoding, @@ -7,53 +7,26 @@ # to the original file, but if transcoding is configured # that takes a while. So best to disable all transcoding # in the configuration if you disable transcodingSupport. -, transcodingSupport ? true, ffmpeg - -# udpater -, writers, vgo2nix }: - -assert transcodingSupport -> ffmpeg != null; - -let - # update these, then run `updateScript` to update dependencies - version = "0.11.0"; - rev = "056fb54a703ef5b5194ce112cbbdd8fb53dbb1ea"; - sha256 = "0hd794wrz29nh89lfnq67w1rc23sg085rqf1agwlgpqycns2djl9"; +, transcodingSupport ? true, ffmpeg }: +buildGoModule rec { + pname = "gonic"; + version = "0.12.0"; src = fetchFromGitHub { owner = "sentriz"; - repo = "gonic"; - inherit rev sha256; + repo = pname; + rev = "6c69bd3be6279f743c83596c4f0fc12798fdb26a"; + sha256 = "1igb2lbkc1nfxp49id3yxql9sbdqr467661jcgnchcnbayj4d664"; }; -in -buildGoPackage { - pname = "gonic-${version}"; - inherit version src; - goPackagePath = "go.senan.xyz/gonic"; - goDeps = ./deps.nix; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ taglib alsaLib ]; - - postPatch = lib.optionalString transcodingSupport '' - substituteInPlace \ - server/encode/encode.go \ - --replace \ - 'ffmpegPath = "/usr/bin/ffmpeg"' \ - 'ffmpegPath = "${ffmpeg}/bin/ffmpeg"' \ - ''; - - passthru.updateScript = writers.writeDash "update-gonic" '' - ${vgo2nix}/bin/vgo2nix \ - -dir ${src} \ - -outfile ${lib.escapeShellArg (toString ./deps.nix)} - ''; + vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; meta = { homepage = "https://github.com/sentriz/gonic"; description = "Music streaming server / subsonic server API implementation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ Profpatsch ]; }; } diff --git a/nixpkgs/pkgs/servers/gonic/deps.nix b/nixpkgs/pkgs/servers/gonic/deps.nix deleted file mode 100644 index 71b2f83a0e01..000000000000 --- a/nixpkgs/pkgs/servers/gonic/deps.nix +++ /dev/null @@ -1,795 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "v0.33.1"; - sha256 = "1xs487sqajpvnhlwp130sfaajyinhxxq2yvmv2533mwf0zhcpz6v"; - }; - } - { - goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; - fetch = { - type = "git"; - url = "https://dmitri.shuralyov.com/gpu/mtl"; - rev = "666a987793e9"; - sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/xgb"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/xgb"; - rev = "27f122750802"; - sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; - }; - } - { - goPackagePath = "github.com/Masterminds/goutils"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/goutils"; - rev = "v1.1.0"; - sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; - }; - } - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "v1.5.0"; - sha256 = "1i169xscsxsh8lsw8bz2apnsqixld37xdnfh36i30xy5wnf0iwfx"; - }; - } - { - goPackagePath = "github.com/Masterminds/sprig"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/sprig"; - rev = "v2.22.0"; - sha256 = "09dzwhj4zh3p6f1jhyic16n4qdnvpamz7hyk9fycpm4b1jfq63gd"; - }; - } - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.2"; - sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.1.0"; - sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; - }; - } - { - goPackagePath = "github.com/d4l3k/messagediff"; - fetch = { - type = "git"; - url = "https://github.com/d4l3k/messagediff"; - rev = "7e0a312ae40b"; - sha256 = "1ab2gm7ys33rs84fjzqcb7b4jy2rr1a0w5a9kakfaf80wd0rjrah"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/denisenkom/go-mssqldb"; - fetch = { - type = "git"; - url = "https://github.com/denisenkom/go-mssqldb"; - rev = "732737034ffd"; - sha256 = "0k1inn33lbfj97d5ir3k5gffjcpb39kairq91jfrz6pnbq0w3zlf"; - }; - } - { - goPackagePath = "github.com/disintegration/imaging"; - fetch = { - type = "git"; - url = "https://github.com/disintegration/imaging"; - rev = "v1.6.2"; - sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/erikstmartin/go-testdb"; - fetch = { - type = "git"; - url = "https://github.com/erikstmartin/go-testdb"; - rev = "8d10e4a1bae5"; - sha256 = "1fhrqcpv8x74qwxx9gpnhgqbz5wkp2bnsq92w418l1fnrgh4ppmq"; - }; - } - { - goPackagePath = "github.com/faiface/beep"; - fetch = { - type = "git"; - url = "https://github.com/faiface/beep"; - rev = "v1.0.2"; - sha256 = "07j0k0ynw1q8f7fzsan4kvfmdlda11583sck66hxfsk9zbp8vpxv"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "v1.0.0"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/gdamore/tcell"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/tcell"; - rev = "v1.1.1"; - sha256 = "0il2nnxp2cqiy73m49215dnf9in3vd25ji8qxbmq87c5qy7i1q9d"; - }; - } - { - goPackagePath = "github.com/go-audio/audio"; - fetch = { - type = "git"; - url = "https://github.com/go-audio/audio"; - rev = "v1.0.0"; - sha256 = "05ai13yc8wwk2zlk9br62lh4z9hs1q685l7ij618bknf449vjsf3"; - }; - } - { - goPackagePath = "github.com/go-audio/riff"; - fetch = { - type = "git"; - url = "https://github.com/go-audio/riff"; - rev = "v1.0.0"; - sha256 = "0wg3p3gsad1rql7bzx7pwwsyd00a5gdb8f1h7zfr7hlqja5skwb4"; - }; - } - { - goPackagePath = "github.com/go-audio/wav"; - fetch = { - type = "git"; - url = "https://github.com/go-audio/wav"; - rev = "v1.0.0"; - sha256 = "058mgc5ahjibnsqayk3k75l04gg9mv27bpmj79jyrya3kaczpamk"; - }; - } - { - goPackagePath = "github.com/go-gl/glfw"; - fetch = { - type = "git"; - url = "https://github.com/go-gl/glfw"; - rev = "6f7a984d4dc4"; - sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.5.0"; - sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; - }; - } - { - goPackagePath = "github.com/gofrs/uuid"; - fetch = { - type = "git"; - url = "https://github.com/gofrs/uuid"; - rev = "v3.2.0"; - sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; - }; - } - { - goPackagePath = "github.com/golang-sql/civil"; - fetch = { - type = "git"; - url = "https://github.com/golang-sql/civil"; - rev = "cb61b32ac6fe"; - sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.1"; - sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0210a2f0f73c"; - sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherwasm"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherwasm"; - rev = "v1.0.0"; - sha256 = "0q20il68gqnrc0s8jndc8mw1ynln60a4xy1lrqakzmp8whyilwri"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "v1.1.1"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "v1.7.4"; - sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh"; - }; - } - { - goPackagePath = "github.com/gorilla/securecookie"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/securecookie"; - rev = "v1.1.1"; - sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"; - }; - } - { - goPackagePath = "github.com/gorilla/sessions"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/sessions"; - rev = "v1.2.0"; - sha256 = "1kz6ydgp7vamhl2ak02hvzp2yv1dbfbwzsdxn6271lyzzdvz4pp1"; - }; - } - { - goPackagePath = "github.com/hajimehoshi/go-mp3"; - fetch = { - type = "git"; - url = "https://github.com/hajimehoshi/go-mp3"; - rev = "v0.2.1"; - sha256 = "0dxqpyj4xbq570if25g5wqbbp6frhq733h2ny3b2z3z8hw4q7vgg"; - }; - } - { - goPackagePath = "github.com/hajimehoshi/oto"; - fetch = { - type = "git"; - url = "https://github.com/hajimehoshi/oto"; - rev = "v0.6.1"; - sha256 = "1k3c0y8gdxn2c8fqc8rbjrn7nbbbhii3krma267jg01qq2zpsm8h"; - }; - } - { - goPackagePath = "github.com/huandu/xstrings"; - fetch = { - type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "v1.3.1"; - sha256 = "0j5vsyjxclk7g7vfr3mfybbimywf3khr8yx07dsdcm1zjwb092iy"; - }; - } - { - goPackagePath = "github.com/icza/bitio"; - fetch = { - type = "git"; - url = "https://github.com/icza/bitio"; - rev = "v1.0.0"; - sha256 = "1c4ps4a9khx2bqp6v0p7b7l0s0gly3vj8rkh816vznj4mdlgk76w"; - }; - } - { - goPackagePath = "github.com/icza/mighty"; - fetch = { - type = "git"; - url = "https://github.com/icza/mighty"; - rev = "cfd07d671de6"; - sha256 = "09prb460wqg72s753g3a9rm0ph60hp83najj0lx9ifp1lixnfb3d"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "v0.3.9"; - sha256 = "042v7bzx575isa4pr868hrlv085qxpg8qi4m04jnkh5vbq4hvs90"; - }; - } - { - goPackagePath = "github.com/jfreymuth/oggvorbis"; - fetch = { - type = "git"; - url = "https://github.com/jfreymuth/oggvorbis"; - rev = "v1.0.0"; - sha256 = "0c0r63sp4q8bl8vvgayr98m0fsscl1f65cd2h7i4cr1awg6r6l6a"; - }; - } - { - goPackagePath = "github.com/jfreymuth/vorbis"; - fetch = { - type = "git"; - url = "https://github.com/jfreymuth/vorbis"; - rev = "v1.0.0"; - sha256 = "16gl1lwagiqw6ib48zsl4zpv1dmykz7fzhxc65vpcdipx2byhi7a"; - }; - } - { - goPackagePath = "github.com/jinzhu/gorm"; - fetch = { - type = "git"; - url = "https://github.com/jinzhu/gorm"; - rev = "v1.9.12"; - sha256 = "06d25jvrqvp1bd4k7mh9gsk414d2vhpr049qvj46yx21hyv9d6v3"; - }; - } - { - goPackagePath = "github.com/jinzhu/inflection"; - fetch = { - type = "git"; - url = "https://github.com/jinzhu/inflection"; - rev = "v1.0.0"; - sha256 = "165i20d11s03771gi43skl66salxj36212r25fbs0cgr4qgfj7fy"; - }; - } - { - goPackagePath = "github.com/jinzhu/now"; - fetch = { - type = "git"; - url = "https://github.com/jinzhu/now"; - rev = "v1.0.1"; - sha256 = "1b4gyw01b3rq3js43n0wqb1k2iymb2mnpdv7vapjs0lsbm4g5q1p"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "v1.3.0"; - sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; - }; - } - { - goPackagePath = "github.com/josephburnett/jd"; - fetch = { - type = "git"; - url = "https://github.com/josephburnett/jd"; - rev = "aa1a7c66b42f"; - sha256 = "0yjdnifwxhdgzcw4jkal3f69sgcjrdiscd5wg45d83zfrsqbb34c"; - }; - } - { - goPackagePath = "github.com/karrick/godirwalk"; - fetch = { - type = "git"; - url = "https://github.com/karrick/godirwalk"; - rev = "v1.15.6"; - sha256 = "0i8202kcihz2hvqp7zzbla5p9x2ljpbjg5zy5dy3x0capz0ina3c"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.3.0"; - sha256 = "0bfravwqyj7z6v4lhsibbmgp7lajdydy4ij6c81g8hv0067x2mqw"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "12d3b2882a08"; - sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "v2.0.3"; - sha256 = "0gn4dgvwmbf8gmhn5nzpwixc39g8mkp3n8lhyjgvhvsl72llcdzv"; - }; - } - { - goPackagePath = "github.com/mewkiz/flac"; - fetch = { - type = "git"; - url = "https://github.com/mewkiz/flac"; - rev = "v1.0.6"; - sha256 = "19083pfc6wxkb45s61di9a542jslcgkzif5z3qjymy085w4aizzx"; - }; - } - { - goPackagePath = "github.com/mewkiz/pkg"; - fetch = { - type = "git"; - url = "https://github.com/mewkiz/pkg"; - rev = "f6b5e26764c3"; - sha256 = "0djxw953sp2cwqybjxsfrsfma5yjn8n1l19g8yrd629cb6r1ghq2"; - }; - } - { - goPackagePath = "github.com/mitchellh/copystructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/copystructure"; - rev = "v1.0.0"; - sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "v1.0.0"; - sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; - }; - } - { - goPackagePath = "github.com/mitchellh/reflectwalk"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/reflectwalk"; - rev = "v1.0.1"; - sha256 = "0pa6a3nhzwv5s5yqcmsmsfhdp5ggxsg2wa86f3akawxrhrkjarnx"; - }; - } - { - goPackagePath = "github.com/nicksellen/audiotags"; - fetch = { - type = "git"; - url = "https://github.com/nicksellen/audiotags"; - rev = "94015fa599bd"; - sha256 = "1817vw2j1lnk4y3925cszmkvwzsdcmgccrcdqyq39jqpwawl2c0j"; - }; - } - { - goPackagePath = "github.com/oklog/run"; - fetch = { - type = "git"; - url = "https://github.com/oklog/run"; - rev = "v1.1.0"; - sha256 = "0r55p3kgdkgw55i33lqvvvl60mjp92mhd1170m980sw98z9150jk"; - }; - } - { - goPackagePath = "github.com/oxtoacart/bpool"; - fetch = { - type = "git"; - url = "https://github.com/oxtoacart/bpool"; - rev = "03653db5a59c"; - sha256 = "1crdgm5w6kvcnvdglrrnrfkh5h60ldafwvrv00q97lz3790kgb15"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.6.0"; - sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; - }; - } - { - goPackagePath = "github.com/peterbourgon/ff"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/ff"; - rev = "v1.7.0"; - sha256 = "17msscfi4pfdih1w3sq0wsw6246a30fckga9kvjpzwva6jni0466"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.1"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/rainycape/unidecode"; - fetch = { - type = "git"; - url = "https://github.com/rainycape/unidecode"; - rev = "cb7f23ec59be"; - sha256 = "1wvzdijd640blwkgmw6h09frkfa04kcpdq87n2zh2ymj1dzla5v5"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/wader/gormstore"; - fetch = { - type = "git"; - url = "https://github.com/wader/gormstore"; - rev = "65a111a20c23"; - sha256 = "0dnylv4gdqsizll7b07nivv6chanqm0014yhqg6gcjccns6bl9bm"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "06a226fb4e37"; - sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "00229845015e"; - sha256 = "0b0f05vbxzbgaaawxqns2m9qbvkfam1ylq8c8yhv7h6jnk2afaff"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "33d19683fad8"; - sha256 = "16qw6s9qlv84x98s9dib90y97x8bli3msaqw8kz498dbnbyx59zk"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "4c31acba0007"; - sha256 = "0k42pn6fq886k9hn85wbgg4h4y1myj7niw0746sn50zfbrmy3s2c"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "331c550502dd"; - sha256 = "0942gzs6mlsjal4drjmm8gr54pj1cdhsl9mnj3ygm200mf3fj6pi"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "3b0461eec859"; - sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fe76b779f299"; - sha256 = "0g6j3n9fdv1a2lp2i8wbaaya85yrbfx3ns6iq1s7l2ayhxxmgh6b"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "b753a1ba74fa"; - sha256 = "1xyzswbz9cx0bns2n75fw9pbm82dk9dj2il9iknmryyxvci9n5zv"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "1b5146add898"; - sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.4.0"; - sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; - }; - } - { - goPackagePath = "gopkg.in/DATA-DOG/go-sqlmock.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/DATA-DOG/go-sqlmock.v1"; - rev = "v1.3.0"; - sha256 = "1684d6ima6638xwvr743kd7j5mpqq0vspcw9ai67bnb7m722qqqv"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/gormigrate.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/gormigrate.v1"; - rev = "v1.6.0"; - sha256 = "03304vh58i5gxchrxy2v91bjdfgp7849jarmlanz3gaa2r574fmf"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.4"; - sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; - }; - } -] diff --git a/nixpkgs/pkgs/servers/gotty/default.nix b/nixpkgs/pkgs/servers/gotty/default.nix index c4881baeac06..7bd09569248f 100644 --- a/nixpkgs/pkgs/servers/gotty/default.nix +++ b/nixpkgs/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotty"; diff --git a/nixpkgs/pkgs/servers/h2/default.nix b/nixpkgs/pkgs/servers/h2/default.nix index 51060a3ab9d9..be28578bcb0f 100644 --- a/nixpkgs/pkgs/servers/h2/default.nix +++ b/nixpkgs/pkgs/servers/h2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "h2"; - version = "1.4.193"; + version = "1.4.199"; src = fetchzip { - url = "https://www.h2database.com/h2-2016-10-31.zip"; - sha256 = "1da1qcfwi5gvh68i6w6y0qpcqp3rbgakizagkajmjxk2ryc4b3z9"; + url = "https://h2database.com/h2-2019-03-13.zip"; + sha256 = "0pdvbnx7nqfqs7x1zkwz2q34331l55jknpk6arf6dksvnd71hinj"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/headphones/default.nix b/nixpkgs/pkgs/servers/headphones/default.nix index 75d15d4f3786..67b328d661a9 100644 --- a/nixpkgs/pkgs/servers/headphones/default.nix +++ b/nixpkgs/pkgs/servers/headphones/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { pname = "headphones"; diff --git a/nixpkgs/pkgs/servers/holochain-go/default.nix b/nixpkgs/pkgs/servers/holochain-go/default.nix index e6e35c35900e..0d138e1f648e 100644 --- a/nixpkgs/pkgs/servers/holochain-go/default.nix +++ b/nixpkgs/pkgs/servers/holochain-go/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "holochain-go${version}"; diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index e2a656e85b56..40779f4bc198 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.1.5"; + version = "2021.2.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -16,6 +16,7 @@ "agent_dvr" = ps: with ps; [ agent-py ]; "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ airly ]; + "airnow" = ps: with ps; [ pyairnow ]; "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; @@ -61,7 +62,7 @@ "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ avea ]; - "avion" = ps: with ps; [ ]; # missing inputs: avion + "avion" = ps: with ps; [ avion ]; "awair" = ps: with ps; [ ]; # missing inputs: python_awair "aws" = ps: with ps; [ aiobotocore ]; "axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ]; @@ -96,7 +97,7 @@ "braviatv" = ps: with ps; [ bravia-tv ]; "broadlink" = ps: with ps; [ broadlink ]; "brother" = ps: with ps; [ brother ]; - "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan + "brottsplatskartan" = ps: with ps; [ brottsplatskartan ]; "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; # missing inputs: brunt "bsblan" = ps: with ps; [ bsblan ]; @@ -107,7 +108,7 @@ "calendar" = ps: with ps; [ aiohttp-cors ]; "camera" = ps: with ps; [ aiohttp-cors ]; "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pysonos zeroconf ]; + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ ]; # missing inputs: pychannels "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook @@ -153,7 +154,7 @@ "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco pillow sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; @@ -166,6 +167,7 @@ "device_tracker" = ps: with ps; [ ]; "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api zeroconf ]; "dexcom" = ps: with ps; [ pydexcom ]; + "dhcp" = ps: with ps; [ scapy ]; "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT "dialogflow" = ps: with ps; [ aiohttp-cors ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; @@ -193,7 +195,7 @@ "dwd_weather_warnings" = ps: with ps; [ ]; # missing inputs: dwdwfsapi "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool + "dyson" = ps: with ps; [ aiohttp-cors libpurecool zeroconf ]; "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy @@ -202,7 +204,7 @@ "econet" = ps: with ps; [ ]; # missing inputs: pyeconet "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] - "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax + "edimax" = ps: with ps; [ pyedimax ]; "edl21" = ps: with ps; [ ]; # missing inputs: pysml "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox "efergy" = ps: with ps; [ ]; @@ -242,7 +244,7 @@ "familyhub" = ps: with ps; [ ]; # missing inputs: python-family-hub-local "fan" = ps: with ps; [ ]; "fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom - "feedreader" = ps: with ps; [ ]; # missing inputs: feedparser-homeassistant + "feedreader" = ps: with ps; [ feedparser ]; "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; @@ -364,6 +366,7 @@ "huawei_lte" = ps: with ps; [ getmac stringcase url-normalize ]; # missing inputs: huawei-lte-api "huawei_router" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue ]; + "huisbaasje" = ps: with ps; [ ]; # missing inputs: huisbaasje-client "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti @@ -460,7 +463,7 @@ "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy "lutron" = ps: with ps; [ pylutron ]; - "lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta + "lutron_caseta" = ps: with ps; [ ]; # missing inputs: aiolip pylutron-caseta "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed @@ -558,7 +561,7 @@ "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat "nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo - "nuki" = ps: with ps; [ ]; # missing inputs: pynuki + "nuki" = ps: with ps; [ pynuki ]; "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "number" = ps: with ps; [ ]; "nut" = ps: with ps; [ ]; # missing inputs: pynut2 @@ -573,6 +576,7 @@ "ombi" = ps: with ps; [ ]; # missing inputs: pyombi "omnilogic" = ps: with ps; [ ]; # missing inputs: omnilogic "onboarding" = ps: with ps; [ aiohttp-cors pillow ]; + "ondilo_ico" = ps: with ps; [ aiohttp-cors ]; # missing inputs: ondilo "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; "onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async @@ -588,7 +592,7 @@ "opensensemap" = ps: with ps; [ opensensemap-api ]; "opensky" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw - "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv + "openuv" = ps: with ps; [ pyopenuv ]; "openweathermap" = ps: with ps; [ pyowm ]; "opnsense" = ps: with ps; [ pyopnsense ]; "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio @@ -599,7 +603,7 @@ "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; - "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt[mqtt-client] + "ozw" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ]; "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; @@ -620,8 +624,8 @@ "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ aiohttp-cors ]; "plant" = ps: with ps; [ sqlalchemy ]; - "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; - "plugwise" = ps: with ps; [ ]; # missing inputs: plugwise + "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket ]; + "plugwise" = ps: with ps; [ plugwise ]; "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint @@ -636,7 +640,6 @@ "proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen - "ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; "push" = ps: with ps; [ aiohttp-cors ]; "pushbullet" = ps: with ps; [ pushbullet ]; @@ -659,11 +662,11 @@ "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle - "rainmachine" = ps: with ps; [ ]; # missing inputs: regenmaschine + "rainmachine" = ps: with ps; [ regenmaschine ]; "random" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client - "recollect_waste" = ps: with ps; [ ]; # missing inputs: aiorecollect + "recollect_waste" = ps: with ps; [ aiorecollect ]; "recorder" = ps: with ps; [ sqlalchemy ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch "reddit" = ps: with ps; [ praw ]; @@ -741,7 +744,7 @@ "slack" = ps: with ps; [ ]; # missing inputs: slackclient "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api - "sma" = ps: with ps; [ ]; # missing inputs: pysma + "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee "smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab @@ -758,13 +761,13 @@ "solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher - "solax" = ps: with ps; [ ]; # missing inputs: solax + "solax" = ps: with ps; [ solax ]; "soma" = ps: with ps; [ pysoma ]; "somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy "sonarr" = ps: with ps; [ ]; # missing inputs: sonarr "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal - "sonos" = ps: with ps; [ pysonos ]; + "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -898,7 +901,7 @@ "verisure" = ps: with ps; [ jsonpath vsure ]; "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense "version" = ps: with ps; [ pyhaversion ]; - "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync + "vesync" = ps: with ps; [ pyvesync ]; "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client @@ -941,7 +944,7 @@ "x10" = ps: with ps; [ ]; "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi - "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi + "xbox_live" = ps: with ps; [ xboxapi ]; "xeoma" = ps: with ps; [ pyxeoma ]; "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway "xiaomi" = ps: with ps; [ ha-ffmpeg ]; @@ -962,7 +965,7 @@ "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; - "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc + "zerproc" = ps: with ps; [ pyzerproc ]; "zestimate" = ps: with ps; [ xmltodict ]; "zha" = ps: with ps; [ bellows pyserial-asyncio pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac @@ -970,6 +973,7 @@ "zodiac" = ps: with ps; [ ]; "zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ zm-py ]; - "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; + "zwave" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ]; + "zwave_js" = ps: with ps; [ aiohttp-cors ]; # missing inputs: zwave-js-server-python }; } diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 3a6b5d353209..fae857fda5dc 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixosTests, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 +{ stdenv, nixosTests, lib, fetchFromGitHub, python3 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] @@ -57,7 +57,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.1.5"; + hassVersion = "2021.2.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "sha256-xi5rHZlhwgEHll3TFlRu7D963tdcQNMmWcoXVjEFLXo="; + sha256 = "0s1jcd94wwvmvzq86w8s9dwfvnmjs9l661z9pc6kwgagggjjgd8c"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -84,49 +84,76 @@ in with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "aiohttp==3.7.1" "aiohttp>=3.6.3" \ --replace "attrs==19.3.0" "attrs>=19.3.0" \ --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \ --replace "cryptography==3.2" "cryptography" \ --replace "pip>=8.0.3,<20.3" "pip" \ - --replace "requests==2.25.0" "requests>=2.24.0" \ + --replace "pytz>=2020.5" "pytz>=2020.4" \ + --replace "pyyaml==5.4.1" "pyyaml" \ + --replace "requests==2.25.1" "requests>=2.25.0" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; propagatedBuildInputs = [ - # From setup.py - aiohttp astral async-timeout attrs bcrypt certifi ciso8601 httpx jinja2 - pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml - setuptools voluptuous voluptuous-serialize yarl - # From default_config. frontend, http, image, mobile_app and recorder components as well as - # the auth.mfa_modules.totp module - aiohttp-cors defusedxml distro emoji hass-frontend pynacl pillow pyotp - pyqrcode sqlalchemy + # Only packages required in setup.py + hass-frontend + aiohttp + astral + async-timeout + attrs + awesomeversion + bcrypt + certifi + ciso8601 + cryptography + hass-frontend + httpx + jinja2 + pip + pyjwt + python-slugify + pytz + pyyaml + requests + ruamel_yaml + voluptuous + voluptuous-serialize + yarl ] ++ componentBuildInputs ++ extraBuildInputs; # upstream only tests on Linux, so do we. doCheck = stdenv.isLinux; checkInputs = [ - asynctest pytestCheckHook pytest-aiohttp pytest_xdist requests-mock hass-nabucasa netdisco pydispatcher - ]; + # test infrastructure + asynctest + pytest-aiohttp + pytest-xdist + pytestCheckHook + requests-mock + # component dependencies + pyotp + ] ++ lib.concatMap (component: getPackages component py.pkgs) componentTests; # We cannot test all components, since they'd introduce lots of dependencies, some of which are unpackaged, # but we should test very common stuff, like what's in `default_config`. + # https://github.com/home-assistant/core/commits/dev/homeassistant/components/default_config/manifest.json componentTests = [ "api" "automation" "config" "configurator" + "counter" "default_config" "demo" + "dhcp" "discovery" "frontend" "group" "history" "homeassistant" "http" + "hue" "input_boolean" "input_datetime" "input_text" @@ -145,42 +172,34 @@ in with py.pkgs; buildPythonApplication rec { "system_health" "system_log" "tag" + "timer" + "webhook" "websocket_api" "zeroconf" "zone" + "zwave" ]; pytestFlagsArray = [ - "-n auto" + # limit amout of runners to reduce race conditions + "-n 2" + # assign tests grouped by file to workers + "--dist loadfile" # don't bulk test all components "--ignore tests/components" - # prone to race conditions due to parallel file access - "--ignore tests/test_config.py" - # tries to import unpackaged dependencies - "--ignore tests/test_loader.py" # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0 "--ignore tests/auth/mfa_modules/test_notify.py" "tests" ] ++ map (component: "tests/components/" + component) componentTests; disabledTests = [ - # AssertionError: merge_log_err.call_count != 0 + # AssertionError: assert 1 == 0 "test_merge" # ModuleNotFoundError: No module named 'pyqwikswitch' "test_merge_id_schema" - # AssertionError: assert 'unknown' == 'not_home' - "test_device_tracker_not_home" - # Racy https://github.com/home-assistant/core/issues/41425 - "test_cached_event_message" - # ValueError: count must be a positive integer (got 0) - "test_media_view" - # AssertionError: len(events) == 1 - "test_error_posted_as_event" # keyring.errors.NoKeyringError: No recommended backend was available. "test_secrets_from_unrelated_fails" "test_secrets_credstash" - # RuntimeError: Event loop is closed - "test_remove_older_logs" ]; preCheck = '' diff --git a/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 9606f8645a1d..812f4d096cef 100644 --- a/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20201229.1"; + version = "20210127.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3JMWugAiVDq/NBgX8ft2Bchim2g493jy7wZvvXrX+Ws="; + sha256 = "sha256-N+n1DI1oZ/j+GydH+Du21zTNA6leW4YBri7cAMvAac4="; }; # there is nothing to strip in this package diff --git a/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py index 55e58d7a017f..eeb117a984e4 100755 --- a/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py +++ b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ mypy attrs ]) +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ mypy attrs packaging rich ]) # # This script downloads Home Assistant's source tarball. # Inside the homeassistant/components directory, each integration has an associated manifest.json, @@ -26,6 +26,9 @@ import tempfile from io import BytesIO from typing import Dict, Optional, Set, Any from urllib.request import urlopen +from packaging import version as Version +from rich.console import Console +from rich.table import Table COMPONENT_PREFIX = "homeassistant.components" PKG_SET = "python3Packages" @@ -142,12 +145,20 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional return None +def get_pkg_version(package: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: + pkg = packages.get(f"{PKG_SET}.{package}", None) + if not pkg: + return None + return pkg["version"] + + def main() -> None: packages = dump_packages() version = get_version() print("Generating component-packages.nix for version {}".format(version)) components = parse_components(version=version) build_inputs = {} + outdated = {} for component in sorted(components.keys()): attr_paths = [] missing_reqs = [] @@ -156,8 +167,14 @@ def main() -> None: # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0 # Therefore, if there's a "#" in the line, only take the part after it req = req[req.find("#") + 1 :] - name = req.split("==")[0] + name, required_version = req.split("==", maxsplit=1) attr_path = name_to_attr_path(name, packages) + if our_version := get_pkg_version(name, packages): + if Version.parse(our_version) < Version.parse(required_version): + outdated[name] = { + 'wanted': required_version, + 'current': our_version + } if attr_path is not None: # Add attribute path without "python3Packages." prefix attr_paths.append(attr_path[len(PKG_SET + ".") :]) @@ -189,6 +206,17 @@ def main() -> None: f.write(" };\n") f.write("}\n") + if outdated: + table = Table(title="Outdated dependencies") + table.add_column("Package") + table.add_column("Current") + table.add_column("Wanted") + for package, version in sorted(outdated.items()): + table.add_row(package, version['current'], version['wanted']) + + console = Console() + console.print(table) + if __name__ == "__main__": run_mypy() diff --git a/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix index de3f58fc06f3..72c6286af3f2 100644 --- a/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2"; + sha256 = "sha256-/4jA5acNpHpdQ9kb/1A9thtoUCqsYFxSCr4JLmFYdt4="; }; nativeBuildInputs = [ cmake doxygen pkg-config ]; diff --git a/nixpkgs/pkgs/servers/http/envoy/default.nix b/nixpkgs/pkgs/servers/http/envoy/default.nix index c297ea382459..3a4535281513 100644 --- a/nixpkgs/pkgs/servers/http/envoy/default.nix +++ b/nixpkgs/pkgs/servers/http/envoy/default.nix @@ -56,7 +56,7 @@ buildBazelPackage rec { ]; fetchAttrs = { - sha256 = "sha256-mct7anzErY9eSujZyGORfRJqzAO9XuFAv04DS8VRZKM="; + sha256 = "0q72c2zrl5vc8afkhkwyalb2h0mxn3133d4b9z4gag0p95wbwgc0"; dontUseCmakeConfigure = true; preInstall = '' # Strip out the path to the build location (by deleting the comment line). diff --git a/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix b/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix index 0174f8af43f5..c5ca1bf20a74 100644 --- a/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix +++ b/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.30.0"; + version = "1.34.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "0gn5lwn1lk1ghv6lw0fvax0m829w09mmq8flbmcxvszfyv7x0rix"; + sha256 = "sha256-bJ9BQbAe35z5cIw0HhFjM6arWf1Tdy4gRipAHywxZZk="; }; - vendorSha256 = "08zma4b58b9132h41m6frbdi502yima9lkpab87fi0q5r6qwhf1z"; + vendorSha256 = "sha256-amPL0gzvqsacj7+UNJeZOQbeiBESUttbtPHxLpDykRI="; subPackages = [ "." ]; doCheck = false; # Broken diff --git a/nixpkgs/pkgs/servers/http/hyp/default.nix b/nixpkgs/pkgs/servers/http/hyp/default.nix index 52f345d54771..1faa85cfc141 100644 --- a/nixpkgs/pkgs/servers/http/hyp/default.nix +++ b/nixpkgs/pkgs/servers/http/hyp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages }: +{ lib, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { pname = "hyp-server"; diff --git a/nixpkgs/pkgs/servers/http/jetty/default.nix b/nixpkgs/pkgs/servers/http/jetty/default.nix index d6207e79554c..d95740b6d153 100644 --- a/nixpkgs/pkgs/servers/http/jetty/default.nix +++ b/nixpkgs/pkgs/servers/http/jetty/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.35.v20201120"; + version = "9.4.36.v20210114"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; - name = "jetty-distribution-${version}.tar.gz"; - sha256 = "1cpdrqz6wi7fd228lh4ijs82jq51qr5aym6vff464w3y2sd0jbav"; + sha256 = "1bsqxzjcdgdg2qdgc64pvrimkn9j2di2s3prlgdpbwi566744q54"; }; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; installPhase = '' mkdir -p $out diff --git a/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/nixpkgs/pkgs/servers/http/lighttpd/default.nix index afc7c5c7453a..be631dd341e9 100644 --- a/nixpkgs/pkgs/servers/http/lighttpd/default.nix +++ b/nixpkgs/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.58"; + name = "lighttpd-1.4.59"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "sha256-Jn/v/aE6GQ69znsVFy2L4W2pgAhFfzD93s1ygy0SbQ4="; + sha256 = "sha256-+5U9snPa7wjttuICVWyuij0H7tYIHJa9mQPblX0QhNU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/http/nginx/modules.nix b/nixpkgs/pkgs/servers/http/nginx/modules.nix index 71bc969bbea6..0725b674a391 100644 --- a/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -22,6 +22,17 @@ in fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge"; ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth"; + akamai-token-validate = { + src = fetchFromGitHub { + name = "akamai-token-validate"; + owner = "kaltura"; + repo = "nginx-akamai-token-validate-module"; + rev = "34fd0c94d2c43c642f323491c4f4a226cd83b962"; + sha256 = "0yf34s11vgkcl03wbl6gjngm3p9hs8vvm7hkjkwhjh39vkk2a7cy"; + }; + inputs = [ pkgs.openssl ]; + }; + aws-auth = { src = fetchFromGitHub { name = "aws-auth"; @@ -320,6 +331,17 @@ in }; }; + secure-token = { + src = fetchFromGitHub { + name = "secure-token"; + owner = "kaltura"; + repo = "nginx-secure-token-module"; + rev = "95bdc0d1aca06ea7fe42555f71e65910bd74914d"; + sha256 = "19wzck1xzq4kz7nyabcwzlank1k7wi7w2wn2c1mwz374c79g8ggp"; + }; + inputs = [ pkgs.openssl ]; + }; + set-misc = { src = fetchFromGitHub { name = "set-misc"; @@ -370,6 +392,16 @@ in }; }; + spnego-http-auth = { + src = fetchFromGitHub { + name = "spnego-http-auth"; + owner = "stnoonan"; + repo = "spnego-http-auth-nginx-module"; + rev = "72c8ee04c81f929ec84d5a6d126f789b77781a8c"; + sha256 = "05rw3a7cv651951li995r5l1yzz6kwkm2xpbd59jsfzd74bw941i"; + }; + }; + statsd = { src = fetchFromGitHub { name = "statsd"; @@ -462,6 +494,17 @@ in inputs = [ pkgs.ffmpeg_3 ]; }; + vod = { + src = fetchFromGitHub { + name = "vod"; + owner = "kaltura"; + repo = "nginx-vod-module"; + rev = "e46079f51282d5a378e6911714b5f3a533bb7700"; + sha256 = "0pzzq4xcq7jg8mxwnz7srj1nczg9ajd1b8q58qlm03lny8nd2hr5"; + }; + inputs = [ pkgs.ffmpeg_3 pkgs.fdk_aac pkgs.openssl pkgs.libxml2 pkgs.libiconv ]; + }; + vts = { src = fetchFromGitHub { name = "vts"; diff --git a/nixpkgs/pkgs/servers/hydron/default.nix b/nixpkgs/pkgs/servers/hydron/default.nix index 8b950ec12c54..41c69bde2852 100644 --- a/nixpkgs/pkgs/servers/hydron/default.nix +++ b/nixpkgs/pkgs/servers/hydron/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }: buildGoModule rec { pname = "hydron"; diff --git a/nixpkgs/pkgs/servers/icingaweb2/default.nix b/nixpkgs/pkgs/servers/icingaweb2/default.nix index eaf16e388048..e7d9b1a2847b 100644 --- a/nixpkgs/pkgs/servers/icingaweb2/default.nix +++ b/nixpkgs/pkgs/servers/icingaweb2/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { +{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: + +stdenv.mkDerivation rec { pname = "icingaweb2"; version = "2.8.2"; @@ -16,10 +18,10 @@ cp -ra application bin etc library modules public $out cp -ra doc $out/share - wrapProgram $out/bin/icingacli --prefix PATH : "${makeBinPath [ php ]}" + wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php ]}" ''; - meta = { + meta = with lib; { description = "Webinterface for Icinga 2"; longDescription = '' A lightweight and extensible web interface to keep an eye on your environment. diff --git a/nixpkgs/pkgs/servers/icingaweb2/theme-april/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-april/default.nix index 7c592fca33b6..0a152a7e157e 100644 --- a/nixpkgs/pkgs/servers/icingaweb2/theme-april/default.nix +++ b/nixpkgs/pkgs/servers/icingaweb2/theme-april/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-april"; version = "1.0.4"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Icingaweb2 theme for april fools"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-april"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/servers/icingaweb2/theme-lsd/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-lsd/default.nix index 273bcf6945d9..59b8df6b4d42 100644 --- a/nixpkgs/pkgs/servers/icingaweb2/theme-lsd/default.nix +++ b/nixpkgs/pkgs/servers/icingaweb2/theme-lsd/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-lsd"; version = "1.0.3"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Psychadelic theme for IcingaWeb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-lsd"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/servers/icingaweb2/theme-particles/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-particles/default.nix index 3d28481cd84e..ddd363701a7c 100644 --- a/nixpkgs/pkgs/servers/icingaweb2/theme-particles/default.nix +++ b/nixpkgs/pkgs/servers/icingaweb2/theme-particles/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-particles"; version = "1.0.0"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "This theme adds a nice particle effect to the login screen of Icingaweb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-particles"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/servers/icingaweb2/theme-snow/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-snow/default.nix index 941138bb0a52..5650d1ccdba8 100644 --- a/nixpkgs/pkgs/servers/icingaweb2/theme-snow/default.nix +++ b/nixpkgs/pkgs/servers/icingaweb2/theme-snow/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-snow"; version = "1.0.0"; @@ -20,7 +25,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Snow theme for Icingaweb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-snow"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/servers/icingaweb2/theme-spring/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-spring/default.nix index a21f6cc89a25..dda26caf6a19 100644 --- a/nixpkgs/pkgs/servers/icingaweb2/theme-spring/default.nix +++ b/nixpkgs/pkgs/servers/icingaweb2/theme-spring/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-spring"; version = "1.0.0"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Theme with some soft colors and nice background images loaded from unsplash.com"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-spring"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/servers/icingaweb2/theme-unicorn/default.nix b/nixpkgs/pkgs/servers/icingaweb2/theme-unicorn/default.nix index a43f7d7c09ad..a2bb3f9e4a2b 100644 --- a/nixpkgs/pkgs/servers/icingaweb2/theme-unicorn/default.nix +++ b/nixpkgs/pkgs/servers/icingaweb2/theme-unicorn/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-unicorn"; version = "1.0.2"; @@ -35,7 +41,7 @@ cp unicorn.png "$out/public/img/unicorn.png" ''; - meta = { + meta = with lib; { description = "Unicorn theme for IcingaWeb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-unicorn"; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix b/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix index b383135f2eb5..ee759ac55ea1 100644 --- a/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix +++ b/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "nullidentdmod"; version = "1.3"; diff --git a/nixpkgs/pkgs/servers/irc/ngircd/default.nix b/nixpkgs/pkgs/servers/irc/ngircd/default.nix index b89837e5942d..870a7836fe4f 100644 --- a/nixpkgs/pkgs/servers/irc/ngircd/default.nix +++ b/nixpkgs/pkgs/servers/irc/ngircd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ngircd"; - version = "26"; + version = "26.1"; src = fetchurl { url = "https://ngircd.barton.de/pub/ngircd/${pname}-${version}.tar.xz"; - sha256 = "1ijmv18fa648y7apxb9vp4j9iq6fxq850kz5v36rysaq614cdp2n"; + sha256 = "sha256-VcFv0mAJ9vxqAH3076yHoC4SL2gGEs2hzibhehjYYlQ="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/servers/irc/robustirc-bridge/default.nix b/nixpkgs/pkgs/servers/irc/robustirc-bridge/default.nix index d0b192010c10..2530c72cbb9d 100644 --- a/nixpkgs/pkgs/servers/irc/robustirc-bridge/default.nix +++ b/nixpkgs/pkgs/servers/irc/robustirc-bridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "robustirc-bridge"; diff --git a/nixpkgs/pkgs/servers/isso/default.nix b/nixpkgs/pkgs/servers/isso/default.nix index 4680c37c85e3..4db8ac1f4034 100644 --- a/nixpkgs/pkgs/servers/isso/default.nix +++ b/nixpkgs/pkgs/servers/isso/default.nix @@ -1,18 +1,16 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { pname = "isso"; - # Can not use 0.12.2 because of: - # https://github.com/posativ/isso/issues/617 - version = "unstable-2020-09-14"; + version = "0.12.4"; # no tests on PyPI src = fetchFromGitHub { owner = "posativ"; repo = pname; - rev = "f4d2705d4f1b51f444d0629355a6fcbcec8d57b5"; - sha256 = "02jgfzq3svd54zj09jj7lm2r7ypqqjynzxa9dgnnm0pqvq728wzr"; + rev = version; + sha256 = "16wjpz8r74fzjvzhl6by3sjc2g1riz8lh59ccgp14bns1yhsh2yi"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/kapowbang/default.nix b/nixpkgs/pkgs/servers/kapowbang/default.nix index b52018b64f4c..94a1832bd8d3 100644 --- a/nixpkgs/pkgs/servers/kapowbang/default.nix +++ b/nixpkgs/pkgs/servers/kapowbang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kapowbang"; diff --git a/nixpkgs/pkgs/servers/keycloak/default.nix b/nixpkgs/pkgs/servers/keycloak/default.nix index 91234cdb4100..468904b3f0d0 100644 --- a/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "11.0.3"; + version = "12.0.2"; src = fetchzip { - url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "15fw49rhnjky108hh71dkdlafd0ajr1n13vhivqcw6c18zvyan35"; + url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; + sha256 = "006k6ac00iz61s6hi3wzj6w71mhhv7n00vh82ak4yhwr97jffqbz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/klipper/default.nix b/nixpkgs/pkgs/servers/klipper/default.nix index 9c44dabe3df9..23b44be0316a 100644 --- a/nixpkgs/pkgs/servers/klipper/default.nix +++ b/nixpkgs/pkgs/servers/klipper/default.nix @@ -2,16 +2,17 @@ , lib , fetchFromGitHub , python2 +, unstableGitUpdater }: stdenv.mkDerivation rec { name = "klipper"; - version = "0.9.1"; + version = "unstable-2021-01-31"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "v${version}"; - sha256 = "1wgklngsz6xxl25qxi9fkqhbyhwy61iyyk76ycq68b3miayrkgpj"; + rev = "ef4d9c3abd30ae8a485020fd9ff2fb4529a143b3"; + sha256 = "puAkSGL0DD0JUWejPdzr7zKIW2UP2soBBtgm2msUKzA="; }; sourceRoot = "source/klippy"; @@ -39,6 +40,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + meta = with lib; { description = "The Klipper 3D printer firmware"; homepage = "https://github.com/KevinOConnor/klipper"; diff --git a/nixpkgs/pkgs/servers/limesurvey/default.nix b/nixpkgs/pkgs/servers/limesurvey/default.nix index 261285341c42..e71ff33e2f9d 100644 --- a/nixpkgs/pkgs/servers/limesurvey/default.nix +++ b/nixpkgs/pkgs/servers/limesurvey/default.nix @@ -37,5 +37,10 @@ stdenv.mkDerivation rec { homepage = "https://www.limesurvey.org"; maintainers = with maintainers; [offline]; platforms = with platforms; unix; + knownVulnerabilities = [ + # https://github.com/LimeSurvey/LimeSurvey/blob/3.x-LTS/docs/release_notes.txt + "Unauthorized access to statistics of a survey with certain permission configurations" + "Persistent XSS in browse response" + ]; }; } diff --git a/nixpkgs/pkgs/servers/livepeer/default.nix b/nixpkgs/pkgs/servers/livepeer/default.nix index acfa1aa2c3fb..a016c8e7f099 100644 --- a/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/nixpkgs/pkgs/servers/livepeer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule +{ lib, fetchFromGitHub, buildGoModule , pkg-config, ffmpeg, gnutls }: diff --git a/nixpkgs/pkgs/servers/maddy/default.nix b/nixpkgs/pkgs/servers/maddy/default.nix new file mode 100644 index 000000000000..ac3c075717ce --- /dev/null +++ b/nixpkgs/pkgs/servers/maddy/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "maddy"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "foxcpp"; + repo = "maddy"; + rev = "v${version}"; + sha256 = "1mi607hl4c9y9xxv5lywh9fvpybprlrgqa7617km9rssbgk4x1v7"; + }; + + vendorSha256 = "16laf864789yiakvqs6dy3sgnnp2hcdbyzif492wcijqlir2swv7"; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ]; + + subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; + + meta = with lib; { + description = "Composable all-in-one mail server"; + homepage = "https://foxcpp.dev/maddy"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lxea ]; + }; +} diff --git a/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 0b61a779c483..eb3f8bf19cb7 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64, sqlite }: -stdenv.mkDerivation { +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }: +stdenv.mkDerivation rec { pname = "fts-xapian"; - version = "1.3.1"; + version = "1.4.7"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; - rev = "1.3.1"; - sha256 = "10yl5fyfbx2ijqckx13vbmzj9mpm5pkh8qzichbdgplrzm738q43"; + rev = version; + sha256 = "K2d1FFAilIggNuP0e698s+9bN08x2s/0Jryp7pmeixc="; }; - buildInputs = [ dovecot xapian icu64 sqlite ]; + buildInputs = [ dovecot xapian icu64 ]; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; diff --git a/nixpkgs/pkgs/servers/mail/mailhog/default.nix b/nixpkgs/pkgs/servers/mail/mailhog/default.nix index f1ba497720a9..674fdbabb4eb 100644 --- a/nixpkgs/pkgs/servers/mail/mailhog/default.nix +++ b/nixpkgs/pkgs/servers/mail/mailhog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "MailHog"; diff --git a/nixpkgs/pkgs/servers/mail/mailman/default.nix b/nixpkgs/pkgs/servers/mail/mailman/default.nix index 57ceee948b50..9a86cc31fdd8 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/default.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython +{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources , zope_component, lynx, postfix, authheaders, gunicorn diff --git a/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix index 58ef52e9c26d..00cf2c1e83c0 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock +{ lib, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 , django-haystack, flufl_lock, networkx, dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q diff --git a/nixpkgs/pkgs/servers/mail/mailman/postorius.nix b/nixpkgs/pkgs/servers/mail/mailman/postorius.nix index ab8ad4440ab6..9330de3a8f38 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/postorius.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/postorius.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock +{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock , django-mailman3, mailmanclient, readme_renderer }: diff --git a/nixpkgs/pkgs/servers/mail/postfix/default.nix b/nixpkgs/pkgs/servers/mail/postfix/default.nix index deea480b2f71..6862507c6296 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.5.8"; + version = "3.5.9"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "0vs50z5p5xcrdbbkb0dnbx1sk5fx8d2z97sw2p2iip1yrwl2cn12"; + sha256 = "0avn00drmk9c9mjynfvcmir72ss9s3mckdhjm3mmnhas2sixbkji"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix b/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix index 1c92a4a76764..800a69e95096 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages }: +{ lib, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "pflogsumm"; diff --git a/nixpkgs/pkgs/servers/mail/postgrey/default.nix b/nixpkgs/pkgs/servers/mail/postgrey/default.nix index d0eaf40d06c7..07b351bfb216 100644 --- a/nixpkgs/pkgs/servers/mail/postgrey/default.nix +++ b/nixpkgs/pkgs/servers/mail/postgrey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, lib, runCommand, postfix }: +{ fetchurl, perlPackages, lib, runCommand, postfix }: let mk-perl-flags = inputs: lib.concatStringsSep " " (map (dep: "-I ${dep}/${perlPackages.perl.libPrefix}") inputs); diff --git a/nixpkgs/pkgs/servers/mail/postsrsd/default.nix b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix index 978a3f6216bc..2ba07ee5739e 100644 --- a/nixpkgs/pkgs/servers/mail/postsrsd/default.nix +++ b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "postsrsd"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "roehling"; repo = "postsrsd"; rev = version; - sha256 = "0kmdm8nwb40cs4wvxv2kapjbiy4h6924zmx8h1kk7j3j9yjshl1p"; + sha256 = "sha256-AqOHHOnGqOnIw5hPPiJjUJFiwngTux7gwn8qig0t7hs="; }; cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ]; diff --git a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix index c5980bc8889e..ff96f0e7c827 100644 --- a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix +++ b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, makeWrapper, gnupg }: +{ lib, fetchurl, perlPackages, makeWrapper, gnupg }: perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; diff --git a/nixpkgs/pkgs/servers/mastodon/default.nix b/nixpkgs/pkgs/servers/mastodon/default.nix new file mode 100644 index 000000000000..8508fbe8f78b --- /dev/null +++ b/nixpkgs/pkgs/servers/mastodon/default.nix @@ -0,0 +1,112 @@ +{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv +, yarn, callPackage, imagemagick, ffmpeg, file, ruby_2_7 + + # Allow building a fork or custom version of Mastodon: +, pname ? "mastodon" +, version ? import ./version.nix +, srcOverride ? null +, dependenciesDir ? ./. # Should contain gemset.nix, yarn.nix and package.json. +}: + +stdenv.mkDerivation rec { + inherit pname version; + + # Using overrideAttrs on src does not build the gems and modules with the overridden src. + # Putting the callPackage up in the arguments list also does not work. + src = if srcOverride != null then srcOverride else callPackage ./source.nix {}; + + mastodon-gems = bundlerEnv { + name = "${pname}-gems-${version}"; + inherit version; + ruby = ruby_2_7; + gemdir = src; + gemset = dependenciesDir + "/gemset.nix"; + # This fix (copied from https://github.com/NixOS/nixpkgs/pull/76765) replaces the gem + # symlinks with directories, resolving this error when running rake: + # /nix/store/451rhxkggw53h7253izpbq55nrhs7iv0-mastodon-gems-3.0.1/lib/ruby/gems/2.6.0/gems/bundler-1.17.3/lib/bundler/settings.rb:6:in `<module:Bundler>': uninitialized constant Bundler::Settings (NameError) + postBuild = '' + for gem in "$out"/lib/ruby/gems/*/gems/*; do + cp -a "$gem/" "$gem.new" + rm "$gem" + # needed on macOS, otherwise the mv yields permission denied + chmod +w "$gem.new" + mv "$gem.new" "$gem" + done + ''; + }; + + mastodon-js-modules = mkYarnPackage { + pname = "${pname}-modules"; + yarnNix = dependenciesDir + "/yarn.nix"; + packageJSON = dependenciesDir + "/package.json"; + inherit src version; + }; + + mastodon-assets = stdenv.mkDerivation { + pname = "${pname}-assets"; + inherit src version; + + buildInputs = [ + mastodon-gems nodejs-slim yarn + ]; + + # FIXME: "production" would require OTP_SECRET to be set, so we use + # development here. + RAILS_ENV = "development"; + + buildPhase = '' + # Support Mastodon forks which don't call themselves 'mastodon' or which + # omit the organization name from package.json. + if [ "$(ls ${mastodon-js-modules}/libexec/* | grep node_modules)" ]; then + cp -r ${mastodon-js-modules}/libexec/*/node_modules node_modules + else + cp -r ${mastodon-js-modules}/libexec/*/*/node_modules node_modules + fi + chmod -R u+w node_modules + rake webpacker:compile + ''; + + installPhase = '' + mkdir -p $out/public + cp -r public/assets $out/public + cp -r public/packs $out/public + ''; + }; + + passthru.updateScript = callPackage ./update.nix {}; + + buildPhase = '' + if [ "$(ls ${mastodon-js-modules}/libexec/* | grep node_modules)" ]; then + ln -s ${mastodon-js-modules}/libexec/*/node_modules node_modules + else + ln -s ${mastodon-js-modules}/libexec/*/*/node_modules node_modules + fi + ln -s ${mastodon-assets}/public/assets public/assets + ln -s ${mastodon-assets}/public/packs public/packs + + patchShebangs bin/ + for b in $(ls ${mastodon-gems}/bin/) + do + if [ ! -f bin/$b ]; then + ln -s ${mastodon-gems}/bin/$b bin/$b + fi + done + + rm -rf log + ln -s /var/log/mastodon log + ln -s /tmp tmp + ''; + propagatedBuildInputs = [ imagemagick ffmpeg file mastodon-gems.wrappedRuby ]; + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; + + meta = with lib; { + description = "Self-hosted, globally interconnected microblogging software based on ActivityPub"; + homepage = "https://joinmastodon.org"; + license = licenses.agpl3Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ petabyteboy happy-river erictapen ]; + }; +} diff --git a/nixpkgs/pkgs/servers/mastodon/gemset.nix b/nixpkgs/pkgs/servers/mastodon/gemset.nix new file mode 100644 index 000000000000..07aeb0bc9c4b --- /dev/null +++ b/nixpkgs/pkgs/servers/mastodon/gemset.nix @@ -0,0 +1,3006 @@ +{ + actioncable = { + dependencies = ["actionpack" "nio4r" "websocket-driver"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yvrnxvdzx3yvgkxwzffhkr8m4w19h97lyyj030g1q4xjii5a1kr"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + actionmailer = { + dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nhslq95il78h7qv7w7h7i9fx3znc5hxmqbnws0sl9w7am7zkl8x"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d8gxymshjhva5fyv33iy2hzp4jm3i44asdbma9pv9wzpl5fwhn0"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + actionview = { + dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k8dgkplqj76i3q1f8897m8svj2xggd1knhy3bcwfl4nh7998kw6"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + active_model_serializers = { + dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p8rhy2bw86d0l3d0l97zj179yqzl338v7r5pvl8mdagcrp2fw9i"; + type = "gem"; + }; + version = "0.10.10"; + }; + active_record_query_trace = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19888wjdpqvr2kaci6v6jyjw9pjf682zb1iyx2lz12mpdmy3500n"; + type = "gem"; + }; + version = "1.8"; + }; + activejob = { + dependencies = ["activesupport" "globalid"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w32z0s111cr95mwpdb3fnlzaf1vdz0ag3l2gah9m95kfa2pb2kv"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + activemodel = { + dependencies = ["activesupport"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g79l7v0ddpxcj5r2s9kii6h4r4nbpy5bksbqi5lxvivrb3pkz1m"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport" "arel"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05b9l85a31cq6g7v4b4ifrj798q49rlidcvvfasmb3bk412wlp03"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + activestorage = { + dependencies = ["actionpack" "activerecord" "marcel"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yzig9p9qb2wx91y0d0vs7bz23hli6djwwf4cawxh6b93bycbcci"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; + }; + airbrussh = { + dependencies = ["sshkit"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16lmd6173gvhcpzj1blracx6hhlqjmmmmi4rh5y4lz6c87vg51lp"; + type = "gem"; + }; + version = "1.4.0"; + }; + android_key_attestation = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02spc1sh7zsljl02v9d5rdb717b628vw2k7jkkplifyjk4db0zj6"; + type = "gem"; + }; + version = "0.3.0"; + }; + annotate = { + dependencies = ["activerecord" "rake"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dxrfppwfg13vqmambbs56xjj8qsdgcy58r2yc44vvy3z1g5yflw"; + type = "gem"; + }; + version = "3.1.1"; + }; + arel = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; + type = "gem"; + }; + version = "9.0.0"; + }; + ast = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; + type = "gem"; + }; + version = "2.4.1"; + }; + attr_encrypted = { + dependencies = ["encryptor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg"; + type = "gem"; + }; + version = "3.1.0"; + }; + av = { + dependencies = ["cocaine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1swakpybf6g0nzfdn6q4s9c97ysc3i4ffk84dw8v2321fpvc8gqq"; + type = "gem"; + }; + version = "0.9.0"; + }; + awrence = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zwdli370jfsj6jypv7vrqf4vv4ac4784faw7ar5v88fk4q9rcv"; + type = "gem"; + }; + version = "1.1.1"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pqgnc4pcwdvvxlclmyjwcaf0vmlciy0l9y1yab5f1f0fjn969fs"; + type = "gem"; + }; + version = "1.397.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8w8qqrmx91ngw9b8dr1zx2h2g071kjd1973w9fk2486gs0n44f"; + type = "gem"; + }; + version = "3.109.3"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a"; + type = "gem"; + }; + version = "1.39.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ak4kz8x7l0qfadx4p09iky1gbf6ka3wa66rnvc7rn3sf1k80zjm"; + type = "gem"; + }; + version = "1.85.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; + type = "gem"; + }; + version = "1.2.2"; + }; + bcrypt = { + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; + type = "gem"; + }; + version = "3.1.16"; + }; + better_errors = { + dependencies = ["coderay" "erubi" "rack"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11220lfzhsyf5fcril3qd689kgg46qlpiiaj00hc9mh4mcbc3vrr"; + type = "gem"; + }; + version = "2.9.1"; + }; + bindata = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic"; + type = "gem"; + }; + version = "2.4.8"; + }; + binding_of_caller = { + dependencies = ["debug_inspector"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; + type = "gem"; + }; + version = "0.8.0"; + }; + blurhash = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04halkacf3pd030s3bqfjd59vbj47lchrhp9zvwsn4c6sdrfjdd4"; + type = "gem"; + }; + version = "0.1.4"; + }; + bootsnap = { + dependencies = ["msgpack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qx1f729bgh391agsqb4ngzn22wdn4cc6mkp0cipf0d5hsg9cpaq"; + type = "gem"; + }; + version = "1.5.1"; + }; + brakeman = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pbr3drisii8j8wdvxhvd7kmpqwcgzayl99kzkjnpl1p27vpvvvv"; + type = "gem"; + }; + version = "4.10.0"; + }; + browser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q1yzvbqp0mykswipq3w00ljw9fgkhjfrij3hkwi7cx85r14n6gw"; + type = "gem"; + }; + version = "4.2.0"; + }; + builder = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + bullet = { + dependencies = ["activesupport" "uniform_notifier"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18ifwnvn13755qkfigapyj5bflpby3phxzbb7x5336d0kzv5k7d9"; + type = "gem"; + }; + version = "6.1.0"; + }; + bundler-audit = { + dependencies = ["thor"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j"; + type = "gem"; + }; + version = "0.7.0.1"; + }; + byebug = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; + type = "gem"; + }; + version = "11.1.3"; + }; + capistrano = { + dependencies = ["airbrussh" "i18n" "rake" "sshkit"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13k2k29y8idcacr0r4ycixpb7mvv2v88dilwzdmaw9r08wc8y9bl"; + type = "gem"; + }; + version = "3.14.1"; + }; + capistrano-bundler = { + dependencies = ["capistrano"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "168kyi0gv2s84jm533m8rg0dii50flr06n6s2ci6kzsib3n9n8dr"; + type = "gem"; + }; + version = "2.0.1"; + }; + capistrano-rails = { + dependencies = ["capistrano" "capistrano-bundler"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13fnicx9fkilgvlapjmdglcs3yjll0brx3bp4mbi3sixxcm6vy9r"; + type = "gem"; + }; + version = "1.6.1"; + }; + capistrano-rbenv = { + dependencies = ["capistrano" "sshkit"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x9m1i5zd0wx122zw3m40zprlmxk9d47bd6w61k81wr4qsvkk3rw"; + type = "gem"; + }; + version = "2.2.0"; + }; + capistrano-yarn = { + dependencies = ["capistrano"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zdg2s061vl5b8114n909mrjb2hc1qx0i4wqx9nacsrcjgyp07l9"; + type = "gem"; + }; + version = "2.0.2"; + }; + capybara = { + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ji9kyb01dpnjbvpyb0c481cpnisd6wx6div6rywi9fihk66627w"; + type = "gem"; + }; + version = "3.33.0"; + }; + case_transform = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fzyws6spn5arqf6q604dh9mrj84a36k5hsc8z7jgcpfvhc49bg2"; + type = "gem"; + }; + version = "0.2"; + }; + cbor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3"; + type = "gem"; + }; + version = "0.5.9.6"; + }; + charlock_holmes = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + type = "gem"; + }; + version = "0.7.7"; + }; + chewy = { + dependencies = ["activesupport" "elasticsearch" "elasticsearch-dsl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dczmxh09s0s8d2l111zdb49s0c6wa1s09dslh8prqms6r4n544f"; + type = "gem"; + }; + version = "5.1.0"; + }; + chunky_png = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0av5km25hxz21zkbnvac1g8hjskwhr1gvb3rhlcnjvhqq8cvz2lj"; + type = "gem"; + }; + version = "1.3.12"; + }; + cld3 = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04hwr44m7x7vv55lc4vk5zcd6zq98c2asvzl3dh2adg1fhpk29nr"; + type = "gem"; + }; + version = "3.3.0"; + }; + climate_control = { + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q11v0iabvr6rif0d025xh078ili5frrihlj0m04zfg7lgvagxji"; + type = "gem"; + }; + version = "0.2.0"; + }; + cocaine = { + dependencies = ["climate_control"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01kk5xd7lspbkdvn6nyj0y51zhvia3z6r4nalbdcqw5fbsywwi7d"; + type = "gem"; + }; + version = "0.5.8"; + }; + coderay = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; + type = "gem"; + }; + version = "1.1.3"; + }; + color_diff = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01dpvqlzybpb3pkcwd9ik5sbjw283618ywvdphxslhiy8ps3kp4r"; + type = "gem"; + }; + version = "0.1"; + }; + concurrent-ruby = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + type = "gem"; + }; + version = "1.1.7"; + }; + connection_pool = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qikl4av1z8kqnk5ba18136dpqzw8wjawc2w9b4zb5psdd5z8nwf"; + type = "gem"; + }; + version = "2.2.3"; + }; + cose = { + dependencies = ["cbor" "openssl-signature_algorithm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h1vcirk1vpr992xmnwf5z77fpizjwn4xzq2vrrjhvdmjynvl3jj"; + type = "gem"; + }; + version = "1.0.0"; + }; + crack = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1awi8jy4jn0f7vxpdvz3xvn1zzjbjh33n28lfkijh77dla5zb7lc"; + type = "gem"; + }; + version = "0.4.4"; + }; + crass = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; + type = "gem"; + }; + version = "1.0.6"; + }; + css_parser = { + dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; + type = "gem"; + }; + version = "1.7.1"; + }; + debug_inspector = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; + type = "gem"; + }; + version = "0.0.3"; + }; + devise = { + dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"]; + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0syqkh0q9mcdgj68m2cf1innpxb8fv6xsayk1kgsdmq539rkv3ic"; + type = "gem"; + }; + version = "4.7.3"; + }; + devise-two-factor = { + dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzk7phrryxlq4k3jrcxm8faifmbqrbfxq7jx089ncsixwd69bn4"; + type = "gem"; + }; + version = "3.1.0"; + }; + devise_pam_authenticatable2 = { + dependencies = ["devise" "rpam2"]; + groups = ["pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13ipl52pkhc6vxp8ca31viwv01237bi2bfk3b1fixq1x46nf87p2"; + type = "gem"; + }; + version = "9.2.0"; + }; + diff-lcs = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; + type = "gem"; + }; + version = "1.4.4"; + }; + discard = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zq7wjmknz8fd1pw169xpwf6js4280gnphy6mw8m3xiz1715bcig"; + type = "gem"; + }; + version = "1.2.0"; + }; + docile = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; + type = "gem"; + }; + version = "1.3.2"; + }; + domain_name = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + doorkeeper = { + dependencies = ["railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "105yr9gy60z0pyh85pbc6gazanm6jmb5c6agd7p1mzrc21hmrzrk"; + type = "gem"; + }; + version = "5.4.0"; + }; + dotenv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + type = "gem"; + }; + version = "2.7.6"; + }; + dotenv-rails = { + dependencies = ["dotenv" "railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1my2jdmgmpf32rfxffkb9cyxh7ayis4q5ygpwjqj4vpp25y3a70c"; + type = "gem"; + }; + version = "2.7.6"; + }; + e2mmap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5"; + type = "gem"; + }; + version = "0.1.0"; + }; + ed25519 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; + type = "gem"; + }; + version = "1.2.4"; + }; + elasticsearch = { + dependencies = ["elasticsearch-api" "elasticsearch-transport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qkabj3hd0f9yf6l42xls78vzsbihziqw3zqrmjj91l0w1d1abkk"; + type = "gem"; + }; + version = "7.9.0"; + }; + elasticsearch-api = { + dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nsk9p816x3rck1xklmzbbhfp18w0i32qb0qaxvrx8jlgwvd3y7z"; + type = "gem"; + }; + version = "7.9.0"; + }; + elasticsearch-dsl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d2qr5hvqcr5r78djzrw5fjkaggvw080sdixnnq8cf8yriwhsvnf"; + type = "gem"; + }; + version = "0.1.9"; + }; + elasticsearch-transport = { + dependencies = ["faraday" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ic87n4772an00nq6z2znd8wmyhpgdcmjbvrzfqj51xi4q627x0a"; + type = "gem"; + }; + version = "7.9.0"; + }; + encryptor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb"; + type = "gem"; + }; + version = "3.0.0"; + }; + erubi = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + type = "gem"; + }; + version = "1.9.0"; + }; + et-orbi = { + dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xr8i8ql4xzx17d12590i3j299hj6vc0ja2j29dy12i5nlchxrvp"; + type = "gem"; + }; + version = "1.2.4"; + }; + excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05is0kb650j8wrdi4rgkdls662chnhdg2p64pgq3zkd3d7l2a9zw"; + type = "gem"; + }; + version = "0.76.0"; + }; + fabrication = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pdrl55xf76pbc5kjzp7diawxxvgbk2cm38532in6df823431n6z"; + type = "gem"; + }; + version = "2.21.1"; + }; + faker = { + dependencies = ["i18n"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6"; + type = "gem"; + }; + version = "2.14.0"; + }; + faraday = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; + type = "gem"; + }; + version = "1.0.1"; + }; + fast_blank = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56"; + type = "gem"; + }; + version = "1.0.0"; + }; + fastimage = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11ny2pj0j6pljszrf1w3iqdv2pcl2iwwghjbgcjlizy424zbh0hb"; + type = "gem"; + }; + version = "2.2.0"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + type = "gem"; + }; + version = "1.10.0"; + }; + ffi-compiler = { + dependencies = ["ffi" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + type = "gem"; + }; + version = "1.0.1"; + }; + fog-core = { + dependencies = ["builder" "excon" "formatador" "mime-types"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; + type = "gem"; + }; + version = "2.1.0"; + }; + fog-json = { + dependencies = ["fog-core" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; + type = "gem"; + }; + version = "1.2.0"; + }; + fog-openstack = { + dependencies = ["fog-core" "fog-json" "ipaddress"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11j18h61d3p0pcp9k5346lbj1lahab1dqybkrx9338932lmjn7ap"; + type = "gem"; + }; + version = "0.3.10"; + }; + formatador = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + type = "gem"; + }; + version = "0.2.5"; + }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vmzjmwq5968ni9wzdp957iizddj85v69qi0hz5rk8148lz1bccm"; + type = "gem"; + }; + version = "1.3.9"; + }; + fuubar = { + dependencies = ["rspec-core" "ruby-progressbar"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "090sx0ck194am6v3hwfld2ijvldd0mjwplqz8r36p34l4p8z9d79"; + type = "gem"; + }; + version = "2.5.0"; + }; + globalid = { + dependencies = ["activesupport"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; + type = "gem"; + }; + version = "0.4.2"; + }; + hamlit = { + dependencies = ["temple" "thor" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06imnwpzvpagwn0b9a8kwv7hncii32flmafz20z95hd77hhr6ab7"; + type = "gem"; + }; + version = "2.13.0"; + }; + hamlit-rails = { + dependencies = ["actionpack" "activesupport" "hamlit" "railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v75yd6x0nwky83smd9hw5ym9h0pi32jrzbnvq55pzj0rc95gg2p"; + type = "gem"; + }; + version = "0.2.3"; + }; + hamster = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1lsh96vnyc1pnzyd30f9prcsclmvmkdb3nm5aahnyizyiy6lar"; + type = "gem"; + }; + version = "3.0.0"; + }; + hashdiff = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c"; + type = "gem"; + }; + version = "1.0.1"; + }; + hashie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; + type = "gem"; + }; + version = "4.1.0"; + }; + health_check = { + dependencies = ["rails"]; + groups = ["default"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "0b799ead604f900ed50685e9b2d469cd2befba5b"; + sha256 = "0yz4axwkynsnng8xswrg2ysxlkjwfw0v4padvqwm4xal7nri172d"; + type = "git"; + url = "https://github.com/ianheggie/health_check"; + }; + version = "4.0.0.pre"; + }; + highline = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + type = "gem"; + }; + version = "2.0.3"; + }; + hiredis = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04jj8k7lxqxw24sp0jiravigdkgsyrpprxpxm71ba93x1wr2w1bz"; + type = "gem"; + }; + version = "0.6.3"; + }; + hkdf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04fixg0a51n4vy0j6c1hvisa2yl33m3jrrpxpb5sq6j511vjriil"; + type = "gem"; + }; + version = "0.3.0"; + }; + htmlentities = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + http = { + dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y"; + type = "gem"; + }; + version = "4.4.1"; + }; + http-cookie = { + dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + http-form_data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wx591jdhy84901pklh1n9sgh74gnvq1qyqxwchni1yrc49ynknc"; + type = "gem"; + }; + version = "2.3.0"; + }; + http-parser = { + dependencies = ["ffi-compiler"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10wz818i7dq5zkcll0yf7pbjz1zqvs7mgh3xg3x6www2f2ccwxqj"; + type = "gem"; + }; + version = "1.2.1"; + }; + http_accept_language = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d0nlfz9vm4jr1l6q0chx4rp2hrnrfbx3gadc1dz930lbbaz0hq0"; + type = "gem"; + }; + version = "2.1.1"; + }; + httplog = { + dependencies = ["rack" "rainbow"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mq67if5lq388raxa5rh43z6g5zlqh9yixcja4s81p9dzrsj4i3x"; + type = "gem"; + }; + version = "1.4.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + type = "gem"; + }; + version = "1.8.5"; + }; + i18n-tasks = { + dependencies = ["activesupport" "ast" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04am9452ihm8fcq2si44bba0msz0014wfg50ksxs5dpb2l065abg"; + type = "gem"; + }; + version = "0.9.31"; + }; + idn-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr"; + type = "gem"; + }; + version = "0.1.0"; + }; + ipaddress = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; + type = "gem"; + }; + version = "0.8.3"; + }; + iso-639 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k1r8wgk6syvpsl3j5qfh5az5w4zdvk0pvpjl7qspznfdbp2mn71"; + type = "gem"; + }; + version = "0.3.5"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + type = "gem"; + }; + version = "1.4.0"; + }; + json = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + type = "gem"; + }; + version = "2.3.1"; + }; + json-canonicalization = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "014lc8am17m2amfkzdfc9ksaafnwpb7zzr8l7382r60zkkgpkljg"; + type = "gem"; + }; + version = "0.2.0"; + }; + json-ld = { + dependencies = ["htmlentities" "json-canonicalization" "link_header" "multi_json" "rack" "rdf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q9sg8a719sai53gjpznf9r78l035xry0pk1yrag34pb50k2l05l"; + type = "gem"; + }; + version = "3.1.5"; + }; + json-ld-preloaded = { + dependencies = ["json-ld" "rdf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f8vham63wy689d4jp2j9rani0n10h40dpymgishf3na8cjj0lix"; + type = "gem"; + }; + version = "3.1.3"; + }; + jsonapi-renderer = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ys4drd0k9rw5ixf8n8fx8v0pjh792w4myh0cpdspd317l1lpi5m"; + type = "gem"; + }; + version = "0.2.2"; + }; + jwt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; + type = "gem"; + }; + version = "2.2.2"; + }; + kaminari = { + dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vxkqciny5v4jgmjxl8qrgbmig2cij2iskqbwh4bfcmpxf467ch3"; + type = "gem"; + }; + version = "1.2.1"; + }; + kaminari-actionview = { + dependencies = ["actionview" "kaminari-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w0p1hyv6lgf6h036cmn2kbkdv4x7g0g9q9kc5gzkpz7amlxr8ri"; + type = "gem"; + }; + version = "1.2.1"; + }; + kaminari-activerecord = { + dependencies = ["activerecord" "kaminari-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02n5xxv6ilh39q2m6vcz7qrdai7ghk3s178dw6f0b3lavwyq49w3"; + type = "gem"; + }; + version = "1.2.1"; + }; + kaminari-core = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h04cr4y1jfn81gxy439vmczifghc2cvsyw47aa32is5bbxg1wlz"; + type = "gem"; + }; + version = "1.2.1"; + }; + launchy = { + dependencies = ["addressable"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xdyvr5j0gjj7b10kgvh8ylxnwk3wx19my42wqn9h82r4p246hlm"; + type = "gem"; + }; + version = "2.5.0"; + }; + letter_opener = { + dependencies = ["launchy"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09a7kgsmr10a0hrc9bwxglgqvppjxij9w8bxx91mnvh0ivaw0nq9"; + type = "gem"; + }; + version = "1.7.0"; + }; + letter_opener_web = { + dependencies = ["actionmailer" "letter_opener" "railties"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pianlrbf9n7jrqxpyxgsfk1j1d312d57d6gq7yxni6ax2q0293q"; + type = "gem"; + }; + version = "1.4.0"; + }; + link_header = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yamrdq4rywmnpdhbygnkkl9fdy249fg5r851nrkkxr97gj5rihm"; + type = "gem"; + }; + version = "0.0.8"; + }; + lograge = { + dependencies = ["actionpack" "activesupport" "railties" "request_store"]; + groups = ["production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vrjm4yqn5l6q5gsl72fmk95fl6j9z1a05gzbrwmsm3gp1a1bgac"; + type = "gem"; + }; + version = "0.11.2"; + }; + loofah = { + dependencies = ["crass" "nokogiri"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; + type = "gem"; + }; + version = "2.7.0"; + }; + mail = { + dependencies = ["mini_mime"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + type = "gem"; + }; + version = "2.7.1"; + }; + makara = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01n90s1jcc05dc9a70k3c3aa4gc9j49k9iv56n2k4jm949dacms6"; + type = "gem"; + }; + version = "0.4.1"; + }; + marcel = { + dependencies = ["mimemagic"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; + type = "gem"; + }; + version = "0.3.3"; + }; + mario-redis-lock = { + dependencies = ["redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v9wdjcjqzpns2migxp4a5b4w82mipi0fwihbqz3q2qj2qm7wc17"; + type = "gem"; + }; + version = "1.2.1"; + }; + memory_profiler = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04ivhv1bilwqm33jv28gar2vwzsichb5nipaq395d3axabv8qmfy"; + type = "gem"; + }; + version = "0.9.14"; + }; + method_source = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; + type = "gem"; + }; + version = "1.0.0"; + }; + microformats = { + dependencies = ["json" "nokogiri"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wdyxr22qzw9ri5gzng3a4wqj6a25vq4dhbhd9synk2hjg5pfgvq"; + type = "gem"; + }; + version = "4.2.1"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + type = "gem"; + }; + version = "3.2020.0512"; + }; + mimemagic = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf"; + type = "gem"; + }; + version = "0.3.5"; + }; + mini_mime = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + type = "gem"; + }; + version = "1.0.2"; + }; + mini_portile2 = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + type = "gem"; + }; + version = "2.4.0"; + }; + minitest = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + type = "gem"; + }; + version = "5.14.2"; + }; + msgpack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; + type = "gem"; + }; + version = "1.3.3"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + multipart-post = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + version = "2.1.1"; + }; + net-ldap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; + type = "gem"; + }; + version = "0.16.3"; + }; + net-scp = { + dependencies = ["net-ssh"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b4h3ip8d1gkrc0znnw54hbxillk73mdnaf5pz330lmrcl1wiilg"; + type = "gem"; + }; + version = "3.0.0"; + }; + net-ssh = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; + type = "gem"; + }; + version = "6.1.0"; + }; + nilsimsa = { + groups = ["default"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "fd184883048b922b176939f851338d0a4971a532"; + sha256 = "0fds01pr220kg6g3g0rphrkg1fc6py1pnf546pnsb76wd9c0c5il"; + type = "git"; + url = "https://github.com/witgo/nilsimsa"; + }; + version = "1.1.2"; + }; + nio4r = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + type = "gem"; + }; + version = "2.5.4"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + type = "gem"; + }; + version = "1.10.10"; + }; + nokogumbo = { + dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sxjnpjvrn10gdmfw2dimhch861lz00f28hvkkz0b1gc2rb65k9s"; + type = "gem"; + }; + version = "2.0.2"; + }; + nsa = { + dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i1bhmvs49yv70pgl41lx1lr8x6whg52szb8ic1jb6wmmxr2ylcz"; + type = "gem"; + }; + version = "0.2.7"; + }; + oj = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqmzqldi9a0wpilwx87yh61xd7647gg8ffammg4ava0bsx375g2"; + type = "gem"; + }; + version = "3.10.16"; + }; + omniauth = { + dependencies = ["hashie" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; + type = "gem"; + }; + version = "1.9.1"; + }; + omniauth-cas = { + dependencies = ["addressable" "nokogiri" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kzlh1nac4yz70917cdcsk0r23gy5h7i0x5kbmkvkpbgk6gvrb0z"; + type = "gem"; + }; + version = "2.0.0"; + }; + omniauth-rails_csrf_protection = { + dependencies = ["actionpack" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xgkxwg17w39q3yjqcj0fm6hdkw37qm1l82dvm9zxn6q2pbzm2zv"; + type = "gem"; + }; + version = "0.1.2"; + }; + omniauth-saml = { + dependencies = ["omniauth" "ruby-saml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gxl14lbksnjkl8dfn23lsjkk63md77icm5racrh6fsp5n4ni9d4"; + type = "gem"; + }; + version = "1.10.3"; + }; + openssl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03wbynzkhay7l1x76srjkg91q48mxl575vrxb3blfxlpqwsvvp0w"; + type = "gem"; + }; + version = "2.2.0"; + }; + openssl-signature_algorithm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14d95jr5z6dgvpwf52p7ckjf3w3cihin2k6g9599711pfxdj4fp5"; + type = "gem"; + }; + version = "0.4.0"; + }; + orm_adapter = { + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda"; + type = "gem"; + }; + version = "0.5.0"; + }; + ox = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nd301vsf3k4pl0aa6gkng12yxfdf5s490v65ky2vz8lainaw16q"; + type = "gem"; + }; + version = "2.13.4"; + }; + paperclip = { + dependencies = ["activemodel" "activesupport" "mime-types" "mimemagic" "terrapin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04mlw7aqj20ry0fy92gxnxg99hy5xczff7rhywfzz4mqlhc2wgg7"; + type = "gem"; + }; + version = "6.0.0"; + }; + paperclip-av-transcoder = { + dependencies = ["av" "paperclip"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gcnp3fpdb5lqilcij4yqga6397nb7zyyf9lzxnqpbp7cvc18lhf"; + type = "gem"; + }; + version = "0.6.4"; + }; + parallel = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + type = "gem"; + }; + version = "1.20.1"; + }; + parallel_tests = { + dependencies = ["parallel"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mvdk8vgzqjv2pvadxwc8w2vf8dmiw145rjf47c36nn6l5hh02j6"; + type = "gem"; + }; + version = "3.4.0"; + }; + parser = { + dependencies = ["ast"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; + type = "gem"; + }; + version = "2.7.2.0"; + }; + parslet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01pnw6ymz6nynklqvqxs4bcai25kcvnd5x4id9z3vd1rbmlk0lfl"; + type = "gem"; + }; + version = "2.0.0"; + }; + pastel = { + dependencies = ["tty-color"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; + type = "gem"; + }; + version = "0.8.0"; + }; + pg = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + type = "gem"; + }; + version = "1.2.3"; + }; + pghero = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lb858gpz8919in51pgxbk9v5m4qppd136gpag2plzs24rv5hg3s"; + type = "gem"; + }; + version = "2.7.2"; + }; + pkg-config = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "068sf963n2zk47kqcckj624g5pxmk68mm76h02piphfyh9x4zmi3"; + type = "gem"; + }; + version = "1.4.4"; + }; + pluck_each = { + dependencies = ["activerecord" "activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b7g0ggjsbca81qwvpayj1c5qy65p5zq19lb7fiy1v0yb48pzvhp"; + type = "gem"; + }; + version = "0.1.3"; + }; + posix-spawn = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cmb0svalqcxfzlzc5fvrci12b79x7bakasr8gkl3q5rz6di1q52"; + type = "gem"; + }; + version = "0.3.15"; + }; + premailer = { + dependencies = ["addressable" "css_parser" "htmlentities"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f0zz3vwv1kyr43chvrpvhb8wm9qgcaz8ckc1lj2jxfp6xsss971"; + type = "gem"; + }; + version = "1.14.2"; + }; + premailer-rails = { + dependencies = ["actionmailer" "premailer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q23clzqgzxcg1jld7hn5jy2yqxvana3iw66vmjgzz7y4ylf97b6"; + type = "gem"; + }; + version = "1.11.1"; + }; + private_address_check = { + groups = ["production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05phz0vscfh9chv90yc9091pifw3cpwkh76flnhrmvja1q3na4cy"; + type = "gem"; + }; + version = "0.5.0"; + }; + pry = { + dependencies = ["coderay" "method_source"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; + type = "gem"; + }; + version = "0.13.1"; + }; + pry-byebug = { + dependencies = ["byebug" "pry"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; + type = "gem"; + }; + version = "3.9.0"; + }; + pry-rails = { + dependencies = ["pry"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; + type = "gem"; + }; + version = "0.3.9"; + }; + public_suffix = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + puma = { + dependencies = ["nio4r"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mkmfbf4qyiknwi9bb5432cpbbz06r855gknxb8grn24gmgs4d9i"; + type = "gem"; + }; + version = "5.0.4"; + }; + pundit = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18kwm5rkazb89yf792y3fxqihcxw2vdy7k1w542s4hg82ibfpyx3"; + type = "gem"; + }; + version = "2.1.0"; + }; + raabro = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1idqvx5cpmyj1a5nwb1b19szx4lilyr6qpp6drkn744mzq2hppgr"; + type = "gem"; + }; + version = "1.3.3"; + }; + rack = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rack-attack = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zzyiiif9w67v43rv0hg7nxbwp1ish1f02x61kx0rmz8sy1j7wnn"; + type = "gem"; + }; + version = "6.3.1"; + }; + rack-cors = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7"; + type = "gem"; + }; + version = "1.1.1"; + }; + rack-proxy = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v40xd3xhzhbdqfynd03gn88j1pga2zhrv58xs9fl4hzrlbp096s"; + type = "gem"; + }; + version = "0.6.5"; + }; + rack-test = { + dependencies = ["rack"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + type = "gem"; + }; + version = "1.1.0"; + }; + rails = { + dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b5g3h5sbbncks44w8vjnx0zp145ygphrsspy4ay7xsls92xynq0"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + rails-controller-testing = { + dependencies = ["actionpack" "actionview" "activesupport"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "151f303jcvs8s149mhx2g5mn67487x0blrf9dzl76q1nb7dlh53l"; + type = "gem"; + }; + version = "1.0.5"; + }; + rails-dom-testing = { + dependencies = ["activesupport" "nokogiri"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + type = "gem"; + }; + version = "2.0.3"; + }; + rails-html-sanitizer = { + dependencies = ["loofah"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; + type = "gem"; + }; + version = "1.3.0"; + }; + rails-i18n = { + dependencies = ["i18n" "railties"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02kdlm7jgwvwnnc1amy8md2vl0f2jkfr6rr36vybclr9qm4fb80f"; + type = "gem"; + }; + version = "5.1.3"; + }; + rails-settings-cached = { + dependencies = ["rails"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wyhyls0aqb1iw7mnaldg39w3mnbi3anmpbvb52rjwkpj2mchhnc"; + type = "gem"; + }; + version = "0.6.6"; + }; + railties = { + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "089kiwmv8fxyfk0zp57q74nyd5i6d5x5ihlrzbzwl041v94s2zx9"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + rainbow = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; + }; + rake = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + type = "gem"; + }; + version = "13.0.1"; + }; + rdf = { + dependencies = ["hamster" "link_header"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "109c355wj2a74v2yrwgqpzhgnxchkm5dakcacqx9fk2i98f7m7d8"; + type = "gem"; + }; + version = "3.1.7"; + }; + rdf-normalize = { + dependencies = ["rdf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kfhh5n57im80i1ak00qz9f5hx8k10ldn0r5l1gw1qaa1lydmydg"; + type = "gem"; + }; + version = "0.4.0"; + }; + redis = { + groups = ["default" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48"; + type = "gem"; + }; + version = "4.2.5"; + }; + redis-actionpack = { + dependencies = ["actionpack" "redis-rack" "redis-store"]; + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2276zzc0044zh37a8frx1v7hnra7z7k126154ps7njbqngfdv3"; + type = "gem"; + }; + version = "5.2.0"; + }; + redis-activesupport = { + dependencies = ["activesupport" "redis-store"]; + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14a3z8810j02ysvg53f3mvcfb4rw34m91yfd19zy9y5lb3yv2g59"; + type = "gem"; + }; + version = "5.2.0"; + }; + redis-namespace = { + dependencies = ["redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05i6s898z5w31z385cba1683pgg5nnmj4m686cbravg7j4pgbcgv"; + type = "gem"; + }; + version = "1.8.0"; + }; + redis-rack = { + dependencies = ["rack" "redis-store"]; + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nblbxg1f051dn83jp92lz3lc1wxm18nviglrabv2l0vz6rd0pkb"; + type = "gem"; + }; + version = "2.1.3"; + }; + redis-rails = { + dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; + groups = ["production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40"; + type = "gem"; + }; + version = "5.0.2"; + }; + redis-store = { + dependencies = ["redis"]; + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cpzbf2svnk4j5awb24ncl0mih45zkbdrd7q23jdg1r8k3q7mdg6"; + type = "gem"; + }; + version = "1.9.0"; + }; + regexp_parser = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; + type = "gem"; + }; + version = "1.8.2"; + }; + request_store = { + dependencies = ["rack"]; + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi"; + type = "gem"; + }; + version = "1.5.0"; + }; + responders = { + dependencies = ["actionpack" "railties"]; + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14kjykc6rpdh24sshg9savqdajya2dislc1jmbzg91w9967f4gv1"; + type = "gem"; + }; + version = "3.0.1"; + }; + rexml = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; + }; + rotp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d"; + type = "gem"; + }; + version = "2.1.2"; + }; + rpam2 = { + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zvli3s4z1hf2l7gyfickm5i3afjrnycc3ihbiax6ji6arpbyf33"; + type = "gem"; + }; + version = "4.0.2"; + }; + rqrcode = { + dependencies = ["chunky_png" "rqrcode_core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06lw8b6wfshxd61xw98xyp1a0zsz6av4nls2c9fwb7q59wb05sci"; + type = "gem"; + }; + version = "1.1.2"; + }; + rqrcode_core = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "071jqmhk3hf0grsvi0jx5sl449pf82p40ls5b3likbq4q516zc0j"; + type = "gem"; + }; + version = "0.1.2"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b8891149l4rdlaz58k1dprc09rhpvq98bblk4qpd3dvcvqklkvh"; + type = "gem"; + }; + version = "3.9.3"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb"; + type = "gem"; + }; + version = "3.9.2"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + type = "gem"; + }; + version = "3.9.1"; + }; + rspec-rails = { + dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lzik01ziaskgpdpy8knffpw0fsy9151f5lfigyhb89wq4q45hfs"; + type = "gem"; + }; + version = "4.0.1"; + }; + rspec-sidekiq = { + dependencies = ["rspec-core" "sidekiq"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1spzw3sc2p0n9qfb89y1v8igd60y7c5z9w2hjqqbbgbyjvy0agp8"; + type = "gem"; + }; + version = "3.1.0"; + }; + rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir"; + type = "gem"; + }; + version = "3.9.3"; + }; + rspec_junit_formatter = { + dependencies = ["rspec-core"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aynmrgnv26pkprrajvp7advb8nbh0x4pkwk6jwq8qmwzarzk21p"; + type = "gem"; + }; + version = "0.4.1"; + }; + rubocop = { + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cganc8j8zq7x81bmkav39dhbqydxhqyfs98z2g4g7ld6scywm20"; + type = "gem"; + }; + version = "1.3.1"; + }; + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15jxn0aqxgalpl9zlrqyk2kk41qcp4sn1yys55qif5f787b3nrij"; + type = "gem"; + }; + version = "1.1.1"; + }; + rubocop-rails = { + dependencies = ["activesupport" "rack" "rubocop"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14g703lv0cbqw504cdjsv0yydrsnm61rwg0n0mql4zl5hw1n7lfh"; + type = "gem"; + }; + version = "2.8.1"; + }; + ruby-progressbar = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + type = "gem"; + }; + version = "1.10.1"; + }; + ruby-saml = { + dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ps79g3f39iy6dpc9z4z5wwxdkbaciqjfbi0pfl7dbkz1d8q14qi"; + type = "gem"; + }; + version = "1.11.0"; + }; + rufus-scheduler = { + dependencies = ["fugit"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bcr8y9nq0anw0gkkpl0zvzgzhhsamw2swp9jwwffd33n8fxg76c"; + type = "gem"; + }; + version = "3.6.0"; + }; + safety_net_attestation = { + dependencies = ["jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln"; + type = "gem"; + }; + version = "0.4.0"; + }; + sanitize = { + dependencies = ["crass" "nokogiri" "nokogumbo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18m3zcf207gcrmghx288w3n2kpphc22lbmbc1wdx1nzcn8g2yddh"; + type = "gem"; + }; + version = "5.2.1"; + }; + scenic = { + dependencies = ["activerecord" "railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11inxsg0qd6kdj8cdwbh7syvr9wzv93jpp5nhlhjwp4v9ngrm9xk"; + type = "gem"; + }; + version = "1.5.4"; + }; + securecompare = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ay65wba4i7bvfqyvf5i4r48q6g70s5m724diz9gdvdavscna36b"; + type = "gem"; + }; + version = "1.0.0"; + }; + semantic_range = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "150wq0y749rags4pm0g3zljd575vk17nwdzp0m0q04s62977rd24"; + type = "gem"; + }; + version = "2.3.0"; + }; + sidekiq = { + dependencies = ["connection_pool" "rack" "redis"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mjxrxppv08a1hwqi8gpg6n168cxqhp7c2r2jwc4rbz9j5k41vcw"; + type = "gem"; + }; + version = "6.1.2"; + }; + sidekiq-bulk = { + dependencies = ["sidekiq"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08nyxzmgf742irafy3l4fj09d4s5pyvsh0dzlh8y4hl51rgkh4xv"; + type = "gem"; + }; + version = "0.2.0"; + }; + sidekiq-scheduler = { + dependencies = ["e2mmap" "redis" "rufus-scheduler" "sidekiq" "thwait" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ycwmpf17mdd762l5q9w01b4ms5fqrr6hb7s4ndi3nwz8pcngw91"; + type = "gem"; + }; + version = "3.0.1"; + }; + sidekiq-unique-jobs = { + dependencies = ["concurrent-ruby" "sidekiq" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lw2hgq28wd97kkp2897gy1yf0fx0yz6l23gdgjl8i2pas7d5wxd"; + type = "gem"; + }; + version = "6.0.25"; + }; + simple-navigation = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pkj5z48k90v9v53gckl1b0jsix08kpl6qkgsd4pkc7cva8dbqid"; + type = "gem"; + }; + version = "4.1.0"; + }; + simple_form = { + dependencies = ["actionpack" "activemodel"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jj4fcs2r5sm3gjsmygcs2fi2ai18az5ynq1cqp1w0j3aajdian7"; + type = "gem"; + }; + version = "5.0.3"; + }; + simplecov = { + dependencies = ["docile" "simplecov-html"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00xwb0mizvbm9s04a6h5ycwn2zpdxjb3wxaawq6ypjjbvxszihcq"; + type = "gem"; + }; + version = "0.19.1"; + }; + simplecov-html = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; + type = "gem"; + }; + version = "0.12.3"; + }; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-rails = { + dependencies = ["actionpack" "activesupport" "sprockets"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; + type = "gem"; + }; + version = "3.2.2"; + }; + sshkit = { + dependencies = ["net-scp" "net-ssh"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gfglybqjw6g6hccqvh2yjfqlvdy4hwad8mcjdc7zjm5swncfxwz"; + type = "gem"; + }; + version = "1.21.0"; + }; + stackprof = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "147rb66p3n062vc433afqhkd99iazvkrqnghxgh871r62yhha93f"; + type = "gem"; + }; + version = "0.2.16"; + }; + statsd-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0djig5dnqjgww6wrw3f1mvnnjllznahlchvk4lvs4wx9qjsqpysr"; + type = "gem"; + }; + version = "1.4.0"; + }; + stoplight = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ixpwp14hrygif8c1wn05gh4d4nq1940p3grh95r4dqmpjdqn0sr"; + type = "gem"; + }; + version = "2.2.1"; + }; + streamio-ffmpeg = { + dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nnxizc0371vwh0k6gqjj1b7fjszydpqfz549n6qn2q1pza3894z"; + type = "gem"; + }; + version = "3.0.2"; + }; + strong_migrations = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sdijc2nc9lx6kga216rg4yfmyv4g7slbpcrlfjx20psbn54d7jd"; + type = "gem"; + }; + version = "0.7.2"; + }; + temple = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861"; + type = "gem"; + }; + version = "0.8.2"; + }; + terminal-table = { + dependencies = ["unicode-display_width"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; + terrapin = { + dependencies = ["climate_control"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p18f05r0c5s70571gqig3z2ym74wx79s6rd45sprp207bqskzn9"; + type = "gem"; + }; + version = "0.6.0"; + }; + thor = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + type = "gem"; + }; + version = "1.0.1"; + }; + thread_safe = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + thwait = { + dependencies = ["e2mmap"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q0fqlh0668j66z0g3s5yhqs39368az2ycxyphsx4c5nib5r4kak"; + type = "gem"; + }; + version = "0.2.0"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + version = "2.0.10"; + }; + tpm-key_attestation = { + dependencies = ["bindata" "openssl-signature_algorithm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kdqyanz211wmxjzfiz2wg17gj6p4431qvjr0i6sp3d6268sssg4"; + type = "gem"; + }; + version = "0.9.0"; + }; + tty-color = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12vcxmn3lj405rs0fxcki7jwpkrx8y55x8jwjf9v6yvnx2y5kga3"; + type = "gem"; + }; + version = "0.5.2"; + }; + tty-cursor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-prompt = { + dependencies = ["pastel" "tty-reader"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "170y0imsmzav5xgaav6xhzlz879fq2zv25ryk8y3qc2kqaz7x657"; + type = "gem"; + }; + version = "0.22.0"; + }; + tty-reader = { + dependencies = ["tty-cursor" "tty-screen" "wisper"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "078rlqbdw72jjgp597yn5psasgf4508qdw9g3prxgbcgpcdcsd0r"; + type = "gem"; + }; + version = "0.8.0"; + }; + tty-screen = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + type = "gem"; + }; + version = "0.8.1"; + }; + twitter-text = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg"; + type = "gem"; + }; + version = "1.14.7"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; + tzinfo-data = { + dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a"; + type = "gem"; + }; + version = "1.2020.4"; + }; + unf = { + dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + type = "gem"; + }; + version = "0.0.7.7"; + }; + unicode-display_width = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + type = "gem"; + }; + version = "1.7.0"; + }; + uniform_notifier = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vm4aix8jmv42s1x58m3lj3xwkbxyn9qn6lzhhig0d1j8fv6j30c"; + type = "gem"; + }; + version = "1.13.0"; + }; + warden = { + dependencies = ["rack"]; + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l7gl7vms023w4clg02pm4ky9j12la2vzsixi2xrv9imbn44ys26"; + type = "gem"; + }; + version = "1.2.9"; + }; + webauthn = { + dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "securecompare" "tpm-key_attestation"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jpr8b2lzhvfxv47yjvw0h8sqa9aah5bnharh686xqzyjz9a823q"; + type = "gem"; + }; + version = "3.0.0.alpha1"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wbdjagk2qpr76k3zw2gmkfp5aqlrc1a4qrpjv7sq1q39qbn8xax"; + type = "gem"; + }; + version = "3.10.0"; + }; + webpacker = { + dependencies = ["activesupport" "rack-proxy" "railties" "semantic_range"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xgyv5ppljw3yq71nbrw2hj6hq9y8qbdavjrn53nsccpy7801wdx"; + type = "gem"; + }; + version = "5.2.1"; + }; + webpush = { + dependencies = ["hkdf" "jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gi7aircw2bizk08pihr9srncjy9x9iy0ymp1qgchni639k1k05s"; + type = "gem"; + }; + version = "0.3.8"; + }; + websocket-driver = { + dependencies = ["websocket-extensions"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh"; + type = "gem"; + }; + version = "0.7.3"; + }; + websocket-extensions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; + type = "gem"; + }; + version = "0.1.5"; + }; + wisper = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf"; + type = "gem"; + }; + version = "2.0.1"; + }; + xorcist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q7hr3qyn1hczv9fglqc2cbaax0fb37gjjr0y24x19mmp817csdn"; + type = "gem"; + }; + version = "1.1.2"; + }; + xpath = { + dependencies = ["nokogiri"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; + type = "gem"; + }; + version = "3.2.0"; + }; +} diff --git a/nixpkgs/pkgs/servers/mastodon/package.json b/nixpkgs/pkgs/servers/mastodon/package.json new file mode 100644 index 000000000000..498d4b63723e --- /dev/null +++ b/nixpkgs/pkgs/servers/mastodon/package.json @@ -0,0 +1,193 @@ +{ + "version": "3.3.0", + "name": "@tootsuite/mastodon", + "license": "AGPL-3.0-or-later", + "engines": { + "node": ">=10.13" + }, + "scripts": { + "postversion": "git push --tags", + "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack", + "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack", + "manage:translations": "node ./config/webpack/translationRunner.js", + "start": "node ./streaming/index.js", + "test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest", + "test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass", + "test:lint:js": "eslint --ext=js . --cache", + "test:lint:sass": "sass-lint -v", + "test:jest": "cross-env NODE_ENV=test jest --coverage" + }, + "repository": { + "type": "git", + "url": "https://github.com/tootsuite/mastodon.git" + }, + "browserslist": [ + "last 2 versions", + "IE >= 11", + "iOS >= 9", + "not dead" + ], + "jest": { + "projects": [ + "<rootDir>/app/javascript/mastodon" + ], + "testPathIgnorePatterns": [ + "<rootDir>/node_modules/", + "<rootDir>/vendor/", + "<rootDir>/config/", + "<rootDir>/log/", + "<rootDir>/public/", + "<rootDir>/tmp/" + ], + "setupFiles": [ + "raf/polyfill" + ], + "setupFilesAfterEnv": [ + "<rootDir>/app/javascript/mastodon/test_setup.js" + ], + "collectCoverageFrom": [ + "app/javascript/mastodon/**/*.js", + "!app/javascript/mastodon/features/emoji/emoji_compressed.js", + "!app/javascript/mastodon/locales/locale-data/*.js", + "!app/javascript/mastodon/service_worker/entry.js", + "!app/javascript/mastodon/test_setup.js" + ], + "coverageDirectory": "<rootDir>/coverage", + "moduleDirectories": [ + "<rootDir>/node_modules", + "<rootDir>/app/javascript" + ] + }, + "private": true, + "dependencies": { + "@babel/core": "^7.12.7", + "@babel/plugin-proposal-class-properties": "^7.8.3", + "@babel/plugin-proposal-decorators": "^7.12.1", + "@babel/plugin-transform-react-inline-elements": "^7.12.1", + "@babel/plugin-transform-runtime": "^7.12.1", + "@babel/preset-env": "^7.12.7", + "@babel/preset-react": "^7.12.7", + "@babel/runtime": "^7.12.5", + "@clusterws/cws": "^3.0.0", + "@gamestdio/websocket": "^0.3.2", + "@github/webauthn-json": "^0.5.7", + "@rails/ujs": "^6.0.3", + "array-includes": "^3.1.1", + "arrow-key-navigation": "^1.2.0", + "autoprefixer": "^9.8.6", + "axios": "^0.21.0", + "babel-loader": "^8.2.1", + "babel-plugin-lodash": "^3.3.4", + "babel-plugin-preval": "^5.0.0", + "babel-plugin-react-intl": "^6.2.0", + "babel-plugin-transform-react-remove-prop-types": "^0.4.24", + "babel-runtime": "^6.26.0", + "blurhash": "^1.1.3", + "classnames": "^2.2.5", + "color-blend": "^3.0.0", + "compression-webpack-plugin": "^6.1.1", + "cross-env": "^7.0.2", + "css-loader": "^5.0.1", + "cssnano": "^4.1.10", + "detect-passive-events": "^2.0.1", + "dotenv": "^8.2.0", + "emoji-mart": "Gargron/emoji-mart#build", + "es6-symbol": "^3.1.3", + "escape-html": "^1.0.3", + "exif-js": "^2.3.0", + "express": "^4.17.1", + "file-loader": "^6.2.0", + "font-awesome": "^4.7.0", + "glob": "^7.1.6", + "history": "^4.10.1", + "http-link-header": "^1.0.3", + "immutable": "^3.8.2", + "imports-loader": "^1.2.0", + "intersection-observer": "^0.11.0", + "intl": "^1.2.5", + "intl-messageformat": "^2.2.0", + "intl-relativeformat": "^6.4.3", + "is-nan": "^1.3.0", + "js-yaml": "^3.13.1", + "lodash": "^4.17.19", + "mark-loader": "^0.1.6", + "marky": "^1.2.1", + "mini-css-extract-plugin": "^1.3.1", + "mkdirp": "^1.0.4", + "npmlog": "^4.1.2", + "object-assign": "^4.1.1", + "object-fit-images": "^3.2.3", + "object.values": "^1.1.1", + "offline-plugin": "^5.0.7", + "path-complete-extname": "^1.0.0", + "pg": "^6.4.0", + "postcss-loader": "^3.0.0", + "postcss-object-fit-images": "^1.1.2", + "promise.prototype.finally": "^3.1.2", + "prop-types": "^15.5.10", + "punycode": "^2.1.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hotkeys": "^1.1.4", + "react-immutable-proptypes": "^2.2.0", + "react-immutable-pure-component": "^2.2.2", + "react-intl": "^2.9.0", + "react-masonry-infinite": "^1.2.2", + "react-motion": "^0.5.2", + "react-notification": "^6.8.5", + "react-overlays": "^0.9.2", + "react-redux": "^7.2.2", + "react-redux-loading-bar": "^4.0.8", + "react-router-dom": "^4.1.1", + "react-router-scroll-4": "^1.0.0-beta.1", + "react-select": "^3.1.0", + "react-sparklines": "^1.7.0", + "react-swipeable-views": "^0.13.9", + "react-textarea-autosize": "^8.3.0", + "react-toggle": "^4.1.1", + "redis": "^3.0.2", + "redux": "^4.0.5", + "redux-immutable": "^4.0.0", + "redux-thunk": "^2.2.0", + "regenerator-runtime": "^0.13.7", + "rellax": "^1.12.1", + "requestidlecallback": "^0.3.0", + "reselect": "^4.0.0", + "rimraf": "^3.0.2", + "sass": "^1.29.0", + "sass-loader": "^10.1.0", + "stacktrace-js": "^2.0.2", + "stringz": "^2.1.0", + "substring-trie": "^1.0.2", + "terser-webpack-plugin": "^4.2.3", + "tesseract.js": "^2.1.1", + "throng": "^4.0.0", + "tiny-queue": "^0.2.1", + "uuid": "^8.3.1", + "webpack": "^4.44.2", + "webpack-assets-manifest": "^3.1.1", + "webpack-bundle-analyzer": "^4.1.0", + "webpack-cli": "^3.3.12", + "webpack-merge": "^5.4.0", + "wicg-inert": "^3.1.0", + "kind-of": "^6.0.3" + }, + "devDependencies": { + "@testing-library/jest-dom": "^5.11.6", + "@testing-library/react": "^11.2.2", + "babel-eslint": "^10.1.0", + "babel-jest": "^26.6.3", + "eslint": "^7.14.0", + "eslint-plugin-import": "~2.22.1", + "eslint-plugin-jsx-a11y": "~6.4.1", + "eslint-plugin-promise": "~4.2.1", + "eslint-plugin-react": "~7.21.5", + "jest": "^26.6.3", + "raf": "^3.4.1", + "react-intl-translations-manager": "^5.0.3", + "react-test-renderer": "^16.14.0", + "sass-lint": "^1.13.1", + "webpack-dev-server": "^3.11.0", + "yargs": "^16.1.1" + } +} diff --git a/nixpkgs/pkgs/servers/mastodon/resolutions.patch b/nixpkgs/pkgs/servers/mastodon/resolutions.patch new file mode 100644 index 000000000000..4cde0ba8dfe9 --- /dev/null +++ b/nixpkgs/pkgs/servers/mastodon/resolutions.patch @@ -0,0 +1,67 @@ +diff --git a/package.json b/package.json +index 7b8f49dd8..24cdd3498 100644 +--- a/package.json ++++ b/package.json +@@ -168,7 +168,8 @@ + "webpack-bundle-analyzer": "^4.1.0", + "webpack-cli": "^3.3.12", + "webpack-merge": "^5.4.0", +- "wicg-inert": "^3.1.0" ++ "wicg-inert": "^3.1.0", ++ "kind-of": "^6.0.3" + }, + "devDependencies": { + "@testing-library/jest-dom": "^5.11.6", +@@ -187,8 +188,5 @@ + "sass-lint": "^1.13.1", + "webpack-dev-server": "^3.11.0", + "yargs": "^16.1.1" +- }, +- "resolutions": { +- "kind-of": "^6.0.3" + } + } +diff --git a/yarn.lock b/yarn.lock +index 4aa8f6380..68d2fd8b5 100644 +--- a/yarn.lock ++++ b/yarn.lock +@@ -5689,6 +5689,11 @@ is-binary-path@~2.1.0: + dependencies: + binary-extensions "^2.0.0" + ++is-buffer@^1.1.5: ++ version "1.1.6" ++ resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" ++ integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== ++ + is-callable@^1.1.4, is-callable@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" +@@ -6639,7 +6644,26 @@ killable@^1.0.1: + resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" + integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg== + +-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: ++kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: ++ version "3.2.2" ++ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" ++ integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= ++ dependencies: ++ is-buffer "^1.1.5" ++ ++kind-of@^4.0.0: ++ version "4.0.0" ++ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" ++ integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= ++ dependencies: ++ is-buffer "^1.1.5" ++ ++kind-of@^5.0.0: ++ version "5.1.0" ++ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" ++ integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== ++ ++kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== diff --git a/nixpkgs/pkgs/servers/mastodon/source.nix b/nixpkgs/pkgs/servers/mastodon/source.nix new file mode 100644 index 000000000000..57eff626ee49 --- /dev/null +++ b/nixpkgs/pkgs/servers/mastodon/source.nix @@ -0,0 +1,11 @@ +# This file was generated by pkgs.mastodon.updateScript. +{ fetchgit, applyPatches }: let + src = fetchgit { + url = "https://github.com/tootsuite/mastodon.git"; + rev = "v3.3.0"; + sha256 = "17wvggvy5mmyf3f1i5v1hgvh6wjdhg9hb3wiyfaydx0slsg03qba"; + }; +in applyPatches { + inherit src; + patches = [./resolutions.patch ./version.patch ]; +} diff --git a/nixpkgs/pkgs/servers/mastodon/update.nix b/nixpkgs/pkgs/servers/mastodon/update.nix new file mode 100644 index 000000000000..28c0ff235e74 --- /dev/null +++ b/nixpkgs/pkgs/servers/mastodon/update.nix @@ -0,0 +1,21 @@ +{ pkgs, stdenv, lib, makeWrapper, yarn2nix, bundix, coreutils, + diffutils, nix-prefetch-github, gnused, jq }: +stdenv.mkDerivation rec { + name = "mastodon-update-script"; + installPhase = '' + mkdir -p $out/bin + cp ${./update.sh} $out/bin/update.sh + patchShebangs $out/bin/update.sh + wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} + ''; + phases = [ "installPhase" ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ]; + + meta = { + maintainers = with lib.maintainers; [ happy-river ]; + description = "Utility to generate Nix expressions for Mastodon's dependencies"; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/servers/mastodon/update.sh b/nixpkgs/pkgs/servers/mastodon/update.sh new file mode 100755 index 000000000000..be06f52207d0 --- /dev/null +++ b/nixpkgs/pkgs/servers/mastodon/update.sh @@ -0,0 +1,121 @@ +#!/usr/bin/env bash +set -e + +URL=https://github.com/tootsuite/mastodon.git + +POSITIONAL=() +while [[ $# -gt 0 ]]; do + key="$1" + + case $key in + --url) + URL="$2" + shift # past argument + shift # past value + ;; + --ver) + VERSION="$2" + shift # past argument + shift # past value + ;; + --rev) + REVISION="$2" + shift # past argument + shift # past value + ;; + --patches) + PATCHES="$2" + shift # past argument + shift # past value + ;; + *) # unknown option + POSITIONAL+=("$1") + shift # past argument + ;; + esac +done + +if [[ -z "$VERSION" || -n "$POSITIONAL" ]]; then + echo "Usage: update.sh [--url URL] --ver VERSION [--rev REVISION] [--patches PATCHES]" + echo "URL may be any path acceptable to 'git clone' and VERSION the" + echo "semantic version number. If VERSION is not a revision acceptable to" + echo "'git checkout', you must provide one in REVISION. If URL is not" + echo "provided, it defaults to https://github.com/tootsuite/mastodon.git." + echo "PATCHES, if provided, should be one or more Nix expressions" + echo "separated by spaces." + exit 1 +fi + +if [[ -z "$REVISION" ]]; then + REVISION="$VERSION" +fi + +rm -f gemset.nix yarn.nix version.nix version.patch source.nix package.json +TARGET_DIR="$PWD" + + +WORK_DIR=$(mktemp -d) + +# Check that working directory was created. +if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then + echo "Could not create temporary directory" + exit 1 +fi + +# Delete the working directory on exit. +function cleanup { + # Report errors, if any, from nix-prefetch-git + grep "fatal" $WORK_DIR/nix-prefetch-git.out >/dev/stderr || true + rm -rf "$WORK_DIR" +} +trap cleanup EXIT + +echo "Fetching source code $REVISION from $URL" +JSON=$(nix-prefetch-git --url "$URL" --rev "$REVISION" 2> $WORK_DIR/nix-prefetch-git.out) +SHA=$(echo $JSON | jq -r .sha256) +FETCHED_SOURCE_DIR=$(grep '^path is' $WORK_DIR/nix-prefetch-git.out | sed 's/^path is //') + +echo "Creating version.nix" +echo \"$VERSION\" | sed 's/^"v/"/' > version.nix + +echo "Creating source.nix" +# yarn2nix and mkYarnPackage want the version to be present in +# package.json. Mastodon itself does not include the version in +# package.json but at least one fork (Soapbox) does. +if [ $(jq .version $FETCHED_SOURCE_DIR/package.json) == "null" ]; then + mkdir $WORK_DIR/a $WORK_DIR/b + cp $FETCHED_SOURCE_DIR/package.json $WORK_DIR/a + cd $WORK_DIR + jq "{version:$(cat $TARGET_DIR/version.nix)} + ." a/package.json > b/package.json + diff -Naur --label a/package.json --label b/package.json a b > $TARGET_DIR/version.patch || true + rm -rf a b tmp + cd $TARGET_DIR + PATCHES="$PATCHES ./version.patch " +fi + +cat > source.nix << EOF +# This file was generated by pkgs.mastodon.updateScript. +{ fetchgit, applyPatches }: let + src = fetchgit { + url = "$URL"; + rev = "$REVISION"; + sha256 = "$SHA"; + }; +in applyPatches { + inherit src; + patches = [$PATCHES]; +} +EOF +SOURCE_DIR="$(nix-build --no-out-link -E '(import <nixpkgs> {}).callPackage ./source.nix {}')" + +echo "Creating gemset.nix" +bundix --lockfile="$SOURCE_DIR/Gemfile.lock" --gemfile="$SOURCE_DIR/Gemfile" +echo "" >> $TARGET_DIR/gemset.nix # Create trailing newline to please EditorConfig checks + +echo "Creating yarn.nix" +cp -r $SOURCE_DIR/* $WORK_DIR +chmod -R u+w $WORK_DIR +cd $WORK_DIR +yarn2nix > $TARGET_DIR/yarn.nix +sed "s/https___.*_//g" -i $TARGET_DIR/yarn.nix +cp $WORK_DIR/package.json $TARGET_DIR diff --git a/nixpkgs/pkgs/servers/mastodon/version.nix b/nixpkgs/pkgs/servers/mastodon/version.nix new file mode 100644 index 000000000000..b577fbf1969b --- /dev/null +++ b/nixpkgs/pkgs/servers/mastodon/version.nix @@ -0,0 +1 @@ +"3.3.0" diff --git a/nixpkgs/pkgs/servers/mastodon/version.patch b/nixpkgs/pkgs/servers/mastodon/version.patch new file mode 100644 index 000000000000..c1449e413272 --- /dev/null +++ b/nixpkgs/pkgs/servers/mastodon/version.patch @@ -0,0 +1,9 @@ +diff -Naur --label a/package.json --label b/package.json a/package.json b/package.json +--- a/package.json ++++ b/package.json +@@ -1,4 +1,5 @@ + { ++ "version": "3.3.0", + "name": "@tootsuite/mastodon", + "license": "AGPL-3.0-or-later", + "engines": { diff --git a/nixpkgs/pkgs/servers/mastodon/yarn.nix b/nixpkgs/pkgs/servers/mastodon/yarn.nix new file mode 100644 index 000000000000..9c3b844bcccd --- /dev/null +++ b/nixpkgs/pkgs/servers/mastodon/yarn.nix @@ -0,0 +1,12181 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; + }; + } + { + name = "_babel_compat_data___compat_data_7.12.7.tgz"; + path = fetchurl { + name = "_babel_compat_data___compat_data_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz"; + sha1 = "9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"; + }; + } + { + name = "_babel_core___core_7.12.7.tgz"; + path = fetchurl { + name = "_babel_core___core_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.7.tgz"; + sha1 = "bf55363c08c8352a37691f7216ec30090bf7e3bf"; + }; + } + { + name = "_babel_generator___generator_7.12.5.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz"; + sha1 = "a2c50de5c8b6d708ab95be5e6053936c1884a4de"; + }; + } + { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; + sha1 = "5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"; + }; + } + { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; + sha1 = "bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"; + }; + } + { + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz"; + path = fetchurl { + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz"; + sha1 = "55fc1ead5242caa0ca2875dcb8eed6d311e50f48"; + }; + } + { + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz"; + sha1 = "8095cddbff858e6fa9c326daee54a2f2732c1d5d"; + }; + } + { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz"; + path = fetchurl { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; + sha1 = "cb470c76198db6a24e9dbc8987275631e5d29831"; + }; + } + { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; + sha1 = "3c45998f431edd4a9214c5f1d3ad1448a6137f6e"; + }; + } + { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz"; + sha1 = "18b1302d4677f9dc4740fe8c9ed96680e29d37e8"; + }; + } + { + name = "_babel_helper_define_map___helper_define_map_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_define_map___helper_define_map_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz"; + sha1 = "f037ad794264f729eda1889f4ee210b870999092"; + }; + } + { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz"; + sha1 = "40a1cd917bff1288f699a94a75b37a1a2dbd8c7c"; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; + sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; + }; + } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; + sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; + }; + } + { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; + sha1 = "d49b001d1d5a68ca5e6604dda01a6297f7c9381e"; + }; + } + { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"; + sha1 = "fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; + sha1 = "1bfc0229f794988f76ed0a4d4e90860850b54dfb"; + }; + } + { + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; + sha1 = "7954fec71f5b32c48e4b303b437c34453fd7247c"; + }; + } + { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; + sha1 = "50dc96413d594f995a77905905b05893cd779673"; + }; + } + { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; + sha1 = "2f75a831269d4f677de49986dff59927533cf375"; + }; + } + { + name = "_babel_helper_regex___helper_regex_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_regex___helper_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.4.tgz"; + sha1 = "59b373daaf3458e5747dece71bbaf45f9676af6d"; + }; + } + { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; + sha1 = "8c4dbbf916314f6047dc05e6a2217074238347fd"; + }; + } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz"; + sha1 = "f15c9cc897439281891e11d5ce12562ac0cf3fa9"; + }; + } + { + name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; + sha1 = "32427e5aa61547d38eb1e6eaf5fd1426fdad9136"; + }; + } + { + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; + sha1 = "462dc63a7e435ade8468385c63d2b84cce4b3cbf"; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; + sha1 = "2c70576eaa3b5609b24cb99db2888cc3fc4251d1"; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; + sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; + }; + } + { + name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; + sha1 = "175567380c3e77d60ff98a54bb015fe78f2178d9"; + }; + } + { + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; + sha1 = "8a6f701eab0ff39f765b5a1cfef409990e624b87"; + }; + } + { + name = "_babel_helpers___helpers_7.12.5.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz"; + sha1 = "1a1ba4a768d9b58310eda516c449913fe647116e"; + }; + } + { + name = "_babel_highlight___highlight_7.10.4.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; + sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; + }; + } + { + name = "_babel_parser___parser_7.12.7.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz"; + sha1 = "fee7b39fe809d0e73e5b25eecaf5780ef3d73056"; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; + sha1 = "dc6c1170e27d8aca99ff65f4925bd06b1c90550e"; + }; + } + { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; + sha1 = "a082ff541f2a29a4821065b8add9346c0c16e5de"; + }; + } + { + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz"; + sha1 = "59271439fed4145456c41067450543aee332d15f"; + }; + } + { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; + sha1 = "43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"; + }; + } + { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; + sha1 = "8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"; + }; + } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; + sha1 = "d45423b517714eedd5621a9dfdc03fa9f4eb241c"; + }; + } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; + sha1 = "f2c490d36e1b3c9659241034a5d2cd50263a2751"; + }; + } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; + sha1 = "3ed4fff31c015e7f3f1467f190dbe545cd7b046c"; + }; + } + { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz"; + sha1 = "8bf253de8139099fea193b297d23a9d406ef056b"; + }; + } + { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; + sha1 = "def9bd03cea0f9b72283dac0ec22d289c7691069"; + }; + } + { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; + sha1 = "ccc2421af64d3aae50b558a71cede929a5ab2942"; + }; + } + { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; + sha1 = "e02f0ea1b5dc59d401ec16fb824679f683d3303c"; + }; + } + { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; + sha1 = "86814f6e7a21374c980c10d38b4493e703f4a389"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; + sha1 = "2a183958d417765b9eae334f47758e5d6a82e072"; + }; + } + { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; + }; + } + { + name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; + sha1 = "4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"; + }; + } + { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; + sha1 = "bcb297c5366e79bebadef509549cd93b04f19978"; + }; + } + { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz"; + sha1 = "81a8b535b284476c41be6de06853a8802b98c5dd"; + }; + } + { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"; + }; + } + { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha1 = "028964a9ba80dbc094c915c487ad7c4e7a66465a"; + }; + } + { + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; + sha1 = "ee601348c370fa334d2207be158777496521fd51"; + }; + } + { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; + }; + } + { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz"; + sha1 = "9d9d357cc818aa7ae7935917c1257f67677a0926"; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; + }; + } + { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; + }; + } + { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; + }; + } + { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; + }; + } + { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; + }; + } + { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; + }; + } + { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; + sha1 = "dd6c0b357ac1bb142d98537450a319625d13d2a0"; + }; + } + { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; + sha1 = "8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"; + }; + } + { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; + sha1 = "3849a49cc2a22e9743cbd6b52926d30337229af1"; + }; + } + { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; + sha1 = "f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"; + }; + } + { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; + sha1 = "f0ee727874b42a208a48a586b84c3d222c2bbef1"; + }; + } + { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; + sha1 = "65e650fcaddd3d88ddce67c0f834a3d436a32db6"; + }; + } + { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; + sha1 = "d68cf6c9b7f838a8a4144badbe97541ea0904852"; + }; + } + { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; + sha1 = "b9a570fe0d0a8d460116413cb4f97e8e08b2f847"; + }; + } + { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; + sha1 = "a1d16c14862817b6409c0a678d6f9373ca9cd975"; + }; + } + { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; + sha1 = "745661baba295ac06e686822797a69fbaa2ca228"; + }; + } + { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; + sha1 = "b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"; + }; + } + { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; + sha1 = "07640f28867ed16f9511c99c888291f560921cfa"; + }; + } + { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; + sha1 = "2ec76258c70fe08c6d7da154003a480620eba667"; + }; + } + { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; + sha1 = "d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"; + }; + } + { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; + sha1 = "496038602daf1514a64d43d8e17cbb2755e0c3ad"; + }; + } + { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; + sha1 = "3154300b026185666eebb0c0ed7f8415fefcf6f9"; + }; + } + { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; + sha1 = "fa403124542636c786cf9b460a0ffbb48a86e648"; + }; + } + { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; + sha1 = "663fea620d593c93f214a464cd399bf6dc683086"; + }; + } + { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; + sha1 = "eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"; + }; + } + { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; + sha1 = "b407f5c96be0d9f5f88467497fa82b30ac3e8753"; + }; + } + { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; + sha1 = "80073f02ee1bb2d365c3416490e085c95759dec0"; + }; + } + { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; + sha1 = "4ea08696b8d2e65841d0c7706482b048bed1066e"; + }; + } + { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; + sha1 = "d2e963b038771650c922eff593799c96d853255d"; + }; + } + { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; + sha1 = "41bc81200d730abb4456ab8b3fbd5537b59adecd"; + }; + } + { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz"; + sha1 = "1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"; + }; + } + { + name = "_babel_plugin_transform_react_inline_elements___plugin_transform_react_inline_elements_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_inline_elements___plugin_transform_react_inline_elements_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.12.1.tgz"; + sha1 = "f7d507200923adbbdacb107feec7ad09cefae631"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz"; + sha1 = "4c2a647de79c7e2b16bfe4540677ba3121e82a08"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz"; + sha1 = "ef43cbca2a14f1bd17807dbe4376ff89d714cf28"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz"; + sha1 = "d07de6863f468da0809edcf79a1aa8ce2a82a26b"; + }; + } + { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz"; + sha1 = "8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f"; + }; + } + { + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"; + sha1 = "05d46f0ab4d1339ac59adf20a1462c91b37a1a42"; + }; + } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; + sha1 = "5f0a28d842f6462281f06a964e88ba8d7ab49753"; + }; + } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; + sha1 = "6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"; + }; + } + { + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz"; + sha1 = "04b792057eb460389ff6a4198e377614ea1e7ba5"; + }; + } + { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; + sha1 = "0bf9cac5550fce0cfdf043420f661d645fdc75e3"; + }; + } + { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; + sha1 = "527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"; + }; + } + { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz"; + sha1 = "560224613ab23987453948ed21d0b0b193fa7fad"; + }; + } + { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; + sha1 = "b43ece6ed9a79c0c71119f576d299ef09d942843"; + }; + } + { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; + sha1 = "9ca6be343d42512fbc2e68236a82ae64bc7af78a"; + }; + } + { + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; + sha1 = "5232b9f81ccb07070b7c3c36c67a1b78f1845709"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; + sha1 = "cc9661f61390db5c65e3febaccefd5c6ac3faecb"; + }; + } + { + name = "_babel_preset_env___preset_env_7.12.7.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz"; + sha1 = "54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"; + }; + } + { + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + path = fetchurl { + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; + }; + } + { + name = "_babel_preset_react___preset_react_7.12.7.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz"; + sha1 = "36d61d83223b07b6ac4ec55cf016abb0f70be83b"; + }; + } + { + name = "_babel_runtime_corejs3___runtime_corejs3_7.10.3.tgz"; + path = fetchurl { + name = "_babel_runtime_corejs3___runtime_corejs3_7.10.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.3.tgz"; + sha1 = "931ed6941d3954924a7aa967ee440e60c507b91a"; + }; + } + { + name = "_babel_runtime___runtime_7.0.0.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz"; + sha1 = "adeb78fedfc855aa05bc041640f3f6f98e85424c"; + }; + } + { + name = "_babel_runtime___runtime_7.12.5.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz"; + sha1 = "410e7e487441e1b360c29be715d870d9b985882e"; + }; + } + { + name = "_babel_template___template_7.12.7.tgz"; + path = fetchurl { + name = "_babel_template___template_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz"; + sha1 = "c817233696018e39fbb6c491d2fb684e05ed43bc"; + }; + } + { + name = "_babel_traverse___traverse_7.12.7.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.7.tgz"; + sha1 = "572a722408681cef17d6b0bef69ef2e728ca69f1"; + }; + } + { + name = "_babel_types___types_7.12.7.tgz"; + path = fetchurl { + name = "_babel_types___types_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz"; + sha1 = "6039ff1e242640a29452c9ae572162ec9a8f5d13"; + }; + } + { + name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; + path = fetchurl { + name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"; + sha1 = "75a2e8b51cb758a7553d6804a5932d7aace75c39"; + }; + } + { + name = "_clusterws_cws___cws_3.0.0.tgz"; + path = fetchurl { + name = "_clusterws_cws___cws_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@clusterws/cws/-/cws-3.0.0.tgz"; + sha1 = "518fc8e7d9066e220f6f6aef3158cc14d5a1e98e"; + }; + } + { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + path = fetchurl { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz"; + sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; + }; + } + { + name = "_emotion_cache___cache_10.0.19.tgz"; + path = fetchurl { + name = "_emotion_cache___cache_10.0.19.tgz"; + url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.19.tgz"; + sha1 = "d258d94d9c707dcadaf1558def968b86bb87ad71"; + }; + } + { + name = "_emotion_core___core_10.0.17.tgz"; + path = fetchurl { + name = "_emotion_core___core_10.0.17.tgz"; + url = "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.17.tgz"; + sha1 = "3367376709721f4ee2068cff54ba581d362789d8"; + }; + } + { + name = "_emotion_css___css_10.0.14.tgz"; + path = fetchurl { + name = "_emotion_css___css_10.0.14.tgz"; + url = "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.14.tgz"; + sha1 = "95dacabdd0e22845d1a1b0b5968d9afa34011139"; + }; + } + { + name = "_emotion_hash___hash_0.8.0.tgz"; + path = fetchurl { + name = "_emotion_hash___hash_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz"; + sha1 = "bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"; + }; + } + { + name = "_emotion_memoize___memoize_0.7.4.tgz"; + path = fetchurl { + name = "_emotion_memoize___memoize_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz"; + sha1 = "19bf0f5af19149111c40d98bb0cf82119f5d9eeb"; + }; + } + { + name = "_emotion_serialize___serialize_0.11.16.tgz"; + path = fetchurl { + name = "_emotion_serialize___serialize_0.11.16.tgz"; + url = "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz"; + sha1 = "dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad"; + }; + } + { + name = "_emotion_sheet___sheet_0.9.3.tgz"; + path = fetchurl { + name = "_emotion_sheet___sheet_0.9.3.tgz"; + url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.3.tgz"; + sha1 = "689f135ecf87d3c650ed0c4f5ddcbe579883564a"; + }; + } + { + name = "_emotion_stylis___stylis_0.8.4.tgz"; + path = fetchurl { + name = "_emotion_stylis___stylis_0.8.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.4.tgz"; + sha1 = "6c51afdf1dd0d73666ba09d2eb6c25c220d6fe4c"; + }; + } + { + name = "_emotion_unitless___unitless_0.7.5.tgz"; + path = fetchurl { + name = "_emotion_unitless___unitless_0.7.5.tgz"; + url = "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz"; + sha1 = "77211291c1900a700b8a78cfafda3160d76949ed"; + }; + } + { + name = "_emotion_utils___utils_0.11.2.tgz"; + path = fetchurl { + name = "_emotion_utils___utils_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.2.tgz"; + sha1 = "713056bfdffb396b0a14f1c8f18e7b4d0d200183"; + }; + } + { + name = "_emotion_utils___utils_0.11.3.tgz"; + path = fetchurl { + name = "_emotion_utils___utils_0.11.3.tgz"; + url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz"; + sha1 = "a759863867befa7e583400d322652a3f44820924"; + }; + } + { + name = "_emotion_weak_memoize___weak_memoize_0.2.4.tgz"; + path = fetchurl { + name = "_emotion_weak_memoize___weak_memoize_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.4.tgz"; + sha1 = "622a72bebd1e3f48d921563b4b60a762295a81fc"; + }; + } + { + name = "_eslint_eslintrc___eslintrc_0.2.1.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz"; + sha1 = "f72069c330461a06684d119384435e12a5d76e3c"; + }; + } + { + name = "_formatjs_intl_unified_numberformat___intl_unified_numberformat_3.3.6.tgz"; + path = fetchurl { + name = "_formatjs_intl_unified_numberformat___intl_unified_numberformat_3.3.6.tgz"; + url = "https://registry.yarnpkg.com/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.6.tgz"; + sha1 = "ab69818f7568894023cb31fdb5b5c7eed62c6537"; + }; + } + { + name = "_formatjs_intl_utils___intl_utils_2.2.5.tgz"; + path = fetchurl { + name = "_formatjs_intl_utils___intl_utils_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.2.5.tgz"; + sha1 = "eaafd94df3d102ee13e54e80f992a33868a6b1e8"; + }; + } + { + name = "_gamestdio_websocket___websocket_0.3.2.tgz"; + path = fetchurl { + name = "_gamestdio_websocket___websocket_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@gamestdio/websocket/-/websocket-0.3.2.tgz"; + sha1 = "321ba0976ee30fd14e51dbf8faa85ce7b325f76a"; + }; + } + { + name = "_github_webauthn_json___webauthn_json_0.5.7.tgz"; + path = fetchurl { + name = "_github_webauthn_json___webauthn_json_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/@github/webauthn-json/-/webauthn-json-0.5.7.tgz"; + sha1 = "143bc67f6e0f75f8d188e565741507bb08c31214"; + }; + } + { + name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; + path = fetchurl { + name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"; + sha1 = "fd3db1d59ecf7cf121e80650bb86712f9b55eced"; + }; + } + { + name = "_istanbuljs_schema___schema_0.1.2.tgz"; + path = fetchurl { + name = "_istanbuljs_schema___schema_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz"; + sha1 = "26520bf09abe4a5644cd5414e37125a8954241dd"; + }; + } + { + name = "_jest_console___console_26.6.2.tgz"; + path = fetchurl { + name = "_jest_console___console_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz"; + sha1 = "4e04bc464014358b03ab4937805ee36a0aeb98f2"; + }; + } + { + name = "_jest_core___core_26.6.3.tgz"; + path = fetchurl { + name = "_jest_core___core_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz"; + sha1 = "7639fcb3833d748a4656ada54bde193051e45fad"; + }; + } + { + name = "_jest_environment___environment_26.6.2.tgz"; + path = fetchurl { + name = "_jest_environment___environment_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz"; + sha1 = "ba364cc72e221e79cc8f0a99555bf5d7577cf92c"; + }; + } + { + name = "_jest_fake_timers___fake_timers_26.6.2.tgz"; + path = fetchurl { + name = "_jest_fake_timers___fake_timers_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz"; + sha1 = "459c329bcf70cee4af4d7e3f3e67848123535aad"; + }; + } + { + name = "_jest_globals___globals_26.6.2.tgz"; + path = fetchurl { + name = "_jest_globals___globals_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz"; + sha1 = "5b613b78a1aa2655ae908eba638cc96a20df720a"; + }; + } + { + name = "_jest_reporters___reporters_26.6.2.tgz"; + path = fetchurl { + name = "_jest_reporters___reporters_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz"; + sha1 = "1f518b99637a5f18307bd3ecf9275f6882a667f6"; + }; + } + { + name = "_jest_source_map___source_map_26.6.2.tgz"; + path = fetchurl { + name = "_jest_source_map___source_map_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz"; + sha1 = "29af5e1e2e324cafccc936f218309f54ab69d535"; + }; + } + { + name = "_jest_test_result___test_result_26.6.2.tgz"; + path = fetchurl { + name = "_jest_test_result___test_result_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz"; + sha1 = "55da58b62df134576cc95476efa5f7949e3f5f18"; + }; + } + { + name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz"; + path = fetchurl { + name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz"; + sha1 = "98e8a45100863886d074205e8ffdc5a7eb582b17"; + }; + } + { + name = "_jest_transform___transform_26.6.2.tgz"; + path = fetchurl { + name = "_jest_transform___transform_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz"; + sha1 = "5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"; + }; + } + { + name = "_jest_types___types_25.5.0.tgz"; + path = fetchurl { + name = "_jest_types___types_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; + sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; + }; + } + { + name = "_jest_types___types_26.6.2.tgz"; + path = fetchurl { + name = "_jest_types___types_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz"; + sha1 = "bef5a532030e1d88a2f5a6d933f84e97226ed48e"; + }; + } + { + name = "_npmcli_move_file___move_file_1.0.1.tgz"; + path = fetchurl { + name = "_npmcli_move_file___move_file_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz"; + sha1 = "de103070dac0f48ce49cf6693c23af59c0f70464"; + }; + } + { + name = "_rails_ujs___ujs_6.0.3.tgz"; + path = fetchurl { + name = "_rails_ujs___ujs_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3.tgz"; + sha1 = "e68a03278e30daea6a110aac5dfa33c60c53055d"; + }; + } + { + name = "_sinonjs_commons___commons_1.8.1.tgz"; + path = fetchurl { + name = "_sinonjs_commons___commons_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz"; + sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217"; + }; + } + { + name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; + path = fetchurl { + name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz"; + sha1 = "293674fccb3262ac782c7aadfdeca86b10c75c40"; + }; + } + { + name = "_testing_library_dom___dom_7.28.1.tgz"; + path = fetchurl { + name = "_testing_library_dom___dom_7.28.1.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.28.1.tgz"; + sha1 = "dea78be6e1e6db32ddcb29a449e94d9700c79eb9"; + }; + } + { + name = "_testing_library_jest_dom___jest_dom_5.11.6.tgz"; + path = fetchurl { + name = "_testing_library_jest_dom___jest_dom_5.11.6.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.6.tgz"; + sha1 = "782940e82e5cd17bc0a36f15156ba16f3570ac81"; + }; + } + { + name = "_testing_library_react___react_11.2.2.tgz"; + path = fetchurl { + name = "_testing_library_react___react_11.2.2.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.2.tgz"; + sha1 = "099c6c195140ff069211143cb31c0f8337bdb7b7"; + }; + } + { + name = "_types_aria_query___aria_query_4.2.0.tgz"; + path = fetchurl { + name = "_types_aria_query___aria_query_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz"; + sha1 = "14264692a9d6e2fa4db3df5e56e94b5e25647ac0"; + }; + } + { + name = "_types_babel__core___babel__core_7.1.9.tgz"; + path = fetchurl { + name = "_types_babel__core___babel__core_7.1.9.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz"; + sha1 = "77e59d438522a6fb898fa43dc3455c6e72f3963d"; + }; + } + { + name = "_types_babel__generator___babel__generator_7.6.1.tgz"; + path = fetchurl { + name = "_types_babel__generator___babel__generator_7.6.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz"; + sha1 = "4901767b397e8711aeb99df8d396d7ba7b7f0e04"; + }; + } + { + name = "_types_babel__template___babel__template_7.0.2.tgz"; + path = fetchurl { + name = "_types_babel__template___babel__template_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz"; + sha1 = "4ff63d6b52eddac1de7b975a5223ed32ecea9307"; + }; + } + { + name = "_types_babel__traverse___babel__traverse_7.0.13.tgz"; + path = fetchurl { + name = "_types_babel__traverse___babel__traverse_7.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.13.tgz"; + sha1 = "1874914be974a492e1b4cb00585cabb274e8ba18"; + }; + } + { + name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; + path = fetchurl { + name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; + sha1 = "db9e4238931eb69ef8aab0ad6523d4d4caa39d03"; + }; + } + { + name = "_types_color_name___color_name_1.1.1.tgz"; + path = fetchurl { + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; + }; + } + { + name = "_types_events___events_3.0.0.tgz"; + path = fetchurl { + name = "_types_events___events_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; + sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; + }; + } + { + name = "_types_glob___glob_7.1.1.tgz"; + path = fetchurl { + name = "_types_glob___glob_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; + sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + }; + } + { + name = "_types_graceful_fs___graceful_fs_4.1.3.tgz"; + path = fetchurl { + name = "_types_graceful_fs___graceful_fs_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz"; + sha1 = "039af35fe26bec35003e8d86d2ee9c586354348f"; + }; + } + { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762"; + }; + } + { + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686"; + }; + } + { + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; + path = fetchurl { + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; + sha1 = "e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"; + }; + } + { + name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + path = fetchurl { + name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; + sha1 = "508b13aa344fa4976234e75dddcc34925737d821"; + }; + } + { + name = "_types_jest___jest_26.0.3.tgz"; + path = fetchurl { + name = "_types_jest___jest_26.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.3.tgz"; + sha1 = "79534e0e94857171c0edc596db0ebe7cb7863251"; + }; + } + { + name = "_types_json_schema___json_schema_7.0.6.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; + }; + } + { + name = "_types_json5___json5_0.0.29.tgz"; + path = fetchurl { + name = "_types_json5___json5_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; + }; + } + { + name = "_types_minimatch___minimatch_3.0.3.tgz"; + path = fetchurl { + name = "_types_minimatch___minimatch_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + }; + } + { + name = "_types_node___node_14.11.1.tgz"; + path = fetchurl { + name = "_types_node___node_14.11.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.11.1.tgz"; + sha1 = "56af902ad157e763f9ba63d671c39cda3193c835"; + }; + } + { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + path = fetchurl { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + }; + } + { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + }; + } + { + name = "_types_prettier___prettier_2.0.2.tgz"; + path = fetchurl { + name = "_types_prettier___prettier_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz"; + sha1 = "5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3"; + }; + } + { + name = "_types_q___q_1.5.2.tgz"; + path = fetchurl { + name = "_types_q___q_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz"; + sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8"; + }; + } + { + name = "_types_schema_utils___schema_utils_1.0.0.tgz"; + path = fetchurl { + name = "_types_schema_utils___schema_utils_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/schema-utils/-/schema-utils-1.0.0.tgz"; + sha1 = "295d36f01e2cb8bc3207ca1d9a68e210db6b40cb"; + }; + } + { + name = "_types_stack_utils___stack_utils_2.0.0.tgz"; + path = fetchurl { + name = "_types_stack_utils___stack_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz"; + sha1 = "7036640b4e21cc2f259ae826ce843d277dad8cff"; + }; + } + { + name = "_types_testing_library__jest_dom___testing_library__jest_dom_5.9.1.tgz"; + path = fetchurl { + name = "_types_testing_library__jest_dom___testing_library__jest_dom_5.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.1.tgz"; + sha1 = "aba5ee062b7880f69c212ef769389f30752806e5"; + }; + } + { + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + path = fetchurl { + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + }; + } + { + name = "_types_yargs___yargs_15.0.5.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_15.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz"; + sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79"; + }; + } + { + name = "_webassemblyjs_ast___ast_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_ast___ast_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz"; + sha1 = "bd850604b4042459a5a41cd7d338cbed695ed964"; + }; + } + { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; + sha1 = "3c3d3b271bddfc84deb00f71344438311d52ffb4"; + }; + } + { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; + sha1 = "203f676e333b96c9da2eeab3ccef33c45928b6a2"; + }; + } + { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; + sha1 = "a1442d269c5feb23fcbc9ef759dac3547f29de00"; + }; + } + { + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; + sha1 = "647f8892cd2043a82ac0c8c5e75c36f1d9159f27"; + }; + } + { + name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; + sha1 = "c05256b71244214671f4b08ec108ad63b70eddb8"; + }; + } + { + name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; + sha1 = "25d8884b76839871a08a6c6f806c3979ef712f07"; + }; + } + { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; + sha1 = "4fed8beac9b8c14f8c58b70d124d549dd1fe5790"; + }; + } + { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; + sha1 = "5a4138d5a6292ba18b04c5ae49717e4167965346"; + }; + } + { + name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; + sha1 = "15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"; + }; + } + { + name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; + sha1 = "f19ca0b76a6dc55623a09cffa769e838fa1e1c95"; + }; + } + { + name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; + sha1 = "04d33b636f78e6a6813227e82402f7637b6229ab"; + }; + } + { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; + sha1 = "3fe6d79d3f0f922183aa86002c42dd256cfee9cf"; + }; + } + { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; + sha1 = "50bc70ec68ded8e2763b01a1418bf43491a7a49c"; + }; + } + { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; + sha1 = "2211181e5b31326443cc8112eb9f0b9028721a61"; + }; + } + { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; + sha1 = "9d48e44826df4a6598294aa6c87469d642fff65e"; + }; + } + { + name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; + sha1 = "3031115d79ac5bd261556cecc3fa90a3ef451914"; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; + sha1 = "4935d54c85fef637b00ce9f52377451d00d47899"; + }; + } + { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + path = fetchurl { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790"; + }; + } + { + name = "_xtuc_long___long_4.2.2.tgz"; + path = fetchurl { + name = "_xtuc_long___long_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; + sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d"; + }; + } + { + name = "abab___abab_2.0.5.tgz"; + path = fetchurl { + name = "abab___abab_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; + sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; + }; + } + { + name = "accepts___accepts_1.3.7.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + }; + } + { + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + path = fetchurl { + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz"; + sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"; + }; + } + { + name = "acorn_jsx___acorn_jsx_3.0.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; + sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; + }; + } + { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; + }; + } + { + name = "acorn_walk___acorn_walk_8.0.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.0.0.tgz"; + sha1 = "56ae4c0f434a45fff4a125e7ea95fa9c98f67a16"; + }; + } + { + name = "acorn___acorn_3.3.0.tgz"; + path = fetchurl { + name = "acorn___acorn_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + } + { + name = "acorn___acorn_5.7.3.tgz"; + path = fetchurl { + name = "acorn___acorn_5.7.3.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; + sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + }; + } + { + name = "acorn___acorn_6.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; + }; + } + { + name = "acorn___acorn_7.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + }; + } + { + name = "acorn___acorn_8.0.4.tgz"; + path = fetchurl { + name = "acorn___acorn_8.0.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.0.4.tgz"; + sha1 = "7a3ae4191466a6984eee0fe3407a4f3aa9db8354"; + }; + } + { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + path = fetchurl { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; + }; + } + { + name = "ajv_errors___ajv_errors_1.0.1.tgz"; + path = fetchurl { + name = "ajv_errors___ajv_errors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz"; + sha1 = "f35986aceb91afadec4102fbd85014950cefa64d"; + }; + } + { + name = "ajv_keywords___ajv_keywords_1.5.1.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; + sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + }; + } + { + name = "ajv___ajv_4.11.8.tgz"; + path = fetchurl { + name = "ajv___ajv_4.11.8.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; + path = fetchurl { + name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; + sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3"; + }; + } + { + name = "ansi_colors___ansi_colors_3.2.4.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz"; + sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf"; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } + { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + }; + } + { + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; + }; + } + { + name = "ansi_html___ansi_html_0.0.7.tgz"; + path = fetchurl { + name = "ansi_html___ansi_html_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } + { + name = "anymatch___anymatch_2.0.0.tgz"; + path = fetchurl { + name = "anymatch___anymatch_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz"; + sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"; + }; + } + { + name = "anymatch___anymatch_3.1.1.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; + sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + }; + } + { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "aria_query___aria_query_4.2.2.tgz"; + path = fetchurl { + name = "aria_query___aria_query_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz"; + sha1 = "0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"; + }; + } + { + name = "arr_diff___arr_diff_4.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + } + { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + path = fetchurl { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + }; + } + { + name = "arr_union___arr_union_3.1.0.tgz"; + path = fetchurl { + name = "arr_union___arr_union_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + } + { + name = "array_flatten___array_flatten_1.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + } + { + name = "array_flatten___array_flatten_2.1.2.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz"; + sha1 = "24ef80a28c1a893617e2149b0c6d0d788293b099"; + }; + } + { + name = "array_includes___array_includes_3.1.1.tgz"; + path = fetchurl { + name = "array_includes___array_includes_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; + sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; + }; + } + { + name = "array_union___array_union_1.0.2.tgz"; + path = fetchurl { + name = "array_union___array_union_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + } + { + name = "array_uniq___array_uniq_1.0.3.tgz"; + path = fetchurl { + name = "array_uniq___array_uniq_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + } + { + name = "array_unique___array_unique_0.3.2.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + } + { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + path = fetchurl { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; + sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + }; + } + { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + path = fetchurl { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"; + sha1 = "1c13f84a178566042dd63de4414440db9222e443"; + }; + } + { + name = "arrow_key_navigation___arrow_key_navigation_1.2.0.tgz"; + path = fetchurl { + name = "arrow_key_navigation___arrow_key_navigation_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/arrow-key-navigation/-/arrow-key-navigation-1.2.0.tgz"; + sha1 = "edefc5f8b4fc4e384e7c20ddecf81db7ffc970a9"; + }; + } + { + name = "asn1.js___asn1.js_5.4.1.tgz"; + path = fetchurl { + name = "asn1.js___asn1.js_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; + sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07"; + }; + } + { + name = "asn1___asn1_0.2.4.tgz"; + path = fetchurl { + name = "asn1___asn1_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + { + name = "assert___assert_1.5.0.tgz"; + path = fetchurl { + name = "assert___assert_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz"; + sha1 = "55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"; + }; + } + { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + path = fetchurl { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + } + { + name = "ast_types_flow___ast_types_flow_0.0.7.tgz"; + path = fetchurl { + name = "ast_types_flow___ast_types_flow_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz"; + sha1 = "f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"; + }; + } + { + name = "astral_regex___astral_regex_1.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; + sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + }; + } + { + name = "async_each___async_each_1.0.3.tgz"; + path = fetchurl { + name = "async_each___async_each_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; + sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; + }; + } + { + name = "async_limiter___async_limiter_1.0.1.tgz"; + path = fetchurl { + name = "async_limiter___async_limiter_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; + sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; + }; + } + { + name = "async___async_0.9.2.tgz"; + path = fetchurl { + name = "async___async_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + } + { + name = "async___async_2.6.3.tgz"; + path = fetchurl { + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + { + name = "atob___atob_2.1.2.tgz"; + path = fetchurl { + name = "atob___atob_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; + sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + }; + } + { + name = "autoprefixer___autoprefixer_9.8.6.tgz"; + path = fetchurl { + name = "autoprefixer___autoprefixer_9.8.6.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz"; + sha1 = "3b73594ca1bf9266320c5acf1588d74dea74210f"; + }; + } + { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + path = fetchurl { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + { + name = "aws4___aws4_1.10.1.tgz"; + path = fetchurl { + name = "aws4___aws4_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz"; + sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428"; + }; + } + { + name = "axe_core___axe_core_4.0.2.tgz"; + path = fetchurl { + name = "axe_core___axe_core_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.0.2.tgz"; + sha1 = "c7cf7378378a51fcd272d3c09668002a4990b1cb"; + }; + } + { + name = "axios___axios_0.21.0.tgz"; + path = fetchurl { + name = "axios___axios_0.21.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.0.tgz"; + sha1 = "26df088803a2350dff2c27f96fef99fe49442aca"; + }; + } + { + name = "axobject_query___axobject_query_2.2.0.tgz"; + path = fetchurl { + name = "axobject_query___axobject_query_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz"; + sha1 = "943d47e10c0b704aa42275e20edf3722648989be"; + }; + } + { + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + path = fetchurl { + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; + sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; + }; + } + { + name = "babel_jest___babel_jest_26.6.3.tgz"; + path = fetchurl { + name = "babel_jest___babel_jest_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz"; + sha1 = "d87d25cb0037577a0c89f82e5755c5d293c01056"; + }; + } + { + name = "babel_loader___babel_loader_8.2.1.tgz"; + path = fetchurl { + name = "babel_loader___babel_loader_8.2.1.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.1.tgz"; + sha1 = "e53313254677e86f27536f5071d807e01d24ec00"; + }; + } + { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + path = fetchurl { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; + }; + } + { + name = "babel_plugin_emotion___babel_plugin_emotion_10.0.33.tgz"; + path = fetchurl { + name = "babel_plugin_emotion___babel_plugin_emotion_10.0.33.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz"; + sha1 = "ce1155dcd1783bbb9286051efee53f4e2be63e03"; + }; + } + { + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; + path = fetchurl { + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"; + sha1 = "e159ccdc9af95e0b570c75b4573b7c34d671d765"; + }; + } + { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz"; + path = fetchurl { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz"; + sha1 = "8185bd030348d254c6d7dd974355e6a28b21e62d"; + }; + } + { + name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; + path = fetchurl { + name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz"; + sha1 = "4f6844358a1340baed182adbeffa8df9967bc196"; + }; + } + { + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + path = fetchurl { + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; + sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; + }; + } + { + name = "babel_plugin_preval___babel_plugin_preval_5.0.0.tgz"; + path = fetchurl { + name = "babel_plugin_preval___babel_plugin_preval_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-5.0.0.tgz"; + sha1 = "6cabb947ecc241664966e1f99eb56a3b4bb63d1e"; + }; + } + { + name = "babel_plugin_react_intl___babel_plugin_react_intl_6.2.0.tgz"; + path = fetchurl { + name = "babel_plugin_react_intl___babel_plugin_react_intl_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-6.2.0.tgz"; + sha1 = "ac51ca757f318938792fc91e1747515e9225386a"; + }; + } + { + name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; + path = fetchurl { + name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; + }; + } + { + name = "babel_plugin_transform_react_remove_prop_types___babel_plugin_transform_react_remove_prop_types_0.4.24.tgz"; + path = fetchurl { + name = "babel_plugin_transform_react_remove_prop_types___babel_plugin_transform_react_remove_prop_types_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz"; + sha1 = "f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"; + }; + } + { + name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; + path = fetchurl { + name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz"; + sha1 = "cf5feef29551253471cfa82fc8e0f5063df07a77"; + }; + } + { + name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz"; + path = fetchurl { + name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz"; + sha1 = "747872b1171df032252426586881d62d31798fee"; + }; + } + { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + path = fetchurl { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "base64_js___base64_js_1.3.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; + sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; + }; + } + { + name = "base___base_0.11.2.tgz"; + path = fetchurl { + name = "base___base_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; + sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + }; + } + { + name = "batch___batch_0.6.1.tgz"; + path = fetchurl { + name = "batch___batch_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz"; + sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + }; + } + { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + path = fetchurl { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + { + name = "big.js___big.js_3.2.0.tgz"; + path = fetchurl { + name = "big.js___big.js_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz"; + sha1 = "a5fc298b81b9e0dca2e458824784b65c52ba588e"; + }; + } + { + name = "big.js___big.js_5.2.2.tgz"; + path = fetchurl { + name = "big.js___big.js_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; + sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328"; + }; + } + { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; + }; + } + { + name = "binary_extensions___binary_extensions_2.1.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "blurhash___blurhash_1.1.3.tgz"; + path = fetchurl { + name = "blurhash___blurhash_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.3.tgz"; + sha1 = "dc325af7da836d07a0861d830bdd63694382483e"; + }; + } + { + name = "bmp_js___bmp_js_0.1.0.tgz"; + path = fetchurl { + name = "bmp_js___bmp_js_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz"; + sha1 = "e05a63f796a6c1ff25f4771ec7adadc148c07233"; + }; + } + { + name = "bn.js___bn.js_4.11.9.tgz"; + path = fetchurl { + name = "bn.js___bn.js_4.11.9.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; + sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; + }; + } + { + name = "bn.js___bn.js_5.1.3.tgz"; + path = fetchurl { + name = "bn.js___bn.js_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz"; + sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b"; + }; + } + { + name = "body_parser___body_parser_1.19.0.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + }; + } + { + name = "bonjour___bonjour_3.5.0.tgz"; + path = fetchurl { + name = "bonjour___bonjour_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz"; + sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + }; + } + { + name = "boolbase___boolbase_1.0.0.tgz"; + path = fetchurl { + name = "boolbase___boolbase_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_2.3.2.tgz"; + path = fetchurl { + name = "braces___braces_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; + sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { + name = "bricks.js___bricks.js_1.8.0.tgz"; + path = fetchurl { + name = "bricks.js___bricks.js_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/bricks.js/-/bricks.js-1.8.0.tgz"; + sha1 = "8fdeb3c0226af251f4d5727a7df7f9ac0092b4b2"; + }; + } + { + name = "brorand___brorand_1.1.0.tgz"; + path = fetchurl { + name = "brorand___brorand_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + }; + } + { + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + path = fetchurl { + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; + }; + } + { + name = "browserify_aes___browserify_aes_1.2.0.tgz"; + path = fetchurl { + name = "browserify_aes___browserify_aes_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha1 = "326734642f403dabc3003209853bb70ad428ef48"; + }; + } + { + name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; + path = fetchurl { + name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha1 = "8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"; + }; + } + { + name = "browserify_des___browserify_des_1.0.2.tgz"; + path = fetchurl { + name = "browserify_des___browserify_des_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz"; + sha1 = "3af4f1f59839403572f1c66204375f7a7f703e9c"; + }; + } + { + name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; + path = fetchurl { + name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + }; + } + { + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + path = fetchurl { + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"; + }; + } + { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + path = fetchurl { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha1 = "2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"; + }; + } + { + name = "browserslist___browserslist_4.14.5.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.14.5.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz"; + sha1 = "1c751461a102ddc60e40993639b709be7f2c4015"; + }; + } + { + name = "browserslist___browserslist_4.14.7.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.14.7.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz"; + sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6"; + }; + } + { + name = "bser___bser_2.1.1.tgz"; + path = fetchurl { + name = "bser___bser_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; + sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "buffer_indexof___buffer_indexof_1.1.1.tgz"; + path = fetchurl { + name = "buffer_indexof___buffer_indexof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha1 = "52fabcc6a606d1a00302802648ef68f639da268c"; + }; + } + { + name = "buffer_writer___buffer_writer_1.0.1.tgz"; + path = fetchurl { + name = "buffer_writer___buffer_writer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz"; + sha1 = "22a936901e3029afcd7547eb4487ceb697a3bf08"; + }; + } + { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + path = fetchurl { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + } + { + name = "buffer___buffer_4.9.2.tgz"; + path = fetchurl { + name = "buffer___buffer_4.9.2.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz"; + sha1 = "230ead344002988644841ab0244af8c44bbe3ef8"; + }; + } + { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + path = fetchurl { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + }; + } + { + name = "bytes___bytes_3.0.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } + { + name = "cacache___cacache_12.0.4.tgz"; + path = fetchurl { + name = "cacache___cacache_12.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; + sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c"; + }; + } + { + name = "cacache___cacache_15.0.5.tgz"; + path = fetchurl { + name = "cacache___cacache_15.0.5.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz"; + sha1 = "69162833da29170d6732334643c60e005f5f17d0"; + }; + } + { + name = "cache_base___cache_base_1.0.1.tgz"; + path = fetchurl { + name = "cache_base___cache_base_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; + sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + }; + } + { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + path = fetchurl { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + } + { + name = "caller_path___caller_path_0.1.0.tgz"; + path = fetchurl { + name = "caller_path___caller_path_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz"; + sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; + }; + } + { + name = "caller_path___caller_path_2.0.0.tgz"; + path = fetchurl { + name = "caller_path___caller_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + } + { + name = "callsites___callsites_0.2.0.tgz"; + path = fetchurl { + name = "callsites___callsites_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz"; + sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; + }; + } + { + name = "callsites___callsites_2.0.0.tgz"; + path = fetchurl { + name = "callsites___callsites_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "camelcase___camelcase_6.2.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; + sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + }; + } + { + name = "caniuse_api___caniuse_api_3.0.0.tgz"; + path = fetchurl { + name = "caniuse_api___caniuse_api_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz"; + sha1 = "5e4d90e2274961d46291997df599e3ed008ee4c0"; + }; + } + { + name = "caniuse_lite___caniuse_lite_1.0.30001143.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001143.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001143.tgz"; + sha1 = "560f2cfb9f313d1d7e52eb8dac0e4e36c8821c0d"; + }; + } + { + name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz"; + sha1 = "bebde28f893fa9594dadcaa7d6b8e2aa0299df20"; + }; + } + { + name = "capture_exit___capture_exit_2.0.0.tgz"; + path = fetchurl { + name = "capture_exit___capture_exit_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz"; + sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4"; + }; + } + { + name = "caseless___caseless_0.12.0.tgz"; + path = fetchurl { + name = "caseless___caseless_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } + { + name = "chalk___chalk_4.1.0.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; + sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + }; + } + { + name = "char_regex___char_regex_1.0.2.tgz"; + path = fetchurl { + name = "char_regex___char_regex_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz"; + sha1 = "d744358226217f981ed58f479b1d6bcc29545dcf"; + }; + } + { + name = "chokidar___chokidar_3.4.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz"; + sha1 = "e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1"; + }; + } + { + name = "chokidar___chokidar_2.1.8.tgz"; + path = fetchurl { + name = "chokidar___chokidar_2.1.8.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; + sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + }; + } + { + name = "chownr___chownr_2.0.0.tgz"; + path = fetchurl { + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; + }; + } + { + name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; + path = fetchurl { + name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; + sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4"; + }; + } + { + name = "ci_info___ci_info_2.0.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; + sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + }; + } + { + name = "cipher_base___cipher_base_1.0.4.tgz"; + path = fetchurl { + name = "cipher_base___cipher_base_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz"; + sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de"; + }; + } + { + name = "circular_json___circular_json_0.3.3.tgz"; + path = fetchurl { + name = "circular_json___circular_json_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz"; + sha1 = "815c99ea84f6809529d2f45791bdf82711352d66"; + }; + } + { + name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz"; + path = fetchurl { + name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz"; + sha1 = "4186fcca0eae175970aee870b9fe2d6cf8d5655f"; + }; + } + { + name = "class_utils___class_utils_0.3.6.tgz"; + path = fetchurl { + name = "class_utils___class_utils_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; + sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + }; + } + { + name = "classnames___classnames_2.2.6.tgz"; + path = fetchurl { + name = "classnames___classnames_2.2.6.tgz"; + url = "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz"; + sha1 = "43935bffdd291f326dad0a205309b38d00f650ce"; + }; + } + { + name = "clean_stack___clean_stack_2.2.0.tgz"; + path = fetchurl { + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + }; + } + { + name = "cli_cursor___cli_cursor_1.0.2.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + }; + } + { + name = "cli_width___cli_width_2.2.1.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; + }; + } + { + name = "cliui___cliui_5.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + }; + } + { + name = "cliui___cliui_6.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; + sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1"; + }; + } + { + name = "cliui___cliui_7.0.3.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.3.tgz"; + sha1 = "ef180f26c8d9bff3927ee52428bfec2090427981"; + }; + } + { + name = "clone_deep___clone_deep_4.0.1.tgz"; + path = fetchurl { + name = "clone_deep___clone_deep_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; + sha1 = "c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"; + }; + } + { + name = "co___co_4.6.0.tgz"; + path = fetchurl { + name = "co___co_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + } + { + name = "coa___coa_2.0.2.tgz"; + path = fetchurl { + name = "coa___coa_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz"; + sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3"; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } + { + name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; + path = fetchurl { + name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"; + sha1 = "cc2c8e94fc18bbdffe64d6534570c8a673b27f59"; + }; + } + { + name = "collection_visit___collection_visit_1.0.0.tgz"; + path = fetchurl { + name = "collection_visit___collection_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + } + { + name = "color_blend___color_blend_3.0.0.tgz"; + path = fetchurl { + name = "color_blend___color_blend_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/color-blend/-/color-blend-3.0.0.tgz"; + sha1 = "077073ee59ebce15e084f00590c5bf7577899cb5"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "color_string___color_string_1.5.3.tgz"; + path = fetchurl { + name = "color_string___color_string_1.5.3.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz"; + sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc"; + }; + } + { + name = "color___color_3.1.2.tgz"; + path = fetchurl { + name = "color___color_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz"; + sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10"; + }; + } + { + name = "colorette___colorette_1.2.1.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; + sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "commander___commander_6.2.0.tgz"; + path = fetchurl { + name = "commander___commander_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz"; + sha1 = "b990bfb8ac030aedc6d11bc04d1488ffef56db75"; + }; + } + { + name = "commondir___commondir_1.0.1.tgz"; + path = fetchurl { + name = "commondir___commondir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + } + { + name = "component_emitter___component_emitter_1.3.0.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + }; + } + { + name = "compressible___compressible_2.0.18.tgz"; + path = fetchurl { + name = "compressible___compressible_2.0.18.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; + sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba"; + }; + } + { + name = "compression_webpack_plugin___compression_webpack_plugin_6.1.1.tgz"; + path = fetchurl { + name = "compression_webpack_plugin___compression_webpack_plugin_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz"; + sha1 = "ae8e4b2ffdb7396bb776e66918d751a20d8ccf0e"; + }; + } + { + name = "compression___compression_1.7.4.tgz"; + path = fetchurl { + name = "compression___compression_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz"; + sha1 = "95523eff170ca57c29a0ca41e6fe131f41e5bb8f"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; + path = fetchurl { + name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha1 = "8b32089359308d111115d81cad3fceab888f97bc"; + }; + } + { + name = "console_browserify___console_browserify_1.2.0.tgz"; + path = fetchurl { + name = "console_browserify___console_browserify_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; + sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336"; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + } + { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + path = fetchurl { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + } + { + name = "contains_path___contains_path_0.1.0.tgz"; + path = fetchurl { + name = "contains_path___contains_path_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz"; + sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; + }; + } + { + name = "content_disposition___content_disposition_0.5.3.tgz"; + path = fetchurl { + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + }; + } + { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + path = fetchurl { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } + { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + path = fetchurl { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; + }; + } + { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + path = fetchurl { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + } + { + name = "core_js_compat___core_js_compat_3.7.0.tgz"; + path = fetchurl { + name = "core_js_compat___core_js_compat_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz"; + sha1 = "8479c5d3d672d83f1f5ab94cf353e57113e065ed"; + }; + } + { + name = "core_js_pure___core_js_pure_3.6.5.tgz"; + path = fetchurl { + name = "core_js_pure___core_js_pure_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; + sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; + }; + } + { + name = "core_js___core_js_2.6.11.tgz"; + path = fetchurl { + name = "core_js___core_js_2.6.11.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; + sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; + }; + } + { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; + }; + } + { + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + path = fetchurl { + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e"; + }; + } + { + name = "create_hash___create_hash_1.2.0.tgz"; + path = fetchurl { + name = "create_hash___create_hash_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz"; + sha1 = "889078af11a63756bcfb59bd221996be3a9ef196"; + }; + } + { + name = "create_hmac___create_hmac_1.1.7.tgz"; + path = fetchurl { + name = "create_hmac___create_hmac_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz"; + sha1 = "69170c78b3ab957147b2b8b04572e47ead2243ff"; + }; + } + { + name = "cross_env___cross_env_7.0.2.tgz"; + path = fetchurl { + name = "cross_env___cross_env_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz"; + sha1 = "bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"; + }; + } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } + { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + path = fetchurl { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec"; + }; + } + { + name = "css_color_names___css_color_names_0.0.4.tgz"; + path = fetchurl { + name = "css_color_names___css_color_names_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz"; + sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; + }; + } + { + name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; + path = fetchurl { + name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; + sha1 = "c198940f63a76d7e36c1e71018b001721054cb22"; + }; + } + { + name = "css_font_size_keywords___css_font_size_keywords_1.0.0.tgz"; + path = fetchurl { + name = "css_font_size_keywords___css_font_size_keywords_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz"; + sha1 = "854875ace9aca6a8d2ee0d345a44aae9bb6db6cb"; + }; + } + { + name = "css_font_stretch_keywords___css_font_stretch_keywords_1.0.1.tgz"; + path = fetchurl { + name = "css_font_stretch_keywords___css_font_stretch_keywords_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz"; + sha1 = "50cee9b9ba031fb5c952d4723139f1e107b54b10"; + }; + } + { + name = "css_font_style_keywords___css_font_style_keywords_1.0.1.tgz"; + path = fetchurl { + name = "css_font_style_keywords___css_font_style_keywords_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz"; + sha1 = "5c3532813f63b4a1de954d13cea86ab4333409e4"; + }; + } + { + name = "css_font_weight_keywords___css_font_weight_keywords_1.0.0.tgz"; + path = fetchurl { + name = "css_font_weight_keywords___css_font_weight_keywords_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz"; + sha1 = "9bc04671ac85bc724b574ef5d3ac96b0d604fd97"; + }; + } + { + name = "css_global_keywords___css_global_keywords_1.0.1.tgz"; + path = fetchurl { + name = "css_global_keywords___css_global_keywords_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-global-keywords/-/css-global-keywords-1.0.1.tgz"; + sha1 = "72a9aea72796d019b1d2a3252de4e5aaa37e4a69"; + }; + } + { + name = "css_list_helpers___css_list_helpers_1.0.1.tgz"; + path = fetchurl { + name = "css_list_helpers___css_list_helpers_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-list-helpers/-/css-list-helpers-1.0.1.tgz"; + sha1 = "fff57192202db83240c41686f919e449a7024f7d"; + }; + } + { + name = "css_loader___css_loader_5.0.1.tgz"; + path = fetchurl { + name = "css_loader___css_loader_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.1.tgz"; + sha1 = "9e4de0d6636a6266a585bd0900b422c85539d25f"; + }; + } + { + name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; + path = fetchurl { + name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; + sha1 = "3b2ff4972cc362ab88561507a95408a1432135d7"; + }; + } + { + name = "css_select___css_select_2.1.0.tgz"; + path = fetchurl { + name = "css_select___css_select_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; + sha1 = "6a34653356635934a81baca68d0255432105dbef"; + }; + } + { + name = "css_system_font_keywords___css_system_font_keywords_1.0.0.tgz"; + path = fetchurl { + name = "css_system_font_keywords___css_system_font_keywords_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz"; + sha1 = "85c6f086aba4eb32c571a3086affc434b84823ed"; + }; + } + { + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + path = fetchurl { + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; + }; + } + { + name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; + path = fetchurl { + name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; + sha1 = "2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"; + }; + } + { + name = "css_what___css_what_3.3.0.tgz"; + path = fetchurl { + name = "css_what___css_what_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.3.0.tgz"; + sha1 = "10fec696a9ece2e591ac772d759aacabac38cd39"; + }; + } + { + name = "css.escape___css.escape_1.5.1.tgz"; + path = fetchurl { + name = "css.escape___css.escape_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz"; + sha1 = "42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"; + }; + } + { + name = "css___css_3.0.0.tgz"; + path = fetchurl { + name = "css___css_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz"; + sha1 = "4447a4d58fdd03367c516ca9f64ae365cee4aa5d"; + }; + } + { + name = "cssesc___cssesc_3.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; + sha1 = "37741919903b868565e1c09ea747445cd18983ee"; + }; + } + { + name = "cssnano_preset_default___cssnano_preset_default_4.0.7.tgz"; + path = fetchurl { + name = "cssnano_preset_default___cssnano_preset_default_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; + sha1 = "51ec662ccfca0f88b396dcd9679cdb931be17f76"; + }; + } + { + name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; + path = fetchurl { + name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; + sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; + }; + } + { + name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; + path = fetchurl { + name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; + sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; + }; + } + { + name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; + path = fetchurl { + name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; + sha1 = "b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"; + }; + } + { + name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; + path = fetchurl { + name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; + sha1 = "574082fb2859d2db433855835d9a8456ea18bbf3"; + }; + } + { + name = "cssnano___cssnano_4.1.10.tgz"; + path = fetchurl { + name = "cssnano___cssnano_4.1.10.tgz"; + url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz"; + sha1 = "0ac41f0b13d13d465487e111b778d42da631b8b2"; + }; + } + { + name = "csso___csso_4.0.3.tgz"; + path = fetchurl { + name = "csso___csso_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz"; + sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"; + }; + } + { + name = "cssom___cssom_0.4.4.tgz"; + path = fetchurl { + name = "cssom___cssom_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; + sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"; + }; + } + { + name = "cssom___cssom_0.3.8.tgz"; + path = fetchurl { + name = "cssom___cssom_0.3.8.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; + sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; + }; + } + { + name = "cssstyle___cssstyle_2.3.0.tgz"; + path = fetchurl { + name = "cssstyle___cssstyle_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; + sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; + }; + } + { + name = "csstype___csstype_2.6.13.tgz"; + path = fetchurl { + name = "csstype___csstype_2.6.13.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz"; + sha1 = "a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"; + }; + } + { + name = "cyclist___cyclist_1.0.1.tgz"; + path = fetchurl { + name = "cyclist___cyclist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + }; + } + { + name = "d___d_1.0.1.tgz"; + path = fetchurl { + name = "d___d_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz"; + sha1 = "8698095372d58dbee346ffd0c7093f99f8f9eb5a"; + }; + } + { + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; + path = fetchurl { + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; + sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; + }; + } + { + name = "dashdash___dashdash_1.14.1.tgz"; + path = fetchurl { + name = "dashdash___dashdash_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + { + name = "data_urls___data_urls_2.0.0.tgz"; + path = fetchurl { + name = "data_urls___data_urls_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; + sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "debug___debug_3.2.6.tgz"; + path = fetchurl { + name = "debug___debug_3.2.6.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; + sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; + }; + } + { + name = "debug___debug_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "decimal.js___decimal.js_10.2.1.tgz"; + path = fetchurl { + name = "decimal.js___decimal.js_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz"; + sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "deep_equal___deep_equal_1.1.1.tgz"; + path = fetchurl { + name = "deep_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; + }; + } + { + name = "deep_extend___deep_extend_0.5.1.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz"; + sha1 = "b894a9dd90d3023fbf1c55a394fb858eb2066f1f"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "deepmerge___deepmerge_4.2.2.tgz"; + path = fetchurl { + name = "deepmerge___deepmerge_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; + sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; + }; + } + { + name = "default_gateway___default_gateway_4.2.0.tgz"; + path = fetchurl { + name = "default_gateway___default_gateway_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz"; + sha1 = "167104c7500c2115f6dd69b0a536bb8ed720552b"; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + { + name = "define_property___define_property_0.2.5.tgz"; + path = fetchurl { + name = "define_property___define_property_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + } + { + name = "define_property___define_property_1.0.0.tgz"; + path = fetchurl { + name = "define_property___define_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + } + { + name = "define_property___define_property_2.0.2.tgz"; + path = fetchurl { + name = "define_property___define_property_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; + sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + }; + } + { + name = "del___del_4.1.1.tgz"; + path = fetchurl { + name = "del___del_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; + sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + } + { + name = "denque___denque_1.4.1.tgz"; + path = fetchurl { + name = "denque___denque_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz"; + sha1 = "6744ff7641c148c3f8a69c307e51235c1f4a37cf"; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + } + { + name = "des.js___des.js_1.0.1.tgz"; + path = fetchurl { + name = "des.js___des.js_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; + sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843"; + }; + } + { + name = "destroy___destroy_1.0.4.tgz"; + path = fetchurl { + name = "destroy___destroy_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + } + { + name = "detect_file___detect_file_1.0.0.tgz"; + path = fetchurl { + name = "detect_file___detect_file_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + } + { + name = "detect_newline___detect_newline_3.1.0.tgz"; + path = fetchurl { + name = "detect_newline___detect_newline_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz"; + sha1 = "576f5dfc63ae1a192ff192d8ad3af6308991b651"; + }; + } + { + name = "detect_node___detect_node_2.0.4.tgz"; + path = fetchurl { + name = "detect_node___detect_node_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz"; + sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c"; + }; + } + { + name = "detect_passive_events___detect_passive_events_2.0.1.tgz"; + path = fetchurl { + name = "detect_passive_events___detect_passive_events_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/detect-passive-events/-/detect-passive-events-2.0.1.tgz"; + sha1 = "fdbd6f6dd5e6ac10c6189a4cb26ab264d41c0835"; + }; + } + { + name = "diff_sequences___diff_sequences_25.2.6.tgz"; + path = fetchurl { + name = "diff_sequences___diff_sequences_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz"; + sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; + }; + } + { + name = "diff_sequences___diff_sequences_26.6.2.tgz"; + path = fetchurl { + name = "diff_sequences___diff_sequences_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz"; + sha1 = "48ba99157de1923412eed41db6b6d4aa9ca7c0b1"; + }; + } + { + name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; + path = fetchurl { + name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha1 = "40e8ee98f55a2149607146921c63e1ae5f3d2875"; + }; + } + { + name = "dns_equal___dns_equal_1.0.0.tgz"; + path = fetchurl { + name = "dns_equal___dns_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + }; + } + { + name = "dns_packet___dns_packet_1.3.1.tgz"; + path = fetchurl { + name = "dns_packet___dns_packet_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz"; + sha1 = "12aa426981075be500b910eedcd0b47dd7deda5a"; + }; + } + { + name = "dns_txt___dns_txt_2.0.2.tgz"; + path = fetchurl { + name = "dns_txt___dns_txt_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + } + { + name = "doctrine___doctrine_1.5.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; + sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + }; + } + { + name = "doctrine___doctrine_2.1.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; + sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; + }; + } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } + { + name = "dom_accessibility_api___dom_accessibility_api_0.5.4.tgz"; + path = fetchurl { + name = "dom_accessibility_api___dom_accessibility_api_0.5.4.tgz"; + url = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz"; + sha1 = "b06d059cdd4a4ad9a79275f9d414a5c126241166"; + }; + } + { + name = "dom_helpers___dom_helpers_3.4.0.tgz"; + path = fetchurl { + name = "dom_helpers___dom_helpers_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz"; + sha1 = "e9b369700f959f62ecde5a6babde4bccd9169af8"; + }; + } + { + name = "dom_helpers___dom_helpers_5.1.3.tgz"; + path = fetchurl { + name = "dom_helpers___dom_helpers_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz"; + sha1 = "7233248eb3a2d1f74aafca31e52c5299cc8ce821"; + }; + } + { + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; + }; + } + { + name = "domain_browser___domain_browser_1.2.0.tgz"; + path = fetchurl { + name = "domain_browser___domain_browser_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz"; + sha1 = "3d31f50191a6749dd1375a7f522e823d42e54eda"; + }; + } + { + name = "domelementtype___domelementtype_1.3.1.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz"; + sha1 = "d048c44b37b0d10a7f2a3d5fee3f4333d790481f"; + }; + } + { + name = "domelementtype___domelementtype_2.0.1.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz"; + sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"; + }; + } + { + name = "domexception___domexception_2.0.1.tgz"; + path = fetchurl { + name = "domexception___domexception_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; + sha1 = "fb44aefba793e1574b0af6aed2801d057529f304"; + }; + } + { + name = "domutils___domutils_1.7.0.tgz"; + path = fetchurl { + name = "domutils___domutils_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz"; + sha1 = "56ea341e834e06e6748af7a1cb25da67ea9f8c2a"; + }; + } + { + name = "dot_prop___dot_prop_5.3.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + }; + } + { + name = "dotenv___dotenv_8.2.0.tgz"; + path = fetchurl { + name = "dotenv___dotenv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz"; + sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a"; + }; + } + { + name = "duplexer___duplexer_0.1.2.tgz"; + path = fetchurl { + name = "duplexer___duplexer_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; + sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; + }; + } + { + name = "duplexify___duplexify_3.7.1.tgz"; + path = fetchurl { + name = "duplexify___duplexify_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; + sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"; + }; + } + { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + path = fetchurl { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + } + { + name = "ee_first___ee_first_1.1.1.tgz"; + path = fetchurl { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + } + { + name = "ejs___ejs_2.7.4.tgz"; + path = fetchurl { + name = "ejs___ejs_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz"; + sha1 = "48661287573dcc53e366c7a1ae52c3a120eec9ba"; + }; + } + { + name = "ejs___ejs_3.1.5.tgz"; + path = fetchurl { + name = "ejs___ejs_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz"; + sha1 = "aed723844dc20acb4b170cd9ab1017e476a0d93b"; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.574.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.574.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.574.tgz"; + sha1 = "bdd87f62fe70165e5c862a0acf0cee9889e23aa3"; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.603.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.603.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz"; + sha1 = "1b71bec27fb940eccd79245f6824c63d5f7e8abf"; + }; + } + { + name = "elliptic___elliptic_6.5.3.tgz"; + path = fetchurl { + name = "elliptic___elliptic_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; + sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; + }; + } + { + name = "emittery___emittery_0.7.1.tgz"; + path = fetchurl { + name = "emittery___emittery_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz"; + sha1 = "c02375a927a40948c0345cc903072597f5270451"; + }; + } + { + name = "934f314fd8322276765066e8a2a6be5bac61b1cf"; + path = fetchurl { + name = "934f314fd8322276765066e8a2a6be5bac61b1cf"; + url = "https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf"; + sha1 = "1768aa6ab3d6b926f457e082bd4ed7279f6fc9cf"; + }; + } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "emoji_regex___emoji_regex_9.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.0.0.tgz"; + sha1 = "48a2309cc8a1d2e9d23bc6a67c39b63032e76ea4"; + }; + } + { + name = "emojis_list___emojis_list_2.1.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz"; + sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + }; + } + { + name = "emojis_list___emojis_list_3.0.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; + sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126"; + }; + } + { + name = "enquirer___enquirer_2.3.6.tgz"; + path = fetchurl { + name = "enquirer___enquirer_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; + sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + }; + } + { + name = "entities___entities_2.0.3.tgz"; + path = fetchurl { + name = "entities___entities_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; + sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; + }; + } + { + name = "errno___errno_0.1.7.tgz"; + path = fetchurl { + name = "errno___errno_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; + sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "error_stack_parser___error_stack_parser_2.0.6.tgz"; + path = fetchurl { + name = "error_stack_parser___error_stack_parser_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz"; + sha1 = "5a99a707bd7a4c58a797902d48d82803ede6aad8"; + }; + } + { + name = "es_abstract___es_abstract_1.17.7.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.17.7.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz"; + sha1 = "a4de61b2f66989fc7421676c1cb9787573ace54c"; + }; + } + { + name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; + sha1 = "6e3a0a4bda717e5023ab3b8e90bec36108d22c68"; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + }; + } + { + name = "es5_ext___es5_ext_0.10.53.tgz"; + path = fetchurl { + name = "es5_ext___es5_ext_0.10.53.tgz"; + url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; + sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; + }; + } + { + name = "es6_iterator___es6_iterator_2.0.3.tgz"; + path = fetchurl { + name = "es6_iterator___es6_iterator_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + } + { + name = "es6_map___es6_map_0.1.5.tgz"; + path = fetchurl { + name = "es6_map___es6_map_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz"; + sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + }; + } + { + name = "es6_set___es6_set_0.1.5.tgz"; + path = fetchurl { + name = "es6_set___es6_set_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + }; + } + { + name = "es6_symbol___es6_symbol_3.1.1.tgz"; + path = fetchurl { + name = "es6_symbol___es6_symbol_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + } + { + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + path = fetchurl { + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; + }; + } + { + name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; + path = fetchurl { + name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; + sha1 = "b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; + }; + } + { + name = "escodegen___escodegen_1.14.3.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; + }; + } + { + name = "escope___escope_3.6.0.tgz"; + path = fetchurl { + name = "escope___escope_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz"; + sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; + }; + } + { + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + path = fetchurl { + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; + sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; + }; + } + { + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + path = fetchurl { + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; + sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; + }; + } + { + name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; + path = fetchurl { + name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; + sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702"; + }; + } + { + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; + path = fetchurl { + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz"; + sha1 = "a2d84caa49756942f42f1ffab9002436391718fd"; + }; + } + { + name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz"; + path = fetchurl { + name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz"; + sha1 = "845fd8b2260ad8f82564c1222fce44ad71d9418a"; + }; + } + { + name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz"; + path = fetchurl { + name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz"; + sha1 = "50b21a412b9574bfe05b21db176e8b7b3b15bff3"; + }; + } + { + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + }; + } + { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + }; + } + { + name = "eslint___eslint_2.13.1.tgz"; + path = fetchurl { + name = "eslint___eslint_2.13.1.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-2.13.1.tgz"; + sha1 = "e4cc8fa0f009fb829aaae23855a29360be1f6c11"; + }; + } + { + name = "eslint___eslint_7.14.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz"; + sha1 = "2d2cac1d28174c510a97b377f122a5507958e344"; + }; + } + { + name = "espree___espree_3.5.4.tgz"; + path = fetchurl { + name = "espree___espree_3.5.4.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz"; + sha1 = "b0f447187c8a8bed944b815a660bddf5deb5d1a7"; + }; + } + { + name = "espree___espree_7.3.0.tgz"; + path = fetchurl { + name = "espree___espree_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz"; + sha1 = "dc30437cf67947cf576121ebd780f15eeac72348"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esquery___esquery_1.3.1.tgz"; + path = fetchurl { + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + }; + } + { + name = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "etag___etag_1.8.1.tgz"; + path = fetchurl { + name = "etag___etag_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + } + { + name = "event_emitter___event_emitter_0.3.5.tgz"; + path = fetchurl { + name = "event_emitter___event_emitter_0.3.5.tgz"; + url = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + } + { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + path = fetchurl { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f"; + }; + } + { + name = "events___events_3.2.0.tgz"; + path = fetchurl { + name = "events___events_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz"; + sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379"; + }; + } + { + name = "eventsource___eventsource_1.0.7.tgz"; + path = fetchurl { + name = "eventsource___eventsource_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz"; + sha1 = "8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"; + }; + } + { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + path = fetchurl { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha1 = "7fcbdb198dc71959432efe13842684e0525acb02"; + }; + } + { + name = "exec_sh___exec_sh_0.3.4.tgz"; + path = fetchurl { + name = "exec_sh___exec_sh_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; + sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; + }; + } + { + name = "execa___execa_1.0.0.tgz"; + path = fetchurl { + name = "execa___execa_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; + sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + }; + } + { + name = "execa___execa_4.1.0.tgz"; + path = fetchurl { + name = "execa___execa_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz"; + sha1 = "4e5491ad1572f2f17a77d388c6c857135b22847a"; + }; + } + { + name = "exif_js___exif_js_2.3.0.tgz"; + path = fetchurl { + name = "exif_js___exif_js_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/exif-js/-/exif-js-2.3.0.tgz"; + sha1 = "9d10819bf571f873813e7640241255ab9ce1a814"; + }; + } + { + name = "exit_hook___exit_hook_1.1.1.tgz"; + path = fetchurl { + name = "exit_hook___exit_hook_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz"; + sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; + }; + } + { + name = "exit___exit_0.1.2.tgz"; + path = fetchurl { + name = "exit___exit_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + } + { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + } + { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + path = fetchurl { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + } + { + name = "expect___expect_26.6.2.tgz"; + path = fetchurl { + name = "expect___expect_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz"; + sha1 = "c6b996bf26bf3fe18b67b2d0f51fc981ba934417"; + }; + } + { + name = "express___express_4.17.1.tgz"; + path = fetchurl { + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + }; + } + { + name = "ext___ext_1.4.0.tgz"; + path = fetchurl { + name = "ext___ext_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; + sha1 = "89ae7a07158f79d35517882904324077e4379244"; + }; + } + { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + } + { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "extglob___extglob_2.0.4.tgz"; + path = fetchurl { + name = "extglob___extglob_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; + sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + }; + } + { + name = "extsprintf___extsprintf_1.3.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + } + { + name = "extsprintf___extsprintf_1.4.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "faye_websocket___faye_websocket_0.10.0.tgz"; + path = fetchurl { + name = "faye_websocket___faye_websocket_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + } + { + name = "faye_websocket___faye_websocket_0.11.3.tgz"; + path = fetchurl { + name = "faye_websocket___faye_websocket_0.11.3.tgz"; + url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz"; + sha1 = "5c0e9a8968e8912c286639fde977a8b209f2508e"; + }; + } + { + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + path = fetchurl { + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; + }; + } + { + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + path = fetchurl { + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; + }; + } + { + name = "figures___figures_1.7.0.tgz"; + path = fetchurl { + name = "figures___figures_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + }; + } + { + name = "file_entry_cache___file_entry_cache_1.3.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-1.3.1.tgz"; + sha1 = "44c61ea607ae4be9c1402f41f44270cbfe334ff8"; + }; + } + { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + }; + } + { + name = "file_loader___file_loader_6.2.0.tgz"; + path = fetchurl { + name = "file_loader___file_loader_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz"; + sha1 = "baef7cf8e1840df325e4390b4484879480eebe4d"; + }; + } + { + name = "file_type___file_type_12.4.2.tgz"; + path = fetchurl { + name = "file_type___file_type_12.4.2.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz"; + sha1 = "a344ea5664a1d01447ee7fb1b635f72feb6169d9"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } + { + name = "filelist___filelist_1.0.1.tgz"; + path = fetchurl { + name = "filelist___filelist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz"; + sha1 = "f10d1a3ae86c1694808e8f20906f43d4c9132dbb"; + }; + } + { + name = "filesize___filesize_6.1.0.tgz"; + path = fetchurl { + name = "filesize___filesize_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz"; + sha1 = "e81bdaa780e2451d714d71c0d7a4f3238d37ad00"; + }; + } + { + name = "fill_range___fill_range_4.0.0.tgz"; + path = fetchurl { + name = "fill_range___fill_range_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { + name = "finalhandler___finalhandler_1.1.2.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + }; + } + { + name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"; + }; + } + { + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; + }; + } + { + name = "find_root___find_root_1.1.0.tgz"; + path = fetchurl { + name = "find_root___find_root_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz"; + sha1 = "abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"; + }; + } + { + name = "find_up___find_up_2.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + } + { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "findup_sync___findup_sync_3.0.0.tgz"; + path = fetchurl { + name = "findup_sync___findup_sync_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz"; + sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"; + }; + } + { + name = "flat_cache___flat_cache_1.3.4.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz"; + sha1 = "2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"; + }; + } + { + name = "flat_cache___flat_cache_2.0.1.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; + sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + }; + } + { + name = "flatted___flatted_2.0.2.tgz"; + path = fetchurl { + name = "flatted___flatted_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; + sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"; + }; + } + { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + path = fetchurl { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; + }; + } + { + name = "follow_redirects___follow_redirects_1.13.0.tgz"; + path = fetchurl { + name = "follow_redirects___follow_redirects_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz"; + sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; + }; + } + { + name = "font_awesome___font_awesome_4.7.0.tgz"; + path = fetchurl { + name = "font_awesome___font_awesome_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; + sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; + }; + } + { + name = "for_in___for_in_1.0.2.tgz"; + path = fetchurl { + name = "for_in___for_in_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + } + { + name = "forever_agent___forever_agent_0.6.1.tgz"; + path = fetchurl { + name = "forever_agent___forever_agent_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + { + name = "form_data___form_data_2.3.3.tgz"; + path = fetchurl { + name = "form_data___form_data_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + { + name = "forwarded___forwarded_0.1.2.tgz"; + path = fetchurl { + name = "forwarded___forwarded_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + } + { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + path = fetchurl { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + } + { + name = "fresh___fresh_0.5.2.tgz"; + path = fetchurl { + name = "fresh___fresh_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + } + { + name = "from2___from2_2.3.0.tgz"; + path = fetchurl { + name = "from2___from2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + } + { + name = "front_matter___front_matter_2.1.2.tgz"; + path = fetchurl { + name = "front_matter___front_matter_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/front-matter/-/front-matter-2.1.2.tgz"; + sha1 = "f75983b9f2f413be658c93dfd7bd8ce4078f5cdb"; + }; + } + { + name = "fs_extra___fs_extra_3.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz"; + sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + }; + } + { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; + }; + } + { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + path = fetchurl { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_1.2.13.tgz"; + path = fetchurl { + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; + }; + } + { + name = "fsevents___fsevents_2.1.3.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; + sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + } + { + name = "generate_function___generate_function_2.3.1.tgz"; + path = fetchurl { + name = "generate_function___generate_function_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz"; + sha1 = "f069617690c10c868e73b8465746764f97c3479f"; + }; + } + { + name = "generate_object_property___generate_object_property_1.2.0.tgz"; + path = fetchurl { + name = "generate_object_property___generate_object_property_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + }; + } + { + name = "generic_pool___generic_pool_2.4.3.tgz"; + path = fetchurl { + name = "generic_pool___generic_pool_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz"; + sha1 = "780c36f69dfad05a5a045dd37be7adca11a4f6ff"; + }; + } + { + name = "gensync___gensync_1.0.0_beta.1.tgz"; + path = fetchurl { + name = "gensync___gensync_1.0.0_beta.1.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz"; + sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_package_type___get_package_type_0.1.0.tgz"; + path = fetchurl { + name = "get_package_type___get_package_type_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz"; + sha1 = "8de2d803cff44df3bc6c456e6668b36c3926e11a"; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + }; + } + { + name = "get_stream___get_stream_5.2.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + }; + } + { + name = "get_value___get_value_2.0.6.tgz"; + path = fetchurl { + name = "get_value___get_value_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + } + { + name = "getpass___getpass_0.1.7.tgz"; + path = fetchurl { + name = "getpass___getpass_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + { + name = "glob_parent___glob_parent_3.1.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + } + { + name = "glob_parent___glob_parent_5.1.1.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; + sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "global_modules___global_modules_1.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz"; + sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; + }; + } + { + name = "global_modules___global_modules_2.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; + sha1 = "997605ad2345f27f51539bea26574421215c7780"; + }; + } + { + name = "global_prefix___global_prefix_1.0.2.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + } + { + name = "global_prefix___global_prefix_3.0.0.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz"; + sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97"; + }; + } + { + name = "globals___globals_11.12.0.tgz"; + path = fetchurl { + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + }; + } + { + name = "globals___globals_12.3.0.tgz"; + path = fetchurl { + name = "globals___globals_12.3.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz"; + sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; + }; + } + { + name = "globals___globals_9.18.0.tgz"; + path = fetchurl { + name = "globals___globals_9.18.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz"; + sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; + }; + } + { + name = "globby___globby_6.1.0.tgz"; + path = fetchurl { + name = "globby___globby_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + } + { + name = "globule___globule_1.3.2.tgz"; + path = fetchurl { + name = "globule___globule_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz"; + sha1 = "d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"; + }; + } + { + name = "gonzales_pe_sl___gonzales_pe_sl_4.2.3.tgz"; + path = fetchurl { + name = "gonzales_pe_sl___gonzales_pe_sl_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/gonzales-pe-sl/-/gonzales-pe-sl-4.2.3.tgz"; + sha1 = "6a868bc380645f141feeb042c6f97fcc71b59fe6"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; + }; + } + { + name = "growly___growly_1.3.0.tgz"; + path = fetchurl { + name = "growly___growly_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz"; + sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; + }; + } + { + name = "gzip_size___gzip_size_5.1.1.tgz"; + path = fetchurl { + name = "gzip_size___gzip_size_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz"; + sha1 = "cb9bee692f87c0612b232840a873904e4c135274"; + }; + } + { + name = "handle_thing___handle_thing_2.0.1.tgz"; + path = fetchurl { + name = "handle_thing___handle_thing_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"; + sha1 = "857f79ce359580c340d43081cc648970d0bb234e"; + }; + } + { + name = "har_schema___har_schema_2.0.0.tgz"; + path = fetchurl { + name = "har_schema___har_schema_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + { + name = "har_validator___har_validator_5.1.5.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + } + { + name = "has_flag___has_flag_1.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_symbols___has_symbols_1.0.1.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } + { + name = "has_value___has_value_0.3.1.tgz"; + path = fetchurl { + name = "has_value___has_value_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + } + { + name = "has_value___has_value_1.0.0.tgz"; + path = fetchurl { + name = "has_value___has_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + } + { + name = "has_values___has_values_0.1.4.tgz"; + path = fetchurl { + name = "has_values___has_values_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + } + { + name = "has_values___has_values_1.0.0.tgz"; + path = fetchurl { + name = "has_values___has_values_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "hash_base___hash_base_3.1.0.tgz"; + path = fetchurl { + name = "hash_base___hash_base_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; + sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"; + }; + } + { + name = "hash.js___hash.js_1.1.7.tgz"; + path = fetchurl { + name = "hash.js___hash.js_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; + sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42"; + }; + } + { + name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; + path = fetchurl { + name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; + sha1 = "4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"; + }; + } + { + name = "history___history_4.10.1.tgz"; + path = fetchurl { + name = "history___history_4.10.1.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz"; + sha1 = "33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"; + }; + } + { + name = "history___history_4.7.2.tgz"; + path = fetchurl { + name = "history___history_4.7.2.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz"; + sha1 = "22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"; + }; + } + { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + path = fetchurl { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + }; + } + { + name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; + path = fetchurl { + name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; + url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz"; + sha1 = "c5903cf409c0dfd908f388e619d86b9c1174cb47"; + }; + } + { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + path = fetchurl { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; + sha1 = "ece0acaf71d62c2969c2ec59feff42a4b1a85b45"; + }; + } + { + name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + path = fetchurl { + name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha1 = "743298cef4e5af3e194161fbadcc2151d3a058e8"; + }; + } + { + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; + }; + } + { + name = "hpack.js___hpack.js_2.1.6.tgz"; + path = fetchurl { + name = "hpack.js___hpack.js_2.1.6.tgz"; + url = "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz"; + sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + }; + } + { + name = "hsl_regex___hsl_regex_1.0.0.tgz"; + path = fetchurl { + name = "hsl_regex___hsl_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz"; + sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; + }; + } + { + name = "hsla_regex___hsla_regex_1.0.0.tgz"; + path = fetchurl { + name = "hsla_regex___hsla_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz"; + sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; + }; + } + { + name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; + path = fetchurl { + name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; + sha1 = "97d4688aeb5c81886a364faa0cad1dda14d433a7"; + }; + } + { + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + path = fetchurl { + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; + sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3"; + }; + } + { + name = "html_entities___html_entities_1.3.1.tgz"; + path = fetchurl { + name = "html_entities___html_entities_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz"; + sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"; + }; + } + { + name = "html_escaper___html_escaper_2.0.2.tgz"; + path = fetchurl { + name = "html_escaper___html_escaper_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; + sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; + }; + } + { + name = "http_deceiver___http_deceiver_1.2.7.tgz"; + path = fetchurl { + name = "http_deceiver___http_deceiver_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz"; + sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + }; + } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } + { + name = "http_errors___http_errors_1.6.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + } + { + name = "http_errors___http_errors_1.7.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; + sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + }; + } + { + name = "http_link_header___http_link_header_1.0.3.tgz"; + path = fetchurl { + name = "http_link_header___http_link_header_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/http-link-header/-/http-link-header-1.0.3.tgz"; + sha1 = "abbc2cdc5e06dd7e196a4983adac08a2d085ec90"; + }; + } + { + name = "http_parser_js___http_parser_js_0.4.10.tgz"; + path = fetchurl { + name = "http_parser_js___http_parser_js_0.4.10.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz"; + sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + }; + } + { + name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; + path = fetchurl { + name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; + sha1 = "183c7dc4aa1479150306498c210cdaf96080a43a"; + }; + } + { + name = "http_proxy___http_proxy_1.18.1.tgz"; + path = fetchurl { + name = "http_proxy___http_proxy_1.18.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; + sha1 = "401541f0534884bbf95260334e72f88ee3976549"; + }; + } + { + name = "http_signature___http_signature_1.2.0.tgz"; + path = fetchurl { + name = "http_signature___http_signature_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + { + name = "https_browserify___https_browserify_1.0.0.tgz"; + path = fetchurl { + name = "https_browserify___https_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + }; + } + { + name = "human_signals___human_signals_1.1.1.tgz"; + path = fetchurl { + name = "human_signals___human_signals_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz"; + sha1 = "c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "icss_utils___icss_utils_5.0.0.tgz"; + path = fetchurl { + name = "icss_utils___icss_utils_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.0.0.tgz"; + sha1 = "03ed56c3accd32f9caaf1752ebf64ef12347bb84"; + }; + } + { + name = "idb_keyval___idb_keyval_3.2.0.tgz"; + path = fetchurl { + name = "idb_keyval___idb_keyval_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-3.2.0.tgz"; + sha1 = "cbbf354deb5684b6cdc84376294fc05932845bd6"; + }; + } + { + name = "ieee754___ieee754_1.1.13.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; + sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; + }; + } + { + name = "iferr___iferr_0.1.5.tgz"; + path = fetchurl { + name = "iferr___iferr_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + } + { + name = "ignore___ignore_3.3.10.tgz"; + path = fetchurl { + name = "ignore___ignore_3.3.10.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz"; + sha1 = "0a97fb876986e8081c631160f8f9f389157f0043"; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + }; + } + { + name = "immutable___immutable_3.8.2.tgz"; + path = fetchurl { + name = "immutable___immutable_3.8.2.tgz"; + url = "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz"; + sha1 = "c2439951455bb39913daf281376f1530e104adf3"; + }; + } + { + name = "import_cwd___import_cwd_2.1.0.tgz"; + path = fetchurl { + name = "import_cwd___import_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz"; + sha1 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; + }; + } + { + name = "import_fresh___import_fresh_2.0.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; + sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + }; + } + { + name = "import_fresh___import_fresh_3.2.1.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; + }; + } + { + name = "import_from___import_from_2.1.0.tgz"; + path = fetchurl { + name = "import_from___import_from_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz"; + sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; + }; + } + { + name = "import_local___import_local_2.0.0.tgz"; + path = fetchurl { + name = "import_local___import_local_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz"; + sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d"; + }; + } + { + name = "import_local___import_local_3.0.2.tgz"; + path = fetchurl { + name = "import_local___import_local_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; + sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; + }; + } + { + name = "imports_loader___imports_loader_1.2.0.tgz"; + path = fetchurl { + name = "imports_loader___imports_loader_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz"; + sha1 = "b06823d0bb42e6f5ff89bc893829000eda46693f"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } + { + name = "indexes_of___indexes_of_1.0.1.tgz"; + path = fetchurl { + name = "indexes_of___indexes_of_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz"; + sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + }; + } + { + name = "infer_owner___infer_owner_1.0.4.tgz"; + path = fetchurl { + name = "infer_owner___infer_owner_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; + sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "inherits___inherits_2.0.1.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "ini___ini_1.3.7.tgz"; + path = fetchurl { + name = "ini___ini_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz"; + sha1 = "a09363e1911972ea16d7a8851005d84cf09a9a84"; + }; + } + { + name = "inquirer___inquirer_0.12.0.tgz"; + path = fetchurl { + name = "inquirer___inquirer_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz"; + sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; + }; + } + { + name = "internal_ip___internal_ip_4.3.0.tgz"; + path = fetchurl { + name = "internal_ip___internal_ip_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz"; + sha1 = "845452baad9d2ca3b69c635a137acb9a0dad0907"; + }; + } + { + name = "internal_slot___internal_slot_1.0.2.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; + sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; + }; + } + { + name = "interpret___interpret_1.4.0.tgz"; + path = fetchurl { + name = "interpret___interpret_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"; + sha1 = "665ab8bc4da27a774a40584e812e3e0fa45b1a1e"; + }; + } + { + name = "intersection_observer___intersection_observer_0.11.0.tgz"; + path = fetchurl { + name = "intersection_observer___intersection_observer_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.11.0.tgz"; + sha1 = "f4ea067070326f68393ee161cc0a2ca4c0040c6f"; + }; + } + { + name = "intl_format_cache___intl_format_cache_2.2.9.tgz"; + path = fetchurl { + name = "intl_format_cache___intl_format_cache_2.2.9.tgz"; + url = "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-2.2.9.tgz"; + sha1 = "fb560de20c549cda20b569cf1ffb6dc62b5b93b4"; + }; + } + { + name = "intl_messageformat_parser___intl_messageformat_parser_1.4.0.tgz"; + path = fetchurl { + name = "intl_messageformat_parser___intl_messageformat_parser_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz"; + sha1 = "b43d45a97468cadbe44331d74bb1e8dea44fc075"; + }; + } + { + name = "intl_messageformat_parser___intl_messageformat_parser_4.1.4.tgz"; + path = fetchurl { + name = "intl_messageformat_parser___intl_messageformat_parser_4.1.4.tgz"; + url = "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-4.1.4.tgz"; + sha1 = "98f3415e6990d44bebf2e0ad8e4cfbacf3ef5ed3"; + }; + } + { + name = "intl_messageformat___intl_messageformat_2.2.0.tgz"; + path = fetchurl { + name = "intl_messageformat___intl_messageformat_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz"; + sha1 = "345bcd46de630b7683330c2e52177ff5eab484fc"; + }; + } + { + name = "intl_relativeformat___intl_relativeformat_2.2.0.tgz"; + path = fetchurl { + name = "intl_relativeformat___intl_relativeformat_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz"; + sha1 = "6aca95d019ec8d30b6c5653b6629f9983ea5b6c5"; + }; + } + { + name = "intl_relativeformat___intl_relativeformat_6.4.3.tgz"; + path = fetchurl { + name = "intl_relativeformat___intl_relativeformat_6.4.3.tgz"; + url = "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-6.4.3.tgz"; + sha1 = "cb5559e1e257cc2e763583502012a354bb777efe"; + }; + } + { + name = "intl___intl_1.2.5.tgz"; + path = fetchurl { + name = "intl___intl_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz"; + sha1 = "82244a2190c4e419f8371f5aa34daa3420e2abde"; + }; + } + { + name = "invariant___invariant_2.2.4.tgz"; + path = fetchurl { + name = "invariant___invariant_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz"; + sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; + }; + } + { + name = "ip_regex___ip_regex_2.1.0.tgz"; + path = fetchurl { + name = "ip_regex___ip_regex_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + } + { + name = "ip___ip_1.1.5.tgz"; + path = fetchurl { + name = "ip___ip_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + } + { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + }; + } + { + name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; + sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; + }; + } + { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + }; + } + { + name = "is_arguments___is_arguments_1.0.4.tgz"; + path = fetchurl { + name = "is_arguments___is_arguments_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; + sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { + name = "is_arrayish___is_arrayish_0.3.2.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz"; + sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; + }; + } + { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "is_callable___is_callable_1.2.2.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz"; + sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9"; + }; + } + { + name = "is_ci___is_ci_2.0.0.tgz"; + path = fetchurl { + name = "is_ci___is_ci_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; + sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + }; + } + { + name = "is_color_stop___is_color_stop_1.1.0.tgz"; + path = fetchurl { + name = "is_color_stop___is_color_stop_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz"; + sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; + }; + } + { + name = "is_core_module___is_core_module_2.1.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz"; + sha1 = "a4cc031d9b1aca63eecbd18a650e13cb4eeab946"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; + }; + } + { + name = "is_date_object___is_date_object_1.0.2.tgz"; + path = fetchurl { + name = "is_date_object___is_date_object_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; + sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; + }; + } + { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + }; + } + { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + }; + } + { + name = "is_directory___is_directory_0.3.1.tgz"; + path = fetchurl { + name = "is_directory___is_directory_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + } + { + name = "is_docker___is_docker_2.1.1.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; + sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; + }; + } + { + name = "is_electron___is_electron_2.2.0.tgz"; + path = fetchurl { + name = "is_electron___is_electron_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.0.tgz"; + sha1 = "8943084f09e8b731b3a7a0298a7b5d56f6b7eef0"; + }; + } + { + name = "is_extendable___is_extendable_0.1.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + } + { + name = "is_extendable___is_extendable_1.0.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; + sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; + path = fetchurl { + name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; + sha1 = "7d140adc389aaf3011a8f2a2a4cfa6faadffb118"; + }; + } + { + name = "is_glob___is_glob_3.1.0.tgz"; + path = fetchurl { + name = "is_glob___is_glob_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { + name = "is_my_ip_valid___is_my_ip_valid_1.0.0.tgz"; + path = fetchurl { + name = "is_my_ip_valid___is_my_ip_valid_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; + sha1 = "7b351b8e8edd4d3995d4d066680e664d94696824"; + }; + } + { + name = "is_my_json_valid___is_my_json_valid_2.20.5.tgz"; + path = fetchurl { + name = "is_my_json_valid___is_my_json_valid_2.20.5.tgz"; + url = "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz"; + sha1 = "5eca6a8232a687f68869b7361be1612e7512e5df"; + }; + } + { + name = "is_nan___is_nan_1.3.0.tgz"; + path = fetchurl { + name = "is_nan___is_nan_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.0.tgz"; + sha1 = "85d1f5482f7051c2019f5673ccebdb06f3b0db03"; + }; + } + { + name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; + sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + }; + } + { + name = "is_number___is_number_3.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } + { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + path = fetchurl { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; + }; + } + { + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + path = fetchurl { + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; + }; + } + { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + path = fetchurl { + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; + sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; + }; + } + { + name = "is_property___is_property_1.0.2.tgz"; + path = fetchurl { + name = "is_property___is_property_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + } + { + name = "is_regex___is_regex_1.1.0.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; + sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; + }; + } + { + name = "is_regex___is_regex_1.1.1.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz"; + sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9"; + }; + } + { + name = "is_resolvable___is_resolvable_1.1.0.tgz"; + path = fetchurl { + name = "is_resolvable___is_resolvable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz"; + sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88"; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + } + { + name = "is_stream___is_stream_2.0.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; + sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; + }; + } + { + name = "is_string___is_string_1.0.5.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; + sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + }; + } + { + name = "is_svg___is_svg_3.0.0.tgz"; + path = fetchurl { + name = "is_svg___is_svg_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz"; + sha1 = "9321dbd29c212e5ca99c4fa9794c714bcafa2f75"; + }; + } + { + name = "is_symbol___is_symbol_1.0.3.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "is_url___is_url_1.2.4.tgz"; + path = fetchurl { + name = "is_url___is_url_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz"; + sha1 = "04a4df46d28c4cff3d73d01ff06abeb318a1aa52"; + }; + } + { + name = "is_windows___is_windows_1.0.2.tgz"; + path = fetchurl { + name = "is_windows___is_windows_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; + sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + }; + } + { + name = "is_wsl___is_wsl_1.1.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + } + { + name = "is_wsl___is_wsl_2.2.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "isobject___isobject_2.1.0.tgz"; + path = fetchurl { + name = "isobject___isobject_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; + sha1 = "f5944a37c70b550b02a78a5c3b2055b280cec8ec"; + }; + } + { + name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; + path = fetchurl { + name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; + sha1 = "873c6fff897450118222774696a3f28902d77c1d"; + }; + } + { + name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha1 = "7518fe52ea44de372f460a76b5ecda9ffb73d8a6"; + }; + } + { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"; + sha1 = "75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"; + }; + } + { + name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; + path = fetchurl { + name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; + sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b"; + }; + } + { + name = "jake___jake_10.8.2.tgz"; + path = fetchurl { + name = "jake___jake_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; + sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"; + }; + } + { + name = "jest_changed_files___jest_changed_files_26.6.2.tgz"; + path = fetchurl { + name = "jest_changed_files___jest_changed_files_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz"; + sha1 = "f6198479e1cc66f22f9ae1e22acaa0b429c042d0"; + }; + } + { + name = "jest_cli___jest_cli_26.6.3.tgz"; + path = fetchurl { + name = "jest_cli___jest_cli_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz"; + sha1 = "43117cfef24bc4cd691a174a8796a532e135e92a"; + }; + } + { + name = "jest_config___jest_config_26.6.3.tgz"; + path = fetchurl { + name = "jest_config___jest_config_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz"; + sha1 = "64f41444eef9eb03dc51d5c53b75c8c71f645349"; + }; + } + { + name = "jest_diff___jest_diff_25.5.0.tgz"; + path = fetchurl { + name = "jest_diff___jest_diff_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz"; + sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9"; + }; + } + { + name = "jest_diff___jest_diff_26.6.2.tgz"; + path = fetchurl { + name = "jest_diff___jest_diff_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz"; + sha1 = "1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"; + }; + } + { + name = "jest_docblock___jest_docblock_26.0.0.tgz"; + path = fetchurl { + name = "jest_docblock___jest_docblock_26.0.0.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz"; + sha1 = "3e2fa20899fc928cb13bd0ff68bd3711a36889b5"; + }; + } + { + name = "jest_each___jest_each_26.6.2.tgz"; + path = fetchurl { + name = "jest_each___jest_each_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz"; + sha1 = "02526438a77a67401c8a6382dfe5999952c167cb"; + }; + } + { + name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz"; + path = fetchurl { + name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz"; + sha1 = "78d09fe9cf019a357009b9b7e1f101d23bd1da3e"; + }; + } + { + name = "jest_environment_node___jest_environment_node_26.6.2.tgz"; + path = fetchurl { + name = "jest_environment_node___jest_environment_node_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz"; + sha1 = "824e4c7fb4944646356f11ac75b229b0035f2b0c"; + }; + } + { + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + path = fetchurl { + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz"; + sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877"; + }; + } + { + name = "jest_get_type___jest_get_type_26.3.0.tgz"; + path = fetchurl { + name = "jest_get_type___jest_get_type_26.3.0.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz"; + sha1 = "e97dc3c3f53c2b406ca7afaed4493b1d099199e0"; + }; + } + { + name = "jest_haste_map___jest_haste_map_26.6.2.tgz"; + path = fetchurl { + name = "jest_haste_map___jest_haste_map_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz"; + sha1 = "dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"; + }; + } + { + name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; + path = fetchurl { + name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz"; + sha1 = "adc3cf915deacb5212c93b9f3547cd12958f2edd"; + }; + } + { + name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz"; + path = fetchurl { + name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz"; + sha1 = "7717cf118b92238f2eba65054c8a0c9c653a91af"; + }; + } + { + name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz"; + path = fetchurl { + name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz"; + sha1 = "8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"; + }; + } + { + name = "jest_message_util___jest_message_util_26.6.2.tgz"; + path = fetchurl { + name = "jest_message_util___jest_message_util_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz"; + sha1 = "58173744ad6fc0506b5d21150b9be56ef001ca07"; + }; + } + { + name = "jest_mock___jest_mock_26.6.2.tgz"; + path = fetchurl { + name = "jest_mock___jest_mock_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz"; + sha1 = "d6cb712b041ed47fe0d9b6fc3474bc6543feb302"; + }; + } + { + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + path = fetchurl { + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; + sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; + }; + } + { + name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; + path = fetchurl { + name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz"; + sha1 = "d25e7184b36e39fd466c3bc41be0971e821fee28"; + }; + } + { + name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; + path = fetchurl { + name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz"; + sha1 = "6680859ee5d22ee5dcd961fe4871f59f4c784fb6"; + }; + } + { + name = "jest_resolve___jest_resolve_26.6.2.tgz"; + path = fetchurl { + name = "jest_resolve___jest_resolve_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz"; + sha1 = "a3ab1517217f469b504f1b56603c5bb541fbb507"; + }; + } + { + name = "jest_runner___jest_runner_26.6.3.tgz"; + path = fetchurl { + name = "jest_runner___jest_runner_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz"; + sha1 = "2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"; + }; + } + { + name = "jest_runtime___jest_runtime_26.6.3.tgz"; + path = fetchurl { + name = "jest_runtime___jest_runtime_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz"; + sha1 = "4f64efbcfac398331b74b4b3c82d27d401b8fa2b"; + }; + } + { + name = "jest_serializer___jest_serializer_26.6.2.tgz"; + path = fetchurl { + name = "jest_serializer___jest_serializer_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz"; + sha1 = "d139aafd46957d3a448f3a6cdabe2919ba0742d1"; + }; + } + { + name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; + path = fetchurl { + name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz"; + sha1 = "f3b0af1acb223316850bd14e1beea9837fb39c84"; + }; + } + { + name = "jest_util___jest_util_26.6.2.tgz"; + path = fetchurl { + name = "jest_util___jest_util_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz"; + sha1 = "907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"; + }; + } + { + name = "jest_validate___jest_validate_26.6.2.tgz"; + path = fetchurl { + name = "jest_validate___jest_validate_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz"; + sha1 = "23d380971587150467342911c3d7b4ac57ab20ec"; + }; + } + { + name = "jest_watcher___jest_watcher_26.6.2.tgz"; + path = fetchurl { + name = "jest_watcher___jest_watcher_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz"; + sha1 = "a5b683b8f9d68dbcb1d7dae32172d2cca0592975"; + }; + } + { + name = "jest_worker___jest_worker_26.5.0.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_26.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz"; + sha1 = "87deee86dbbc5f98d9919e0dadf2c40e3152fa30"; + }; + } + { + name = "jest_worker___jest_worker_26.6.2.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz"; + sha1 = "7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"; + }; + } + { + name = "jest___jest_26.6.3.tgz"; + path = fetchurl { + name = "jest___jest_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz"; + sha1 = "40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"; + }; + } + { + name = "js_base64___js_base64_2.6.4.tgz"; + path = fetchurl { + name = "js_base64___js_base64_2.6.4.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz"; + sha1 = "f4e686c5de1ea1f867dbcad3d46d969428df98c4"; + }; + } + { + name = "js_string_escape___js_string_escape_1.0.1.tgz"; + path = fetchurl { + name = "js_string_escape___js_string_escape_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz"; + sha1 = "e2625badbc0d67c7533e9edc1068c587ae4137ef"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.14.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; + sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; + }; + } + { + name = "jsbn___jsbn_0.1.1.tgz"; + path = fetchurl { + name = "jsbn___jsbn_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + { + name = "jsdom___jsdom_16.4.0.tgz"; + path = fetchurl { + name = "jsdom___jsdom_16.4.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; + sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; + }; + } + { + name = "jsesc___jsesc_2.5.2.tgz"; + path = fetchurl { + name = "jsesc___jsesc_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; + sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + }; + } + { + name = "jsesc___jsesc_0.5.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema___json_schema_0.2.3.tgz"; + path = fetchurl { + name = "json_schema___json_schema_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + } + { + name = "json_stable_stringify___json_stable_stringify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify___json_stable_stringify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + { + name = "json3___json3_3.3.3.tgz"; + path = fetchurl { + name = "json3___json3_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz"; + sha1 = "7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"; + }; + } + { + name = "json5___json5_0.5.1.tgz"; + path = fetchurl { + name = "json5___json5_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + } + { + name = "json5___json5_1.0.1.tgz"; + path = fetchurl { + name = "json5___json5_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; + sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; + }; + } + { + name = "json5___json5_2.1.3.tgz"; + path = fetchurl { + name = "json5___json5_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; + }; + } + { + name = "jsonfile___jsonfile_3.0.1.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "jsonify___jsonify_0.0.0.tgz"; + path = fetchurl { + name = "jsonify___jsonify_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }; + } + { + name = "jsonpointer___jsonpointer_4.1.0.tgz"; + path = fetchurl { + name = "jsonpointer___jsonpointer_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz"; + sha1 = "501fb89986a2389765ba09e6053299ceb4f2c2cc"; + }; + } + { + name = "jsprim___jsprim_1.4.1.tgz"; + path = fetchurl { + name = "jsprim___jsprim_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + } + { + name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; + path = fetchurl { + name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz"; + sha1 = "642f1d7b88aa6d7eb9d8f2210e166478444fa891"; + }; + } + { + name = "keycode___keycode_2.2.0.tgz"; + path = fetchurl { + name = "keycode___keycode_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz"; + sha1 = "3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"; + }; + } + { + name = "killable___killable_1.0.1.tgz"; + path = fetchurl { + name = "killable___killable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz"; + sha1 = "4c8ce441187a061c7474fb87ca08e2a638194892"; + }; + } + { + name = "kind_of___kind_of_3.2.2.tgz"; + path = fetchurl { + name = "kind_of___kind_of_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + } + { + name = "kind_of___kind_of_4.0.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + } + { + name = "kind_of___kind_of_5.1.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; + sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "kleur___kleur_3.0.3.tgz"; + path = fetchurl { + name = "kleur___kleur_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz"; + sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"; + }; + } + { + name = "klona___klona_2.0.4.tgz"; + path = fetchurl { + name = "klona___klona_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; + sha1 = "7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"; + }; + } + { + name = "knot.js___knot.js_1.1.5.tgz"; + path = fetchurl { + name = "knot.js___knot.js_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/knot.js/-/knot.js-1.1.5.tgz"; + sha1 = "28e72522f703f50fe98812fde224dd72728fef5d"; + }; + } + { + name = "known_css_properties___known_css_properties_0.3.0.tgz"; + path = fetchurl { + name = "known_css_properties___known_css_properties_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz"; + sha1 = "a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4"; + }; + } + { + name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; + path = fetchurl { + name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; + url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz"; + sha1 = "a00a37121894f224f763268e431c55556b0c0755"; + }; + } + { + name = "language_tags___language_tags_1.0.5.tgz"; + path = fetchurl { + name = "language_tags___language_tags_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz"; + sha1 = "d321dbc4da30ba8bf3024e040fa5c14661f9193a"; + }; + } + { + name = "leven___leven_3.1.0.tgz"; + path = fetchurl { + name = "leven___leven_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz"; + sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "levn___levn_0.4.1.tgz"; + path = fetchurl { + name = "levn___levn_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; + sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + }; + } + { + name = "line_column___line_column_1.0.2.tgz"; + path = fetchurl { + name = "line_column___line_column_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz"; + sha1 = "d25af2936b6f4849172b312e4792d1d987bc34a2"; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { + name = "load_json_file___load_json_file_2.0.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + } + { + name = "loader_runner___loader_runner_2.4.0.tgz"; + path = fetchurl { + name = "loader_runner___loader_runner_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz"; + sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357"; + }; + } + { + name = "loader_utils___loader_utils_0.2.17.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_0.2.17.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz"; + sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348"; + }; + } + { + name = "loader_utils___loader_utils_1.4.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; + sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; + }; + } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + }; + } + { + name = "locate_path___locate_path_2.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + } + { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { + name = "lodash.capitalize___lodash.capitalize_4.2.1.tgz"; + path = fetchurl { + name = "lodash.capitalize___lodash.capitalize_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz"; + sha1 = "f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9"; + }; + } + { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + path = fetchurl { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + }; + } + { + name = "lodash.get___lodash.get_4.4.2.tgz"; + path = fetchurl { + name = "lodash.get___lodash.get_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + } + { + name = "lodash.has___lodash.has_4.5.2.tgz"; + path = fetchurl { + name = "lodash.has___lodash.has_4.5.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz"; + sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; + }; + } + { + name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; + path = fetchurl { + name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; + sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; + }; + } + { + name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; + path = fetchurl { + name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + } + { + name = "lodash.isobject___lodash.isobject_3.0.2.tgz"; + path = fetchurl { + name = "lodash.isobject___lodash.isobject_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz"; + sha1 = "3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"; + }; + } + { + name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; + path = fetchurl { + name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; + sha1 = "8489b1cb0d29ff88195cceca448ff6d6cc295c36"; + }; + } + { + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + path = fetchurl { + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + }; + } + { + name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; + path = fetchurl { + name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + }; + } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + } + { + name = "lodash___lodash_4.17.20.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.20.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; + sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + }; + } + { + name = "loglevel___loglevel_1.7.0.tgz"; + path = fetchurl { + name = "loglevel___loglevel_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz"; + sha1 = "728166855a740d59d38db01cf46f042caa041bb0"; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + name = "lru_cache___lru_cache_5.1.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; + sha1 = "1da27e6710271947695daf6848e847f01d84b920"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { + name = "lz_string___lz_string_1.4.4.tgz"; + path = fetchurl { + name = "lz_string___lz_string_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz"; + sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26"; + }; + } + { + name = "make_dir___make_dir_2.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz"; + sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5"; + }; + } + { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + }; + } + { + name = "makeerror___makeerror_1.0.11.tgz"; + path = fetchurl { + name = "makeerror___makeerror_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz"; + sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; + }; + } + { + name = "map_cache___map_cache_0.2.2.tgz"; + path = fetchurl { + name = "map_cache___map_cache_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + } + { + name = "map_visit___map_visit_1.0.0.tgz"; + path = fetchurl { + name = "map_visit___map_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + } + { + name = "mark_loader___mark_loader_0.1.6.tgz"; + path = fetchurl { + name = "mark_loader___mark_loader_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/mark-loader/-/mark-loader-0.1.6.tgz"; + sha1 = "0abb477dca7421d70e20128ff6489f5cae8676d5"; + }; + } + { + name = "marky___marky_1.2.1.tgz"; + path = fetchurl { + name = "marky___marky_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/marky/-/marky-1.2.1.tgz"; + sha1 = "a3fcf82ffd357756b8b8affec9fdbf3a30dc1b02"; + }; + } + { + name = "md5.js___md5.js_1.3.5.tgz"; + path = fetchurl { + name = "md5.js___md5.js_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz"; + sha1 = "b5d07b8e3216e3e27cd728d72f70d1e6a342005f"; + }; + } + { + name = "mdn_data___mdn_data_2.0.4.tgz"; + path = fetchurl { + name = "mdn_data___mdn_data_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; + sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b"; + }; + } + { + name = "mdn_data___mdn_data_2.0.6.tgz"; + path = fetchurl { + name = "mdn_data___mdn_data_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz"; + sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978"; + }; + } + { + name = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + } + { + name = "memoize_one___memoize_one_5.1.1.tgz"; + path = fetchurl { + name = "memoize_one___memoize_one_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz"; + sha1 = "047b6e3199b508eaec03504de71229b8eb1d75c0"; + }; + } + { + name = "memory_fs___memory_fs_0.4.1.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + }; + } + { + name = "memory_fs___memory_fs_0.5.0.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz"; + sha1 = "324c01288b88652966d161db77838720845a8e3c"; + }; + } + { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + path = fetchurl { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + } + { + name = "merge_stream___merge_stream_2.0.0.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + }; + } + { + name = "merge___merge_1.2.1.tgz"; + path = fetchurl { + name = "merge___merge_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz"; + sha1 = "38bebf80c3220a8a487b6fcfb3941bb11720c145"; + }; + } + { + name = "methods___methods_1.1.2.tgz"; + path = fetchurl { + name = "methods___methods_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + } + { + name = "micromatch___micromatch_3.1.10.tgz"; + path = fetchurl { + name = "micromatch___micromatch_3.1.10.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; + sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + }; + } + { + name = "micromatch___micromatch_4.0.2.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; + sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + }; + } + { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + path = fetchurl { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha1 = "f080351c865b0dc562a8462966daa53543c78a4d"; + }; + } + { + name = "mime_db___mime_db_1.44.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.44.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; + sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + }; + } + { + name = "mime_types___mime_types_2.1.27.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + }; + } + { + name = "mime___mime_1.6.0.tgz"; + path = fetchurl { + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + { + name = "mime___mime_2.4.4.tgz"; + path = fetchurl { + name = "mime___mime_2.4.4.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; + sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + }; + } + { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + }; + } + { + name = "min_indent___min_indent_1.0.1.tgz"; + path = fetchurl { + name = "min_indent___min_indent_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz"; + sha1 = "a63f681673b30571fbe8bc25686ae746eefa9869"; + }; + } + { + name = "mini_css_extract_plugin___mini_css_extract_plugin_1.3.1.tgz"; + path = fetchurl { + name = "mini_css_extract_plugin___mini_css_extract_plugin_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.1.tgz"; + sha1 = "1375c88b2bc2a9d197670a55761edcd1b5d72f21"; + }; + } + { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; + }; + } + { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_1.1.3.tgz"; + path = fetchurl { + name = "minimist___minimist_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz"; + sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + path = fetchurl { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; + }; + } + { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + path = fetchurl { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; + }; + } + { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + path = fetchurl { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha1 = "68472f79711c084657c067c5c6ad93cddea8214c"; + }; + } + { + name = "minipass___minipass_3.1.3.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; + sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; + }; + } + { + name = "minizlib___minizlib_2.1.2.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; + }; + } + { + name = "mississippi___mississippi_3.0.0.tgz"; + path = fetchurl { + name = "mississippi___mississippi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; + sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; + }; + } + { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + path = fetchurl { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + }; + } + { + name = "mousetrap___mousetrap_1.6.5.tgz"; + path = fetchurl { + name = "mousetrap___mousetrap_1.6.5.tgz"; + url = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz"; + sha1 = "8a766d8c272b08393d5f56074e0b5ec183485bf9"; + }; + } + { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + path = fetchurl { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.1.tgz"; + path = fetchurl { + name = "ms___ms_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; + sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; + path = fetchurl { + name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + }; + } + { + name = "multicast_dns___multicast_dns_6.2.3.tgz"; + path = fetchurl { + name = "multicast_dns___multicast_dns_6.2.3.tgz"; + url = "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha1 = "a0ec7bd9055c4282f790c3c82f4e28db3b31b229"; + }; + } + { + name = "mute_stream___mute_stream_0.0.5.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.5.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz"; + sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; + }; + } + { + name = "nan___nan_2.14.1.tgz"; + path = fetchurl { + name = "nan___nan_2.14.1.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; + sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; + }; + } + { + name = "nanoid___nanoid_3.1.16.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.16.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.16.tgz"; + sha1 = "b21f0a7d031196faf75314d7c65d36352beeef64"; + }; + } + { + name = "nanomatch___nanomatch_1.2.13.tgz"; + path = fetchurl { + name = "nanomatch___nanomatch_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; + sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + }; + } + { + name = "natural_compare___natural_compare_1.4.0.tgz"; + path = fetchurl { + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + }; + } + { + name = "neo_async___neo_async_2.6.2.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; + }; + } + { + name = "next_tick___next_tick_1.0.0.tgz"; + path = fetchurl { + name = "next_tick___next_tick_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + } + { + name = "nice_try___nice_try_1.0.5.tgz"; + path = fetchurl { + name = "nice_try___nice_try_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; + sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + }; + } + { + name = "node_fetch___node_fetch_2.6.1.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; + sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + }; + } + { + name = "node_forge___node_forge_0.10.0.tgz"; + path = fetchurl { + name = "node_forge___node_forge_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz"; + sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3"; + }; + } + { + name = "node_int64___node_int64_0.4.0.tgz"; + path = fetchurl { + name = "node_int64___node_int64_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz"; + sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + }; + } + { + name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; + path = fetchurl { + name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; + sha1 = "b64f513d18338625f90346d27b0d235e631f6425"; + }; + } + { + name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; + path = fetchurl { + name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; + sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; + }; + } + { + name = "node_notifier___node_notifier_8.0.1.tgz"; + path = fetchurl { + name = "node_notifier___node_notifier_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz"; + sha1 = "f86e89bbc925f2b068784b31f382afdc6ca56be1"; + }; + } + { + name = "node_releases___node_releases_1.1.61.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.61.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz"; + sha1 = "707b0fca9ce4e11783612ba4a2fcba09047af16e"; + }; + } + { + name = "node_releases___node_releases_1.1.67.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.67.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz"; + sha1 = "28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + }; + } + { + name = "normalize_path___normalize_path_2.1.1.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "normalize_range___normalize_range_0.1.2.tgz"; + path = fetchurl { + name = "normalize_range___normalize_range_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz"; + sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; + }; + } + { + name = "normalize_url___normalize_url_3.3.0.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz"; + sha1 = "b2e1c4dc4f7c6d57743df733a4f5978d18650559"; + }; + } + { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + } + { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + }; + } + { + name = "nth_check___nth_check_1.0.2.tgz"; + path = fetchurl { + name = "nth_check___nth_check_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz"; + sha1 = "b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"; + }; + } + { + name = "num2fraction___num2fraction_1.2.2.tgz"; + path = fetchurl { + name = "num2fraction___num2fraction_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz"; + sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } + { + name = "nwsapi___nwsapi_2.2.0.tgz"; + path = fetchurl { + name = "nwsapi___nwsapi_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; + sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; + }; + } + { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + path = fetchurl { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + { + name = "object_assign___object_assign_4.1.0.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_copy___object_copy_0.1.0.tgz"; + path = fetchurl { + name = "object_copy___object_copy_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + } + { + name = "object_fit_images___object_fit_images_3.2.4.tgz"; + path = fetchurl { + name = "object_fit_images___object_fit_images_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.4.tgz"; + sha1 = "6c299d38fdf207746e5d2d46c2877f6f25d15b52"; + }; + } + { + name = "object_inspect___object_inspect_1.8.0.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; + sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; + }; + } + { + name = "object_is___object_is_1.1.3.tgz"; + path = fetchurl { + name = "object_is___object_is_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz"; + sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object_visit___object_visit_1.0.1.tgz"; + path = fetchurl { + name = "object_visit___object_visit_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + } + { + name = "object.assign___object.assign_4.1.1.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz"; + sha1 = "303867a666cdd41936ecdedfb1f8f3e32a478cdd"; + }; + } + { + name = "object.entries___object.entries_1.1.2.tgz"; + path = fetchurl { + name = "object.entries___object.entries_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; + sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; + }; + } + { + name = "object.fromentries___object.fromentries_2.0.2.tgz"; + path = fetchurl { + name = "object.fromentries___object.fromentries_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; + sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; + }; + } + { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; + path = fetchurl { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; + sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; + }; + } + { + name = "object.pick___object.pick_1.3.0.tgz"; + path = fetchurl { + name = "object.pick___object.pick_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + } + { + name = "object.values___object.values_1.1.1.tgz"; + path = fetchurl { + name = "object.values___object.values_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; + sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + }; + } + { + name = "obuf___obuf_1.1.2.tgz"; + path = fetchurl { + name = "obuf___obuf_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz"; + sha1 = "09bea3343d41859ebd446292d11c9d4db619084e"; + }; + } + { + name = "offline_plugin___offline_plugin_5.0.7.tgz"; + path = fetchurl { + name = "offline_plugin___offline_plugin_5.0.7.tgz"; + url = "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-5.0.7.tgz"; + sha1 = "26936ad1a7699f4d67e0a095a258972a4ccf1788"; + }; + } + { + name = "on_finished___on_finished_2.3.0.tgz"; + path = fetchurl { + name = "on_finished___on_finished_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + } + { + name = "on_headers___on_headers_1.0.2.tgz"; + path = fetchurl { + name = "on_headers___on_headers_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; + sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_1.1.0.tgz"; + path = fetchurl { + name = "onetime___onetime_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz"; + sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + }; + } + { + name = "onetime___onetime_5.1.2.tgz"; + path = fetchurl { + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + }; + } + { + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + path = fetchurl { + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; + sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; + }; + } + { + name = "opener___opener_1.5.2.tgz"; + path = fetchurl { + name = "opener___opener_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz"; + sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598"; + }; + } + { + name = "opn___opn_5.5.0.tgz"; + path = fetchurl { + name = "opn___opn_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz"; + sha1 = "fc7164fab56d235904c51c3b27da6758ca3b9bfc"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "optionator___optionator_0.9.1.tgz"; + path = fetchurl { + name = "optionator___optionator_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; + sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + }; + } + { + name = "original___original_1.0.2.tgz"; + path = fetchurl { + name = "original___original_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz"; + sha1 = "e442a61cffe1c5fd20a65f3261c26663b303f25f"; + }; + } + { + name = "os_browserify___os_browserify_0.3.0.tgz"; + path = fetchurl { + name = "os_browserify___os_browserify_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + }; + } + { + name = "os_homedir___os_homedir_1.0.2.tgz"; + path = fetchurl { + name = "os_homedir___os_homedir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + } + { + name = "p_each_series___p_each_series_2.1.0.tgz"; + path = fetchurl { + name = "p_each_series___p_each_series_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz"; + sha1 = "961c8dd3f195ea96c747e636b262b800a6b1af48"; + }; + } + { + name = "p_finally___p_finally_1.0.0.tgz"; + path = fetchurl { + name = "p_finally___p_finally_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + } + { + name = "p_limit___p_limit_1.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; + sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_limit___p_limit_3.0.2.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz"; + sha1 = "1664e010af3cadc681baafd3e2a437be7b0fb5fe"; + }; + } + { + name = "p_locate___p_locate_2.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + } + { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_2.1.0.tgz"; + path = fetchurl { + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; + }; + } + { + name = "p_map___p_map_4.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; + sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; + }; + } + { + name = "p_retry___p_retry_3.0.1.tgz"; + path = fetchurl { + name = "p_retry___p_retry_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; + sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328"; + }; + } + { + name = "p_try___p_try_1.0.0.tgz"; + path = fetchurl { + name = "p_try___p_try_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "packet_reader___packet_reader_0.3.1.tgz"; + path = fetchurl { + name = "packet_reader___packet_reader_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz"; + sha1 = "cd62e60af8d7fea8a705ec4ff990871c46871f27"; + }; + } + { + name = "pako___pako_1.0.11.tgz"; + path = fetchurl { + name = "pako___pako_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; + sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; + }; + } + { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + path = fetchurl { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + path = fetchurl { + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha1 = "385080a3ec13cb62a62d39409cb3e88844cdaed4"; + }; + } + { + name = "parse_css_font___parse_css_font_2.0.2.tgz"; + path = fetchurl { + name = "parse_css_font___parse_css_font_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/parse-css-font/-/parse-css-font-2.0.2.tgz"; + sha1 = "7b60b060705a25a9b90b7f0ed493e5823248a652"; + }; + } + { + name = "parse_json___parse_json_2.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + } + { + name = "parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + } + { + name = "parse_json___parse_json_5.0.1.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.1.tgz"; + sha1 = "7cfe35c1ccd641bce3981467e6c2ece61b3b3878"; + }; + } + { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + path = fetchurl { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + } + { + name = "parse5___parse5_5.1.1.tgz"; + path = fetchurl { + name = "parse5___parse5_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; + sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; + }; + } + { + name = "parseurl___parseurl_1.3.3.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + }; + } + { + name = "pascalcase___pascalcase_0.1.1.tgz"; + path = fetchurl { + name = "pascalcase___pascalcase_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + } + { + name = "path_browserify___path_browserify_0.0.1.tgz"; + path = fetchurl { + name = "path_browserify___path_browserify_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz"; + sha1 = "e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"; + }; + } + { + name = "path_complete_extname___path_complete_extname_1.0.0.tgz"; + path = fetchurl { + name = "path_complete_extname___path_complete_extname_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-complete-extname/-/path-complete-extname-1.0.0.tgz"; + sha1 = "f889985dc91000c815515c0bfed06c5acda0752b"; + }; + } + { + name = "path_dirname___path_dirname_1.0.2.tgz"; + path = fetchurl { + name = "path_dirname___path_dirname_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + } + { + name = "path_exists___path_exists_3.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + path = fetchurl { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { + name = "path_parse___path_parse_1.0.6.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; + sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + }; + } + { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + } + { + name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + } + { + name = "path_type___path_type_2.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { + name = "pbkdf2___pbkdf2_3.1.1.tgz"; + path = fetchurl { + name = "pbkdf2___pbkdf2_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; + sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; + }; + } + { + name = "performance_now___performance_now_0.2.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + { + name = "pg_connection_string___pg_connection_string_0.1.3.tgz"; + path = fetchurl { + name = "pg_connection_string___pg_connection_string_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz"; + sha1 = "da1847b20940e42ee1492beaf65d49d91b245df7"; + }; + } + { + name = "pg_int8___pg_int8_1.0.1.tgz"; + path = fetchurl { + name = "pg_int8___pg_int8_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz"; + sha1 = "943bd463bf5b71b4170115f80f8efc9a0c0eb78c"; + }; + } + { + name = "pg_pool___pg_pool_1.8.0.tgz"; + path = fetchurl { + name = "pg_pool___pg_pool_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.8.0.tgz"; + sha1 = "f7ec73824c37a03f076f51bfdf70e340147c4f37"; + }; + } + { + name = "pg_types___pg_types_1.13.0.tgz"; + path = fetchurl { + name = "pg_types___pg_types_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/pg-types/-/pg-types-1.13.0.tgz"; + sha1 = "75f490b8a8abf75f1386ef5ec4455ecf6b345c63"; + }; + } + { + name = "pg___pg_6.4.2.tgz"; + path = fetchurl { + name = "pg___pg_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/pg/-/pg-6.4.2.tgz"; + sha1 = "c364011060eac7a507a2ae063eb857ece910e27f"; + }; + } + { + name = "pgpass___pgpass_1.0.2.tgz"; + path = fetchurl { + name = "pgpass___pgpass_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz"; + sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; + }; + } + { + name = "picomatch___picomatch_2.2.2.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + }; + } + { + name = "pify___pify_2.3.0.tgz"; + path = fetchurl { + name = "pify___pify_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + } + { + name = "pify___pify_4.0.1.tgz"; + path = fetchurl { + name = "pify___pify_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; + sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231"; + }; + } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + } + { + name = "pirates___pirates_4.0.1.tgz"; + path = fetchurl { + name = "pirates___pirates_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz"; + sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87"; + }; + } + { + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + } + { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; + }; + } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "pluralize___pluralize_1.2.1.tgz"; + path = fetchurl { + name = "pluralize___pluralize_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz"; + sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; + }; + } + { + name = "portfinder___portfinder_1.0.28.tgz"; + path = fetchurl { + name = "portfinder___portfinder_1.0.28.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz"; + sha1 = "67c4622852bd5374dd1dd900f779f53462fac778"; + }; + } + { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + path = fetchurl { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + } + { + name = "postcss_calc___postcss_calc_7.0.4.tgz"; + path = fetchurl { + name = "postcss_calc___postcss_calc_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.4.tgz"; + sha1 = "5e177ddb417341e6d4a193c5d9fd8ada79094f8b"; + }; + } + { + name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; + path = fetchurl { + name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; + sha1 = "ae060bce93ed794ac71264f08132d550956bd381"; + }; + } + { + name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; + path = fetchurl { + name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; + sha1 = "ca3813ed4da0f812f9d43703584e449ebe189a7f"; + }; + } + { + name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; + path = fetchurl { + name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; + sha1 = "1fbabd2c246bff6aaad7997b2b0918f4d7af4033"; + }; + } + { + name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; + path = fetchurl { + name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; + sha1 = "3fe133cd3c82282e550fc9b239176a9207b784eb"; + }; + } + { + name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; + path = fetchurl { + name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; + sha1 = "c8c951e9f73ed9428019458444a02ad90bb9f765"; + }; + } + { + name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; + path = fetchurl { + name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; + sha1 = "652aef8a96726f029f5e3e00146ee7a4e755ff57"; + }; + } + { + name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; + path = fetchurl { + name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz"; + sha1 = "c5ea504f2c4aef33c7359a34de3573772ad7502a"; + }; + } + { + name = "postcss_loader___postcss_loader_3.0.0.tgz"; + path = fetchurl { + name = "postcss_loader___postcss_loader_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz"; + sha1 = "6b97943e47c72d845fa9e03f273773d4e8dd6c2d"; + }; + } + { + name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; + path = fetchurl { + name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; + sha1 = "62f49a13e4a0ee04e7b98f42bb16062ca2549e24"; + }; + } + { + name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; + path = fetchurl { + name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; + sha1 = "362bea4ff5a1f98e4075a713c6cb25aefef9a650"; + }; + } + { + name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; + sha1 = "cd4c344cce474343fac5d82206ab2cbcb8afd5a6"; + }; + } + { + name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; + sha1 = "93b29c2ff5099c535eecda56c4aa6e665a663471"; + }; + } + { + name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; + sha1 = "6b9cef030c11e35261f95f618c90036d680db874"; + }; + } + { + name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; + sha1 = "e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"; + }; + } + { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha1 = "cda1f047c0ae80c97dbe28c3e76a43b88025741d"; + }; + } + { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha1 = "ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"; + }; + } + { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha1 = "9ef3151456d3bbfa120ca44898dfca6f2fa01f06"; + }; + } + { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha1 = "d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"; + }; + } + { + name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; + sha1 = "8b35add3aee83a136b0471e0d59be58a50285dd4"; + }; + } + { + name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; + sha1 = "0dbe04a4ce9063d4667ed2be476bb830c825935a"; + }; + } + { + name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; + sha1 = "05f757f84f260437378368a91f8932d4b102917f"; + }; + } + { + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; + sha1 = "c4ebbc289f3991a028d44751cbdd11918b17910c"; + }; + } + { + name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; + sha1 = "cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"; + }; + } + { + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; + sha1 = "8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"; + }; + } + { + name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; + sha1 = "841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"; + }; + } + { + name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; + sha1 = "10e437f86bc7c7e58f7b9652ed878daaa95faae1"; + }; + } + { + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; + sha1 = "bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"; + }; + } + { + name = "postcss_object_fit_images___postcss_object_fit_images_1.1.2.tgz"; + path = fetchurl { + name = "postcss_object_fit_images___postcss_object_fit_images_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-object-fit-images/-/postcss-object-fit-images-1.1.2.tgz"; + sha1 = "8b773043db14672ef6cd6f2cb1f0d8b26a9f573b"; + }; + } + { + name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; + path = fetchurl { + name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; + sha1 = "0cf75c820ec7d5c4d280189559e0b571ebac0eee"; + }; + } + { + name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; + path = fetchurl { + name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; + sha1 = "7fd42ebea5e9c814609639e2c2e84ae270ba48df"; + }; + } + { + name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; + path = fetchurl { + name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; + sha1 = "17efa405eacc6e07be3414a5ca2d1074681d4e29"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; + sha1 = "934cf799d016c83411859e09dcecade01286ec5c"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; + sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3"; + }; + } + { + name = "postcss_svgo___postcss_svgo_4.0.2.tgz"; + path = fetchurl { + name = "postcss_svgo___postcss_svgo_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; + sha1 = "17b997bc711b333bab143aaed3b8d3d6e3d38258"; + }; + } + { + name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; + path = fetchurl { + name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; + sha1 = "9446911f3289bfd64c6d680f073c03b1f9ee4bac"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; + sha1 = "9ff822547e2893213cf1c30efa51ac5fd1ba8281"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; + }; + } + { + name = "postcss___postcss_5.2.18.tgz"; + path = fetchurl { + name = "postcss___postcss_5.2.18.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz"; + sha1 = "badfa1497d46244f6390f58b319830d9107853c5"; + }; + } + { + name = "postcss___postcss_7.0.32.tgz"; + path = fetchurl { + name = "postcss___postcss_7.0.32.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz"; + sha1 = "4310d6ee347053da3433db2be492883d62cec59d"; + }; + } + { + name = "postcss___postcss_8.1.6.tgz"; + path = fetchurl { + name = "postcss___postcss_8.1.6.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.1.6.tgz"; + sha1 = "b022ba2cfb8701da234d073ed3128c5a384c35ff"; + }; + } + { + name = "postgres_array___postgres_array_1.0.3.tgz"; + path = fetchurl { + name = "postgres_array___postgres_array_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz"; + sha1 = "c561fc3b266b21451fc6555384f4986d78ec80f5"; + }; + } + { + name = "postgres_bytea___postgres_bytea_1.0.0.tgz"; + path = fetchurl { + name = "postgres_bytea___postgres_bytea_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; + sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; + }; + } + { + name = "postgres_date___postgres_date_1.0.7.tgz"; + path = fetchurl { + name = "postgres_date___postgres_date_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz"; + sha1 = "51bc086006005e5061c591cee727f2531bf641a8"; + }; + } + { + name = "postgres_interval___postgres_interval_1.2.0.tgz"; + path = fetchurl { + name = "postgres_interval___postgres_interval_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz"; + sha1 = "b460c82cb1587507788819a06aa0fffdb3544695"; + }; + } + { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + }; + } + { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "pretty_format___pretty_format_25.5.0.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz"; + sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; + }; + } + { + name = "pretty_format___pretty_format_26.6.2.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz"; + sha1 = "e35c2705f14cb7fe2fe94fa078345b444120fc93"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "process___process_0.11.10.tgz"; + path = fetchurl { + name = "process___process_0.11.10.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + } + { + name = "progress___progress_1.1.8.tgz"; + path = fetchurl { + name = "progress___progress_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz"; + sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + path = fetchurl { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + } + { + name = "promise.prototype.finally___promise.prototype.finally_3.1.2.tgz"; + path = fetchurl { + name = "promise.prototype.finally___promise.prototype.finally_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz"; + sha1 = "b8af89160c9c673cefe3b4c4435b53cfd0287067"; + }; + } + { + name = "prompts___prompts_2.3.2.tgz"; + path = fetchurl { + name = "prompts___prompts_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; + sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; + }; + } + { + name = "prop_types_extra___prop_types_extra_1.1.1.tgz"; + path = fetchurl { + name = "prop_types_extra___prop_types_extra_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.1.tgz"; + sha1 = "58c3b74cbfbb95d304625975aa2f0848329a010b"; + }; + } + { + name = "prop_types___prop_types_15.7.2.tgz"; + path = fetchurl { + name = "prop_types___prop_types_15.7.2.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; + sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + path = fetchurl { + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; + }; + } + { + name = "prr___prr_1.0.1.tgz"; + path = fetchurl { + name = "prr___prr_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + } + { + name = "psl___psl_1.8.0.tgz"; + path = fetchurl { + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; + }; + } + { + name = "public_encrypt___public_encrypt_4.0.3.tgz"; + path = fetchurl { + name = "public_encrypt___public_encrypt_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha1 = "4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"; + }; + } + { + name = "pump___pump_2.0.1.tgz"; + path = fetchurl { + name = "pump___pump_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; + sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "pumpify___pumpify_1.5.1.tgz"; + path = fetchurl { + name = "pumpify___pumpify_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; + sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce"; + }; + } + { + name = "punycode___punycode_1.3.2.tgz"; + path = fetchurl { + name = "punycode___punycode_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + } + { + name = "punycode___punycode_1.4.1.tgz"; + path = fetchurl { + name = "punycode___punycode_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "q___q_1.5.1.tgz"; + path = fetchurl { + name = "q___q_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + } + { + name = "qs___qs_6.7.0.tgz"; + path = fetchurl { + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + }; + } + { + name = "qs___qs_6.5.2.tgz"; + path = fetchurl { + name = "qs___qs_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + path = fetchurl { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + } + { + name = "querystring___querystring_0.2.0.tgz"; + path = fetchurl { + name = "querystring___querystring_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + } + { + name = "querystringify___querystringify_2.2.0.tgz"; + path = fetchurl { + name = "querystringify___querystringify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; + sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6"; + }; + } + { + name = "quote___quote_0.4.0.tgz"; + path = fetchurl { + name = "quote___quote_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz"; + sha1 = "10839217f6c1362b89194044d29b233fd7f32f01"; + }; + } + { + name = "raf___raf_3.4.1.tgz"; + path = fetchurl { + name = "raf___raf_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz"; + sha1 = "0742e99a4a6552f445d73e3ee0328af0ff1ede39"; + }; + } + { + name = "randombytes___randombytes_2.1.0.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; + }; + } + { + name = "randomfill___randomfill_1.0.4.tgz"; + path = fetchurl { + name = "randomfill___randomfill_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz"; + sha1 = "c92196fc86ab42be983f1bf31778224931d61458"; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + }; + } + { + name = "raw_body___raw_body_2.4.0.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + }; + } + { + name = "react_dom___react_dom_16.14.0.tgz"; + path = fetchurl { + name = "react_dom___react_dom_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz"; + sha1 = "7ad838ec29a777fb3c75c3a190f661cf92ab8b89"; + }; + } + { + name = "react_event_listener___react_event_listener_0.6.6.tgz"; + path = fetchurl { + name = "react_event_listener___react_event_listener_0.6.6.tgz"; + url = "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.6.tgz"; + sha1 = "758f7b991cad9086dd39fd29fad72127e1d8962a"; + }; + } + { + name = "react_hotkeys___react_hotkeys_1.1.4.tgz"; + path = fetchurl { + name = "react_hotkeys___react_hotkeys_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-1.1.4.tgz"; + sha1 = "a0712aa2e0c03a759fd7885808598497a4dace72"; + }; + } + { + name = "react_immutable_proptypes___react_immutable_proptypes_2.2.0.tgz"; + path = fetchurl { + name = "react_immutable_proptypes___react_immutable_proptypes_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz"; + sha1 = "cce96d68cc3c18e89617cbf3092d08e35126af4a"; + }; + } + { + name = "react_immutable_pure_component___react_immutable_pure_component_2.2.2.tgz"; + path = fetchurl { + name = "react_immutable_pure_component___react_immutable_pure_component_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-2.2.2.tgz"; + sha1 = "3014d3e20cd5a7a4db73b81f1f1464f4d351684b"; + }; + } + { + name = "react_infinite_scroller___react_infinite_scroller_1.2.4.tgz"; + path = fetchurl { + name = "react_infinite_scroller___react_infinite_scroller_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.2.4.tgz"; + sha1 = "f67eaec4940a4ce6417bebdd6e3433bfc38826e9"; + }; + } + { + name = "react_input_autosize___react_input_autosize_2.2.2.tgz"; + path = fetchurl { + name = "react_input_autosize___react_input_autosize_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.2.tgz"; + sha1 = "fcaa7020568ec206bc04be36f4eb68e647c4d8c2"; + }; + } + { + name = "react_intl_translations_manager___react_intl_translations_manager_5.0.3.tgz"; + path = fetchurl { + name = "react_intl_translations_manager___react_intl_translations_manager_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz"; + sha1 = "aee010ecf35975673e033ca5d7d3f4147894324d"; + }; + } + { + name = "react_intl___react_intl_2.9.0.tgz"; + path = fetchurl { + name = "react_intl___react_intl_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/react-intl/-/react-intl-2.9.0.tgz"; + sha1 = "c97c5d17d4718f1575fdbd5a769f96018a3b1843"; + }; + } + { + name = "react_is___react_is_16.13.1.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + }; + } + { + name = "react_is___react_is_17.0.1.tgz"; + path = fetchurl { + name = "react_is___react_is_17.0.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz"; + sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339"; + }; + } + { + name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; + path = fetchurl { + name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"; + sha1 = "4f1a273afdfc8f3488a8c516bfda78f872352362"; + }; + } + { + name = "react_masonry_infinite___react_masonry_infinite_1.2.2.tgz"; + path = fetchurl { + name = "react_masonry_infinite___react_masonry_infinite_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/react-masonry-infinite/-/react-masonry-infinite-1.2.2.tgz"; + sha1 = "20c1386f9ccdda9747527c8f42bc2c02dd2e7951"; + }; + } + { + name = "react_motion___react_motion_0.5.2.tgz"; + path = fetchurl { + name = "react_motion___react_motion_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz"; + sha1 = "0dd3a69e411316567927917c6626551ba0607316"; + }; + } + { + name = "react_notification___react_notification_6.8.5.tgz"; + path = fetchurl { + name = "react_notification___react_notification_6.8.5.tgz"; + url = "https://registry.yarnpkg.com/react-notification/-/react-notification-6.8.5.tgz"; + sha1 = "7ea90a633bb2a280d899e30c93cf372265cce4f0"; + }; + } + { + name = "react_overlays___react_overlays_0.9.2.tgz"; + path = fetchurl { + name = "react_overlays___react_overlays_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.9.2.tgz"; + sha1 = "51ab1c62ded5af4d279bd3b943999531bbd648da"; + }; + } + { + name = "react_redux_loading_bar___react_redux_loading_bar_4.0.8.tgz"; + path = fetchurl { + name = "react_redux_loading_bar___react_redux_loading_bar_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-4.0.8.tgz"; + sha1 = "e84d59d1517b79f53b0f39c8ddb40682af648c1b"; + }; + } + { + name = "react_redux___react_redux_7.2.2.tgz"; + path = fetchurl { + name = "react_redux___react_redux_7.2.2.tgz"; + url = "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.2.tgz"; + sha1 = "03862e803a30b6b9ef8582dadcc810947f74b736"; + }; + } + { + name = "react_router_dom___react_router_dom_4.3.1.tgz"; + path = fetchurl { + name = "react_router_dom___react_router_dom_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz"; + sha1 = "4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"; + }; + } + { + name = "react_router_scroll_4___react_router_scroll_4_1.0.0_beta.2.tgz"; + path = fetchurl { + name = "react_router_scroll_4___react_router_scroll_4_1.0.0_beta.2.tgz"; + url = "https://registry.yarnpkg.com/react-router-scroll-4/-/react-router-scroll-4-1.0.0-beta.2.tgz"; + sha1 = "d887063ec0f66124aaf450158dd158ff7d3dc279"; + }; + } + { + name = "react_router___react_router_4.3.1.tgz"; + path = fetchurl { + name = "react_router___react_router_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz"; + sha1 = "aada4aef14c809cb2e686b05cee4742234506c4e"; + }; + } + { + name = "react_select___react_select_3.1.0.tgz"; + path = fetchurl { + name = "react_select___react_select_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/react-select/-/react-select-3.1.0.tgz"; + sha1 = "ab098720b2e9fe275047c993f0d0caf5ded17c27"; + }; + } + { + name = "react_sparklines___react_sparklines_1.7.0.tgz"; + path = fetchurl { + name = "react_sparklines___react_sparklines_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/react-sparklines/-/react-sparklines-1.7.0.tgz"; + sha1 = "9b1d97e8c8610095eeb2ad658d2e1fcf91f91a60"; + }; + } + { + name = "react_swipeable_views_core___react_swipeable_views_core_0.13.7.tgz"; + path = fetchurl { + name = "react_swipeable_views_core___react_swipeable_views_core_0.13.7.tgz"; + url = "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.13.7.tgz"; + sha1 = "c082b553f26e83fd20fc17f934200eb717023c8a"; + }; + } + { + name = "react_swipeable_views_utils___react_swipeable_views_utils_0.13.9.tgz"; + path = fetchurl { + name = "react_swipeable_views_utils___react_swipeable_views_utils_0.13.9.tgz"; + url = "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.13.9.tgz"; + sha1 = "a66e98f2f4502d8b00182901f80d13b2f903e10f"; + }; + } + { + name = "react_swipeable_views___react_swipeable_views_0.13.9.tgz"; + path = fetchurl { + name = "react_swipeable_views___react_swipeable_views_0.13.9.tgz"; + url = "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.13.9.tgz"; + sha1 = "d6a6c508bf5288ad55509f9c65916db5df0f2cec"; + }; + } + { + name = "react_test_renderer___react_test_renderer_16.14.0.tgz"; + path = fetchurl { + name = "react_test_renderer___react_test_renderer_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz"; + sha1 = "e98360087348e260c56d4fe2315e970480c228ae"; + }; + } + { + name = "react_textarea_autosize___react_textarea_autosize_8.3.0.tgz"; + path = fetchurl { + name = "react_textarea_autosize___react_textarea_autosize_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.0.tgz"; + sha1 = "e6e2fd186d9f61bb80ac6e2dcb4c55504f93c2fa"; + }; + } + { + name = "react_toggle___react_toggle_4.1.1.tgz"; + path = fetchurl { + name = "react_toggle___react_toggle_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/react-toggle/-/react-toggle-4.1.1.tgz"; + sha1 = "2317f67bf918ea3508a96b09dd383efd9da572af"; + }; + } + { + name = "react_transition_group___react_transition_group_2.9.0.tgz"; + path = fetchurl { + name = "react_transition_group___react_transition_group_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz"; + sha1 = "df9cdb025796211151a436c69a8f3b97b5b07c8d"; + }; + } + { + name = "react_transition_group___react_transition_group_4.3.0.tgz"; + path = fetchurl { + name = "react_transition_group___react_transition_group_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz"; + sha1 = "fea832e386cf8796c58b61874a3319704f5ce683"; + }; + } + { + name = "react___react_16.14.0.tgz"; + path = fetchurl { + name = "react___react_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz"; + sha1 = "94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"; + }; + } + { + name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + } + { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha1 = "f3a6135758459733ae2b95638056e1854e7ef507"; + }; + } + { + name = "read_pkg___read_pkg_2.0.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + } + { + name = "read_pkg___read_pkg_5.2.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; + sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readdirp___readdirp_2.2.1.tgz"; + path = fetchurl { + name = "readdirp___readdirp_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; + sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; + }; + } + { + name = "readdirp___readdirp_3.4.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz"; + sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada"; + }; + } + { + name = "readline2___readline2_1.0.1.tgz"; + path = fetchurl { + name = "readline2___readline2_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz"; + sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; + }; + } + { + name = "redent___redent_3.0.0.tgz"; + path = fetchurl { + name = "redent___redent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz"; + sha1 = "e557b7998316bb53c9f1f56fa626352c6963059f"; + }; + } + { + name = "redis_commands___redis_commands_1.6.0.tgz"; + path = fetchurl { + name = "redis_commands___redis_commands_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.6.0.tgz"; + sha1 = "36d4ca42ae9ed29815cdb30ad9f97982eba1ce23"; + }; + } + { + name = "redis_errors___redis_errors_1.2.0.tgz"; + path = fetchurl { + name = "redis_errors___redis_errors_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz"; + sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad"; + }; + } + { + name = "redis_parser___redis_parser_3.0.0.tgz"; + path = fetchurl { + name = "redis_parser___redis_parser_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz"; + sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; + }; + } + { + name = "redis___redis_3.0.2.tgz"; + path = fetchurl { + name = "redis___redis_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/redis/-/redis-3.0.2.tgz"; + sha1 = "bd47067b8a4a3e6a2e556e57f71cc82c7360150a"; + }; + } + { + name = "redux_immutable___redux_immutable_4.0.0.tgz"; + path = fetchurl { + name = "redux_immutable___redux_immutable_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/redux-immutable/-/redux-immutable-4.0.0.tgz"; + sha1 = "3a1a32df66366462b63691f0e1dc35e472bbc9f3"; + }; + } + { + name = "redux_thunk___redux_thunk_2.3.0.tgz"; + path = fetchurl { + name = "redux_thunk___redux_thunk_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz"; + sha1 = "51c2c19a185ed5187aaa9a2d08b666d0d6467622"; + }; + } + { + name = "redux___redux_4.0.5.tgz"; + path = fetchurl { + name = "redux___redux_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz"; + sha1 = "4db5de5816e17891de8a80c424232d06f051d93f"; + }; + } + { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + path = fetchurl { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; + }; + } + { + name = "regenerate___regenerate_1.4.1.tgz"; + path = fetchurl { + name = "regenerate___regenerate_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz"; + sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.12.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.12.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz"; + sha1 = "fa1a71544764c036f8c49b13a08b2594c9f8a0de"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; + }; + } + { + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha1 = "c98da154683671c9c4dcb16ece736517e1b7feb4"; + }; + } + { + name = "regex_not___regex_not_1.0.2.tgz"; + path = fetchurl { + name = "regex_not___regex_not_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; + sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + }; + } + { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + path = fetchurl { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; + }; + } + { + name = "regexpp___regexpp_3.1.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + }; + } + { + name = "regexpu_core___regexpu_core_4.7.1.tgz"; + path = fetchurl { + name = "regexpu_core___regexpu_core_4.7.1.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha1 = "2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"; + }; + } + { + name = "regjsgen___regjsgen_0.5.2.tgz"; + path = fetchurl { + name = "regjsgen___regjsgen_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; + sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733"; + }; + } + { + name = "regjsparser___regjsparser_0.6.4.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.6.4.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; + sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; + }; + } + { + name = "rellax___rellax_1.12.1.tgz"; + path = fetchurl { + name = "rellax___rellax_1.12.1.tgz"; + url = "https://registry.yarnpkg.com/rellax/-/rellax-1.12.1.tgz"; + sha1 = "1b433ef7ac4aa3573449a33efab391c112f6b34d"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "repeat_element___repeat_element_1.1.3.tgz"; + path = fetchurl { + name = "repeat_element___repeat_element_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; + sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + }; + } + { + name = "repeat_string___repeat_string_1.6.1.tgz"; + path = fetchurl { + name = "repeat_string___repeat_string_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + } + { + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + path = fetchurl { + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; + }; + } + { + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + path = fetchurl { + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; + }; + } + { + name = "request___request_2.88.2.tgz"; + path = fetchurl { + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + }; + } + { + name = "requestidlecallback___requestidlecallback_0.3.0.tgz"; + path = fetchurl { + name = "requestidlecallback___requestidlecallback_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/requestidlecallback/-/requestidlecallback-0.3.0.tgz"; + sha1 = "6fb74e0733f90df3faa4838f9f6a2a5f9b742ac5"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "require_package_name___require_package_name_2.0.1.tgz"; + path = fetchurl { + name = "require_package_name___require_package_name_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz"; + sha1 = "c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"; + }; + } + { + name = "require_uncached___require_uncached_1.0.3.tgz"; + path = fetchurl { + name = "require_uncached___require_uncached_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz"; + sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; + }; + } + { + name = "requires_port___requires_port_1.0.0.tgz"; + path = fetchurl { + name = "requires_port___requires_port_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + } + { + name = "reselect___reselect_4.0.0.tgz"; + path = fetchurl { + name = "reselect___reselect_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz"; + sha1 = "f2529830e5d3d0e021408b246a206ef4ea4437f7"; + }; + } + { + name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; + sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + }; + } + { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"; + }; + } + { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + path = fetchurl { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + } + { + name = "resolve_from___resolve_from_1.0.1.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz"; + sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; + }; + } + { + name = "resolve_from___resolve_from_3.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve_from___resolve_from_5.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; + sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; + }; + } + { + name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; + path = fetchurl { + name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz"; + sha1 = "7e9ae21ed815fd63ab189adeee64dc831eefa879"; + }; + } + { + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + path = fetchurl { + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz"; + sha1 = "99d02224d3cf263689becbb393bc560313025dcd"; + }; + } + { + name = "resolve_url___resolve_url_0.2.1.tgz"; + path = fetchurl { + name = "resolve_url___resolve_url_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + } + { + name = "resolve___resolve_1.19.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz"; + sha1 = "1af5bf630409734a067cae29318aac7fa29a267c"; + }; + } + { + name = "restore_cursor___restore_cursor_1.0.1.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz"; + sha1 = "34661f46886327fed2991479152252df92daa541"; + }; + } + { + name = "ret___ret_0.1.15.tgz"; + path = fetchurl { + name = "ret___ret_0.1.15.tgz"; + url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; + sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + }; + } + { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } + { + name = "rgb_regex___rgb_regex_1.0.1.tgz"; + path = fetchurl { + name = "rgb_regex___rgb_regex_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz"; + sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; + }; + } + { + name = "rgba_regex___rgba_regex_1.0.0.tgz"; + path = fetchurl { + name = "rgba_regex___rgba_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz"; + sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; + }; + } + { + name = "rimraf___rimraf_2.6.3.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; + sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "ripemd160___ripemd160_2.0.2.tgz"; + path = fetchurl { + name = "ripemd160___ripemd160_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz"; + sha1 = "a1c1a6f624751577ba5d07914cbc92850585890c"; + }; + } + { + name = "rsvp___rsvp_4.8.5.tgz"; + path = fetchurl { + name = "rsvp___rsvp_4.8.5.tgz"; + url = "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz"; + sha1 = "c8f155311d167f68f21e168df71ec5b083113734"; + }; + } + { + name = "run_async___run_async_0.1.0.tgz"; + path = fetchurl { + name = "run_async___run_async_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz"; + sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; + }; + } + { + name = "run_queue___run_queue_1.0.3.tgz"; + path = fetchurl { + name = "run_queue___run_queue_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + } + { + name = "rx_lite___rx_lite_3.1.2.tgz"; + path = fetchurl { + name = "rx_lite___rx_lite_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz"; + sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safe_regex___safe_regex_1.1.0.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "sane___sane_4.1.0.tgz"; + path = fetchurl { + name = "sane___sane_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz"; + sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded"; + }; + } + { + name = "sass_lint___sass_lint_1.13.1.tgz"; + path = fetchurl { + name = "sass_lint___sass_lint_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/sass-lint/-/sass-lint-1.13.1.tgz"; + sha1 = "5fd2b2792e9215272335eb0f0dc607f61e8acc8f"; + }; + } + { + name = "sass_loader___sass_loader_10.1.0.tgz"; + path = fetchurl { + name = "sass_loader___sass_loader_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.0.tgz"; + sha1 = "1727fcc0c32ab3eb197cda61d78adf4e9174a4b3"; + }; + } + { + name = "sass___sass_1.29.0.tgz"; + path = fetchurl { + name = "sass___sass_1.29.0.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.29.0.tgz"; + sha1 = "ec4e1842c146d8ea9258c28c141b8c2b7c6ab7f1"; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + { + name = "saxes___saxes_5.0.1.tgz"; + path = fetchurl { + name = "saxes___saxes_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; + sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d"; + }; + } + { + name = "scheduler___scheduler_0.19.1.tgz"; + path = fetchurl { + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; + }; + } + { + name = "schema_utils___schema_utils_1.0.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz"; + sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770"; + }; + } + { + name = "schema_utils___schema_utils_2.7.1.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; + }; + } + { + name = "schema_utils___schema_utils_3.0.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz"; + sha1 = "67502f6aa2b66a2d4032b4279a2944978a0913ef"; + }; + } + { + name = "scroll_behavior___scroll_behavior_0.9.12.tgz"; + path = fetchurl { + name = "scroll_behavior___scroll_behavior_0.9.12.tgz"; + url = "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.12.tgz"; + sha1 = "1c22d273ec4ce6cd4714a443fead50227da9424c"; + }; + } + { + name = "select_hose___select_hose_2.0.0.tgz"; + path = fetchurl { + name = "select_hose___select_hose_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz"; + sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + }; + } + { + name = "selfsigned___selfsigned_1.10.8.tgz"; + path = fetchurl { + name = "selfsigned___selfsigned_1.10.8.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz"; + sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_4.3.2.tgz"; + path = fetchurl { + name = "semver___semver_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz"; + sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; + }; + } + { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "semver___semver_7.3.4.tgz"; + path = fetchurl { + name = "semver___semver_7.3.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; + sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + }; + } + { + name = "send___send_0.17.1.tgz"; + path = fetchurl { + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + }; + } + { + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; + sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; + }; + } + { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; + }; + } + { + name = "serve_index___serve_index_1.9.1.tgz"; + path = fetchurl { + name = "serve_index___serve_index_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + }; + } + { + name = "serve_static___serve_static_1.14.1.tgz"; + path = fetchurl { + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "set_value___set_value_2.0.1.tgz"; + path = fetchurl { + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + }; + } + { + name = "setimmediate___setimmediate_1.0.5.tgz"; + path = fetchurl { + name = "setimmediate___setimmediate_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.0.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + }; + } + { + name = "sha.js___sha.js_2.4.11.tgz"; + path = fetchurl { + name = "sha.js___sha.js_2.4.11.tgz"; + url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz"; + sha1 = "37a5cf0b81ecbc6943de109ba2960d1b26584ae7"; + }; + } + { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + path = fetchurl { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha1 = "8f2981ad92531f55035b01fb230769a40e02efa3"; + }; + } + { + name = "shallow_equal___shallow_equal_1.2.1.tgz"; + path = fetchurl { + name = "shallow_equal___shallow_equal_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz"; + sha1 = "4c16abfa56043aa20d050324efa68940b0da79da"; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "shelljs___shelljs_0.6.1.tgz"; + path = fetchurl { + name = "shelljs___shelljs_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz"; + sha1 = "ec6211bed1920442088fe0f70b2837232ed2c8a8"; + }; + } + { + name = "shellwords___shellwords_0.1.1.tgz"; + path = fetchurl { + name = "shellwords___shellwords_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz"; + sha1 = "d6b9181c1a48d397324c84871efbcfc73fc0654b"; + }; + } + { + name = "side_channel___side_channel_1.0.3.tgz"; + path = fetchurl { + name = "side_channel___side_channel_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz"; + sha1 = "cdc46b057550bbab63706210838df5d4c19519c3"; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; + path = fetchurl { + name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + } + { + name = "sisteransi___sisteransi_1.0.5.tgz"; + path = fetchurl { + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; + }; + } + { + name = "slash___slash_1.0.0.tgz"; + path = fetchurl { + name = "slash___slash_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { + name = "slice_ansi___slice_ansi_0.0.4.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz"; + sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + }; + } + { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + }; + } + { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + path = fetchurl { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + }; + } + { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + path = fetchurl { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + }; + } + { + name = "snapdragon___snapdragon_0.8.2.tgz"; + path = fetchurl { + name = "snapdragon___snapdragon_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; + sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + }; + } + { + name = "sockjs_client___sockjs_client_1.4.0.tgz"; + path = fetchurl { + name = "sockjs_client___sockjs_client_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha1 = "c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"; + }; + } + { + name = "sockjs___sockjs_0.3.20.tgz"; + path = fetchurl { + name = "sockjs___sockjs_0.3.20.tgz"; + url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz"; + sha1 = "b26a283ec562ef8b2687b44033a4eeceac75d855"; + }; + } + { + name = "source_list_map___source_list_map_2.0.1.tgz"; + path = fetchurl { + name = "source_list_map___source_list_map_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz"; + sha1 = "3993bd873bfc48479cca9ea3a547835c7c154b34"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.6.0.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz"; + sha1 = "3d9df87e236b53f16d01e58150fc7711138e5ed2"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + }; + } + { + name = "source_map_url___source_map_url_0.4.0.tgz"; + path = fetchurl { + name = "source_map_url___source_map_url_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + } + { + name = "source_map___source_map_0.5.6.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "source_map___source_map_0.7.3.tgz"; + path = fetchurl { + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha1 = "5302f8169031735226544092e64981f751750383"; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha1 = "c80757383c28abf7296744998cbc106ae8b854ce"; + }; + } + { + name = "spdy_transport___spdy_transport_3.0.0.tgz"; + path = fetchurl { + name = "spdy_transport___spdy_transport_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz"; + sha1 = "00d4863a6400ad75df93361a1608605e5dcdcf31"; + }; + } + { + name = "spdy___spdy_4.0.2.tgz"; + path = fetchurl { + name = "spdy___spdy_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz"; + sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b"; + }; + } + { + name = "split_string___split_string_3.1.0.tgz"; + path = fetchurl { + name = "split_string___split_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; + sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + }; + } + { + name = "split___split_1.0.1.tgz"; + path = fetchurl { + name = "split___split_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz"; + sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "sshpk___sshpk_1.16.1.tgz"; + path = fetchurl { + name = "sshpk___sshpk_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + } + { + name = "ssri___ssri_6.0.1.tgz"; + path = fetchurl { + name = "ssri___ssri_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"; + sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; + }; + } + { + name = "ssri___ssri_8.0.0.tgz"; + path = fetchurl { + name = "ssri___ssri_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz"; + sha1 = "79ca74e21f8ceaeddfcb4b90143c458b8d988808"; + }; + } + { + name = "stable___stable_0.1.8.tgz"; + path = fetchurl { + name = "stable___stable_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz"; + sha1 = "836eb3c8382fe2936feaf544631017ce7d47a3cf"; + }; + } + { + name = "stack_generator___stack_generator_2.0.5.tgz"; + path = fetchurl { + name = "stack_generator___stack_generator_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz"; + sha1 = "fb00e5b4ee97de603e0773ea78ce944d81596c36"; + }; + } + { + name = "stack_utils___stack_utils_2.0.2.tgz"; + path = fetchurl { + name = "stack_utils___stack_utils_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz"; + sha1 = "5cf48b4557becb4638d0bc4f21d23f5d19586593"; + }; + } + { + name = "stackframe___stackframe_1.2.0.tgz"; + path = fetchurl { + name = "stackframe___stackframe_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz"; + sha1 = "52429492d63c62eb989804c11552e3d22e779303"; + }; + } + { + name = "stacktrace_gps___stacktrace_gps_3.0.4.tgz"; + path = fetchurl { + name = "stacktrace_gps___stacktrace_gps_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.0.4.tgz"; + sha1 = "7688dc2fc09ffb3a13165ebe0dbcaf41bcf0c69a"; + }; + } + { + name = "stacktrace_js___stacktrace_js_2.0.2.tgz"; + path = fetchurl { + name = "stacktrace_js___stacktrace_js_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/stacktrace-js/-/stacktrace-js-2.0.2.tgz"; + sha1 = "4ca93ea9f494752d55709a081d400fdaebee897b"; + }; + } + { + name = "static_extend___static_extend_0.1.2.tgz"; + path = fetchurl { + name = "static_extend___static_extend_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + } + { + name = "statuses___statuses_1.5.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + } + { + name = "stealthy_require___stealthy_require_1.1.1.tgz"; + path = fetchurl { + name = "stealthy_require___stealthy_require_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + } + { + name = "stream_browserify___stream_browserify_2.0.2.tgz"; + path = fetchurl { + name = "stream_browserify___stream_browserify_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha1 = "87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"; + }; + } + { + name = "stream_each___stream_each_1.2.3.tgz"; + path = fetchurl { + name = "stream_each___stream_each_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz"; + sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae"; + }; + } + { + name = "stream_http___stream_http_2.8.3.tgz"; + path = fetchurl { + name = "stream_http___stream_http_2.8.3.tgz"; + url = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz"; + sha1 = "b2d242469288a5a27ec4fe8933acf623de6514fc"; + }; + } + { + name = "stream_shift___stream_shift_1.0.1.tgz"; + path = fetchurl { + name = "stream_shift___stream_shift_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; + sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; + }; + } + { + name = "string_length___string_length_4.0.1.tgz"; + path = fetchurl { + name = "string_length___string_length_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz"; + sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1"; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_width___string_width_4.2.0.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; + sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + }; + } + { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + path = fetchurl { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; + sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha1 = "85812a6b847ac002270f5808146064c995fb6913"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "stringz___stringz_2.1.0.tgz"; + path = fetchurl { + name = "stringz___stringz_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/stringz/-/stringz-2.1.0.tgz"; + sha1 = "5896b4713eac31157556040fb90258fb02c1630c"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_bom___strip_bom_3.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + } + { + name = "strip_bom___strip_bom_4.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz"; + sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"; + }; + } + { + name = "strip_comments___strip_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_comments___strip_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz"; + sha1 = "4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"; + }; + } + { + name = "strip_eof___strip_eof_1.0.0.tgz"; + path = fetchurl { + name = "strip_eof___strip_eof_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + } + { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + path = fetchurl { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + }; + } + { + name = "strip_indent___strip_indent_3.0.0.tgz"; + path = fetchurl { + name = "strip_indent___strip_indent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz"; + sha1 = "c32e1cee940b6b3432c771bc2c54bcce73cd3001"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } + { + name = "strip_json_comments___strip_json_comments_1.0.4.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; + sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + }; + } + { + name = "stylehacks___stylehacks_4.0.3.tgz"; + path = fetchurl { + name = "stylehacks___stylehacks_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz"; + sha1 = "6718fcaf4d1e07d8a1318690881e8d96726a71d5"; + }; + } + { + name = "substring_trie___substring_trie_1.0.2.tgz"; + path = fetchurl { + name = "substring_trie___substring_trie_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.2.tgz"; + sha1 = "7b42592391628b4f2cb17365c6cce4257c7b7af5"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { + name = "supports_color___supports_color_3.2.3.tgz"; + path = fetchurl { + name = "supports_color___supports_color_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz"; + sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_6.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; + sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; + path = fetchurl { + name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"; + sha1 = "f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"; + }; + } + { + name = "svgo___svgo_1.3.2.tgz"; + path = fetchurl { + name = "svgo___svgo_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; + sha1 = "b6dc511c063346c9e415b81e43401145b96d4167"; + }; + } + { + name = "symbol_observable___symbol_observable_1.2.0.tgz"; + path = fetchurl { + name = "symbol_observable___symbol_observable_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz"; + sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804"; + }; + } + { + name = "symbol_tree___symbol_tree_3.2.4.tgz"; + path = fetchurl { + name = "symbol_tree___symbol_tree_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; + sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2"; + }; + } + { + name = "table___table_3.8.3.tgz"; + path = fetchurl { + name = "table___table_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz"; + sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; + }; + } + { + name = "table___table_5.4.1.tgz"; + path = fetchurl { + name = "table___table_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-5.4.1.tgz"; + sha1 = "0691ae2ebe8259858efb63e550b6d5f9300171e8"; + }; + } + { + name = "tapable___tapable_1.1.3.tgz"; + path = fetchurl { + name = "tapable___tapable_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz"; + sha1 = "a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"; + }; + } + { + name = "tar___tar_6.0.5.tgz"; + path = fetchurl { + name = "tar___tar_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz"; + sha1 = "bde815086e10b39f1dcd298e89d596e1535e200f"; + }; + } + { + name = "tcomb___tcomb_2.7.0.tgz"; + path = fetchurl { + name = "tcomb___tcomb_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz"; + sha1 = "10d62958041669a5d53567b9a4ee8cde22b1c2b0"; + }; + } + { + name = "terminal_link___terminal_link_2.1.1.tgz"; + path = fetchurl { + name = "terminal_link___terminal_link_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz"; + sha1 = "14a64a27ab3c0df933ea546fba55f2d078edc994"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; + sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_4.2.3.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz"; + sha1 = "28daef4a83bd17c1db0297070adc07fc8cfc6a9a"; + }; + } + { + name = "terser___terser_4.8.0.tgz"; + path = fetchurl { + name = "terser___terser_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; + sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; + }; + } + { + name = "terser___terser_5.3.4.tgz"; + path = fetchurl { + name = "terser___terser_5.3.4.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.3.4.tgz"; + sha1 = "e510e05f86e0bd87f01835c3238839193f77a60c"; + }; + } + { + name = "tesseract.js_core___tesseract.js_core_2.2.0.tgz"; + path = fetchurl { + name = "tesseract.js_core___tesseract.js_core_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tesseract.js-core/-/tesseract.js-core-2.2.0.tgz"; + sha1 = "6ef78051272a381969fac3e45a226e85022cffef"; + }; + } + { + name = "tesseract.js___tesseract.js_2.1.1.tgz"; + path = fetchurl { + name = "tesseract.js___tesseract.js_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/tesseract.js/-/tesseract.js-2.1.1.tgz"; + sha1 = "5c50fc95542ce8d834cb952bfb75a8fc85f1441d"; + }; + } + { + name = "test_exclude___test_exclude_6.0.0.tgz"; + path = fetchurl { + name = "test_exclude___test_exclude_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz"; + sha1 = "04a8698661d805ea6fa293b6cb9e63ac044ef15e"; + }; + } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + } + { + name = "throat___throat_5.0.0.tgz"; + path = fetchurl { + name = "throat___throat_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz"; + sha1 = "c5199235803aad18754a667d659b5e72ce16764b"; + }; + } + { + name = "throng___throng_4.0.0.tgz"; + path = fetchurl { + name = "throng___throng_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/throng/-/throng-4.0.0.tgz"; + sha1 = "983c6ba1993b58eae859998aa687ffe88df84c17"; + }; + } + { + name = "through2___through2_2.0.5.tgz"; + path = fetchurl { + name = "through2___through2_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; + sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "thunky___thunky_1.1.0.tgz"; + path = fetchurl { + name = "thunky___thunky_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"; + sha1 = "5abaf714a9405db0504732bbccd2cedd9ef9537d"; + }; + } + { + name = "timers_browserify___timers_browserify_2.0.11.tgz"; + path = fetchurl { + name = "timers_browserify___timers_browserify_2.0.11.tgz"; + url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz"; + sha1 = "800b1f3eee272e5bc53ee465a04d0e804c31211f"; + }; + } + { + name = "timsort___timsort_0.3.0.tgz"; + path = fetchurl { + name = "timsort___timsort_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz"; + sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; + }; + } + { + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; + path = fetchurl { + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz"; + sha1 = "634c5f8efdc27714b7f386c35e6760991d230875"; + }; + } + { + name = "tiny_queue___tiny_queue_0.2.1.tgz"; + path = fetchurl { + name = "tiny_queue___tiny_queue_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz"; + sha1 = "25a67f2c6e253b2ca941977b5ef7442ef97a6046"; + }; + } + { + name = "tiny_warning___tiny_warning_1.0.3.tgz"; + path = fetchurl { + name = "tiny_warning___tiny_warning_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz"; + sha1 = "94a30db453df4c643d0fd566060d60a875d84754"; + }; + } + { + name = "tmpl___tmpl_1.0.4.tgz"; + path = fetchurl { + name = "tmpl___tmpl_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz"; + sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + }; + } + { + name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; + path = fetchurl { + name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { + name = "to_object_path___to_object_path_0.3.0.tgz"; + path = fetchurl { + name = "to_object_path___to_object_path_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + } + { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { + name = "to_regex___to_regex_3.0.2.tgz"; + path = fetchurl { + name = "to_regex___to_regex_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; + sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + }; + } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + }; + } + { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { + name = "tough_cookie___tough_cookie_3.0.1.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz"; + sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; + }; + } + { + name = "tr46___tr46_2.0.2.tgz"; + path = fetchurl { + name = "tr46___tr46_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz"; + sha1 = "03273586def1595ae08fedb38d7733cee91d2479"; + }; + } + { + name = "ts_essentials___ts_essentials_2.0.12.tgz"; + path = fetchurl { + name = "ts_essentials___ts_essentials_2.0.12.tgz"; + url = "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz"; + sha1 = "c9303f3d74f75fa7528c3d49b80e089ab09d8745"; + }; + } + { + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + path = fetchurl { + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; + }; + } + { + name = "tslib___tslib_1.13.0.tgz"; + path = fetchurl { + name = "tslib___tslib_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; + sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; + }; + } + { + name = "tty_browserify___tty_browserify_0.0.0.tgz"; + path = fetchurl { + name = "tty_browserify___tty_browserify_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + { + name = "type_check___type_check_0.4.0.tgz"; + path = fetchurl { + name = "type_check___type_check_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; + sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + }; + } + { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_detect___type_detect_4.0.8.tgz"; + path = fetchurl { + name = "type_detect___type_detect_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz"; + sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; + }; + } + { + name = "type_fest___type_fest_0.11.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; + sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; + }; + } + { + name = "type_fest___type_fest_0.6.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; + sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + }; + } + { + name = "type_is___type_is_1.6.18.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + }; + } + { + name = "type___type_1.2.0.tgz"; + path = fetchurl { + name = "type___type_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; + sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0"; + }; + } + { + name = "type___type_2.0.0.tgz"; + path = fetchurl { + name = "type___type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; + sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; + }; + } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; + }; + } + { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; + }; + } + { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + path = fetchurl { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; + }; + } + { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + path = fetchurl { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; + }; + } + { + name = "union_value___union_value_1.0.1.tgz"; + path = fetchurl { + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + }; + } + { + name = "uniq___uniq_1.0.1.tgz"; + path = fetchurl { + name = "uniq___uniq_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + } + { + name = "uniqs___uniqs_2.0.0.tgz"; + path = fetchurl { + name = "uniqs___uniqs_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz"; + sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; + }; + } + { + name = "unique_filename___unique_filename_1.1.1.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; + sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + }; + } + { + name = "unique_slug___unique_slug_2.0.2.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; + sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } + { + name = "unquote___unquote_1.1.1.tgz"; + path = fetchurl { + name = "unquote___unquote_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz"; + sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; + }; + } + { + name = "unset_value___unset_value_1.0.0.tgz"; + path = fetchurl { + name = "unset_value___unset_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + } + { + name = "upath___upath_1.2.0.tgz"; + path = fetchurl { + name = "upath___upath_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"; + sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894"; + }; + } + { + name = "uri_js___uri_js_4.4.0.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; + sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; + }; + } + { + name = "urix___urix_0.1.0.tgz"; + path = fetchurl { + name = "urix___urix_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + } + { + name = "url_parse___url_parse_1.4.7.tgz"; + path = fetchurl { + name = "url_parse___url_parse_1.4.7.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz"; + sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278"; + }; + } + { + name = "url___url_0.11.0.tgz"; + path = fetchurl { + name = "url___url_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + } + { + name = "use_composed_ref___use_composed_ref_1.0.0.tgz"; + path = fetchurl { + name = "use_composed_ref___use_composed_ref_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.0.0.tgz"; + sha1 = "bb13e8f4a0b873632cde4940abeb88b92d03023a"; + }; + } + { + name = "use_isomorphic_layout_effect___use_isomorphic_layout_effect_1.0.0.tgz"; + path = fetchurl { + name = "use_isomorphic_layout_effect___use_isomorphic_layout_effect_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.0.0.tgz"; + sha1 = "f56b4ed633e1c21cd9fc76fe249002a1c28989fb"; + }; + } + { + name = "use_latest___use_latest_1.1.0.tgz"; + path = fetchurl { + name = "use_latest___use_latest_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/use-latest/-/use-latest-1.1.0.tgz"; + sha1 = "7bf9684555869c3f5f37e10d0884c8accf4d3aa6"; + }; + } + { + name = "use___use_3.1.1.tgz"; + path = fetchurl { + name = "use___use_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; + sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + }; + } + { + name = "user_home___user_home_2.0.0.tgz"; + path = fetchurl { + name = "user_home___user_home_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "util.promisify___util.promisify_1.0.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; + sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee"; + }; + } + { + name = "util___util_0.10.3.tgz"; + path = fetchurl { + name = "util___util_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + } + { + name = "util___util_0.10.4.tgz"; + path = fetchurl { + name = "util___util_0.10.4.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz"; + sha1 = "3aa0125bfe668a4672de58857d3ace27ecb76901"; + }; + } + { + name = "util___util_0.11.1.tgz"; + path = fetchurl { + name = "util___util_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz"; + sha1 = "3236733720ec64bb27f6e26f421aaa2e1b588d61"; + }; + } + { + name = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "uuid___uuid_8.3.2.tgz"; + path = fetchurl { + name = "uuid___uuid_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz"; + sha1 = "80d5b5ced271bb9af6c445f21a1a04c606cefbe2"; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; + }; + } + { + name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; + path = fetchurl { + name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz"; + sha1 = "b4fe00e35649ef7785a9b7fcebcea05f37c332fc"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + }; + } + { + name = "value_equal___value_equal_0.4.0.tgz"; + path = fetchurl { + name = "value_equal___value_equal_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz"; + sha1 = "c5bdd2f54ee093c04839d71ce2e4758a6890abc7"; + }; + } + { + name = "value_equal___value_equal_1.0.1.tgz"; + path = fetchurl { + name = "value_equal___value_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz"; + sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c"; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + } + { + name = "vendors___vendors_1.0.4.tgz"; + path = fetchurl { + name = "vendors___vendors_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; + sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"; + }; + } + { + name = "verror___verror_1.10.0.tgz"; + path = fetchurl { + name = "verror___verror_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + { + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + path = fetchurl { + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; + }; + } + { + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + path = fetchurl { + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; + }; + } + { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + path = fetchurl { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; + sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a"; + }; + } + { + name = "walker___walker_1.0.7.tgz"; + path = fetchurl { + name = "walker___walker_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz"; + sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; + }; + } + { + name = "warning___warning_3.0.0.tgz"; + path = fetchurl { + name = "warning___warning_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz"; + sha1 = "32e5377cb572de4ab04753bdf8821c01ed605b7c"; + }; + } + { + name = "warning___warning_4.0.3.tgz"; + path = fetchurl { + name = "warning___warning_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz"; + sha1 = "16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"; + }; + } + { + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; + path = fetchurl { + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; + sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"; + }; + } + { + name = "watchpack___watchpack_1.7.4.tgz"; + path = fetchurl { + name = "watchpack___watchpack_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz"; + sha1 = "6e9da53b3c80bb2d6508188f5b200410866cd30b"; + }; + } + { + name = "wbuf___wbuf_1.7.3.tgz"; + path = fetchurl { + name = "wbuf___wbuf_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz"; + sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df"; + }; + } + { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; + sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff"; + }; + } + { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; + sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514"; + }; + } + { + name = "webpack_assets_manifest___webpack_assets_manifest_3.1.1.tgz"; + path = fetchurl { + name = "webpack_assets_manifest___webpack_assets_manifest_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-assets-manifest/-/webpack-assets-manifest-3.1.1.tgz"; + sha1 = "39bbc3bf2ee57fcd8ba07cda51c9ba4a3c6ae1de"; + }; + } + { + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.1.0.tgz"; + path = fetchurl { + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.1.0.tgz"; + sha1 = "31f9e5e187ee32fae2392b21806582cc6fe74cf9"; + }; + } + { + name = "webpack_cli___webpack_cli_3.3.12.tgz"; + path = fetchurl { + name = "webpack_cli___webpack_cli_3.3.12.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz"; + sha1 = "94e9ada081453cd0aa609c99e500012fd3ad2d4a"; + }; + } + { + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; + path = fetchurl { + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; + sha1 = "0019c3db716e3fa5cecbf64f2ab88a74bab331f3"; + }; + } + { + name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz"; + path = fetchurl { + name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; + sha1 = "8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"; + }; + } + { + name = "webpack_log___webpack_log_2.0.0.tgz"; + path = fetchurl { + name = "webpack_log___webpack_log_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz"; + sha1 = "5b7928e0637593f119d32f6227c1e0ac31e1b47f"; + }; + } + { + name = "webpack_merge___webpack_merge_5.4.0.tgz"; + path = fetchurl { + name = "webpack_merge___webpack_merge_5.4.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.4.0.tgz"; + sha1 = "81bef0a7d23fc1e6c24b06ad8bf22ddeb533a3a3"; + }; + } + { + name = "webpack_sources___webpack_sources_1.4.3.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933"; + }; + } + { + name = "webpack___webpack_4.44.2.tgz"; + path = fetchurl { + name = "webpack___webpack_4.44.2.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz"; + sha1 = "6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"; + }; + } + { + name = "websocket_driver___websocket_driver_0.6.5.tgz"; + path = fetchurl { + name = "websocket_driver___websocket_driver_0.6.5.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + }; + } + { + name = "websocket_driver___websocket_driver_0.7.3.tgz"; + path = fetchurl { + name = "websocket_driver___websocket_driver_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz"; + sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"; + }; + } + { + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + path = fetchurl { + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42"; + }; + } + { + name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + path = fetchurl { + name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0"; + }; + } + { + name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + path = fetchurl { + name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf"; + }; + } + { + name = "whatwg_url___whatwg_url_8.2.2.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz"; + sha1 = "85e7f9795108b53d554cec640b2e8aee2a0d4bfd"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + name = "wicg_inert___wicg_inert_3.1.0.tgz"; + path = fetchurl { + name = "wicg_inert___wicg_inert_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.0.tgz"; + sha1 = "6525f12db188b83f0051bed2ddcf6c1aa5b17590"; + }; + } + { + name = "wide_align___wide_align_1.1.3.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + }; + } + { + name = "wildcard___wildcard_2.0.0.tgz"; + path = fetchurl { + name = "wildcard___wildcard_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; + sha1 = "a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "worker_farm___worker_farm_1.7.0.tgz"; + path = fetchurl { + name = "worker_farm___worker_farm_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; + sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; + }; + } + { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + }; + } + { + name = "write___write_1.0.3.tgz"; + path = fetchurl { + name = "write___write_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; + sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; + }; + } + { + name = "write___write_0.2.1.tgz"; + path = fetchurl { + name = "write___write_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz"; + sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; + }; + } + { + name = "ws___ws_6.2.1.tgz"; + path = fetchurl { + name = "ws___ws_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; + sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; + }; + } + { + name = "ws___ws_7.4.0.tgz"; + path = fetchurl { + name = "ws___ws_7.4.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz"; + sha1 = "a5dd76a24197940d4a8bb9e0e152bb4503764da7"; + }; + } + { + name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + path = fetchurl { + name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; + sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"; + }; + } + { + name = "xmlchars___xmlchars_2.2.0.tgz"; + path = fetchurl { + name = "xmlchars___xmlchars_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; + sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "y18n___y18n_4.0.0.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; + sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + }; + } + { + name = "y18n___y18n_5.0.5.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; + sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; + }; + } + { + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yaml___yaml_1.10.0.tgz"; + path = fetchurl { + name = "yaml___yaml_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz"; + sha1 = "3b593add944876077d4d683fee01081bd9fff31e"; + }; + } + { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; + }; + } + { + name = "yargs_parser___yargs_parser_18.1.3.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_18.1.3.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.3.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.3.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.3.tgz"; + sha1 = "92419ba867b858c868acf8bae9bf74af0dd0ce26"; + }; + } + { + name = "yargs___yargs_13.3.2.tgz"; + path = fetchurl { + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + }; + } + { + name = "yargs___yargs_15.4.1.tgz"; + path = fetchurl { + name = "yargs___yargs_15.4.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz"; + sha1 = "0d87a16de01aee9d8bec2bfbf74f67851730f4f8"; + }; + } + { + name = "yargs___yargs_16.1.1.tgz"; + path = fetchurl { + name = "yargs___yargs_16.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.1.1.tgz"; + sha1 = "5a4a095bd1ca806b0a50d0c03611d38034d219a1"; + }; + } + { + name = "zlibjs___zlibjs_0.3.1.tgz"; + path = fetchurl { + name = "zlibjs___zlibjs_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/zlibjs/-/zlibjs-0.3.1.tgz"; + sha1 = "50197edb28a1c42ca659cc8b4e6a9ddd6d444554"; + }; + } + ]; +} diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index e11bceb14dea..f9d26da62973 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.25.0"; + version = "1.26.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RL0LXBPJR1Qef3TNYYZdo83gh51nrN3BJeLtVzXDAg0="; + sha256 = "1jppwqxamj3a65fw2a87brz4iqgijaa4lja51wlxh2xdkqj0sn6l"; }; patches = [ diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 389b724a134f..9d3b484a5714 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -1,15 +1,21 @@ -{ pkgs, nodejs, stdenv, lib, ... }: +{ pkgs, nodejs, stdenv, fetchFromGitHub, lib, ... }: let - - packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json)); + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "matrix-appservice-slack"; + rev = "1.4.0"; + sha256 = "1xm75rgg7yrz40y2w1njiwfwz17a8wwlvr7a6zyxvkl8cqrgzp6d"; + }; nodePackages = import ./node-composition.nix { inherit pkgs nodejs; inherit (stdenv.hostPlatform) system; }; in -nodePackages."${packageName}".override { +nodePackages.package.override { + inherit src; + nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh index fc89486cfbc0..a6a359876abd 100644..100755 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh @@ -1,11 +1,17 @@ -#!/usr/bin/env bash +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix -ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)" +# Download package.json and package-lock.json from the v1.4.0 release +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/9462a75715ea9afba23b757ec90554f10f457a96/package.json -o package.json +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/9462a75715ea9afba23b757ec90554f10f457a96/package-lock.json -o package-lock.json -$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ +node2nix \ --nodejs-12 \ --node-env ../../../development/node-packages/node-env.nix \ --development \ --input package.json \ + --lock package-lock.json \ --output node-packages.nix \ - --composition node-composition.nix + --composition node-composition.nix \ + +rm -f package.json package-lock.json diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix index 693eeaeaec69..e0d21f7d44d3 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index a2045ee15f11..0b989d159ca9 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -1,79 +1,70 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "@babel/code-frame-7.10.3" = { + "@babel/code-frame-7.8.3" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.10.3"; + version = "7.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz"; - sha512 = "fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/helper-validator-identifier-7.10.3" = { + "@babel/helper-validator-identifier-7.9.0" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.10.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz"; - sha512 = "bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; + sha512 = "6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw=="; }; }; - "@babel/highlight-7.10.3" = { + "@babel/highlight-7.9.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz"; - sha512 = "Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; + sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; }; - "@dabh/diagnostics-2.0.2" = { - name = "_at_dabh_slash_diagnostics"; - packageName = "@dabh/diagnostics"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; - sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; - }; - }; - "@slack/logger-1.1.1" = { + "@slack/logger-1.1.0" = { name = "_at_slack_slash_logger"; packageName = "@slack/logger"; - version = "1.1.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/logger/-/logger-1.1.1.tgz"; - sha512 = "PAC5CMnNAv/FPtJ0le+YD2wUV+tZ7n3Bnjj9dBI+deIcHsExCnQkQmZE79cLvfuYXbz3PWyv5coti30MJQhEjA=="; + url = "https://registry.npmjs.org/@slack/logger/-/logger-1.1.0.tgz"; + sha512 = "D3tabyLoUrsFy0w3koxaCVv+5ZJfIy+j0QW3PUq0XO3UiVuF5rtpAbqngAYVpeKnxPpqBjeth4XJ3tllKoW3aA=="; }; }; - "@slack/rtm-api-5.0.5" = { + "@slack/rtm-api-5.0.3" = { name = "_at_slack_slash_rtm-api"; packageName = "@slack/rtm-api"; - version = "5.0.5"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.5.tgz"; - sha512 = "x2B4hyoxjg62cxf4M5QRomx+xYp2XoajPKdd24SM2Sl4m+IrzwKzmcrysQuYmF6BMsm3IoTKymW5BBGckHGTIw=="; + url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.3.tgz"; + sha512 = "rzNIFst8iuVYyHdE7e3KSrbAtIA7sfS4Pth9ObKUm5KDemX0zyI7YfAijO1kgr1EMriQkjlpKBhlNq9Y+aQr6g=="; }; }; - "@slack/types-1.7.0" = { + "@slack/types-1.5.0" = { name = "_at_slack_slash_types"; packageName = "@slack/types"; - version = "1.7.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/types/-/types-1.7.0.tgz"; - sha512 = "aigLPmTO513JxeFyeII/74y+S5jU39tabDWPsZyMHJWCYqK3vCkRvV73NL+Ay+Tq5RC2NgSmkedk1wvQJ6oXLg=="; + url = "https://registry.npmjs.org/@slack/types/-/types-1.5.0.tgz"; + sha512 = "oCYgatJYxHf9wE3tKXzOLeeTsF0ghX1TIcguNfVmO2V6NDe+cHAzZRglEOmJLdRINDS5gscAgSkeZpDhpKBeUA=="; }; }; - "@slack/web-api-5.10.0" = { + "@slack/web-api-5.8.0" = { name = "_at_slack_slash_web-api"; packageName = "@slack/web-api"; - version = "5.10.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.10.0.tgz"; - sha512 = "t8c2lcSrdX8LIUOS1RvslbBBKvuNaTtbEcrWai4yDGkiNIxzhk+dHPcJzd7A4A0DkAgiEwXeezR7RCELuG8WgQ=="; + url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.0.tgz"; + sha512 = "lUMFM9jtdn+9Q0kHLegf5RjIgQlmb1PGWwWdTsc9mQ8PJu2BogI5ZttG8/tA6r2bX/C4bgXhd0JJ4syUR0AAhQ=="; }; }; "@types/body-parser-1.19.0" = { @@ -112,22 +103,31 @@ let sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A=="; }; }; - "@types/express-4.17.6" = { + "@types/events-3.0.0" = { + name = "_at_types_slash_events"; + packageName = "@types/events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; + }; + }; + "@types/express-4.17.3" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.6"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz"; - sha512 = "n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz"; + sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg=="; }; }; - "@types/express-serve-static-core-4.17.7" = { + "@types/express-serve-static-core-4.17.3" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.7"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.7.tgz"; - sha512 = "EMgTj/DF9qpgLXyc+Btimg+XoH7A2liE8uKul8qSmMTHCeNYzydDKFdsJskDvw42UsesCnhO63dO0Grbj8J4Dw=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.3.tgz"; + sha512 = "sHEsvEzjqN+zLbqP+8OXTipc10yH1QLR+hnr5uw29gi9AhCAAAdri8ClNV7iMdrJrIzXIQtlkPvq8tJGhj3QJQ=="; }; }; "@types/is-stream-1.1.0" = { @@ -139,13 +139,13 @@ let sha512 = "jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg=="; }; }; - "@types/mime-2.0.2" = { + "@types/mime-2.0.1" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.2.tgz"; - sha512 = "4kPlzbljFcsttWEq6aBW0OZe6BDajAmyvr2xknBG92tejQnvdGtT9+kXSZ580DqpxY9qG2xeQVF9Dq0ymUTo5Q=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz"; + sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; "@types/mocha-7.0.2" = { @@ -172,7 +172,7 @@ let version = "13.9.3"; src = fetchurl { url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz"; - sha512 = "28ci34pqk99zkrqa473xlzfms3j6nj4nl2i69ghpbjvw2mh68bd0nd2shb78i09gng4d0fj65l2njrqbdjzmhqix4fvqyiarrlkwnyk"; + sha512 = "01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="; }; }; "@types/node-emoji-1.8.1" = { @@ -202,15 +202,6 @@ let sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ=="; }; }; - "@types/qs-6.9.3" = { - name = "_at_types_slash_qs"; - packageName = "@types/qs"; - version = "6.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.3.tgz"; - sha512 = "7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA=="; - }; - }; "@types/randomstring-1.1.6" = { name = "_at_types_slash_randomstring"; packageName = "@types/randomstring"; @@ -229,13 +220,13 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; - "@types/request-2.48.5" = { + "@types/request-2.48.4" = { name = "_at_types_slash_request"; packageName = "@types/request"; - version = "2.48.5"; + version = "2.48.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz"; - sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ=="; + url = "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz"; + sha512 = "W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw=="; }; }; "@types/request-promise-native-1.0.17" = { @@ -256,66 +247,66 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/serve-static-1.13.4" = { + "@types/serve-static-1.13.3" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.4"; + version = "1.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.4.tgz"; - sha512 = "jTDt0o/YbpNwZbQmE/+2e+lfjJEJJR0I3OFaKQKPWkASkCoW3i6fsUnqudSMcNAfbtmADGu8f4MV4q+GqULmug=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz"; + sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g=="; }; }; - "@types/tough-cookie-4.0.0" = { + "@types/tough-cookie-2.3.6" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; - version = "4.0.0"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz"; - sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz"; + sha512 = "wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ=="; }; }; - "@types/uuid-7.0.4" = { + "@types/uuid-7.0.2" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "7.0.4"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.4.tgz"; - sha512 = "WGZCqBZZ0mXN2RxvLHL6/7RCu+OWs28jgQMP04LWfpyJlQUMTR6YU9CNJAKDgbw+EV/u687INXuLUc7FuML/4g=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.2.tgz"; + sha512 = "8Ly3zIPTnT0/8RCU6Kg/G3uTICf9sRwYOpUzSIM3503tLIKcnJPRuinHhXngJUy2MntrEf6dlpOHXJju90Qh5w=="; }; }; - "@types/ws-7.2.5" = { + "@types/ws-5.1.2" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "7.2.5"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.5.tgz"; - sha512 = "4UEih9BI1nBKii385G9id1oFrSkLcClbwtDfcYj8HJLQqZVAtb/42vXVrYvRWCcufNF/a+rZD3MxNwghA7UmCg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-5.1.2.tgz"; + sha512 = "NkTXUKTYdXdnPE2aUUbGOXE1XfMK527SCvU/9bj86kyFF6kZ9ZnOQ3mK5jADn98Y2vEUD/7wKDgZa7Qst2wYOg=="; }; }; - "@types/yargs-13.0.9" = { + "@types/yargs-13.0.0" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "13.0.9"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz"; - sha512 = "xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.0.tgz"; + sha512 = "hY0o+kcz9M6kH32NUeb6VURghqMuCVkiUx+8Btsqhj4Hhov/hVGUx9DmBJeIkzlp1uAQK4wngQBCjqWdUUkFyA=="; }; }; - "@types/yargs-parser-13.1.0" = { + "@types/yargs-parser-13.0.0" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "13.1.0"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz"; - sha512 = "gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.0.0.tgz"; + sha512 = "wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw=="; }; }; - "Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" = { + "Slackdown-git://github.com/half-shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" = { name = "Slackdown"; packageName = "Slackdown"; version = "0.1.2"; src = fetchgit { - url = "git://github.com/Half-Shot/slackdown"; + url = "git://github.com/half-shot/slackdown"; rev = "efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4"; sha256 = "474e972819b3e1db3af70be75966a3d501c6b9285f4550ff5548193e031eaf9b"; }; @@ -347,13 +338,13 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "ajv-6.12.2" = { + "ajv-6.10.2" = { name = "ajv"; packageName = "ajv"; - version = "6.12.2"; + version = "6.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; - sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; }; }; "another-json-0.2.0" = { @@ -500,13 +491,13 @@ let sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; - "async-3.2.0" = { + "async-2.6.2" = { name = "async"; packageName = "async"; - version = "3.2.0"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; - sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; + url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; + sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; }; }; "async-limiter-1.0.1" = { @@ -536,13 +527,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.10.0" = { + "aws4-1.9.0" = { name = "aws4"; packageName = "aws4"; - version = "1.10.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz"; - sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz"; + sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="; }; }; "axios-0.19.2" = { @@ -788,15 +779,6 @@ let sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; - "chokidar-3.4.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"; - sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="; - }; - }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; @@ -842,13 +824,22 @@ let sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; }; - "colors-1.4.0" = { + "colornames-1.1.1" = { + name = "colornames"; + packageName = "colornames"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz"; + sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; + }; + }; + "colors-1.3.3" = { name = "colors"; packageName = "colors"; - version = "1.4.0"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; + url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz"; + sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; }; }; "colorspace-1.1.2" = { @@ -950,6 +941,15 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; "cycle-1.0.3" = { name = "cycle"; packageName = "cycle"; @@ -1040,15 +1040,6 @@ let sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; - "depd-2.0.0" = { - name = "depd"; - packageName = "depd"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; - sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; - }; - }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -1058,6 +1049,15 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "diagnostics-1.1.1" = { + name = "diagnostics"; + packageName = "diagnostics"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz"; + sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ=="; + }; + }; "diff-3.5.0" = { name = "diff"; packageName = "diff"; @@ -1103,13 +1103,13 @@ let sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; }; - "enabled-2.0.0" = { + "enabled-1.0.2" = { name = "enabled"; packageName = "enabled"; - version = "2.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"; - sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; + url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz"; + sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; }; }; "encodeurl-1.0.2" = { @@ -1121,13 +1121,31 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "es-abstract-1.17.6" = { + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; + }; + }; + "env-variable-0.0.5" = { + name = "env-variable"; + packageName = "env-variable"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz"; + sha512 = "zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA=="; + }; + }; + "es-abstract-1.17.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.6"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; - sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; + sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; }; "es-to-primitive-1.2.1" = { @@ -1193,13 +1211,22 @@ let sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; - "eventemitter3-4.0.4" = { + "eventemitter3-4.0.0" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "4.0.4"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz"; + sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg=="; + }; + }; + "execa-1.0.0" = { + name = "execa"; + packageName = "execa"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz"; - sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="; + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; "express-4.17.1" = { @@ -1229,31 +1256,31 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-3.1.3" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "3.1.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; - "fast-json-stable-stringify-2.1.0" = { + "fast-json-stable-stringify-2.0.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; - version = "2.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; - "fast-safe-stringify-2.0.7" = { + "fast-safe-stringify-2.0.6" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; - version = "2.0.7"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; - sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz"; + sha512 = "q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg=="; }; }; "fecha-2.3.3" = { @@ -1265,15 +1292,6 @@ let sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="; }; }; - "fecha-4.2.0" = { - name = "fecha"; - packageName = "fecha"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz"; - sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; - }; - }; "file-stream-rotator-0.4.1" = { name = "file-stream-rotator"; packageName = "file-stream-rotator"; @@ -1328,15 +1346,6 @@ let sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; }; }; - "fn.name-1.1.0" = { - name = "fn.name"; - packageName = "fn.name"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"; - sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; - }; - }; "follow-redirects-1.5.10" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -1400,13 +1409,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-2.1.3" = { + "fsevents-2.1.2" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.3"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; - sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz"; + sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="; }; }; "function-bind-1.1.1" = { @@ -1454,6 +1463,15 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -1598,13 +1616,22 @@ let sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; - "ipaddr.js-1.9.1" = { + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "ipaddr.js-1.9.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.9.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; }; }; "is-arrayish-0.3.2" = { @@ -1634,13 +1661,13 @@ let sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; }; }; - "is-callable-1.2.0" = { + "is-callable-1.1.5" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.0"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz"; - sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; + sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; }; }; "is-date-object-1.0.2" = { @@ -1715,13 +1742,13 @@ let sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; }; }; - "is-regex-1.1.0" = { + "is-regex-1.0.5" = { name = "is-regex"; packageName = "is-regex"; - version = "1.1.0"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz"; - sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; + sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; }; }; "is-stream-1.1.0" = { @@ -1733,15 +1760,6 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "is-stream-2.0.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; - }; - }; "is-symbol-1.0.3" = { name = "is-symbol"; packageName = "is-symbol"; @@ -1805,15 +1823,6 @@ let sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; }; - "js-yaml-3.14.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; - sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; - }; - }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -1868,13 +1877,22 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "kuler-2.0.0" = { + "kuler-1.0.1" = { name = "kuler"; packageName = "kuler"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz"; + sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ=="; + }; + }; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"; - sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; }; }; "lie-3.1.1" = { @@ -1886,13 +1904,13 @@ let sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; }; }; - "localforage-1.7.4" = { + "localforage-1.7.3" = { name = "localforage"; packageName = "localforage"; - version = "1.7.4"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/localforage/-/localforage-1.7.4.tgz"; - sha512 = "3EmVZatmNVeCo/t6Te7P06h2alGwbq8wXlSkcSXMvDE2/edPmsVqTPlzGnZaqwZZDBs6v+kxWpqjVsqsNJT8jA=="; + url = "https://registry.npmjs.org/localforage/-/localforage-1.7.3.tgz"; + sha512 = "1TulyYfc4udS7ECSBT2vwJksWbkwwTX8BzeUIiq8Y07Riy7bDAAnxDaPU/tWyOVmQAcWJIEIFP9lPfBGqVoPgQ=="; }; }; "locate-path-3.0.0" = { @@ -1940,13 +1958,13 @@ let sha512 = "em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg=="; }; }; - "logform-2.2.0" = { + "logform-2.1.2" = { name = "logform"; packageName = "logform"; - version = "2.2.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz"; - sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; + url = "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz"; + sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; "loglevel-1.6.8" = { @@ -1967,6 +1985,15 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; + "map-age-cleaner-0.1.3" = { + name = "map-age-cleaner"; + packageName = "map-age-cleaner"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; + }; + }; "matrix-appservice-0.4.1" = { name = "matrix-appservice"; packageName = "matrix-appservice"; @@ -2003,6 +2030,15 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; + "mem-4.3.0" = { + name = "mem"; + packageName = "mem"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; + }; + }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -2030,22 +2066,31 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.44.0" = { + "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.44.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; - sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-types-2.1.27" = { + "mime-types-2.1.24" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.27"; + version = "2.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; - sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; "minimatch-3.0.4" = { @@ -2066,6 +2111,15 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; + "mkdirp-0.5.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; + sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; + }; + }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -2075,31 +2129,31 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mocha-7.2.0" = { + "mocha-7.1.1" = { name = "mocha"; packageName = "mocha"; - version = "7.2.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; - sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz"; + sha512 = "3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA=="; }; }; - "moment-2.27.0" = { + "moment-2.24.0" = { name = "moment"; packageName = "moment"; - version = "2.27.0"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz"; - sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; - "morgan-1.10.0" = { + "morgan-1.9.1" = { name = "morgan"; packageName = "morgan"; - version = "1.10.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; - sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; + url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; + sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; }; }; "ms-2.0.0" = { @@ -2147,6 +2201,15 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; "node-emoji-1.10.0" = { name = "node-emoji"; packageName = "node-emoji"; @@ -2183,6 +2246,15 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; "nunjucks-3.2.1" = { name = "nunjucks"; packageName = "nunjucks"; @@ -2210,13 +2282,13 @@ let sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; }; }; - "object-inspect-1.8.0" = { + "object-inspect-1.7.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.8.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; - sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; + sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; }; }; "object-keys-1.1.1" = { @@ -2273,13 +2345,22 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "one-time-1.0.0" = { + "one-time-0.0.4" = { name = "one-time"; packageName = "one-time"; - version = "1.0.0"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz"; - sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; + url = "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz"; + sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; + }; + }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; }; }; "p-cancelable-1.1.0" = { @@ -2291,6 +2372,15 @@ let sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; + "p-defer-1.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + }; "p-finally-1.0.0" = { name = "p-finally"; packageName = "p-finally"; @@ -2300,13 +2390,22 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-limit-2.3.0" = { + "p-is-promise-2.1.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; + }; + }; + "p-limit-2.2.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.3.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"; + sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ=="; }; }; "p-locate-3.0.0" = { @@ -2327,13 +2426,13 @@ let sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng=="; }; }; - "p-queue-6.4.0" = { + "p-queue-6.3.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.4.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; - sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; + sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; }; }; "p-retry-4.2.0" = { @@ -2399,6 +2498,15 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; "path-parse-1.0.6" = { name = "path-parse"; packageName = "path-parse"; @@ -2435,22 +2543,22 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.2.1" = { + "pg-8.1.0" = { name = "pg"; packageName = "pg"; - version = "8.2.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.2.1.tgz"; - sha512 = "DKzffhpkWRr9jx7vKxA+ur79KG+SKw+PdjMb1IRhMiKI9zqYUGczwFprqy+5Veh/DCcFs1Y6V8lRLN5I1DlleQ=="; + url = "https://registry.npmjs.org/pg/-/pg-8.1.0.tgz"; + sha512 = "Jp+XSNTGYDztc2FgIbmBXeeYMR7kKjfgnl3R+ioO6rkcxDmaea+YPp/gaxe13PBnJAFYyEGl0ixpwPm2gb6eUw=="; }; }; - "pg-connection-string-2.2.3" = { + "pg-connection-string-2.2.2" = { name = "pg-connection-string"; packageName = "pg-connection-string"; - version = "2.2.3"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.3.tgz"; - sha512 = "I/KCSQGmOrZx6sMHXkOs2MjddrYcqpza3Dtsy0AjIgBr/bZiPJRK9WhABXN1Uy1UDazRbi9gZEzO2sAhL5EqiQ=="; + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.2.tgz"; + sha512 = "+hel4DGuSZCjCZwglAuyi+XlodHnKmrbyTw0hVWlmGN2o4AfJDkDo5obAFzblS5M5PFBMx0uDt5Y1QjlNC+tqg=="; }; }; "pg-int8-1.0.1" = { @@ -2462,40 +2570,40 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-minify-1.6.1" = { + "pg-minify-1.6.0" = { name = "pg-minify"; packageName = "pg-minify"; - version = "1.6.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.1.tgz"; - sha512 = "ujanxJJB9CSDUvlAOshtjdKAywOPR2vY0a7D+vvgk5rbrYcthZA7TjpN+Z+UwZsz/G/bUexYDT6huE33vYVN0g=="; + url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.0.tgz"; + sha512 = "5Yxduh9Hul9Xev6uI3rSCypPk1kI7vI03ZPu5lgerrhiZ7QLj1Zd92SU2ZyalHVztlWnnPMnTZ+SeXJwh3eY9g=="; }; }; - "pg-pool-3.2.1" = { + "pg-pool-3.2.0" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.2.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz"; - sha512 = "BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.0.tgz"; + sha512 = "7BLwDNDEfPFjE9vmZLcJPLFwuDAVGZ5lIZo2MeQfwYG7EPGfdNVis/dz6obI/yKqvQIx2sf6QBKXMLB+y/ftgA=="; }; }; - "pg-promise-10.5.7" = { + "pg-promise-10.5.5" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.5.7"; + version = "10.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.7.tgz"; - sha512 = "feCpn4J4MsNnR5Ve3fpbIlmbohwRirvZEI1Dcy72zwKvIKKRHPk7TJZFQHP4YQhaZ3sT3VGgg0o1/I+uhht/1g=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.5.tgz"; + sha512 = "Ec2g5bN3uMD0wk65kNEgJbZOcyhQ0S37Gn9gAa78U9V7HcdTfMdpTRSRIFT0LHXpL1EcT00CW62+2Z4wAXs29A=="; }; }; - "pg-protocol-1.2.4" = { + "pg-protocol-1.2.3" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.2.4"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.4.tgz"; - sha512 = "/8L/G+vW/VhWjTGXpGh8XVkXOFx1ZDY+Yuz//Ab8CfjInzFkreI+fDG3WjCeSra7fIZwAFxzbGptNbm8xSXenw=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.3.tgz"; + sha512 = "erHFURS0mPmTbq18cn/zNL3Y4IzNCrU4sgCim0qy7zAPe3Vc0rvK5cImJR6lDvIaz3fJU2R1R9FNOlnUtyF10Q=="; }; }; "pg-types-2.2.0" = { @@ -2579,22 +2687,40 @@ let sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; }; }; - "proxy-addr-2.0.6" = { + "proxy-addr-2.0.5" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; }; }; - "psl-1.8.0" = { + "psl-1.1.33" = { name = "psl"; packageName = "psl"; - version = "1.8.0"; + version = "1.1.33"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.33.tgz"; + sha512 = "LTDP2uSrsc7XCb5lO7A8BI1qYxRe/8EqlRvMeEl6rsnYAqDOl8xHR+8lSAIVfrNaSAlTPTNOCgNjWcoUL3AZsw=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; "punycode-2.1.1" = { @@ -2624,13 +2750,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "quick-lru-5.1.1" = { + "quick-lru-5.0.0" = { name = "quick-lru"; packageName = "quick-lru"; - version = "5.1.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"; - sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.0.0.tgz"; + sha512 = "iNjBLSxM3byM7z8a1MB/Oa+AAeopX4NqKEj/ykgKRi1R4AFXNINR4DSjyjDzXzjqjN9+OBQGfK5w5CAnCtV7jg=="; }; }; "randomstring-1.1.5" = { @@ -2660,22 +2786,22 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; - "readable-stream-2.3.7" = { + "readable-stream-2.3.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.7"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.6.0" = { + "readable-stream-3.4.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz"; + sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ=="; }; }; "readdirp-3.2.0" = { @@ -2687,15 +2813,6 @@ let sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; - "readdirp-3.4.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; - sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; - }; - }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -2705,13 +2822,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "request-2.88.2" = { + "request-2.88.0" = { name = "request"; packageName = "request"; - version = "2.88.2"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; "request-promise-core-1.1.3" = { @@ -2750,13 +2867,13 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "resolve-1.17.0" = { + "resolve-1.15.1" = { name = "resolve"; packageName = "resolve"; - version = "1.17.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; - sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; + sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; }; }; "retry-0.12.0" = { @@ -2777,15 +2894,6 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "safe-buffer-5.2.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -2804,22 +2912,13 @@ let sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; }; }; - "semver-5.7.1" = { - name = "semver"; - packageName = "semver"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - }; - "semver-6.3.0" = { + "semver-5.7.0" = { name = "semver"; packageName = "semver"; - version = "6.3.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; "send-0.17.1" = { @@ -2858,6 +2957,33 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -2876,13 +3002,13 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-support-0.5.19" = { + "source-map-support-0.5.16" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.19"; + version = "0.5.16"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; - sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; + sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; }; }; "spex-3.0.1" = { @@ -2966,22 +3092,22 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string.prototype.trimend-1.0.1" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.1"; + "string.prototype.trimleft-2.1.1" = { + name = "string.prototype.trimleft"; + packageName = "string.prototype.trimleft"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; + sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; }; }; - "string.prototype.trimstart-1.0.1" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.1"; + "string.prototype.trimright-2.1.1" = { + name = "string.prototype.trimright"; + packageName = "string.prototype.trimright"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; + sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; }; }; "string_decoder-1.1.1" = { @@ -2993,13 +3119,13 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "string_decoder-1.3.0" = { + "string_decoder-1.2.0" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.3.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz"; + sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w=="; }; }; "strip-ansi-4.0.0" = { @@ -3020,6 +3146,15 @@ let sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -3092,13 +3227,13 @@ let sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; - "tough-cookie-2.5.0" = { + "tough-cookie-2.4.3" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.5.0"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; "triple-beam-1.3.0" = { @@ -3110,31 +3245,31 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-node-8.10.2" = { + "ts-node-8.8.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.10.2"; + version = "8.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz"; - sha512 = "ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.8.1.tgz"; + sha512 = "10DE9ONho06QORKAaCBpPiFCdW+tZJuY/84tyypGtl6r+/C7Asq0dhqbRZURuUlLQtZxxDvT8eoj8cGW0ha6Bg=="; }; }; - "tslib-1.13.0" = { + "tslib-1.11.1" = { name = "tslib"; packageName = "tslib"; - version = "1.13.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; - sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; + sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; }; }; - "tslint-6.1.2" = { + "tslint-6.1.0" = { name = "tslint"; packageName = "tslint"; - version = "6.1.2"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz"; - sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA=="; + url = "https://registry.npmjs.org/tslint/-/tslint-6.1.0.tgz"; + sha512 = "fXjYd/61vU6da04E505OZQGb2VCN2Mq3doeWcOIryuG+eqdmFUXTYVwdhnbEu2k46LNLgUYt9bI5icQze/j0bQ=="; }; }; "tsutils-2.29.0" = { @@ -3182,13 +3317,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-3.9.5" = { + "typescript-3.8.3" = { name = "typescript"; packageName = "typescript"; - version = "3.9.5"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz"; - sha512 = "hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz"; + sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w=="; }; }; "underscore-1.4.4" = { @@ -3200,13 +3335,13 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; - "unhomoglyph-1.0.6" = { + "unhomoglyph-1.0.5" = { name = "unhomoglyph"; packageName = "unhomoglyph"; - version = "1.0.6"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.6.tgz"; - sha512 = "7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg=="; + url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.5.tgz"; + sha512 = "rNAw2rGogjq4BVhsCX8K6qXrCcHmUaMCHETlUG0ujGZ3OHwnzJHwdMyzy3n/c9Y7lvlbckOd9nkW33grUVE3bg=="; }; }; "unpipe-1.0.0" = { @@ -3254,13 +3389,13 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-7.0.3" = { + "uuid-7.0.2" = { name = "uuid"; packageName = "uuid"; - version = "7.0.3"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; - sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; + url = "https://registry.npmjs.org/uuid/-/uuid-7.0.2.tgz"; + sha512 = "vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw=="; }; }; "vary-1.1.2" = { @@ -3308,40 +3443,40 @@ let sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; - "winston-3.3.2" = { + "winston-3.2.1" = { name = "winston"; packageName = "winston"; - version = "3.3.2"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.3.2.tgz"; - sha512 = "vTOrUZlyQPS8VpCcQ1JT8BumDAUe4awCHZ9nmGgO7LqkV4atj0dKa5suA7Trf7QKtBszE2yUs9d8744Kz9j4jQ=="; + url = "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz"; + sha512 = "zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw=="; }; }; - "winston-compat-0.1.5" = { + "winston-compat-0.1.4" = { name = "winston-compat"; packageName = "winston-compat"; - version = "0.1.5"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.5.tgz"; - sha512 = "EPvPcHT604AV3Ji6d3+vX8ENKIml9VSxMRnPQ+cuK/FX6f3hvPP2hxyoeeCOCFvDrJEujalfcKWlWPvAnFyS9g=="; + url = "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.4.tgz"; + sha512 = "mMEfFsSm6GmkFF+f4/0UJtG4N1vSaczGmXLVJYmS/+u2zUaIPcw2ZRuwUg2TvVBjswgiraN+vNnAG8z4fRUZ4w=="; }; }; - "winston-daily-rotate-file-3.10.0" = { + "winston-daily-rotate-file-3.9.0" = { name = "winston-daily-rotate-file"; packageName = "winston-daily-rotate-file"; - version = "3.10.0"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.10.0.tgz"; - sha512 = "KO8CfbI2CvdR3PaFApEH02GPXiwJ+vbkF1mCkTlvRIoXFI8EFlf1ACcuaahXTEiDEKCii6cNe95gsL4ZkbnphA=="; + url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.9.0.tgz"; + sha512 = "KicvoaLQapqjSDSCIUKik0dDb90vFkqx1/udUiAt6iOqAtBl2qBCrpSDNy3xp7WnT6xHCKAWEEp2XILtiN+zpQ=="; }; }; - "winston-transport-4.4.0" = { + "winston-transport-4.3.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz"; - sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz"; + sha512 = "B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A=="; }; }; "wrap-ansi-5.1.0" = { @@ -3371,13 +3506,13 @@ let sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; - "xtend-4.0.2" = { + "xtend-4.0.1" = { name = "xtend"; packageName = "xtend"; - version = "4.0.2"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; - sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; "y18n-4.0.0" = { @@ -3389,6 +3524,15 @@ let sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; + "yargs-13.2.4" = { + name = "yargs"; + packageName = "yargs"; + version = "13.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz"; + sha512 = "HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg=="; + }; + }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -3398,6 +3542,15 @@ let sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; + "yargs-parser-13.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; + sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; + }; + }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -3426,31 +3579,25 @@ let }; }; }; -in -{ - "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.4.0" = nodeEnv.buildNodePackage { + args = { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; version = "1.4.0"; - src = fetchgit { - url = "https://github.com/matrix-org/matrix-appservice-slack.git"; - rev = "933c3a64fdff42ebc11e5385f588f981e201897d"; - sha256 = "cddcff326688ceddfd37eae44d3947ea84cf1d8fd2062e3c203ffbf35e2ea7f6"; - }; + src = ./.; dependencies = [ - sources."@babel/code-frame-7.10.3" - sources."@babel/helper-validator-identifier-7.10.3" - sources."@babel/highlight-7.10.3" - sources."@dabh/diagnostics-2.0.2" - sources."@slack/logger-1.1.1" - (sources."@slack/rtm-api-5.0.5" // { + sources."@babel/code-frame-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" + sources."@slack/logger-1.1.0" + (sources."@slack/rtm-api-5.0.3" // { dependencies = [ sources."p-queue-2.4.2" ]; }) - sources."@slack/types-1.7.0" - (sources."@slack/web-api-5.10.0" // { + sources."@slack/types-1.5.0" + (sources."@slack/web-api-5.8.0" // { dependencies = [ + sources."form-data-2.5.1" sources."p-queue-2.4.2" ]; }) @@ -3458,33 +3605,37 @@ in sources."@types/caseless-0.12.2" sources."@types/chai-4.2.11" sources."@types/connect-3.4.33" - sources."@types/express-4.17.6" - sources."@types/express-serve-static-core-4.17.7" + sources."@types/events-3.0.0" + sources."@types/express-4.17.3" + sources."@types/express-serve-static-core-4.17.3" sources."@types/is-stream-1.1.0" - sources."@types/mime-2.0.2" + sources."@types/mime-2.0.1" sources."@types/mocha-7.0.2" sources."@types/nedb-1.8.9" sources."@types/node-13.9.3" sources."@types/node-emoji-1.8.1" sources."@types/nunjucks-3.1.3" sources."@types/p-queue-2.3.2" - sources."@types/qs-6.9.3" sources."@types/randomstring-1.1.6" sources."@types/range-parser-1.2.3" - sources."@types/request-2.48.5" + (sources."@types/request-2.48.4" // { + dependencies = [ + sources."form-data-2.5.1" + ]; + }) sources."@types/request-promise-native-1.0.17" sources."@types/retry-0.12.0" - sources."@types/serve-static-1.13.4" - sources."@types/tough-cookie-4.0.0" - sources."@types/uuid-7.0.4" - sources."@types/ws-7.2.5" - sources."@types/yargs-13.0.9" - sources."@types/yargs-parser-13.1.0" - sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" + sources."@types/serve-static-1.13.3" + sources."@types/tough-cookie-2.3.6" + sources."@types/uuid-7.0.2" + sources."@types/ws-5.1.2" + sources."@types/yargs-13.0.0" + sources."@types/yargs-parser-13.0.0" + sources."Slackdown-git://github.com/half-shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.2" + sources."ajv-6.10.2" sources."another-json-0.2.0" sources."ansi-colors-3.2.3" sources."ansi-regex-4.1.0" @@ -3503,7 +3654,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.9.0" sources."axios-0.19.2" sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" @@ -3514,11 +3665,7 @@ in sources."binary-search-tree-0.2.5" sources."bintrees-1.0.1" sources."bluebird-2.11.0" - (sources."body-parser-1.19.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-request-0.3.3" @@ -3537,16 +3684,17 @@ in ]; }) sources."check-error-1.0.2" - sources."chokidar-3.4.0" + sources."chokidar-3.3.0" sources."cliui-5.0.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" - sources."colors-1.4.0" + sources."colornames-1.1.1" + sources."colors-1.3.3" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" - sources."commander-3.0.2" + sources."commander-2.20.3" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" @@ -3554,62 +3702,63 @@ in sources."cookie-signature-1.0.6" sources."core-js-2.6.11" sources."core-util-is-1.0.2" + sources."cross-spawn-6.0.5" sources."cycle-1.0.3" sources."dashdash-1.14.1" - sources."debug-3.1.0" + sources."debug-2.6.9" sources."decamelize-1.2.0" sources."deep-eql-3.0.1" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" + sources."diagnostics-1.1.1" sources."diff-3.5.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-7.0.3" - sources."enabled-2.0.0" + sources."enabled-1.0.2" sources."encodeurl-1.0.2" - sources."es-abstract-1.17.6" + sources."end-of-stream-1.4.1" + sources."env-variable-0.0.5" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" sources."etag-1.8.1" sources."eventemitter3-3.1.2" - (sources."express-4.17.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."execa-1.0.0" + sources."express-4.17.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.7" - sources."fecha-4.2.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-safe-stringify-2.0.6" + sources."fecha-2.3.3" sources."file-stream-rotator-0.4.1" sources."fill-range-7.0.1" - (sources."finalhandler-1.1.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."finalhandler-1.1.2" sources."find-up-3.0.0" sources."finity-0.5.4" sources."flat-4.1.0" - sources."fn.name-1.1.0" - sources."follow-redirects-1.5.10" + (sources."follow-redirects-1.5.10" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."forever-agent-0.6.1" - sources."form-data-2.5.1" + sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.1.2" sources."function-bind-1.1.1" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-func-name-2.0.0" + sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.3" sources."glob-parent-5.1.1" @@ -3626,11 +3775,12 @@ in sources."immediate-3.0.6" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ipaddr.js-1.9.1" + sources."invert-kv-2.0.0" + sources."ipaddr.js-1.9.0" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - sources."is-callable-1.2.0" + sources."is-callable-1.1.5" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -3639,7 +3789,7 @@ in sources."is-my-json-valid-2.20.0" sources."is-number-7.0.0" sources."is-property-1.0.2" - sources."is-regex-1.1.0" + sources."is-regex-1.0.5" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" @@ -3647,27 +3797,29 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-3.13.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonpointer-4.0.1" sources."jsprim-1.4.1" - sources."kuler-2.0.0" + sources."kuler-1.0.1" + sources."lcid-2.0.0" sources."lie-3.1.1" - sources."localforage-1.7.4" + sources."localforage-1.7.3" sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.toarray-4.4.0" sources."log-symbols-3.0.0" - (sources."logform-2.2.0" // { + (sources."logform-2.1.2" // { dependencies = [ sources."ms-2.1.2" ]; }) sources."loglevel-1.6.8" sources."make-error-1.3.6" + sources."map-age-cleaner-0.1.3" sources."matrix-appservice-0.4.1" sources."matrix-appservice-bridge-1.12.2" (sources."matrix-js-sdk-2.4.6" // { @@ -3676,61 +3828,64 @@ in ]; }) sources."media-typer-0.3.0" + sources."mem-4.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-7.2.0" // { + (sources."mocha-7.1.1" // { dependencies = [ - sources."chokidar-3.3.0" sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" - sources."js-yaml-3.13.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.3" sources."ms-2.1.1" - sources."readdirp-3.2.0" sources."supports-color-6.0.0" + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" ]; }) - sources."moment-2.27.0" - (sources."morgan-1.10.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."depd-2.0.0" - ]; - }) + sources."moment-2.24.0" + sources."morgan-1.9.1" sources."ms-2.0.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" + sources."nice-try-1.0.5" sources."node-emoji-1.10.0" - (sources."node-environment-flags-1.0.6" // { + sources."node-environment-flags-1.0.6" + sources."nopt-3.0.6" + sources."normalize-path-3.0.0" + sources."npm-run-path-2.0.2" + (sources."nunjucks-3.2.1" // { dependencies = [ - sources."semver-5.7.1" + sources."commander-3.0.2" ]; }) - sources."nopt-3.0.6" - sources."normalize-path-3.0.0" - sources."nunjucks-3.2.1" sources."oauth-sign-0.9.0" sources."object-hash-1.3.1" - sources."object-inspect-1.8.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."one-time-1.0.0" + sources."one-time-0.0.4" + sources."os-locale-3.1.0" sources."p-cancelable-1.1.0" + sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-limit-2.3.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - (sources."p-queue-6.4.0" // { + (sources."p-queue-6.3.0" // { dependencies = [ - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.0" ]; }) sources."p-retry-4.2.0" @@ -3740,17 +3895,22 @@ in sources."parseurl-1.3.3" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" sources."pathval-1.1.0" sources."performance-now-2.1.0" - sources."pg-8.2.1" - sources."pg-connection-string-2.2.3" + (sources."pg-8.1.0" // { + dependencies = [ + sources."semver-4.3.2" + ]; + }) + sources."pg-connection-string-2.2.2" sources."pg-int8-1.0.1" - sources."pg-minify-1.6.1" - sources."pg-pool-3.2.1" - sources."pg-promise-10.5.7" - sources."pg-protocol-1.2.4" + sources."pg-minify-1.6.0" + sources."pg-pool-3.2.0" + sources."pg-promise-10.5.5" + sources."pg-protocol-1.2.3" sources."pg-types-2.2.0" sources."pgpass-1.0.2" sources."picomatch-2.2.2" @@ -3760,20 +3920,20 @@ in sources."postgres-interval-1.2.0" sources."process-nextick-args-2.0.1" sources."prom-client-11.5.3" - sources."proxy-addr-2.0.6" - sources."psl-1.8.0" + sources."proxy-addr-2.0.5" + sources."psl-1.1.33" + sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."quick-lru-5.1.1" + sources."quick-lru-5.0.0" sources."randomstring-1.1.5" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."readable-stream-3.6.0" - sources."readdirp-3.4.0" + sources."readable-stream-3.4.0" + sources."readdirp-3.2.0" sources."regenerator-runtime-0.11.1" - (sources."request-2.88.2" // { + (sources."request-2.88.0" // { dependencies = [ - sources."form-data-2.3.3" sources."qs-6.5.2" sources."uuid-3.4.0" ]; @@ -3782,27 +3942,25 @@ in sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" + sources."resolve-1.15.1" sources."retry-0.12.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-4.3.2" + sources."semver-5.7.0" (sources."send-0.17.1" // { dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) sources."ms-2.1.1" ]; }) sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" sources."simple-swizzle-0.2.2" sources."source-map-0.6.1" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.16" sources."spex-3.0.1" sources."split-1.0.1" sources."sprintf-js-1.0.3" @@ -3811,14 +3969,11 @@ in sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."string-width-3.1.0" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" - (sources."string_decoder-1.3.0" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" + sources."string_decoder-1.2.0" sources."strip-ansi-5.2.0" + sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" sources."tdigest-0.1.1" @@ -3826,19 +3981,21 @@ in sources."through-2.3.8" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tough-cookie-2.5.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."triple-beam-1.3.0" - (sources."ts-node-8.10.2" // { + (sources."ts-node-8.8.1" // { dependencies = [ sources."diff-4.0.2" ]; }) - sources."tslib-1.13.0" - (sources."tslint-6.1.2" // { + sources."tslib-1.11.1" + (sources."tslint-6.1.0" // { dependencies = [ - sources."commander-2.20.3" sources."diff-4.0.2" - sources."semver-5.7.1" ]; }) sources."tsutils-2.29.0" @@ -3846,14 +4003,14 @@ in sources."tweetnacl-0.14.5" sources."type-detect-4.0.8" sources."type-is-1.6.18" - sources."typescript-3.9.5" + sources."typescript-3.8.3" sources."underscore-1.4.4" - sources."unhomoglyph-1.0.6" + sources."unhomoglyph-1.0.5" sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-7.0.3" + sources."uuid-7.0.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.1" @@ -3865,38 +4022,37 @@ in sources."strip-ansi-4.0.0" ]; }) - (sources."winston-3.3.2" // { + (sources."winston-3.2.1" // { dependencies = [ - sources."async-3.2.0" - sources."is-stream-2.0.0" + sources."async-2.6.2" ]; }) - (sources."winston-compat-0.1.5" // { + (sources."winston-compat-0.1.4" // { dependencies = [ - sources."fecha-2.3.3" sources."logform-1.10.0" sources."ms-2.1.2" ]; }) - (sources."winston-daily-rotate-file-3.10.0" // { + sources."winston-daily-rotate-file-3.9.0" + (sources."winston-transport-4.3.0" // { dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."winston-transport-4.4.0" // { - dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; }) sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" sources."ws-5.2.2" - sources."xtend-4.0.2" + sources."xtend-4.0.1" sources."y18n-4.0.0" - sources."yargs-13.3.2" - sources."yargs-parser-13.1.2" - sources."yargs-unparser-1.6.0" + sources."yargs-13.2.4" + sources."yargs-parser-13.1.1" + (sources."yargs-unparser-1.6.0" // { + dependencies = [ + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" + ]; + }) sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -3907,6 +4063,25 @@ in }; production = false; bypassCache = true; - reconstructLock = true; + reconstructLock = false; }; +in +{ + args = args; + sources = sources; + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; + nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { + src = stdenv.mkDerivation { + name = args.name + "-package-json"; + src = nix-gitignore.gitignoreSourcePure [ + "*" + "!package.json" + "!package-lock.json" + ] args.src; + dontBuild = true; + installPhase = "mkdir -p $out; cp -r ./* $out;"; + }; + }); } diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json deleted file mode 100644 index 52568eefb77e..000000000000 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.4.0" } -] diff --git a/nixpkgs/pkgs/servers/matterbridge/default.nix b/nixpkgs/pkgs/servers/matterbridge/default.nix index df22aab1f957..6d12ac84d901 100644 --- a/nixpkgs/pkgs/servers/matterbridge/default.nix +++ b/nixpkgs/pkgs/servers/matterbridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchurl }: buildGoModule rec { pname = "matterbridge"; diff --git a/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/nixpkgs/pkgs/servers/mattermost/matterircd.nix index 36edd851f36f..3abb728bec1d 100644 --- a/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/nixpkgs/pkgs/servers/mattermost/matterircd.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "matterircd"; diff --git a/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index eea873929275..a17d8a55acc8 100644 --- a/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, olm }: +{ lib, buildGoModule, fetchFromGitHub, olm }: buildGoModule rec { pname = "mautrix-whatsapp"; diff --git a/nixpkgs/pkgs/servers/metabase/default.nix b/nixpkgs/pkgs/servers/metabase/default.nix index 0e1b207a755a..48b5a7195b5b 100644 --- a/nixpkgs/pkgs/servers/metabase/default.nix +++ b/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.37.5"; + version = "0.37.8"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1wvq5nx3y28w8wn6wyy650gc32hgkx7inbcylrdirhagzqhcm8z6"; + sha256 = "sha256-T3isJcnDUvN4TCd9tZA1p46pamhdPSwIKKAOr6+1F30="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/miniflux/default.nix b/nixpkgs/pkgs/servers/miniflux/default.nix index 55dd3d8afc59..08af694560bf 100644 --- a/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/nixpkgs/pkgs/servers/miniflux/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: let pname = "miniflux"; - version = "2.0.23"; + version = "2.0.27"; in buildGoModule { inherit pname version; @@ -11,14 +11,16 @@ in buildGoModule { owner = pname; repo = pname; rev = version; - sha256 = "0v0n5lvrfn3ngs1s1m3hv95dvnqn8ysksb044m4ifk2cr3b77ryc"; + sha256 = "0sl1hxdybafzpa1bi22b8r4fxdzwynr012ga5jvwcn2rcxbdbd8z"; }; - vendorSha256 = "1iin5r9l8wb9gm0bwgdmpx0cp1q35ij4y7zf98lnj2kvb3jv5crp"; + vendorSha256 = "183whf29zq771rq0z4008gwaps1iipb0m9kp6xyizbnzafwm3zwm"; nativeBuildInputs = [ installShellFiles ]; - doCheck = true; + checkPhase = '' + go test $(go list ./... | grep -v client) + ''; # skip client tests as they require network access buildFlagsArray = '' -ldflags=-s -w -X miniflux.app/version.Version=${version} diff --git a/nixpkgs/pkgs/servers/minio/default.nix b/nixpkgs/pkgs/servers/minio/default.nix index d54232fd7f2e..492e0236d19c 100644 --- a/nixpkgs/pkgs/servers/minio/default.nix +++ b/nixpkgs/pkgs/servers/minio/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "minio"; - version = "2021-01-16T02-19-44Z"; + version = "2021-02-11T08-23-43Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-eYOarXgx5+rXCw2gMzrH1vVSsIdN4WrHrAUnnCcLtN8="; + sha256 = "sha256-Y2iyi+bdBCLV/MWPPsrrJFEayuQVGsvrs63kOuFljJ8="; }; - vendorSha256 = "sha256-6p/DBgHawsT5PjpzwjrKgZfWm5Z6v1ozMWzGpEiB2jM="; + vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/nixpkgs/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix index a696bc413515..d6a25b3675ff 100644 --- a/nixpkgs/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix +++ b/nixpkgs/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, base, bytestring, network, lib, stdenv }: +{ mkDerivation, fetchFromGitHub, base, bytestring, network, lib }: mkDerivation { pname = "client-ip-echo"; version = "0.1.0.5"; diff --git a/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/nixpkgs/pkgs/servers/misc/navidrome/default.nix index 9b276afa4bc1..b4dfc4791b76 100644 --- a/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/nixpkgs/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.39.0"; + version = "0.40.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "0ngqlb9d8xml0vnjsn6vpi02sjqldsiirlrzfncrh3hlcrhk4fcn"; + sha256 = "sha256-sBITCHyji55OnopNlDCNypSf/j8LKtarSGPYz5fQZys="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix b/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix index 7f4959e58ebe..1eaaf01578fe 100644 --- a/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "alertmanager-bot"; diff --git a/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix index 630006649212..8501aa5e02cd 100644 --- a/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cadvisor"; diff --git a/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix b/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix index 896664658cf1..4cf5f6b80682 100644 --- a/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "consul-alerts"; diff --git a/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix index 5d825dbe7f26..0034c253c774 100644 --- a/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools , fetchFromGitHub, makeWrapper }: diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index 520aedf2c3f5..1d5715176cae 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "092ry9gq9fpkkgsdymfwzdxz982pp0ljf2gs6mp419ivvllzwhiv"; + sha256 = "sha256-kWl6wkyN/ytnct2MseZ5FQgOL2WeGJDFPPGJxkdcDX8="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix index 43346e9353f3..da60be64603e 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: +{ lib, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: with lib; diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 9dc18936acf3..dc0a66524d1a 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.3.7"; + version = "7.4.1"; excludedPackages = [ "release_publisher" ]; @@ -10,25 +10,25 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "134x2jqrczp5qfa2rmqc7jikv3w258kks532jp1qi65qk7w7jhb9"; + sha256 = "11gvw8kdz7238jcaiyqk6i0ciy6plixljpzdajlabywgr9jam32g"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "052r9gajggd9jlwnl82hq0jflhlz7cbdflkjapq4nx3rpnfscqgp"; + sha256 = "1266vj8saf4nh5h6cz8axkk58g1mwgvc9c6caphj71dhvr3snw6i"; }; - vendorSha256 = "0474d5y40q7i7k1gm1k7ac1dqhizvqql8w9nn44qxb7g2w2bfqiv"; + vendorSha256 = "0ig0f9pa3l0nj2fs8yz8h42y1j07xi9imk7kzmla6vav6s889grc"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ --replace 'var version = "5.0.0"' 'var version = "${version}"' ''; - # fixes build failure with go 1.15: # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go + # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/dashboard-schemas preBuild = '' - rm -rf scripts/go + rm -r dashboard-schemas scripts/go ''; postInstall = '' diff --git a/nixpkgs/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch b/nixpkgs/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch deleted file mode 100644 index 0ebb1751d6bf..000000000000 --- a/nixpkgs/pkgs/servers/monitoring/net-snmp/0002-autoconf-version.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/dist/autoconf-version b/dist/autoconf-version -index 264f2ce..5e1b8b0 100644 ---- a/dist/autoconf-version -+++ b/dist/autoconf-version -@@ -1 +1 @@ --2.68 -+2.69 diff --git a/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix index 524bba527394..8f354d4bb46f 100644 --- a/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix @@ -2,11 +2,12 @@ , file, openssl, perl, perlPackages, unzip, nettools, ncurses }: stdenv.mkDerivation rec { - name = "net-snmp-5.8"; + pname = "net-snmp"; + version = "5.9"; src = fetchurl { - url = "mirror://sourceforge/net-snmp/${name}.tar.gz"; - sha256 = "1pvajzj9gmj56dmwix0ywmkmy2pglh6nny646hkm7ghfhh03bz5j"; + url = "mirror://sourceforge/net-snmp/${pname}-${version}.tar.gz"; + sha256 = "0wb0vyafpspw3mcifkjjmf17r1r80kjvslycscb8nvaxz1k3lc04"; }; patches = @@ -17,7 +18,6 @@ stdenv.mkDerivation rec { in [ (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m") (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid") - ./0002-autoconf-version.patch ]; outputs = [ "bin" "out" "dev" "lib" ]; diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix b/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix index 11183dcc2f29..1ca9e702e7ad 100644 --- a/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix +++ b/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: let bName = "check_esxi_hardware"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix index 19b98124e8e2..bc3cf7539ece 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, go, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "alertmanager"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index 648bb59b0d2d..64105c9c58f2 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "apcupsd-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index 2548e196837a..af58a6ebe947 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-s3-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 1a86a0e38d9c..5cfdf6158300 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "bind_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix index 5670233b0547..3cb04304e26d 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "bird-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 3140056a2696..88ef3f02602c 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "blackbox_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index f86c3a42773c..b3b61567d481 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "collectd-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix index ab4b67402d39..c3cc7eff90aa 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "consul_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index e01417186960..875db1777fba 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "dnsmasq_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index c0d96b08bb65..ff7156360a9c 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "dovecot_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/flow-exporter.nix new file mode 100644 index 000000000000..4b2e76f7043f --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/flow-exporter.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "flow-exporter"; + version = "1.1.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "neptune-networks"; + repo = pname; + sha256 = "sha256-6FqupoYWRvex7XhM7ly8f7ICnuS9JvCRIVEBIJe+64k="; + }; + + vendorSha256 = "sha256-2raOUOPiMUMydIsfSsnwUAAiM7WyMio1NgL1EoADr2s="; + + meta = with lib; { + description = "Export network flows from kafka to Prometheus"; + homepage = "https://github.com/neptune-networks/flow-exporter"; + license = licenses.mit; + maintainers = with maintainers; [ kloenk ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index bc9058e36d97..cefa4579069f 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "fritzbox-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 718c8f2fcb13..18055f9b06a0 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gitlab-ci-pipelines-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index e12c76e09f04..6a42297d502a 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "haproxy_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index e7ecffee9927..a551e55b2168 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "keylight-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index 1f9c38922ebc..34a9511d0b57 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "lndmon"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix index daad5dc81cd8..2d995ba52932 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: buildGoModule { pname = "mailexporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 0fb7ee4fce32..0fa2bced1255 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mesos_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 5044db4b1c14..37f9b0c4e06d 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "mikrotik-exporter-unstable"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 78642821b946..93e9bca3283d 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { pname = "minio-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix index c23d44dca389..e6178dd52a35 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "modemmanager-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index ec181d2e1107..ff32764fcde6 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mysqld_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index a04bd6d9a9a0..e07c8a5a5c0b 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -2,26 +2,16 @@ buildGoModule rec { pname = "prometheus-nextcloud-exporter"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "xperimental"; repo = "nextcloud-exporter"; rev = "v${version}"; - sha256 = "1nmw1hkxgdp7nibrn1gz0lry0666rcc55s3kkfx64ykw6bnl0l34"; + sha256 = "0kq0ka2gjlibl7vhk3s4z15ja5ai7cmwl144gj4dyhylp2xzr72a"; }; - patches = [ - # fixes failing test, remove with next update - # see https://github.com/xperimental/nextcloud-exporter/pull/25 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/xperimental/nextcloud-exporter/pull/25.patch"; - sha256 = "03jvqlqbs5g6ijncx6vxkgwq646yrjlrm0lk2q5vhfjrgrkv0alv"; - includes = [ "internal/config/config_test.go" ]; - }) - ]; - - vendorSha256 = "0xdjphki0p03n6g5b4mm2x0rgm902rnbvq8r6p4r45k3mv8cggmf"; + vendorSha256 = "0qs3p4jl8p0323bklrrhxzql7652pm6a1hj9ch9xyfhkwsx87l4d"; passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 259b4f752d37..ee5bafbc7c9f 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "nginx_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index b15a54c6529c..fad49d275751 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "nginxlog_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix index e2b601f56c14..42ccb91017fc 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "node_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 8e3daa931ee8..021905ba9e00 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "openvpn_exporter-unstable"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index e3f8b2d44d4e..a24edd2fbb0d 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests , systemd, withSystemdSupport ? true }: with lib; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix index 5a3c232ac85c..a147a3c29055 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "process-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix index b333faf0bbdc..a370bf1f2488 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "prom2json"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix index f4a9070fd84a..965b33aa337c 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix @@ -1,24 +1,33 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "promscale"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "0179sw5zx552y14lr56adxcgas642xvxpqly6y4m9pi33r1gs8lj"; + sha256 = "sha256-rXOAAd08NTWFRGnJoAY9xllw6dAA7Xu3qcImIVq9ewE="; }; - vendorSha256 = "sha256:04gzf0siz96ar4qdkcw6daswy14i1zvl7ir200adhw1c5phppab6"; + vendorSha256 = "sha256-/woSbtrOI3BVBhh+A2kO1CB1BLzBciwOqvSbGkFeMEU="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; doCheck = false; # Requires access to a docker daemon + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" -version)" == "${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + exit 1 + fi + ''; meta = with lib; { description = "An open-source analytical platform for Prometheus metrics"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0d47211005f2..0bdb0680ae9d 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, go, buildGoPackage, fetchFromGitHub }: +{ lib, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "pushgateway"; - version = "1.3.0"; + version = "1.4.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "0ll6s8yqcx3fgn6gzmfb1bsfykl0ra6383nyw1kjbj260w200gls"; + sha256 = "sha256-230JgG+TtAuopkkcUda+0hl8E6WXOtTUygWoyorLiEU="; }; buildUser = "nix@nixpkgs"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index d9c08f8718dc..b7832395f626 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "rabbitmq_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 945f403041c6..34c058d5d6cd 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "redis_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index f440be3f57a4..b1c3bc6999f7 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,7 +1,6 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: let - inherit (stdenv) lib; baseVersion = "0.3.1"; commit = "9ba85274dcc21bf8132cbe3b3dccfcb4aab57d9f"; in diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index a71b03a2b41d..ece22e496d12 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: buildGoPackage rec { pname = "snmp_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 2784dae63aff..553613a9c7e9 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "sql_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index a2b0f73904b9..31bd583280cc 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "statsd_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 50915bf65f87..39e475df1974 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "surfboard_exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 669cf8ffaeae..b9971ab72280 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "unifi-exporter"; diff --git a/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix b/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix index 6755aeb9968c..e63cf4851668 100644 --- a/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,19 +4,19 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "6.1.2"; + version = "6.2.3"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "1g4vh4ay5m3sl00j8rn4db87kfdyxcmnaf0rxnv4ah2fbj5nrh2n"; + sha256 = "sha256-8+ibl2D8hSzFV+snJAxRNTiyYqCndUDGVCVKt2bkPlQ="; }; inherit subPackages postInstall; - vendorSha256 = "12qi94k8fjx0kaq2x977yhan8ynd6j6cbqx1l60gqs2xgkm71k9r"; + vendorSha256 = "sha256-KykxKJxel4E5VB8QAkEpBBaA7hKfSnTDkJ9qlNEln80="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 76acc2822f40..55b0ab14af70 100644 --- a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.17.0"; + version = "1.17.2"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "1j3wi398vcvlnf1q335hhbw6bq69qclak92sg2na05cl4snw68y0"; + sha256 = "sha256-R0RYiVVS1ce2xabPBTEmOxBNlknP4iXkbVy412whrFw="; }; - vendorSha256 = "0vb1gvmj7pmz4dljyk91smkn8japmv7mc3mgb0s1imvxala8qq83"; + vendorSha256 = "sha256-3cELah9i2rY563QQOYt7ke0HEUR1By74vTgl+UbOHwc="; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} diff --git a/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index 9955b4a83330..2b0be2803e2e 100644 --- a/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "1zxx6vyf0fhrz8yqnlakszwziyq20k3kprshh414qxdpqfj9jax6"; + sha256 = "sha256-GJKTQGMmFJeUQn02GWP4KKpKdM8eT+VxDBDzST+5NXk="; }; - vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8"; + vendorSha256 = "sha256-s11iJFcJ1Ez6TkhCU3VD2ThU5/9otHz5rDF8z9ux79E="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix b/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix index 0343384a6795..8297503b675e 100644 --- a/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "unifi-poller"; diff --git a/nixpkgs/pkgs/servers/mpd/default.nix b/nixpkgs/pkgs/servers/mpd/default.nix index 54878eda1ac6..b34f62074915 100644 --- a/nixpkgs/pkgs/servers/mpd/default.nix +++ b/nixpkgs/pkgs/servers/mpd/default.nix @@ -15,7 +15,7 @@ # Services , yajl # Client support -, mpd_clientlib +, libmpdclient # Tag support , libid3tag , nixosTests @@ -70,7 +70,7 @@ let soundcloud = [ curl yajl ]; tidal = [ curl yajl ]; # Client support - libmpdclient = [ mpd_clientlib ]; + libmpdclient = [ libmpdclient ]; # Tag support id3tag = [ libid3tag ]; # Misc @@ -114,13 +114,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0323zxmgyrkbklnqm8i6napz8pva50cw14mzr9bvmyg64x404jgj"; + sha256 = "sha256-CVi+fcmFMJMv7X4okALlVsxqsuUsirHgQT61IHdrBNE="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/mpd/clientlib.nix b/nixpkgs/pkgs/servers/mpd/libmpdclient.nix index e0df9458f878..4ff45b527b14 100644 --- a/nixpkgs/pkgs/servers/mpd/clientlib.nix +++ b/nixpkgs/pkgs/servers/mpd/libmpdclient.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { - version = "2.19"; pname = "libmpdclient"; + version = "2.19"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; - repo = "libmpdclient"; + repo = pname; rev = "v${version}"; sha256 = "01agvjscdxagw6jcfx0wg81c4b6p8rh0hp3slycmjs2b835kvmq2"; }; @@ -17,8 +23,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Client library for MPD (music player daemon)"; homepage = "https://www.musicpd.org/libs/libmpdclient/"; - license = licenses.gpl2; + license = licenses.bsd2; + maintainers = with maintainers; [ ehmry AndersonTorres ]; platforms = platforms.unix; - maintainers = with maintainers; [ ehmry ]; }; } diff --git a/nixpkgs/pkgs/servers/nextcloud/default.nix b/nixpkgs/pkgs/servers/nextcloud/default.nix index 3bea50b5620c..a40dd71fafd9 100644 --- a/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -58,7 +58,7 @@ in { }; nextcloud20 = generic { - version = "20.0.5"; - sha256 = "5c70dd33024012a1651fd099133d052d129a4dadc6935f44bb9c3e2b360befe3"; + version = "20.0.7"; + sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys="; }; } diff --git a/nixpkgs/pkgs/servers/nextcloud/news-updater.nix b/nixpkgs/pkgs/servers/nextcloud/news-updater.nix index f4dc2d33d1b0..19147be3f5da 100644 --- a/nixpkgs/pkgs/servers/nextcloud/news-updater.nix +++ b/nixpkgs/pkgs/servers/nextcloud/news-updater.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, php }: +{ lib, fetchurl, python3Packages, php }: python3Packages.buildPythonApplication rec { name = "nextcloud-news-updater-${version}"; diff --git a/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/nixpkgs/pkgs/servers/nfs-ganesha/default.nix index b5fefc963f07..b5533e10b2f6 100644 --- a/nixpkgs/pkgs/servers/nfs-ganesha/default.nix +++ b/nixpkgs/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "1qi617ppjjl38mqpbxiqhpxanq9qgqshb87cajs30rqkv9nj811k"; + sha256 = "sha256-N0qVlnMshsEcWEpPhtR+zXwFKXlik1XnEuZdFMjpZTE="; }; patches = [ ./sysstatedir.patch ]; diff --git a/nixpkgs/pkgs/servers/nginx-sso/default.nix b/nixpkgs/pkgs/servers/nginx-sso/default.nix index 0029d9ad55ee..572f4d94e72b 100644 --- a/nixpkgs/pkgs/servers/nginx-sso/default.nix +++ b/nixpkgs/pkgs/servers/nginx-sso/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv, nixosTests }: +{ buildGoPackage, fetchFromGitHub, lib, nixosTests }: buildGoPackage rec { pname = "nginx-sso"; diff --git a/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/nixpkgs/pkgs/servers/nosql/influxdb/default.nix index d4a26f086ce4..a178d43d231e 100644 --- a/nixpkgs/pkgs/servers/nosql/influxdb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/influxdb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "influxdb"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "1siv31gp7ypjphxjfv91sxzpz2rxk1nn2aj17pgk0cz7c8m59ic7"; + sha256 = "sha256-cL+QaUGMElYd6P+xXkQgRnL8BKo2C95bhCwy59kRnwo="; }; - vendorSha256 = "1pylw30dg6ljxm9ykmsqapg1vq71bj1ngdq4arvmmzcdhy1nhmh0"; + vendorSha256 = "sha256-v4CEkhQiETeU6i186XIE/8z4T71gdKL+6W7sQ7/2RuI="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix b/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix index 627cd6d627d2..bace331e05c8 100644 --- a/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix +++ b/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix @@ -73,28 +73,12 @@ let --replace /out $out ''; }; - - # Can't use the nixpkgs version of go-bindata, it's an ancient - # ancestor of this more modern one. - bindata = buildGoPackage { - pname = "go-bindata"; - version = "v3.22.0"; - src = fetchFromGitHub { - owner = "kevinburke"; - repo = "go-bindata"; - rev = "v3.22.0"; - sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; - }; - - goPackagePath = "github.com/kevinburke/go-bindata"; - subPackages = [ "go-bindata" ]; - }; in buildGoModule { pname = "influxdb"; version = version; src = src; - nativeBuildInputs = [ bindata pkg-config ]; + nativeBuildInputs = [ go-bindata pkg-config ]; vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a"; subPackages = [ "cmd/influxd" "cmd/influx" ]; diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/v3_4.nix b/nixpkgs/pkgs/servers/nosql/mongodb/v3_4.nix index 2a33b9744a2a..666a92004b44 100644 --- a/nixpkgs/pkgs/servers/nosql/mongodb/v3_4.nix +++ b/nixpkgs/pkgs/servers/nosql/mongodb/v3_4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: +{ callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: let buildMongoDB = callPackage ./mongodb.nix { diff --git a/nixpkgs/pkgs/servers/nosql/redis/default.nix b/nixpkgs/pkgs/servers/nosql/redis/default.nix index 799c26e82fdb..9eac9e2f2565 100644 --- a/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "6.0.6"; + version = "6.0.10"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "151x6qicmrmlxkmiwi2vdq8p50d52b9gglp8csag6pmgcfqlkb8j"; + sha256 = "1gc529nfh8frk4pynyjlnmzvwa0j9r5cmqwyd7537sywz6abifvr"; }; # Cross-compiling fixes diff --git a/nixpkgs/pkgs/servers/oauth2_proxy/default.nix b/nixpkgs/pkgs/servers/oauth2_proxy/default.nix index 4fd6a398a30d..8e57e253435a 100644 --- a/nixpkgs/pkgs/servers/oauth2_proxy/default.nix +++ b/nixpkgs/pkgs/servers/oauth2_proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "6.1.1"; + version = "7.0.0"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "10vvib4089yywd10kigjszsfxkzv8xzj7dy3wr5df8h80rcfa74n"; + sha256 = "sha256-yH60mfuYRv31I0DOEtWxqGCzKOwDYsQh4yjvYO3vq3I="; rev = "v${version}"; }; - vendorSha256 = "0z8ibmpil899xvjaw7siswy22shjhx17a6lnjpr62paqdxy1sfwc"; + vendorSha256 = "sha256-kclpoZ33JOciP2IUCQZB5idA7rgbWxPPFNwZU+pEJFU="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); diff --git a/nixpkgs/pkgs/servers/openxpki/default.nix b/nixpkgs/pkgs/servers/openxpki/default.nix index 511ea217328d..bdf12a1f923c 100644 --- a/nixpkgs/pkgs/servers/openxpki/default.nix +++ b/nixpkgs/pkgs/servers/openxpki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, perl, openssl, perlPackages, gettext, python3Packages +{ lib, fetchgit, perl, openssl, perlPackages, gettext, python3Packages # TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere. , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }: diff --git a/nixpkgs/pkgs/servers/osrm-backend/default.nix b/nixpkgs/pkgs/servers/osrm-backend/default.nix index b76210dd9058..c3ca8baaf7c1 100644 --- a/nixpkgs/pkgs/servers/osrm-backend/default.nix +++ b/nixpkgs/pkgs/servers/osrm-backend/default.nix @@ -2,18 +2,17 @@ stdenv.mkDerivation rec { pname = "osrm-backend"; - version = "5.23.0"; + version = "5.24.0"; src = fetchFromGitHub { owner = "Project-OSRM"; repo = "osrm-backend"; rev = "v${version}"; - sha256 = "sha256-FWfrdnpdx4YPa9l7bPc6QNyqyNvrikdeADSZIixX5vE="; + sha256 = "sha256-Srqe6XIF9Fs869Dp25+63ikgO7YlyT0IUJr0qMxunao="; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=pessimizing-move" "-Wno-error=redundant-move" ]; - nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; diff --git a/nixpkgs/pkgs/servers/pg_tileserv/default.nix b/nixpkgs/pkgs/servers/pg_tileserv/default.nix index 9f7356648634..d9ba4e8e6fa0 100644 --- a/nixpkgs/pkgs/servers/pg_tileserv/default.nix +++ b/nixpkgs/pkgs/servers/pg_tileserv/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pg_tileserv"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "CrunchyData"; repo = pname; rev = "v${version}"; - sha256 = "sha256-62cJ0j/UfPW/ujKr0iA7Be8wZYlZ68mpJX8v1tAVREc="; + sha256 = "sha256-PHF8n0rjxvajyC/y2sFcdvxQdDFXkxcDZOkYT10UsE4="; }; vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E="; diff --git a/nixpkgs/pkgs/servers/pleroma-otp/default.nix b/nixpkgs/pkgs/servers/pleroma-otp/default.nix new file mode 100644 index 000000000000..4905acd07577 --- /dev/null +++ b/nixpkgs/pkgs/servers/pleroma-otp/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, autoPatchelfHook +, fetchurl +, file +, makeWrapper +, ncurses +, nixosTests +, openssl +, unzip +, zlib +}: +stdenv.mkDerivation { + pname = "pleroma-otp"; + version = "2.2.2"; + + # To find the latest binary release stable link, have a look at + # the CI pipeline for the latest commit of the stable branch + # https://git.pleroma.social/pleroma/pleroma/-/tree/stable + src = { + aarch64-linux = fetchurl { + url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/175288/artifacts/download"; + sha256 = "107kp5zqwq1lixk1cwkx4v7zpm0h248xzlm152aj36ghb43j2snw"; + }; + x86_64-linux = fetchurl { + url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/175284/artifacts/download"; + sha256 = "1c6l04gga9iigm249ywwcrjg6wzy8iiid652mws3j9dnl71w2sim"; + }; + }."${stdenv.hostPlatform.system}"; + + nativeBuildInputs = [ unzip ]; + + buildInputs = [ + autoPatchelfHook + file + makeWrapper + ncurses + openssl + zlib + ]; + + # mkDerivation fails to detect the zip nature of $src due to the + # missing .zip extension. + # Let's unpack the archive explicitely. + unpackCmd = "unzip $curSrc"; + + installPhase = '' + mkdir $out + cp -r * $out''; + + # Pleroma is using the project's root path (here the store path) + # as its TMPDIR. + # Patching it to move the tmp dir to the actual tmpdir + postFixup = '' + wrapProgram $out/bin/pleroma \ + --set-default RELEASE_TMP "/tmp" + wrapProgram $out/bin/pleroma_ctl \ + --set-default RELEASE_TMP "/tmp"''; + + passthru.tests = { + pleroma = nixosTests.pleroma; + }; + + meta = with lib; { + description = "ActivityPub microblogging server"; + homepage = https://git.pleroma.social/pleroma/pleroma; + license = licenses.agpl3; + maintainers = with maintainers; [ ninjatrappeur ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/servers/plex/raw.nix b/nixpkgs/pkgs/servers/plex/raw.nix index b040c86c9fa2..ca0e41f76d20 100644 --- a/nixpkgs/pkgs/servers/plex/raw.nix +++ b/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.1.3876-3c3adfcb4"; + version = "1.21.3.4014-58bd20c02"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1xpsmk5l0f0blqp5ba9n1w0npsk692p07hp4ipkq7yz3mfag50p0"; + sha256 = "15zfhjvp5yzai5ylhljw221v6qm16fma0x0lay9zpgkxrwqw9iaw"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0dyw84x9h295428l7r8iqfb2vxkv0f1d68z1j2ka3wsw7cj1yq78"; + sha256 = "1gig4n6iijipf2njixgpw00pm3g5rgbq1vvd9ljy8cjpv1kb5z0z"; }; outputs = [ "out" "basedb" ]; diff --git a/nixpkgs/pkgs/servers/pulseaudio/default.nix b/nixpkgs/pkgs/servers/pulseaudio/default.nix index 32aa421ebf03..bebe4801c65e 100644 --- a/nixpkgs/pkgs/servers/pulseaudio/default.nix +++ b/nixpkgs/pkgs/servers/pulseaudio/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "14.0"; + version = "14.2"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "0qf20rgg0ysrnvg3359j56ndls07qmfn5rsy9r85bc42jdfpfd58"; + sha256 = "sha256-ddP3dCwa5EkEmkyIkA5FS4s1DsqoxUTzSIolYqn/ZvE="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/radicale/1.x.nix b/nixpkgs/pkgs/servers/radicale/1.x.nix index 3bfab658af6d..fafeda88975c 100644 --- a/nixpkgs/pkgs/servers/radicale/1.x.nix +++ b/nixpkgs/pkgs/servers/radicale/1.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "radicale"; diff --git a/nixpkgs/pkgs/servers/radicale/2.x.nix b/nixpkgs/pkgs/servers/radicale/2.x.nix index 918dad537a53..b0902feeead4 100644 --- a/nixpkgs/pkgs/servers/radicale/2.x.nix +++ b/nixpkgs/pkgs/servers/radicale/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "Radicale"; diff --git a/nixpkgs/pkgs/servers/roon-server/default.nix b/nixpkgs/pkgs/servers/roon-server/default.nix index 06541b89500e..145a1927f2c4 100644 --- a/nixpkgs/pkgs/servers/roon-server/default.nix +++ b/nixpkgs/pkgs/servers/roon-server/default.nix @@ -11,11 +11,15 @@ , zlib }: stdenv.mkDerivation rec { name = "roon-server"; - version = "100700571"; + version = "100800753"; + # N.B. The URL is unstable. I've asked for them to provide a stable URL but + # they have ignored me. If this package fails to build for you, you may need + # to update the version and sha256. + # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 src = fetchurl { - url = "http://download.roonlabs.com/updates/stable/RoonServer_linuxx64_${version}.tar.bz2"; - sha256 = "191vlzf10ypkk1prp6x2rszlmsihdwpd3wvgf2jg6ckwyxy2hc6k"; + url = "https://web.archive.org/web/20210209195555/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; + sha256 = "sha256-uas1vqIDWlYr7jgsrlBeJSPjMxwzVnrkCD9jJljkFZs="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/roundcube/default.nix b/nixpkgs/pkgs/servers/roundcube/default.nix index ce62b7d1fdcc..75afedaa2ddc 100644 --- a/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/nixpkgs/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.10"; + version = "1.4.11"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "03sjvmnrspkiq0w73xvp1w61pcxhv0djrdm3mvs8h0dp9pfc1n53"; + sha256 = "sha256-rHMZBwwwX8LIjHcjYFVi2GBwMHMr7ukxzbQJHPBeabc="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/nixpkgs/pkgs/servers/routinator/default.nix b/nixpkgs/pkgs/servers/routinator/default.nix index e62ad9753806..f1e705b0693e 100644 --- a/nixpkgs/pkgs/servers/routinator/default.nix +++ b/nixpkgs/pkgs/servers/routinator/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rxCgW4cuYNSJ9P+cBYWAYJsghz2bp9mpAh6AuwLoV5o="; + sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE="; }; - cargoSha256 = "0fcp4b2b0mjddj4blr20gvp1ih3ldzzr04rm1m06i8d2lnl68i79"; + cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ="; meta = with lib; { description = "An RPKI Validator written in Rust"; diff --git a/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix index d3ec7dc75ee6..b5861ce32216 100644 --- a/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix +++ b/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildGoModule }: buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.12.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "094brxiiapm7402q0ysaha2xk3wymc2kz8vqisjyiswz7wf4wsx0"; + sha256 = "sha256-9PjITPuCndz/EuFEt9docmWN93TwZQbnyHV161hUwS0="; }; - vendorSha256 = "007dyw825jsfma7sq5llxllhrzbkhqxr985s1nhg5cdd803gz42p"; + vendorSha256 = "sha256-6tp1hN1dRKm523IegMpsTO+/gktywqdNZflUbE4TPuU="; # Tests need docker doCheck = false; diff --git a/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix index c125732cafcd..0c422970d56a 100644 --- a/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/nixpkgs/pkgs/servers/samba/4.x.nix @@ -158,7 +158,8 @@ stdenv.mkDerivation rec { description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; platforms = platforms.unix; - broken = stdenv.isDarwin; + # N.B. enableGlusterFS does not build + broken = stdenv.isDarwin || enableGlusterFS; maintainers = with maintainers; [ aneeshusa ]; }; } diff --git a/nixpkgs/pkgs/servers/scylladb/default.nix b/nixpkgs/pkgs/servers/scylladb/default.nix index b0793d5e42a8..2ae3d9f486fb 100644 --- a/nixpkgs/pkgs/servers/scylladb/default.nix +++ b/nixpkgs/pkgs/servers/scylladb/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchgit, python3Packages, pkg-config, @@ -98,5 +98,6 @@ gcc8Stdenv.mkDerivation { platforms = lib.platforms.linux; hydraPlatforms = []; # It's huge ATM, about 18 GB. maintainers = [ lib.maintainers.farlion ]; + broken = true; }; } diff --git a/nixpkgs/pkgs/servers/search/groonga/default.nix b/nixpkgs/pkgs/servers/search/groonga/default.nix index b3a14f5f2c7e..b5c553b116e2 100644 --- a/nixpkgs/pkgs/servers/search/groonga/default.nix +++ b/nixpkgs/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.9"; + version = "10.1.1"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "191saqanv8k6ijl96mw4jdhh9pkpdn651f1bg4kfb34p7vy8ld9k"; + sha256 = "sha256-9NKyY+oliGIJQaNHdHOs+1GAfdZ0sy+mbQFrRNXpjLM="; }; buildInputs = with lib; diff --git a/nixpkgs/pkgs/servers/search/solr/default.nix b/nixpkgs/pkgs/servers/search/solr/default.nix index 52bb37a81863..2b22c38143c7 100644 --- a/nixpkgs/pkgs/servers/search/solr/default.nix +++ b/nixpkgs/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.6.1"; + version = "8.6.3"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "0ds6zjsnwgpcmivzi7d6yqdmyn2mhf3k8g7xp26yfpm7f12gpq4g"; + sha256 = "0mbbmamajamxzcvdlrzx9wmv26kg9nhg9bzazk176dhhx3rjajf2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/ser2net/default.nix b/nixpkgs/pkgs/servers/ser2net/default.nix index bbb40844ae51..a751e0872ee7 100644 --- a/nixpkgs/pkgs/servers/ser2net/default.nix +++ b/nixpkgs/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "13zhds3zav03f1snc4bb1j07i2x606bmnqm17yx37frib2hjs4nx"; + sha256 = "sha256-fA4rtFZ2lhGAwY3KUl/Jk8gjueI761J1QRdivMtbqX4="; }; passthru = { diff --git a/nixpkgs/pkgs/servers/serf/default.nix b/nixpkgs/pkgs/servers/serf/default.nix index 04cd93c5306e..8964796862ce 100644 --- a/nixpkgs/pkgs/servers/serf/default.nix +++ b/nixpkgs/pkgs/servers/serf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "serf"; diff --git a/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index afae82b4d391..d9a3332e0214 100644 --- a/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.5"; + version = "0.23.10"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "03wxrf9iyaianlnlcx8ks04r0snpg32a3qbq36cykcq2x55qnczq"; + sha256 = "sha256-EkExTDU7T7FYZrDtF0AF8wjn9fp8y9SLmINYGv8zvXk="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/servers/sickbeard/sickrage.nix b/nixpkgs/pkgs/servers/sickbeard/sickrage.nix index 7bd971e86e75..43ba82caf768 100644 --- a/nixpkgs/pkgs/servers/sickbeard/sickrage.nix +++ b/nixpkgs/pkgs/servers/sickbeard/sickrage.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { pname = "sickrage"; diff --git a/nixpkgs/pkgs/servers/simplehttp2server/default.nix b/nixpkgs/pkgs/servers/simplehttp2server/default.nix index bc56053515bf..d673a201646d 100644 --- a/nixpkgs/pkgs/servers/simplehttp2server/default.nix +++ b/nixpkgs/pkgs/servers/simplehttp2server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "simplehttp2server"; diff --git a/nixpkgs/pkgs/servers/skydns/default.nix b/nixpkgs/pkgs/servers/skydns/default.nix index 587c5d4bda2c..e6f35124a6fc 100644 --- a/nixpkgs/pkgs/servers/skydns/default.nix +++ b/nixpkgs/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "skydns"; diff --git a/nixpkgs/pkgs/servers/slimserver/default.nix b/nixpkgs/pkgs/servers/slimserver/default.nix index 5e1e8544818a..3e28f5010499 100644 --- a/nixpkgs/pkgs/servers/slimserver/default.nix +++ b/nixpkgs/pkgs/servers/slimserver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper +{ lib, fetchurl, makeWrapper , perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: perlPackages.buildPerlPackage rec { diff --git a/nixpkgs/pkgs/servers/sql/dolt/default.nix b/nixpkgs/pkgs/servers/sql/dolt/default.nix index b0dc7a227576..6f6b5c390744 100644 --- a/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, lib, buildGoModule }: +{ fetchFromGitHub, lib, buildGoModule }: buildGoModule rec { pname = "dolt"; - version = "0.22.11"; + version = "0.22.12"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-lOsPB1e3jUBbNZfVHlnNBCMo8mZFpGNhkvGU8+Rq+Kk="; + sha256 = "sha256-SYgBy2WGP6ssMDohnbflnd2XpF8iwmxoTTlHQYc1+Wo="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-+qfgEiJbFtG1/a6RNnYsJzU1ZPYenvhdWh+wIEISRrI="; + vendorSha256 = "sha256-Q87cGO82EmehpuMR3SCW9oF8DtaGURp4coLec4Rv2Js="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix index 7d1c49815e44..3c13388c4602 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.5"; + version = "26.4.7"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "10sir0hxxglw9jsjrclfgrqm8n5zng6rwj2fgff141x9n9l55w7l"; + sha256 = "0h7s670pcasq8wzprhyxqfca2cghi62b8xz2kikb2a86wd453qil"; fetchSubmodules = true; }; @@ -47,7 +47,6 @@ in stdenv.mkDerivation rec { install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR" install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2" install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio" - install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/nixpkgs/pkgs/servers/sql/monetdb/default.nix index ca284330b30a..80033e406ee3 100644 --- a/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.39.7"; + version = "11.39.11"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "0qb2hlz42400diahmsbflfjmfnzd5slm6761xhgvh8s4rjfqm21w"; + sha256 = "1b70r4b5m0r0xpy7i76xx0xsmwagsjdcp5j6nqfjcyn1m65ydzvs"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix b/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix index 98166d0b38a8..547900932153 100644 --- a/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix +++ b/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix @@ -23,8 +23,9 @@ self = stdenv.mkDerivation rec { nativeBuildInputs = [ cmake bison pkg-config rpcsvc-proto ]; - buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ] - ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; + buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] + ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ] + ++ lib.optionals stdenv.isLinux [ libtirpc ]; outputs = [ "out" "static" ]; diff --git a/nixpkgs/pkgs/servers/sql/patroni/default.nix b/nixpkgs/pkgs/servers/sql/patroni/default.nix index 682dbe45f7d0..8da0213a2aa8 100644 --- a/nixpkgs/pkgs/servers/sql/patroni/default.nix +++ b/nixpkgs/pkgs/servers/sql/patroni/default.nix @@ -1,14 +1,17 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib +, pythonPackages +, fetchFromGitHub +}: pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "1.6.5"; + version = "2.0.1"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "v${version}"; - sha256 = "0iw0ra9fya4bf1vkjq3w5kij4x46yinb90v015pi9c6qfpancfdj"; + sha256 = "sha256-IlRltJrEMrRiwVVMYQywb0MqwEoL8MX3do2GlHXjuPc="; }; # cdiff renamed to ydiff; remove when patroni source reflects this. @@ -28,6 +31,7 @@ pythonPackages.buildPythonApplication rec { prettytable psutil psycopg2 + pysyncobj python-dateutil python-etcd pyyaml @@ -40,13 +44,15 @@ pythonPackages.buildPythonApplication rec { flake8 mock pytestCheckHook - pytestcov + pytest-cov requests ]; # Fix tests by preventing them from writing to /homeless-shelter. preCheck = "export HOME=$(mktemp -d)"; + pythonImportsCheck = [ "patroni" ]; + meta = with lib; { homepage = "https://patroni.readthedocs.io/en/latest/"; description = "A Template for PostgreSQL HA with ZooKeeper, etcd or Consul"; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 99a81f875484..7459da6d6cd3 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "0x19p0b9hv1hkhwjm68cm8gskhnsl7np4si8wl0ablf6kasyl3q7"; + sha256 = "030vm83ksfi4daypr4hamvvfs4g1ckww4ldg7rrk6c6hqkppykpa"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 6604b52cfd3d..67e7fc5bc461 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.1.2"; + version = "3.1.3"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9M8Hug+znihViHC/57aPyc7Zgbeb1H8a/iVCfAG/Am8="; + sha256 = "sha256-ahDQ+nSTeIsdjID/ZwiGZCVBzOf0/oQs3SYsFYEEoxY="; }; installPhase = '' @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}"; maintainers = [ maintainers.steve-chavez ]; platforms = postgresql.meta.platforms; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 5ce32177d51b..d6df5e4ba0d5 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "0rjbzcdvwx19ql0ilccr47inilf7kh5hn7aacjqs1nxk91g3x7yf"; + sha256 = "sha256-mYFItrFC0BeRwLfZA1SAV+4rvrNrx75lTWS7w2ZDHag="; }; buildInputs = [ postgresql ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix new file mode 100644 index 000000000000..0bd727e7acf9 --- /dev/null +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, R, postgresql }: + +stdenv.mkDerivation rec { + pname = "plr"; + version = "8.4.1"; + + src = fetchFromGitHub { + owner = "postgres-plr"; + repo = "plr"; + rev = "REL${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "1wy4blg8jl30kzhrkvbncl4gmy6k71zipnq89ykwi1vmx89v3ab7"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ R postgresql ]; + preBuild = '' + export USE_PGXS=1 + ''; + installPhase = '' + install -D plr.so -t $out/lib/ + install -D {plr--unpackaged--8.4.1.sql,plr--8.4.1.sql,plr.control} -t $out/share/postgresql/extension + ''; + + meta = with lib; { + description = "PL/R - R Procedural Language for PostgreSQL"; + homepage = "https://github.com/postgres-plr/plr"; + maintainers = with maintainers; [ qoelet ]; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl2Only; + }; +} diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix index 590aa6f2b6b9..f3f7a4a69114 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.0"; + version = "3.1.1"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "008280ijd6m9h35y9lcpql0fk0h9f3zkc1pfkdm0rkbnd12y41ns"; + sha256 = "0z9a39243fv37mansbbjq5mmxpnhr7xzn8pv92fr7dkdb3psz5hf"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index abde49542f1a..d10907805aa9 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.0.0"; + version = "2.0.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0id1h46490mjqp8ijhv2qswpdli2nh2z15mgh6gfc2wl3bhwhi1g"; + sha256 = "105zc5m3zvnrqr8409qdbycb4yp7znxmna76ri1m2djkdp5rh4q1"; }; # -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream diff --git a/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/nixpkgs/pkgs/servers/sql/postgresql/packages.nix index d45c2d37c8db..e8b2f4130a59 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/packages.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/packages.nix @@ -27,6 +27,8 @@ self: super: { plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { }; + plr = super.callPackage ./ext/plr.nix { }; + plv8 = super.callPackage ./ext/plv8.nix { v8 = super.callPackage ../../../development/libraries/v8/plv8_6_x.nix { python = self.python2; diff --git a/nixpkgs/pkgs/servers/swego/default.nix b/nixpkgs/pkgs/servers/swego/default.nix index 4c7c9d764503..91b0995466a0 100644 --- a/nixpkgs/pkgs/servers/swego/default.nix +++ b/nixpkgs/pkgs/servers/swego/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "swego"; - version = "0.7"; + version = "0.9"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "14qww4ndvrxmrgkggr8hyvfpz2v7fw0vq6s8715mxa28f8pfi78b"; + sha256 = "sha256-Wt+2spZfgBWzZEQP+SiDYI5DdLKrwFMgYT1ukbF4x0I="; }; - vendorSha256 = "068drahh0aysrm8cr5pgik27jqyk28bsx5130mc2v3xd0xmk8yp1"; + vendorSha256 = "sha256-EPcyhnTis7g0uVl+cJdG7iMbisjh7iuMhpzM/SSOeFI="; postInstall = '' mv $out/bin/src $out/bin/$pname diff --git a/nixpkgs/pkgs/servers/tailscale/default.nix b/nixpkgs/pkgs/servers/tailscale/default.nix index 18803636a0db..eb47593c5966 100644 --- a/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,21 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.2.10"; - tagHash = "4b3581abed6c2db79b61eb1b53e29645df12a833"; # from `git rev-parse v1.2.10` + version = "1.4.4"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "09m4xhnjpnkic9jy5dwnmpl40r92xa8fcx4xhpadv6hjpx9k4xx5"; + sha256 = "sha256-zrKkBbsvIqJkPysKx3nJ3EIbePWMZCX9eegekAoqMqk="; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "01g3jkgl3jrygd154gmjm3dq13nkppd993iym7assdz8mr3rq31s"; + vendorSha256 = "sha256-WvojOnGQ/ssBkoQwIlOVsaEUJmi2ugqgtTAVKJg8Spk="; doCheck = false; @@ -25,7 +24,7 @@ buildGoModule rec { preBuild = '' export buildFlagsArray=( -tags="xversion" - -ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version} -X tailscale.com/version.GitCommit=${tagHash}" + -ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version}" ) ''; diff --git a/nixpkgs/pkgs/servers/tarssh/default.nix b/nixpkgs/pkgs/servers/tarssh/default.nix index bb353dda9289..ac7f26782601 100644 --- a/nixpkgs/pkgs/servers/tarssh/default.nix +++ b/nixpkgs/pkgs/servers/tarssh/default.nix @@ -1,19 +1,19 @@ -{ fetchFromGitHub, rustPlatform, lib, stdenv }: +{ fetchFromGitHub, rustPlatform, lib }: with rustPlatform; buildRustPackage rec { pname = "tarssh"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Freaky"; repo = pname; - sha256 = "1waxfbw9lqbqv8igb291pjqg22324lzv4p7fsdfrkvxf95jd2i03"; + sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk="; }; - cargoSha256 = "1f3anrh2y8yg7l4nilwk0a7c7kq5yvg07cqh75igjdb5a7p9di0j"; + cargoSha256 = "sha256-7X9klYVZ2yE8BPuLhzWkuT7VFpmdOZGSD0D1x3kBNEs="; meta = with lib; { description = "A simple SSH tarpit inspired by endlessh"; diff --git a/nixpkgs/pkgs/servers/tautulli/default.nix b/nixpkgs/pkgs/servers/tautulli/default.nix index c7e88eb0c463..61f9c7851855 100644 --- a/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/nixpkgs/pkgs/servers/tautulli/default.nix @@ -15,8 +15,6 @@ buildPythonApplication rec { sha256 = "QHpVIOtGFzNqAEcBCv48YWO4pYatbTe/CWwcwjbj+34="; }; - doBuild = false; - installPhase = '' mkdir -p $out/bin $out/libexec/tautulli cp -R contrib data lib plexpy Tautulli.py $out/libexec/tautulli diff --git a/nixpkgs/pkgs/servers/tegola/default.nix b/nixpkgs/pkgs/servers/tegola/default.nix index c18bf17a7c7c..f2161d5d47ea 100644 --- a/nixpkgs/pkgs/servers/tegola/default.nix +++ b/nixpkgs/pkgs/servers/tegola/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "tegola"; diff --git a/nixpkgs/pkgs/servers/teleport/default.nix b/nixpkgs/pkgs/servers/teleport/default.nix index f89c8f96fcf2..100b021d9cea 100644 --- a/nixpkgs/pkgs/servers/teleport/default.nix +++ b/nixpkgs/pkgs/servers/teleport/default.nix @@ -1,16 +1,24 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, stdenv, buildGoPackage, zip, fetchFromGitHub }: +{ lib, buildGoPackage, zip, fetchFromGitHub }: +let + webassets = fetchFromGitHub { + owner = "gravitational"; + repo = "webassets"; + rev = "2d79788dbcd005bdcfe5b5120007d0faf8f1fc82"; + sha256 = "001a3bx8yyx1hq8y5yiy1jzp122q8gcl369lj0609gaxp6dk5bdw"; + }; +in buildGoPackage rec { pname = "teleport"; - version = "4.2.11"; + version = "5.1.2"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "00mkh6rmdgwwhbk3jmxgwl0aisnnqw6q6i5zl1hn69hvdny9liii"; + sha256 = "0h1hn2dpdsmhxac06gn6787z2mnfcwb3wn0c2l7l2qhw6iqpgmvh"; }; goPackagePath = "github.com/gravitational/teleport"; @@ -24,6 +32,7 @@ buildGoPackage rec { cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport mkdir -p build echo "making webassets" + cp -r ${webassets}/* webassets/ make build/webassets.zip cat build/webassets.zip >> $NIX_BUILD_TOP/go/bin/teleport rm -fr build/webassets.zip @@ -34,6 +43,14 @@ buildGoPackage rec { dontStrip = true; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/tsh version | grep ${version} > /dev/null + $out/bin/tctl version | grep ${version} > /dev/null + $out/bin/teleport version | grep ${version} > /dev/null + ''; + meta = { description = "A SSH CA management suite"; homepage = "https://gravitational.com/teleport/"; diff --git a/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/nixpkgs/pkgs/servers/tracing/tempo/default.nix index 6e5ae662b018..22c1df884b4f 100644 --- a/nixpkgs/pkgs/servers/tracing/tempo/default.nix +++ b/nixpkgs/pkgs/servers/tracing/tempo/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - version = "0.4.0"; + version = "0.5.0"; pname = "tempo"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "tempo"; - sha256 = "16hrvhnlciaf06l34p3bb3nvmxr8zwbh7zql13zja1hs0kvwxv5c"; + sha256 = "sha256-Har0JJqr6mkliKh25n+F4tork+bzfI/bv19H/rIRb9g="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix index 4ef454d6b561..d01252781768 100644 --- a/nixpkgs/pkgs/servers/traefik/default.nix +++ b/nixpkgs/pkgs/servers/traefik/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchzip, buildGoModule, go-bindata, nixosTests }: +{ lib, fetchzip, buildGoModule, go-bindata, nixosTests }: buildGoModule rec { pname = "traefik"; - version = "2.3.4"; + version = "2.4.2"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "1vdnd6nb8bfiwd51rrqhrc9p8lh3fhny49lapgbzk36ynqc97bi5"; + sha256 = "sha256-W6NtlIxeRg432RTiaJHu25Izv1VWNqYetzilCr2gPjU="; stripRoot = false; }; - vendorSha256 = "0h3j0b034yh70c9bscj1k1jy8igsr7p0i014yr0zl7wlc6s6c9bp"; + vendorSha256 = "sha256-kwA0MtmlUEO1eQFr4NpdsMikEFQc3N3Meolw/xw9dgM="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/trezord/default.nix b/nixpkgs/pkgs/servers/trezord/default.nix index 03ff9f32fa51..cc0fb0d74217 100644 --- a/nixpkgs/pkgs/servers/trezord/default.nix +++ b/nixpkgs/pkgs/servers/trezord/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , trezor-udev-rules diff --git a/nixpkgs/pkgs/servers/trickster/trickster.nix b/nixpkgs/pkgs/servers/trickster/trickster.nix index b99375dbb3d0..5cf08ee6c3cf 100644 --- a/nixpkgs/pkgs/servers/trickster/trickster.nix +++ b/nixpkgs/pkgs/servers/trickster/trickster.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "trickster"; diff --git a/nixpkgs/pkgs/servers/tt-rss/default.nix b/nixpkgs/pkgs/servers/tt-rss/default.nix index 95b895b281bb..e91fed5ee160 100644 --- a/nixpkgs/pkgs/servers/tt-rss/default.nix +++ b/nixpkgs/pkgs/servers/tt-rss/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tt-rss"; - version = "2019-01-29"; - rev = "c7c9c5fb0ab6b3d4ea3078865670d6c1dfe2ecac"; + version = "2021-01-29"; + rev = "6d8f2221b82b6a31becbeed8baf5e05ad9e053fe"; src = fetchurl { - url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz"; - sha256 = "0k184zqrfscv17gnl106q4yzhqmxb0g1dn1wkdkrclc3qcrviyp6"; + url = "https://git.tt-rss.org/fox/tt-rss/archive/${rev}.tar.gz"; + sha256 = "124c62hck631xlq5aa1miz9rbg711ygk7z1yx92m5dfcy630l7x5"; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 375726a4692e..1accac5bf6f8 100644 --- a/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation { pname = "tt-rss-plugin-ff-instagram"; version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 diff --git a/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix index 987a6d8aaa67..7df8b7175936 100644 --- a/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ b/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "tt-rss-plugin-tumblr-gdpr"; version = "2.1"; diff --git a/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix b/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix index 41f47ca4a4ec..f6882611a25b 100644 --- a/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; version = "2.5.0"; diff --git a/nixpkgs/pkgs/servers/udpt/default.nix b/nixpkgs/pkgs/servers/udpt/default.nix index acdfb95272a7..b681727c08f9 100644 --- a/nixpkgs/pkgs/servers/udpt/default.nix +++ b/nixpkgs/pkgs/servers/udpt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "udpt"; diff --git a/nixpkgs/pkgs/servers/unifi/default.nix b/nixpkgs/pkgs/servers/unifi/default.nix index c8b610c4d17f..0bc3c3413bb7 100644 --- a/nixpkgs/pkgs/servers/unifi/default.nix +++ b/nixpkgs/pkgs/servers/unifi/default.nix @@ -52,7 +52,7 @@ in rec { }; unifi6 = generic { - version = "6.0.43"; - sha256 = "1d9pw4f20pr4jb1xb43p7ycafv13ld1h40r05qg82029ml1s7jky"; + version = "6.0.45"; + sha256 = "1mph22x2p26q76gh6s714xwsvc03cciy4gx00jv4vhcm28p6nlxy"; }; } diff --git a/nixpkgs/pkgs/servers/unpfs/default.nix b/nixpkgs/pkgs/servers/unpfs/default.nix index 818e92f05965..07342c3edbef 100644 --- a/nixpkgs/pkgs/servers/unpfs/default.nix +++ b/nixpkgs/pkgs/servers/unpfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "unpfs"; diff --git a/nixpkgs/pkgs/servers/varnish/default.nix b/nixpkgs/pkgs/servers/varnish/default.nix index db426f399f83..1fbb36257d26 100644 --- a/nixpkgs/pkgs/servers/varnish/default.nix +++ b/nixpkgs/pkgs/servers/varnish/default.nix @@ -41,15 +41,15 @@ let in { varnish60 = common { - version = "6.0.5"; - sha256 = "11aw202s7zdp5qp66hii5nhgm2jk0d86pila7gqrnjgc7x8fs8a0"; + version = "6.0.7"; + sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a"; }; varnish62 = common { - version = "6.2.2"; - sha256 = "10s3qdvb95pkwp3wxndrigb892h0109yqr8dw4smrhfi0knhnfk5"; + version = "6.2.3"; + sha256 = "02b6pqh5j1d4n362n42q42bfjzjrngd6x49b13q7wzsy6igd1jsy"; }; varnish63 = common { - version = "6.3.1"; - sha256 = "0xa14pd68zpi5hxcax3arl14rcmh5d1cdwa8gv4l5f23mmynr8ni"; + version = "6.3.2"; + sha256 = "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8"; }; } diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix index c8186e1d02c2..47e64e9d911e 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -49,13 +49,13 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "chainpad-crypto-0.2.4" = { + "chainpad-crypto-0.2.5" = { name = "chainpad-crypto"; packageName = "chainpad-crypto"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.4.tgz"; - sha512 = "fWbVyeAv35vf/dkkQaefASlJcEfpEvfRI23Mtn+/TBBry7+LYNuJMXJiovVY35pfyw2+trKh1Py5Asg9vrmaVg=="; + url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.5.tgz"; + sha512 = "K9vRsAspuX+uU1goXPz0CawpLIaOHq+1JP3WfDLqaz67LbCX/MLIUt9aMcSeIJcwZ9uMpqnbMGRktyVPoz6MCA=="; }; }; "chainpad-server-4.0.9" = { @@ -337,22 +337,22 @@ let sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; }; }; - "mime-db-1.44.0" = { + "mime-db-1.45.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.44.0"; + version = "1.45.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; - sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; + sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; }; }; - "mime-types-2.1.27" = { + "mime-types-2.1.28" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.27"; + version = "2.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; - sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; + sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; }; }; "ms-2.0.0" = { @@ -562,12 +562,12 @@ let sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb"; }; }; - "tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2" = { + "tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2" = { name = "tweetnacl"; packageName = "tweetnacl"; version = "0.12.2"; src = fetchgit { - url = "git://github.com/dchest/tweetnacl-js.git"; + url = "https://github.com/dchest/tweetnacl-js.git"; rev = "8a21381d696acdc4e99c9f706f1ad23285795f79"; sha256 = "10f27b673944107995b3f6dcd65caecd705acdae9c37b7e79b810a8a72a40a31"; }; @@ -662,9 +662,9 @@ in sources."async-limiter-1.0.1" sources."body-parser-1.18.3" sources."bytes-3.0.0" - (sources."chainpad-crypto-0.2.4" // { + (sources."chainpad-crypto-0.2.5" // { dependencies = [ - sources."tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2" + sources."tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2" ]; }) sources."chainpad-server-4.0.9" @@ -698,8 +698,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."netflux-websocket-0.1.20" diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix index d0273cfe1f9a..76d5cf6a202f 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages-generated.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/servers/web-apps/galene/default.nix b/nixpkgs/pkgs/servers/web-apps/galene/default.nix new file mode 100644 index 000000000000..1c2e16f76fc6 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/galene/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "galene"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "jech"; + repo = "galene"; + rev = "galene-${version}"; + sha256 = "0hpgqqv8mp1d3sk7dk49m3yv0cv4afa0v3vdd4w8mdnx6pcqdgy1"; + }; + + vendorSha256 = "12b7andpzsgzmd56gg4gc5ilkxvjrpwpmwbdmygfzgkd5jncmcgp"; + + outputs = [ "out" "static" ]; + + postInstall = '' + mkdir $static + cp -r ./static $static + ''; + + meta = with lib; { + description = "Videoconferencing server that is easy to deploy, written in Go"; + homepage = "https://github.com/jech/galene"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ rgrunbla ]; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/morty/default.nix b/nixpkgs/pkgs/servers/web-apps/morty/default.nix index 6b17476623b9..04f1e14d5ccf 100644 --- a/nixpkgs/pkgs/servers/web-apps/morty/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/morty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "morty"; diff --git a/nixpkgs/pkgs/servers/web-apps/shiori/default.nix b/nixpkgs/pkgs/servers/web-apps/shiori/default.nix index 7100c70c0ed8..b39d7a00cedc 100644 --- a/nixpkgs/pkgs/servers/web-apps/shiori/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/shiori/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "shiori"; diff --git a/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix index c8722fbe8f75..44f207e3b86a 100644 --- a/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wallabag"; - version = "2.4.0"; + version = "2.4.1"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "11vda7aqq82kpr88v4hr7zg19zfq970n3z4qp25my8b1fvlgdjhi"; + sha256 = "1dqf5ia66kjsnfad2xkm8w6jgs976mf9x0dcd73jybqfgs4j09kj"; }; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix index af58cbf3f9bb..17f170c4af12 100644 --- a/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix +++ b/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -22,31 +22,31 @@ let sha512 = "g6MJ5tVszip1wAOq41yk8Z0WJqjfpu3hKaos/IaechYC4RqIn8bTanNR/EGD6oeOdJ9/fTPbQQX5/3ZQwSTXtQ=="; }; }; - "@formatjs/ecma402-abstract-1.5.0" = { + "@formatjs/ecma402-abstract-1.5.1" = { name = "_at_formatjs_slash_ecma402-abstract"; packageName = "@formatjs/ecma402-abstract"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.0.tgz"; - sha512 = "wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q=="; + url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.1.tgz"; + sha512 = "io9XhgIpEbc6jSdn4QVnJeFaUzy6gS5fGiIRCUJ7QKqCNp69JS8EJPW8gCtvwz+JQtx2SJvhaMJbzz3rGkTXBA=="; }; }; - "@formatjs/intl-datetimeformat-3.2.2" = { + "@formatjs/intl-datetimeformat-3.2.3" = { name = "_at_formatjs_slash_intl-datetimeformat"; packageName = "@formatjs/intl-datetimeformat"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.2.tgz"; - sha512 = "wIqe4dPzbYB6SrJWNPKBnXkPj1pR68qtGCzHkPo8JGRpWQcVpHh3Cigw1cQs2I9M1F9dOtFHQP6gi+xsb1kAiA=="; + url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.3.tgz"; + sha512 = "KnQUVuctlozQHULnBi+WLZDAGznFYviVU2HqgCYin2ZEz45IJ9dIZH9gqwsIgiLDgudptHfbj98I3JeKJhprcg=="; }; }; - "@formatjs/intl-displaynames-4.0.3" = { + "@formatjs/intl-displaynames-4.0.4" = { name = "_at_formatjs_slash_intl-displaynames"; packageName = "@formatjs/intl-displaynames"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.3.tgz"; - sha512 = "wNJZzIzlA88oyHZAFdAnLKV/srtIrU//md9SU2Bo0LKXKIukz/g5LmJlyhq6uF1oYoJzVvvTxoVXscBJmKcJmg=="; + url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.4.tgz"; + sha512 = "oNeLM0vZDFNZSqrz70XhxbMGtjfQ7T/UUcA9K4DvjWX6vmgCbpw5rdwEddhTotY3EmTyUJueK+14e2gIwfCbBA=="; }; }; "@formatjs/intl-getcanonicallocales-1.5.3" = { @@ -58,49 +58,49 @@ let sha512 = "QVBnSPZ32Y80wkXbf36hP9VbyklbOb8edppxFcgO9Lbd47zagllw65Y81QOHEn/j11JcTn2OhW0vea95LHvQmA=="; }; }; - "@formatjs/intl-listformat-5.0.3" = { + "@formatjs/intl-listformat-5.0.4" = { name = "_at_formatjs_slash_intl-listformat"; packageName = "@formatjs/intl-listformat"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.3.tgz"; - sha512 = "IaW428RI5RpwXr/+doYT1H4ZHL3mYLU3nzR7ZaTkk5dBi1PKKGk1sDwymEzVxyrELT0WHhqhqLKdLjXAqxCz9g=="; + url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.4.tgz"; + sha512 = "0DQ2NF1PmO3+mvZp4V/SPNk7kUaLDcZR3eWbN8cGvSafWOrcv1iEcTXOd8ow8u9OA0gBTWwgPDcQFn7W0mU8kw=="; }; }; - "@formatjs/intl-locale-2.4.12" = { + "@formatjs/intl-locale-2.4.13" = { name = "_at_formatjs_slash_intl-locale"; packageName = "@formatjs/intl-locale"; - version = "2.4.12"; + version = "2.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.12.tgz"; - sha512 = "40khHPYtZRdqjQs1fItNj94eMoiGwJJOAKN//9qUhAsHrXvGxseFVBSg+mItV0Orwb3wqItUj3hu6evrouhstw=="; + url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.13.tgz"; + sha512 = "hrglCuFjRpMrutmuL+Ck84KBxeHhouk7d5B/G9kqHL4zmrW6AsBwU+0KeyvareiY3MWzYZhQj1Nm3JEGulQRUQ=="; }; }; - "@formatjs/intl-numberformat-6.1.2" = { + "@formatjs/intl-numberformat-6.1.3" = { name = "_at_formatjs_slash_intl-numberformat"; packageName = "@formatjs/intl-numberformat"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.2.tgz"; - sha512 = "td0XggQKu8dlPUlP2f322NW0WY58zWLlOoiUVh4eolcWqOs4maKL8tjmFBPXSQt55JiKy14ZrDw1dljyNHLB0g=="; + url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.3.tgz"; + sha512 = "bLVEt4G7IfacLpiBKg2VfHKnPrzWOWX/jxEi+OIUk6M2bEfYj8Vi1nYGb8+D7ZHCbuj/L7+lnlL4bItPTXT8JA=="; }; }; - "@formatjs/intl-pluralrules-4.0.2" = { + "@formatjs/intl-pluralrules-4.0.5" = { name = "_at_formatjs_slash_intl-pluralrules"; packageName = "@formatjs/intl-pluralrules"; - version = "4.0.2"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.2.tgz"; - sha512 = "Oh4zmA3odkXBCPAGVhZuAnP3IfCPy8DyizA9s4QkYptVICX38RbUvXwzr2a9DVpKNiZ7i2TnV4Qkeo06N/6b7Q=="; + url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.5.tgz"; + sha512 = "mWsCpc/SZ6rk0Qb3zpv5bUz6uJysW6qap0qJJz6d0MJpszN3GNsk8CbP5q62oUaWvBmHoeXBvAG9VVEu1TUexw=="; }; }; - "@formatjs/intl-relativetimeformat-8.0.2" = { + "@formatjs/intl-relativetimeformat-8.0.3" = { name = "_at_formatjs_slash_intl-relativetimeformat"; packageName = "@formatjs/intl-relativetimeformat"; - version = "8.0.2"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.2.tgz"; - sha512 = "RBO+4zxJuIYtYGfxv1GuZJQDtrA+fZlgcHjSVoo5HwznWdfg5vVTe8qdbSDbdyFobbB2OYqwj4mcRO2M5P1oNw=="; + url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.3.tgz"; + sha512 = "OIobPtY5vtwe5IM0B0J3KmewYB/NTcbgiW9yRdWzMA1TeFSd8LfuficICYuzUZt25Kh/eIw4g37ArhS1WH/6Iw=="; }; }; "@juggle/resize-observer-3.2.0" = { @@ -139,13 +139,13 @@ let sha512 = "zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg=="; }; }; - "@types/node-14.14.20" = { + "@types/node-14.14.22" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.20"; + version = "14.14.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz"; - sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz"; + sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw=="; }; }; "@webcomponents/template-1.4.4" = { @@ -265,13 +265,13 @@ let sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; }; }; - "cldr-core-38.0.0" = { + "cldr-core-38.1.0" = { name = "cldr-core"; packageName = "cldr-core"; - version = "38.0.0"; + version = "38.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cldr-core/-/cldr-core-38.0.0.tgz"; - sha512 = "WkjA4zo5rLT/BWTZAxHJ0lJXwI33gCYucEz1+CpoI8Wu+rr5IrC57wyNXyrNNMdxfDE5RsWi/JCQ9qnG8sHTiw=="; + url = "https://registry.npmjs.org/cldr-core/-/cldr-core-38.1.0.tgz"; + sha512 = "Da9xKjDp4qGGIX0VDsBqTan09iR5nuYD2a/KkfEaUyqKhu6wFVNRiCpPDXeRbpVwPBY6PgemV8WiHatMhcpy4A=="; }; }; "cliui-2.1.0" = { @@ -427,13 +427,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "engine.io-4.0.6" = { + "engine.io-4.1.1" = { name = "engine.io"; packageName = "engine.io"; - version = "4.0.6"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.6.tgz"; - sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.1.tgz"; + sha512 = "t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w=="; }; }; "engine.io-parser-4.0.2" = { @@ -886,13 +886,13 @@ let sha512 = "JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g=="; }; }; - "polyfill-library-3.101.0" = { + "polyfill-library-3.103.0" = { name = "polyfill-library"; packageName = "polyfill-library"; - version = "3.101.0"; + version = "3.103.0"; src = fetchurl { - url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.101.0.tgz"; - sha512 = "o/ln6GpYGf1Tn8wJiTkoZ3vEtf6oWrcqM9YC61CW4KaHawVm36R/wN+6ZAv7JoAsPFm0J7PsroukpJVlVxPRjQ=="; + url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.103.0.tgz"; + sha512 = "z6DMbqDGO87IeG/sjN/PGPgGLzhKftVj6OeRujxgQn+Kz7x+E8uzFvdB3X8dqoE4xaY6aX3ar0UzRxRlYPH9yg=="; }; }; "process-nextick-args-2.0.1" = { @@ -1012,31 +1012,31 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; - "socket.io-3.0.5" = { + "socket.io-3.1.0" = { name = "socket.io"; packageName = "socket.io"; - version = "3.0.5"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz"; - sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz"; + sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww=="; }; }; - "socket.io-adapter-2.0.3" = { + "socket.io-adapter-2.1.0" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz"; - sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ=="; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz"; + sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg=="; }; }; - "socket.io-parser-4.0.3" = { + "socket.io-parser-4.0.4" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz"; - sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz"; + sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g=="; }; }; "source-map-0.5.7" = { @@ -1147,13 +1147,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.12.4" = { + "uglify-js-3.12.6" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.4"; + version = "3.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; - sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz"; + sha512 = "aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -1315,20 +1315,20 @@ in dependencies = [ sources."@financial-times/polyfill-useragent-normaliser-1.9.0" sources."@financial-times/useragent_parser-1.5.1" - sources."@formatjs/ecma402-abstract-1.5.0" - sources."@formatjs/intl-datetimeformat-3.2.2" - sources."@formatjs/intl-displaynames-4.0.3" + sources."@formatjs/ecma402-abstract-1.5.1" + sources."@formatjs/intl-datetimeformat-3.2.3" + sources."@formatjs/intl-displaynames-4.0.4" sources."@formatjs/intl-getcanonicallocales-1.5.3" - sources."@formatjs/intl-listformat-5.0.3" - sources."@formatjs/intl-locale-2.4.12" - sources."@formatjs/intl-numberformat-6.1.2" - sources."@formatjs/intl-pluralrules-4.0.2" - sources."@formatjs/intl-relativetimeformat-8.0.2" + sources."@formatjs/intl-listformat-5.0.4" + sources."@formatjs/intl-locale-2.4.13" + sources."@formatjs/intl-numberformat-6.1.3" + sources."@formatjs/intl-pluralrules-4.0.5" + sources."@formatjs/intl-relativetimeformat-8.0.3" sources."@juggle/resize-observer-3.2.0" sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.20" + sources."@types/node-14.14.22" sources."@webcomponents/template-1.4.4" sources."Base64-1.1.0" sources."abort-controller-3.0.0" @@ -1342,7 +1342,7 @@ in sources."brace-expansion-1.1.11" sources."camelcase-1.2.1" sources."center-align-0.1.3" - sources."cldr-core-38.0.0" + sources."cldr-core-38.1.0" (sources."cliui-2.1.0" // { dependencies = [ sources."wordwrap-0.0.2" @@ -1362,7 +1362,7 @@ in sources."diff-4.0.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-4.0.6" // { + (sources."engine.io-4.1.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -1415,7 +1415,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."picturefill-3.0.3" - (sources."polyfill-library-3.101.0" // { + (sources."polyfill-library-3.103.0" // { dependencies = [ sources."source-map-0.5.7" sources."uglify-js-2.8.29" @@ -1443,14 +1443,14 @@ in }) sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" - (sources."socket.io-3.0.5" // { + (sources."socket.io-3.1.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.0.3" - (sources."socket.io-parser-4.0.3" // { + sources."socket.io-adapter-2.1.0" + (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -1466,7 +1466,7 @@ in sources."toidentifier-1.0.0" sources."toposort-2.0.2" sources."tslib-2.1.0" - sources."uglify-js-3.12.4" + sources."uglify-js-3.12.6" sources."uglify-to-browserify-1.0.2" sources."unorm-1.6.0" sources."usertiming-0.1.8" diff --git a/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.nix b/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.nix index d0273cfe1f9a..76d5cf6a202f 100644 --- a/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.nix +++ b/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages-generated.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/servers/webmetro/default.nix b/nixpkgs/pkgs/servers/webmetro/default.nix index 316e3a524972..6bda15a93e00 100644 --- a/nixpkgs/pkgs/servers/webmetro/default.nix +++ b/nixpkgs/pkgs/servers/webmetro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "webmetro"; diff --git a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index ddd05150806c..54082ce81261 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -1,5 +1,5 @@ { abiCompat ? null, - stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, + lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, automake, autoconf, gettext, libiconv, libtool, intltool, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, @@ -9,7 +9,7 @@ }: let - inherit (stdenv) lib isDarwin; + inherit (stdenv) isDarwin; inherit (lib) overrideDerivation; malloc0ReturnsNullCrossFlag = lib.optional diff --git a/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix b/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix index 7fe0e5a9f97f..e3d2698e8303 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config +{ lib, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config , epoxy, libxslt, libunwind, makeWrapper, egl-wayland , defaultFontPath ? "" }: diff --git a/nixpkgs/pkgs/servers/xandikos/default.nix b/nixpkgs/pkgs/servers/xandikos/default.nix index b8eb29d87b2d..5241139cfa39 100644 --- a/nixpkgs/pkgs/servers/xandikos/default.nix +++ b/nixpkgs/pkgs/servers/xandikos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3Packages , installShellFiles diff --git a/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix b/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix index 2fa1c913e277..5336df42cbe9 100644 --- a/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix +++ b/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix @@ -24,12 +24,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ]; in stdenv.mkDerivation rec { - version = "20.03"; + version = "20.12"; pname = "ejabberd"; src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz"; - sha256 = "0i013l9cygmgainfid298n6llhs3mblfklry3jw2a6irvhffym0s"; + sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ="; }; nativeBuildInputs = [ fakegit ]; @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0xwgi9hy6y0m8mwznl6px98kdmkcxg98k62zgqbaqd4paks5zwqa"; + outputHash = "sha256-0/hBgA+9rsDOBcvbROSpc5Xnw4JkYpuLCl2V+lJnieY="; }; configureFlags = @@ -115,7 +115,7 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; homepage = "https://www.ejabberd.im"; platforms = platforms.linux; - maintainers = with maintainers; [ sander abbradar ajs124 ]; + maintainers = with maintainers; [ sander abbradar ]; broken = withElixir; }; } diff --git a/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix b/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix index 550e93fb5aa3..85465fd7d145 100644 --- a/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix +++ b/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: +{ pkgs, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: let package = (import ./node.nix { inherit pkgs system; }).package; in diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-env.nix b/nixpkgs/pkgs/servers/zigbee2mqtt/node-env.nix index e1abf5304935..9af216ad1dfe 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-env.nix +++ b/nixpkgs/pkgs/servers/zigbee2mqtt/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -388,16 +388,17 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -443,6 +444,11 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a development shell @@ -470,8 +476,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -491,7 +497,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -500,13 +506,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -516,7 +522,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -529,14 +535,14 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/nixpkgs/pkgs/servers/zigbee2mqtt/node.nix b/nixpkgs/pkgs/servers/zigbee2mqtt/node.nix index 2d0fadffa978..0769168a78fa 100644 --- a/nixpkgs/pkgs/servers/zigbee2mqtt/node.nix +++ b/nixpkgs/pkgs/servers/zigbee2mqtt/node.nix @@ -5,8 +5,8 @@ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let - nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + nodeEnv = import ./node-env.nix { + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/nixpkgs/pkgs/shells/elvish/default.nix b/nixpkgs/pkgs/shells/elvish/default.nix index 938029e9af97..de25503e4aa0 100644 --- a/nixpkgs/pkgs/shells/elvish/default.nix +++ b/nixpkgs/pkgs/shells/elvish/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "elvish"; - version = "0.14.1"; + version = "0.15.0"; excludedPackages = [ "website" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "elves"; repo = pname; rev = "v${version}"; - sha256 = "05wp3cx4s2cjf60yncdpmycs5h4z1dlin56dmljmfwz4z099079b"; + sha256 = "1jksdpf86miz1dv3vrmvpvz4k1c2m23dway6a7b1cypg03c68a75"; }; - vendorSha256 = "1f971n17h9bc0qcgs9ipiaw0x9807mz761fqm605br4ch1kp0897"; + vendorSha256 = "124m9680pl7wrh7ld7v39dfl86r6vih1pjk3bmbihy0fjgxnnq0b"; doCheck = false; diff --git a/nixpkgs/pkgs/shells/fish/babelfish.nix b/nixpkgs/pkgs/shells/fish/babelfish.nix index c23e0b1ca923..fb938b8f37de 100644 --- a/nixpkgs/pkgs/shells/fish/babelfish.nix +++ b/nixpkgs/pkgs/shells/fish/babelfish.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "babelfish"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bouk"; repo = "babelfish"; rev = "v${version}"; - sha256 = "1sr6y79igyfc9ia33nyrjjm4my1jrpcw27iks37kygh93npsb3r1"; + sha256 = "0b1knj9llwzwnl4w3d6akvlc57dp0fszjkq98w8wybcvkbpd3ip1"; }; - vendorSha256 = "0xjy50wciw329kq1nkd7hhaipcp4fy28hhk6cdq21qwid6g21gag"; + vendorSha256 = "0kspqwbgiqfkfj9a9pdwzc0jdi9p35abqqqjhcpvqwdxw378w5lz"; meta = with lib; { description = "Translate bash scripts to fish"; diff --git a/nixpkgs/pkgs/shells/fish/default.nix b/nixpkgs/pkgs/shells/fish/default.nix index a39a2fc740bd..7e38d9dec3a1 100644 --- a/nixpkgs/pkgs/shells/fish/default.nix +++ b/nixpkgs/pkgs/shells/fish/default.nix @@ -16,11 +16,21 @@ , ncurses , python3 , cmake +, fishPlugins , runCommand , writeText , nixosTests , useOperatingSystemEtc ? true + # An optional string containing Fish code that initializes the environment. + # This is run at the very beginning of initialization. If it sets $NIX_PROFILES + # then Fish will use that to configure its function, completion, and conf.d paths. + # For example: + # fishEnvPreInit = "source /etc/fish/my-env-preinit.fish"; + # It can also be a function that takes one argument, which is a function that + # takes a path to a bash file and converts it to fish. For example: + # fishEnvPreInit = source: source "${nix}/etc/profile.d/nix-daemon.sh"; +, fishEnvPreInit ? null }: let etcConfigAppendix = writeText "config.fish.appendix" '' @@ -62,8 +72,12 @@ let # 2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH builtin status --is-login or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED" + ${if fishEnvPreInit != null then '' + and begin + ${lib.removeSuffix "\n" (if lib.isFunction fishEnvPreInit then fishEnvPreInit sourceWithFenv else fishEnvPreInit)} + end'' else '' and test -f /etc/fish/nixos-env-preinit.fish - and source /etc/fish/nixos-env-preinit.fish + and source /etc/fish/nixos-env-preinit.fish''} and set -gx __fish_nixos_env_preinit_sourced 1 test -n "$NIX_PROFILES" @@ -94,6 +108,22 @@ let end ''; + # This is wrapped in begin/end in case the user wants to apply redirections. + # This does mean the basic usage of sourcing a single file will produce + # `begin; begin; …; end; end` but that's ok. + sourceWithFenv = path: '' + begin # fenv + # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently + # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish + set fish_function_path ${fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions + fenv source ${lib.escapeShellArg path} + set -l fenv_status $status + # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish + set -e fish_function_path + test $fenv_status -eq 0 + end # fenv + ''; + fish = stdenv.mkDerivation rec { pname = "fish"; version = "3.1.2"; diff --git a/nixpkgs/pkgs/shells/nushell/default.nix b/nixpkgs/pkgs/shells/nushell/default.nix index 74843dea6cc9..a0a070b92660 100644 --- a/nixpkgs/pkgs/shells/nushell/default.nix +++ b/nixpkgs/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0wsl57i3cd9whqvgjdnbz05230mkn2174gqld7mzn9iiym1rkcm4"; + sha256 = "sha256-v0u04xY4iEbOTeaPKmbHImNTzEgdqf1wZWV0hKOV6Vg="; }; - cargoSha256 = "1ifvfwmrl97skjwp1qwrj863npsxcgfqm4a81cvw9bqhbylbjc77"; + cargoSha256 = "sha256-0Ncjy6vZqiMNB+aRzf255tsIdrnpG0a4Xoid+mAAvUk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/nixpkgs/pkgs/shells/oh/default.nix b/nixpkgs/pkgs/shells/oh/default.nix index 3ea41d7f4728..33e71358b4d5 100644 --- a/nixpkgs/pkgs/shells/oh/default.nix +++ b/nixpkgs/pkgs/shells/oh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit, lib }: +{ buildGoPackage, fetchgit, lib }: buildGoPackage rec { pname = "oh"; diff --git a/nixpkgs/pkgs/shells/oil/default.nix b/nixpkgs/pkgs/shells/oil/default.nix index 0896b8a50462..0c508d0e29df 100644 --- a/nixpkgs/pkgs/shells/oil/default.nix +++ b/nixpkgs/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.5"; + version = "0.8.7"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1z0p08q4808h78bp6nwdszpfavhr4y7n313bp0gg5qdbssnciq1v"; + sha256 = "sha256-KcXu1u/MvvbCLb5a7D09NvfJPaeo0c8Z/Czuk7XR23M="; }; postPatch = '' diff --git a/nixpkgs/pkgs/shells/pash/default.nix b/nixpkgs/pkgs/shells/pash/default.nix index 8b2ac3629598..c7c6e4e5a7d4 100644 --- a/nixpkgs/pkgs/shells/pash/default.nix +++ b/nixpkgs/pkgs/shells/pash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildDotnetPackage }: +{ lib, fetchFromGitHub, buildDotnetPackage }: buildDotnetPackage { baseName = "pash"; diff --git a/nixpkgs/pkgs/shells/tcsh/default.nix b/nixpkgs/pkgs/shells/tcsh/default.nix index 8f4a1664467b..4d6c9556501c 100644 --- a/nixpkgs/pkgs/shells/tcsh/default.nix +++ b/nixpkgs/pkgs/shells/tcsh/default.nix @@ -9,8 +9,11 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" + "ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz" ]; sha256 = "sha256-viz9ZT0qDH9QbS3RTBIyS6dJvUhAN75t9Eo5c/UiYrc="; }; diff --git a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix index 1e6acca9cb99..4d5331543fbf 100644 --- a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.17.4"; + version = "0.18.0"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "09c3f7s2r0cb8g9kgh3xhc8dhr1656g1q9s9i3s5imvknwqii6as"; + sha256 = "sha256-5QwP+dMOm6UBbQ1X1OcHawHSi3DJIciny2sV7biE18c="; }; nativeBuildInputs = [ txt2tags ]; diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index d481ae99b891..e957457c8c3b 100644 --- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-01-20"; + version = "2021-02-09"; pname = "oh-my-zsh"; - rev = "cd4918c2cdb6613cf77ea8f6f29e1930bd7f4bf5"; + rev = "f21e646ce6c09198f7f625c597f08af49551fdb0"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1b8zipghawa2rl3l6vylmhbwcwz9yq52xmbfpkz0bxhifisq74kn"; + sha256 = "14m932zbzdbwyfqkn882jarpw4dbmxkfna5pakd4n5b123drjz46"; }; installPhase = '' diff --git a/nixpkgs/pkgs/shells/zsh/zplugin/default.nix b/nixpkgs/pkgs/shells/zsh/zinit/default.nix index c148f60b2eef..d59f50ce3b9c 100644 --- a/nixpkgs/pkgs/shells/zsh/zplugin/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zinit/default.nix @@ -1,12 +1,13 @@ { stdenvNoCC, lib, fetchFromGitHub, installShellFiles }: + stdenvNoCC.mkDerivation rec { - pname = "zplugin"; - version = "2.3"; + pname = "zinit"; + version = "3.7"; src = fetchFromGitHub { owner = "zdharma"; repo = pname; rev = "v${version}"; - sha256 = "0qqv5p19s8jb06d6h55dm4acji9x2rpxb2ni3h7fb0q43iz6y85w"; + hash = "sha256-B+cTGz+U8MR22l6xXdRAAjDr+ulCk+CJ9GllFMK0axE="; }; # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git dontBuild = true; @@ -18,11 +19,12 @@ stdenvNoCC.mkDerivation rec { # Zplugin's source files install -dm0755 "$outdir" - install -m0644 zplugin{,-side,-install,-autoload}.zsh "$outdir" + # Installing also backward compatibility layer + install -m0644 z{plugin,init}{,-side,-install,-autoload}.zsh "$outdir" install -m0755 git-process-output.zsh "$outdir" # Zplugin autocompletion - installShellCompletion --zsh _zplugin + installShellCompletion --zsh _zinit #TODO:Zplugin-module files # find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \; @@ -32,7 +34,7 @@ stdenvNoCC.mkDerivation rec { #TODO:doc output meta = with lib; { - homepage = "https://github.com/zdharma/zplugin"; + homepage = "https://github.com/zdharma/zinit"; description = "Flexible zsh plugin manager"; license = licenses.mit; maintainers = with maintainers; [ pasqui23 ]; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix new file mode 100644 index 000000000000..0cc1535e53ae --- /dev/null +++ b/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "zsh-autopair"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "hlissner"; + repo = "zsh-autopair"; + rev = "v${version}"; + sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1"; + }; + + installPhase = '' + install -D autopair.zsh $out/share/zsh/${pname}/autopair.zsh + ''; + + meta = with lib; { + homepage = "https://github.com/hlissner/zsh-autopair"; + description = "A plugin that auto-closes, deletes and skips over matching delimiters in zsh intelligently"; + license = licenses.mit; + maintainers = with maintainers; [ _0qq ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix index c0c56570b46d..7fb2d7861937 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -32,7 +32,7 @@ }: haskellPackages.callPackage - ({ mkDerivation, base, HUnit, parsec, process, QuickCheck, stdenv }: + ({ mkDerivation, base, HUnit, parsec, process, QuickCheck }: mkDerivation rec { pname = "zsh-git-prompt"; version = "0.4z"; # While we await a real 0.5 release. diff --git a/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix index 9ff78975b75e..d3e2c6534aa2 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix @@ -12,26 +12,25 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildPhase = '' - sed -i '/\''${ZDOTDIR:\-\$HOME}\/.zpreztorc" ]]/i\ - if [[ -s "/etc/zpreztorc" ]]; then\ - source "/etc/zpreztorc"\ - fi' init.zsh - sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh - for i in runcoms/*; do - sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i - done + postPatch = '' + # make zshrc aware of where zsh-prezto is installed + sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/share/zsh-prezto/|g" runcoms/zshrc ''; installPhase = '' - mkdir -p $out - cp ./* $out/ -R + mkdir -p $out/share/zsh-prezto + cp -R ./ $out/share/zsh-prezto ''; passthru.updateScript = unstableGitUpdater {}; meta = with lib; { - description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes"; + description = "The configuration framework for Zsh"; + longDescription = '' + Prezto is the configuration framework for Zsh; it enriches + the command line interface environment with sane defaults, + aliases, functions, auto completion, and prompt themes. + ''; homepage = "https://github.com/sorin-ionescu/prezto"; license = licenses.mit; maintainers = with maintainers; [ holymonson ]; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix new file mode 100644 index 000000000000..b4d407a70bc9 --- /dev/null +++ b/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "zsh-system-clipboard"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "kutsan"; + repo = "zsh-system-clipboard"; + rev = "v${version}"; + sha256 = "09lqav1mz5zajklr3xa0iaivhpykv3azkjb7yj9wyp0hq3vymp8i"; + }; + + installPhase = '' + install -D zsh-system-clipboard.zsh $out/share/zsh/${pname}/zsh-system-clipboard.zsh + ''; + + meta = with lib; { + homepage = "https://github.com/kutsan/zsh-system-clipboard"; + description = "A plugin that adds key bindings support for ZLE (Zsh Line Editor) clipboard operations for vi emulation keymaps"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ _0qq ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/stdenv/adapters.nix b/nixpkgs/pkgs/stdenv/adapters.nix index 03ae3cb8f0e8..d8f73d5a7e3e 100644 --- a/nixpkgs/pkgs/stdenv/adapters.nix +++ b/nixpkgs/pkgs/stdenv/adapters.nix @@ -110,7 +110,7 @@ rec { */ replaceMaintainersField = stdenv: pkgs: maintainers: stdenv // { mkDerivation = args: - stdenv.lib.recursiveUpdate + pkgs.lib.recursiveUpdate (stdenv.mkDerivation args) { meta.maintainers = maintainers; }; }; diff --git a/nixpkgs/pkgs/stdenv/default.nix b/nixpkgs/pkgs/stdenv/default.nix index b0db1be5f446..d9eadf26804c 100644 --- a/nixpkgs/pkgs/stdenv/default.nix +++ b/nixpkgs/pkgs/stdenv/default.nix @@ -54,6 +54,7 @@ in aarch64-linux = stagesLinux; mipsel-linux = stagesLinux; powerpc-linux = /* stagesLinux */ stagesNative; + powerpc64-linux = stagesLinux; powerpc64le-linux = stagesLinux; x86_64-darwin = stagesDarwin; x86_64-solaris = stagesNix; diff --git a/nixpkgs/pkgs/stdenv/freebsd/default.nix b/nixpkgs/pkgs/stdenv/freebsd/default.nix index 38b168c0e72d..5aadfd81a20f 100644 --- a/nixpkgs/pkgs/stdenv/freebsd/default.nix +++ b/nixpkgs/pkgs/stdenv/freebsd/default.nix @@ -1,11 +1,170 @@ { lib -, localSystem, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays, crossOverlays ? [] }: assert crossSystem == localSystem; -let inherit (localSystem) system; in - - +let inherit (localSystem) system; + fetchURL = import <nix/fetchurl.nix>; + trivialBuilder = (import ./trivial-builder.nix); + make = trivialBuilder rec { + inherit (localSystem) system; + name = "make"; + ver = "4.3"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + bash = trivialBuilder rec { + inherit (localSystem) system; + name = "bash"; + ver = "4.4.18"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "08vz660768mnnax7n8d4d85jxafwdmsxsi7fh0hzvmafbvn9wkb0"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + coreutils = trivialBuilder rec { + inherit (localSystem) system; + name = "coreutils"; + ver = "8.31"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-gmp" + "--without-libpth-prefix" + ]; + }; + findutils = trivialBuilder rec { + inherit (localSystem) system; + name = "findutils"; + ver = "4.7.0"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-gmp" + "--without-libpth-prefix" + ]; + }; + diffutils = trivialBuilder rec { + inherit (localSystem) system; + name = "diffutils"; + ver = "3.7"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-libsigsegv-prefix" + ]; + }; + grep = trivialBuilder rec { + inherit (localSystem) system; + name = "grep"; + ver = "3.4"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1yy33kiwrxrwj2nxa4fg15bvmwyghqbs8qwkdvy5phm784f7brjq"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--disable-perl-regexp" + "--without-libsegsegv-prefix" + ]; + }; + patch = trivialBuilder rec { + inherit (localSystem) system; + name = "patch"; + ver = "2.7.6"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"; + }; + gawk = trivialBuilder rec { + inherit (localSystem) system; + name = "gawk"; + ver = "5.0.1"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf"; + configureArgs = [ "--disable-nls" + "--disable-mpfr" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-libsegsegv-prefix" + ]; + }; + cpio = trivialBuilder rec { + inherit (localSystem) system; + name = "cpio"; + ver = "2.13"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "126vyg4a8wcdwh6npgvxy6gq433bzgz3ph37hmjpycc4r7cp0x78"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + sed = trivialBuilder rec { + inherit (localSystem) system; + name = "sed"; + ver = "4.8"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "0cznxw73fzv1n3nj2zsq6nf73rvsbxndp444xkpahdqvlzz0r6zp"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + cacert = fetchURL rec { + url = "https://curl.haxx.se/ca/cacert-2020-01-01.pem"; + sha256 = "07q808n307gzaga93abpf6an7c3rd35p18psdc1dd83lspgp1xxd"; + executable = false; + }; + curl = trivialBuilder rec { + inherit (localSystem) system; + name = "curl"; + ver = "7.68.0"; + url = "https://curl.haxx.se/download/${name}-${ver}.tar.xz"; + sha256 = "0nh3j90w6b97wqcgxjfq55qhkz9s38955fbhwzv2fsi7483j895p"; + configureArgs = [ "--disable-nls" + "--disable-ares" + "--disable-debug" + "--disable-ldap" + "--disable-ldaps" + "--disable-rtsp" + "--disable-dict" + "--disable-telnet" + "--disable-tftp" + "--disable-pop3" + "--disable-imap" + "--disable-smb" + "--disable-smtp" + "--disable-gopher" + "--disable-manual" + "--disable-verbose" + "--disable-sspi" + "--disable-tls-srp" + "--disable-unix-sockets" + "--without-brotli" + "--without-gnutls" + "--without-mbedtls" + "--without-wolfssl" + "--without-bearssl" + "--without-libidn2" + "--without-librtmp" + "--without-nghttp2" + "--with-ssl=/usr" + "--with-ca-bundle=${cacert}" + ]; + }; + bashExe = "${bash}/bin/bash"; +in [ ({}: { @@ -13,11 +172,14 @@ let inherit (localSystem) system; in bootstrapTools = derivation { inherit system; + inherit make bash coreutils findutils + diffutils grep patch gawk cpio sed + curl; name = "trivial-bootstrap-tools"; - builder = "/usr/local/bin/bash"; + builder = bashExe; args = [ ./trivial-bootstrap.sh ]; - + buildInputs = [ make ]; mkdir = "/bin/mkdir"; ln = "/bin/ln"; }; @@ -52,6 +214,8 @@ let inherit (localSystem) system; in (prevStage: { __raw = true; + inherit (prevStage) bootstrapTools; + stdenv = import ../generic { name = "stdenv-freebsd-boot-0"; inherit config; @@ -66,7 +230,7 @@ let inherit (localSystem) system; in (prevStage: { inherit config overlays; - stdenv = import ../generic { + stdenv = import ../generic rec { name = "stdenv-freebsd-boot-3"; inherit config; @@ -75,16 +239,30 @@ let inherit (localSystem) system; in initialPath shell fetchurlBoot; cc = import ../../build-support/cc-wrapper { + inherit lib; nativeTools = true; nativePrefix = "/usr"; nativeLibc = true; stdenvNoCC = prevStage.stdenv; + buildPackages = { + inherit (prevStage) stdenv; + }; cc = { name = "clang-9.9.9"; cc = "/usr"; - outPath = "/usr"; + outPath = prevStage.bootstrapTools; }; isClang = true; + bintools = import ../../build-support/bintools-wrapper { + inherit lib; + stdenvNoCC = prevStage.stdenv; + nativeTools = true; + nativeLibc = true; + propagateDoc = false; + nativePrefix = "/usr"; + bintools = { name = "${name}-binutils"; + outPath = prevStage.bootstrapTools; }; + }; }; preHook = "export NIX_NO_SELF_RPATH=1"; diff --git a/nixpkgs/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/nixpkgs/pkgs/stdenv/freebsd/trivial-bootstrap.sh index fbff4575e5a4..34b4dbabc2bb 100644 --- a/nixpkgs/pkgs/stdenv/freebsd/trivial-bootstrap.sh +++ b/nixpkgs/pkgs/stdenv/freebsd/trivial-bootstrap.sh @@ -3,9 +3,9 @@ set -o nounset set -o pipefail echo Building the trivial bootstrap environment... -echo -echo Needed FreeBSD packages: -echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils +#echo +#echo Needed FreeBSD packages: +#echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils $mkdir -p $out/bin @@ -28,14 +28,36 @@ ln () { fi } -ln /usr/local/bin/bash -ln /bin/sh - -ln /usr/local/bin/gmake make +ln $bash/bin/bash +ln $make/bin/make -ln /usr/local/bin/lbzip2 +ln /bin/sh -ln /usr/local/bin/gdiff diff +for i in b2sum base32 base64 basename basenc cat chcon chgrp chmod \ + chown chroot cksum comm cp csplit cut date dd df dir dircolors \ + dirname du echo env expand expr factor false fmt fold install \ + groups head hostid id join kill link ln logname ls md5sum mkdir \ + mkfifo mknod mktemp mv nice nl nohup nproc numfmt od paste pathchk \ + pinky pr printenv printf ptx pwd readlink realpath rm rmdir runcon \ + seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf \ + sleep sort split stat stdbuf stty sum sync tac tee test timeout \ + touch tr true truncate tsort tty uname unexpand uniq unlink uptime \ + users vdir wc who whoami yes +do + ln "$coreutils/bin/$i" "$i" +done + +for i in find xargs; do + ln "$findutils/bin/$i" "$i" +done + +for i in diff diff3 sdiff; do + ln "$diffutils/bin/$i" "$i" +done + +for i in grep egrep fgrep; do + ln "$grep/bin/$i" "$i" +done ln /usr/bin/locale @@ -45,160 +67,52 @@ ln /usr/bin/hexdump # for bitcoin ln /usr/bin/bzip2 ln /usr/bin/bunzip2 -ln /usr/bin/bzcat ln /usr/bin/bzip2recover ln /usr/bin/xz ln /usr/bin/unxz -ln /usr/bin/xzcat ln /usr/bin/lzma ln /usr/bin/unlzma -ln /usr/bin/lzcat - -ln /usr/local/bin/gcp cp -ln /usr/local/bin/gdd dd -ln /usr/local/bin/gmv mv -ln /usr/local/bin/grm rm -ln /usr/local/bin/gls ls -ln /bin/ps ps -ln /usr/local/bin/gcat cat -ln /usr/local/bin/gecho echo -ln /usr/local/bin/gexpr expr -ln /usr/local/bin/gtest test -ln /usr/local/bin/gdate date -ln /usr/local/bin/gchmod chmod -ln /usr/local/bin/grmdir rmdir -ln /usr/local/bin/gsleep sleep -ln /bin/hostname hostname - -ln /usr/local/bin/gid id -ln /usr/local/bin/god od -ln /usr/local/bin/gtr tr -ln /usr/local/bin/gwc wc -ln /usr/local/bin/gcut cut -ln /usr/bin/cmp cmp -ln /usr/local/bin/gsed sed -ln /usr/local/bin/gtar tar -ln /usr/local/bin/xar xar -ln /usr/local/bin/gawk awk -ln /usr/local/bin/genv env -ln /usr/local/bin/gtee tee -ln /usr/local/bin/gcomm comm -ln /usr/local/bin/gcpio cpio -ln /usr/local/bin/curl curl -ln /usr/local/bin/gfind find -ln /usr/local/bin/grep grep # other grep is in /usr/bin + +ln /bin/ps +ln /bin/hostname +ln /usr/bin/cmp +ln $sed/bin/sed +ln /usr/bin/tar tar +ln $gawk/bin/gawk +ln $gawk/bin/gawk awk +ln $cpio/bin/cpio +ln $curl/bin/curl curl ln /usr/bin/gzip ln /usr/bin/gunzip -ln /usr/bin/zcat -ln /usr/local/bin/ghead head ln /usr/bin/tail tail # note that we are not using gtail!!! -ln /usr/local/bin/guniq uniq ln /usr/bin/less less -ln /usr/local/bin/gtrue true -# ln /usr/bin/diff diff # we are using gdiff (see above) -ln /usr/local/bin/egrep egrep -ln /usr/local/bin/fgrep fgrep -ln /usr/local/bin/gpatch patch -ln /usr/local/bin/guname uname -ln /usr/local/bin/gtouch touch -ln /usr/local/bin/gsplit split -ln /usr/local/bin/gxargs xargs +ln $patch/bin/patch patch ln /usr/bin/which which -ln /usr/local/bin/ginstall install -ln /usr/local/bin/gbasename basename -ln /usr/local/bin/gdirname dirname -ln /usr/local/bin/greadlink readlink - -ln /usr/local/bin/gln ln -ln /usr/local/bin/gyes yes -ln /usr/local/bin/gwhoami whoami -ln /usr/local/bin/gvdir vdir -ln /usr/local/bin/gusers users -ln /usr/local/bin/guptime uptime -ln /usr/local/bin/gunlink unlink -ln /usr/local/bin/gtty tty -ln /usr/local/bin/gunexpand unexpand -ln /usr/local/bin/gtsort tsort -ln /usr/local/bin/gtruncate truncate -ln /usr/local/bin/gtimeout timeout -ln /usr/local/bin/gtac tac -ln /usr/local/bin/gsync sync -ln /usr/local/bin/gsum sum -ln /usr/local/bin/gstty stty -ln /usr/local/bin/gstdbuf stdbuf -ln /usr/local/bin/gsort sort -ln /usr/local/bin/gruncon runcon -ln /usr/local/bin/gseq seq -ln /usr/local/bin/gsha1sum sha1sum -ln /usr/local/bin/gsha224sum sha224sum -ln /usr/local/bin/gsha256sum sha256sum -ln /usr/local/bin/gsha384sum sha384sum -ln /usr/local/bin/gsha512sum sha512sum -ln /usr/local/bin/gshred shred -ln /usr/local/bin/gshuf shuf -ln /usr/local/bin/grealpath realpath -ln "/usr/local/bin/g[" "[" -ln /usr/local/bin/gbase64 base64 -ln /usr/local/bin/gchcon chcon -ln /usr/local/bin/gchgrp chgrp -ln /usr/local/bin/gchown chown -ln /usr/local/bin/gchroot chroot -ln /usr/local/bin/gcksum cksum -ln /usr/local/bin/gcsplit csplit -ln /usr/local/bin/gdf df -ln /usr/local/bin/gdircolors dircolors -ln /usr/local/bin/gdu du -ln /usr/local/bin/gexpand expand -ln /usr/local/bin/gfactor factor -ln /usr/local/bin/gfalse false -ln /usr/local/bin/gfmt fmt -ln /usr/local/bin/gfold fold -ln /usr/local/bin/ggroups groups -ln /usr/local/bin/ghostid hostid -ln /usr/local/bin/gjoin join -ln /usr/local/bin/gkill kill -ln /usr/local/bin/glink link -ln /usr/local/bin/glogname logname -ln /usr/local/bin/gmd5sum md5sum -ln /usr/local/bin/gmkdir mkdir -ln /usr/local/bin/gmkfifo mkfifo -ln /usr/local/bin/gmknod mknod -ln /usr/local/bin/gmktemp mktemp -ln /usr/local/bin/gnice nice -ln /usr/local/bin/gnl nl -ln /usr/local/bin/gnohup nohup -ln /usr/local/bin/gnproc nproc -ln /usr/local/bin/gnumfmt numfmt -ln /usr/local/bin/gnustat nustat -ln /usr/local/bin/gpaste paste -ln /usr/local/bin/gpathchk pathchk -ln /usr/local/bin/gpinky pinky -ln /usr/local/bin/gpr pr -ln /usr/local/bin/gprintenv printenv -ln /usr/local/bin/gprintf printf -ln /usr/local/bin/gptx ptx -ln /usr/local/bin/gpwd pwd - -# binutils + +## binutils # pkg info -l binutils | grep usr/local/bin -ln /usr/local/bin/addr2line -ln /usr/local/bin/ar -ln /usr/local/bin/as -ln /usr/local/bin/c++filt -ln /usr/local/bin/dwp -ln /usr/local/bin/elfedit -ln /usr/local/bin/gprof -ln /usr/local/bin/ld -ln /usr/local/bin/ld.bfd -ln /usr/local/bin/ld.gold -ln /usr/local/bin/nm -ln /usr/local/bin/objcopy -ln /usr/local/bin/objdump -ln /usr/local/bin/ranlib -ln /usr/local/bin/readelf -ln /usr/local/bin/size -ln /usr/local/bin/strings -ln /usr/local/bin/strip +ln /usr/bin/addr2line +ln /usr/bin/ar +ln /usr/bin/as +ln /usr/bin/c++filt +#ln /usr/bin/dwp +#ln /usr/bin/elfedit +ln /usr/bin/gprof +ln /usr/bin/ld +#ln /usr/bin/ld.bfd +#ln /usr/bin/ld.gold +ln /usr/bin/nm +ln /usr/bin/objcopy +ln /usr/bin/objdump +ln /usr/bin/ranlib +ln /usr/bin/readelf +ln /usr/bin/size +ln /usr/bin/strings +ln /usr/bin/strip + +ln /usr/bin/cc +ln /usr/bin/cpp +ln /usr/bin/c++ #pkg info -l llvm37 | grep usr/local/bin diff --git a/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.nix b/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.nix new file mode 100644 index 000000000000..64265081f542 --- /dev/null +++ b/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.nix @@ -0,0 +1,13 @@ +{ system, name, ver, url, sha256, configureArgs ? [], executable ? false } : + +let fetchURL = import <nix/fetchurl.nix>; + +in derivation { + inherit system configureArgs; + name = "trivial-bootstrap-${name}-${ver}"; + dname = "${name}-${ver}"; + src = fetchURL { + inherit url sha256 executable; + }; + builder = ./trivial-builder.sh; +} diff --git a/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.sh b/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.sh new file mode 100755 index 000000000000..ac5601b5ba0c --- /dev/null +++ b/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +export PATH=/bin:/sbin:/usr/bin:/usr/sbin + +tar -zxvf $src +cd $dname +mkdir -p $out/bin +./configure --prefix=$out $configureArgs +make +make install diff --git a/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/nixpkgs/pkgs/stdenv/generic/check-meta.nix index 160ca5d4e068..e170aae73700 100644 --- a/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -66,7 +66,7 @@ let # {pkgs, ...}: # { # allowUnfree = false; - # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name); + # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "vscode" x.name); # } allowUnfreePredicate = config.allowUnfreePredicate or (x: false); diff --git a/nixpkgs/pkgs/stdenv/generic/default.nix b/nixpkgs/pkgs/stdenv/generic/default.nix index c7c3bb9f3f3f..476fab3eed65 100644 --- a/nixpkgs/pkgs/stdenv/generic/default.nix +++ b/nixpkgs/pkgs/stdenv/generic/default.nix @@ -152,9 +152,12 @@ let inherit lib config stdenv; }) mkDerivation; - # For convenience, bring in the library functions in lib/ so - # packages don't have to do that themselves. - inherit lib; + # Slated for removal in 21.11 + lib = if config.allowAliases or true then builtins.trace + ( "Warning: `stdenv.lib` is deprecated and will be removed in the next release." + + " Please use `lib` instead." + + " For more information see https://github.com/NixOS/nixpkgs/issues/108938") + lib else throw "`stdenv.lib` is a deprecated alias for `lib`"; inherit fetchurlBoot; diff --git a/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index 28d22a4bb476..13a7a03d6a8b 100644 --- a/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -276,7 +276,7 @@ in rec { in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { enableParallelChecking = attrs.enableParallelChecking or true; - } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { + } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { NIX_HARDENING_ENABLE = enabledHardeningOptions; } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) { requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ]; diff --git a/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index d1ee317a2bcf..d8ab96952b7f 100644 --- a/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -17,6 +17,8 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; { armv6l-musl = muslpi; aarch64-musl = aarch64-multiplatform-musl; riscv64 = riscv64; + powerpc64 = ppc64; + powerpc64-musl = ppc64-musl; powerpc64le = powernv; powerpc64le-musl = musl-power; }) diff --git a/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix b/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix index 25cde589a923..869405a27607 100644 --- a/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -19,7 +19,8 @@ in with pkgs; rec { tarMinimal = gnutar.override { acl = null; }; busyboxMinimal = busybox.override { - useMusl = !stdenv.targetPlatform.isRiscV; + useMusl = with stdenv.targetPlatform; !isRiscV && + (system == "powerpc64-linux" -> parsed.abi.name != "elfv1"); enableStatic = true; enableMinimal = true; extraConfig = '' @@ -258,7 +259,7 @@ in with pkgs; rec { gcc --version '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - ldlinux=$(echo ${bootstrapTools}/lib/ld-linux*.so.?) + ldlinux=$(echo ${bootstrapTools}/lib/${builtins.baseNameOf binutils.dynamicLinker}) export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}" export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" diff --git a/nixpkgs/pkgs/test/haskell-shellFor/default.nix b/nixpkgs/pkgs/test/haskell-shellFor/default.nix index 05d09d6f39cf..9d13e1112cc1 100644 --- a/nixpkgs/pkgs/test/haskell-shellFor/default.nix +++ b/nixpkgs/pkgs/test/haskell-shellFor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, haskellPackages, cabal-install }: +{ lib, haskellPackages, cabal-install }: (haskellPackages.shellFor { packages = p: [ p.database-id-class p.constraints ]; diff --git a/nixpkgs/pkgs/test/install-shell-files/default.nix b/nixpkgs/pkgs/test/install-shell-files/default.nix index e9d32e4ccf69..aef5acc1de6b 100644 --- a/nixpkgs/pkgs/test/install-shell-files/default.nix +++ b/nixpkgs/pkgs/test/install-shell-files/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }: +{ lib, runCommandLocal, recurseIntoAttrs, installShellFiles }: let runTest = name: env: buildCommand: diff --git a/nixpkgs/pkgs/tools/X11/arandr/default.nix b/nixpkgs/pkgs/tools/X11/arandr/default.nix index 00296bc54af7..e6f4b5f6ff19 100644 --- a/nixpkgs/pkgs/tools/X11/arandr/default.nix +++ b/nixpkgs/pkgs/tools/X11/arandr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages +{ lib, fetchurl, python3Packages , gobject-introspection, gsettings-desktop-schemas, gtk3 , wrapGAppsHook, xrandr }: diff --git a/nixpkgs/pkgs/tools/X11/go-sct/default.nix b/nixpkgs/pkgs/tools/X11/go-sct/default.nix index 2d6965567b7a..8744c493b71c 100644 --- a/nixpkgs/pkgs/tools/X11/go-sct/default.nix +++ b/nixpkgs/pkgs/tools/X11/go-sct/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, xorg, buildGoPackage, fetchFromGitHub }: +{ lib, xorg, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-sct"; diff --git a/nixpkgs/pkgs/tools/X11/grobi/default.nix b/nixpkgs/pkgs/tools/X11/grobi/default.nix index 1ebd8ccc4e4c..3071ef317814 100644 --- a/nixpkgs/pkgs/tools/X11/grobi/default.nix +++ b/nixpkgs/pkgs/tools/X11/grobi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, fetchpatch }: +{ lib, fetchFromGitHub, buildGoModule, fetchpatch }: buildGoModule rec { version = "0.6.0"; diff --git a/nixpkgs/pkgs/tools/X11/nx-libs/default.nix b/nixpkgs/pkgs/tools/X11/nx-libs/default.nix index bb763962cebf..b92344bf9c4b 100644 --- a/nixpkgs/pkgs/tools/X11/nx-libs/default.nix +++ b/nixpkgs/pkgs/tools/X11/nx-libs/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { pname = "nx-libs"; - version = "3.5.99.25"; + version = "3.5.99.26"; src = fetchFromGitHub { owner = "ArcticaProject"; repo = "nx-libs"; rev = version; - sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc"; + sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ="; }; nativeBuildInputs = [ autoconf automake libtool pkg-config which diff --git a/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix b/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix index 6955f36b8f1c..0ab7be8374cf 100644 --- a/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix +++ b/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "OpenTabletDriver"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "InfinityGhost"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "1xi97nn5zb4fs3pyyqznvxnz07j30j3p967s7jigjmlm9321vkqp"; + sha256 = "1if2mkj193yzf5si9pwaynrm6wkhqy7ihk4k1lklzcryk5675w36"; }; debPkg = fetchurl { url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - sha256 = "06m2g5qvc02ga9f98f2ssa7wr2b7b2qm90qwaf17fz5z8rr0qmp0"; + sha256 = "16a1rr0yxra1dhwysbbfgsxpigh2jhjlsl7r28dgp8qcxncck7wg"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix b/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix index c8f3bd52c3e9..9250a10064ff 100644 --- a/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix +++ b/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, libxcb }: +{ lib, stdenv, fetchurl, libxcb, xcbutil, xcb-util-cursor }: stdenv.mkDerivation rec { pname = "wmutils-core"; - version = "1.1"; + version = "1.5"; src = fetchurl { url = "https://github.com/wmutils/core/archive/v${version}.tar.gz"; - sha256 = "0aq95khs154j004b79w9rgm80vpggxfqynha5rckm2cx20d1fa5s"; + sha256 = "0wk39aq2lrnc0wjs8pv3cigw3lwy2qzaw0v61bwknd5wabm25bvj"; }; - buildInputs = [ libxcb ]; + buildInputs = [ libxcb xcbutil xcb-util-cursor ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/tools/X11/wpgtk/default.nix b/nixpkgs/pkgs/tools/X11/wpgtk/default.nix index f2864ca2eb5a..cf9bbd9bb988 100644 --- a/nixpkgs/pkgs/tools/X11/wpgtk/default.nix +++ b/nixpkgs/pkgs/tools/X11/wpgtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, libxslt, +{ lib, python3Packages, fetchFromGitHub, libxslt, gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: python3Packages.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/tools/X11/xpra/default.nix b/nixpkgs/pkgs/tools/X11/xpra/default.nix index 0c1accd36fbd..0dffdf7bbf79 100644 --- a/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText +{ lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which , ffmpeg, x264, libvpx, libwebp, x265 diff --git a/nixpkgs/pkgs/tools/X11/xsettingsd/SConstruct.patch b/nixpkgs/pkgs/tools/X11/xsettingsd/SConstruct.patch deleted file mode 100644 index bae8d1efc14d..000000000000 --- a/nixpkgs/pkgs/tools/X11/xsettingsd/SConstruct.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index bebc82e..3e0127b 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -59,6 +59,8 @@ srcs = Split('''\ - ''') - libxsettingsd = env.Library('xsettingsd', srcs) - env['LIBS'] = libxsettingsd -+env['ENV']['PATH'] = os.environ.get('PATH', '') -+env['ENV']['PKG_CONFIG_PATH'] = os.environ.get('PKG_CONFIG_PATH', '') - env.ParseConfig('pkg-config --cflags --libs x11') - - xsettingsd = env.Program('xsettingsd', 'xsettingsd.cc') diff --git a/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix b/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix index 7572e19fbf91..0fe260e3db1e 100644 --- a/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix @@ -1,38 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkg-config, libX11 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11 }: stdenv.mkDerivation rec { pname = "xsettingsd"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "derat"; repo = "xsettingsd"; rev = "v${version}"; - sha256 = "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v"; + sha256 = "sha256-CIYshZqJICuL8adKHIN4R6nudaqWOCK2UPrGhsKf9pE="; }; - patches = [ - ./SConstruct.patch - ]; - - nativeBuildInputs = [ scons pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libX11 ]; - buildPhase = '' - scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES - ''; - - installPhase = '' - install -D -t "$out"/bin xsettingsd dump_xsettings - install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1 + # we end up with symlinked unit files if we don't move them around ourselves + postFixup = '' + rm -r $out/lib/systemd + mv $out/share/systemd $out/lib ''; meta = with lib; { description = "Provides settings to X11 applications via the XSETTINGS specification"; homepage = "https://github.com/derat/xsettingsd"; license = licenses.bsd3; + maintainers = with maintainers; [ romildo ]; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; }; } diff --git a/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix b/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix index 55c5f8636157..234b89f94cd8 100644 --- a/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix +++ b/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xwallpaper"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "stoeckmann"; repo = "xwallpaper"; rev = "v${version}"; - sha256 = "121ai4dc0v65qk12gn9w62ixly8hc8a5qrygkbb82vy8ck4jqxj7"; + sha256 = "sha256-WYtbwMFzvJ0Xr84gGoKSofSSnmb7Qn6ioGMOnQOqdII="; }; preConfigure = "./autogen.sh"; diff --git a/nixpkgs/pkgs/tools/admin/afterburn/default.nix b/nixpkgs/pkgs/tools/admin/afterburn/default.nix index 0d3cd957324b..8a42a011da90 100644 --- a/nixpkgs/pkgs/tools/admin/afterburn/default.nix +++ b/nixpkgs/pkgs/tools/admin/afterburn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, openssl, pkg-config, fetchFromGitHub, rustPlatform }: +{ lib, openssl, pkg-config, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "afterburn"; diff --git a/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix b/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix new file mode 100644 index 000000000000..12f63e627e6d --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pkgs +, boto3 +}: + +buildPythonApplication rec { + pname = "aws-mfa"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "broamski"; + repo = "aws-mfa"; + rev = version; + sha256 = "1blcpa13zgyac3v8inc7fh9szxq2avdllx6w5ancfmyh5spc66ay"; + }; + + propagatedBuildInputs = [ + boto3 + ]; + + doCheck = false; + + pythonImportsCheck = [ + "awsmfa" + ]; + + meta = with lib; { + description = "Manage AWS MFA Security Credentials"; + homepage = "https://github.com/broamski/aws-mfa"; + license = [ licenses.mit ]; + maintainers = [ maintainers.srapenne ]; + }; +} diff --git a/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix b/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix index 32c006d7a5ff..070a9b6430ca 100644 --- a/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix b/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix index 4b26e3a74344..82b577391201 100644 --- a/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-rotate-key"; diff --git a/nixpkgs/pkgs/tools/admin/awscli/default.nix b/nixpkgs/pkgs/tools/admin/awscli/default.nix index 0cf02b2540ef..2360ef20e1f6 100644 --- a/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.217"; # N.B: if you change this, change botocore to a matching version too + version = "1.19.5"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-bRrEFDRccklM3f6K/HAptKYrPnnCPM3Jo4vNsDt3Fuo="; + sha256 = "sha256-SwYL2ViwazP2MDZbW9cRThvg6jVOMlkfsbpY6QDsjQY="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/admin/awslogs/default.nix b/nixpkgs/pkgs/tools/admin/awslogs/default.nix index f71422f77a25..3e2cf1505579 100644 --- a/nixpkgs/pkgs/tools/admin/awslogs/default.nix +++ b/nixpkgs/pkgs/tools/admin/awslogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "awslogs"; diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index a4c34662ef36..6379fa94bd7a 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,14 +1,15 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.17.1"; + version = "2.18.0"; srcName = "azure-cli-${version}-src"; + src = fetchFromGitHub { name = srcName; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-RTYCsdoZx1YQa9a8ZyvwQ9yTLEB6r7/mMgfecc/vGvM="; + sha256 = "sha256-3qQKQePyLYwIS3yO3exHNd0uoPr7y4iZ12+GaiHfqz8="; }; # put packages that needs to be overriden in the py package scope diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 743c9e197d76..8decd2f80f1e 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -6,7 +6,6 @@ let prePatch = (attrs.prePatch or "") + '' rm -f azure_bdist_wheel.py tox.ini substituteInPlace setup.py \ - --replace "wheel==0.30.0" "wheel" \ --replace "cryptography>=2.3.1,<3.0.0" "cryptography" sed -i "/azure-namespace-package/c\ " setup.cfg ''; @@ -137,6 +136,9 @@ let azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip" "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0"; + azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.2.0" "zip" + "sha256-sh2IWOaaoW0luQjEARah93PBJ+xN1gLLuFQuvzmlXYM="; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; @@ -149,11 +151,11 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.3.0" "zip" - "1bb95rlwfikfl3pgyga0v5lfgr1xyaybm1nq2498rncfcvdpkjhz"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.0.0" "zip" + "sha256-h3nif64OgekSh4mjOSTbom8qDXVrIVNksbQ3LwILnx8="; - azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip" - "0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy"; + azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip" + "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip" "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx"; @@ -248,8 +250,8 @@ let azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.5.0" "zip" "0dr8xml9zlsnag761zx7ifvdkhsv4syzxpmdn4gbf9c5qcq65dsf"; - azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "0.1.0" "zip" - "1pq5rn32yvrf5kqjafnj0kc92gpfg435w2l0k7cm8gvlja4r4m77"; + azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip" + "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; @@ -414,12 +416,12 @@ let }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.7.2"; + version = "0.8.0rc2"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "1jh81xyri7wb7vqa049imf6dfy3nc501bq3p0miaka8ffvvaxinz"; + sha256 = "sha256-4pzgVwOVcT5UsjbyGkE30xashMASUzoQe2OGHSnK5do="; }; }); diff --git a/nixpkgs/pkgs/tools/admin/berglas/default.nix b/nixpkgs/pkgs/tools/admin/berglas/default.nix index ca588db01a59..8a6bb559041b 100644 --- a/nixpkgs/pkgs/tools/admin/berglas/default.nix +++ b/nixpkgs/pkgs/tools/admin/berglas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "berglas"; diff --git a/nixpkgs/pkgs/tools/admin/certigo/default.nix b/nixpkgs/pkgs/tools/admin/certigo/default.nix index ff66e926d4b5..422c6da82d2f 100644 --- a/nixpkgs/pkgs/tools/admin/certigo/default.nix +++ b/nixpkgs/pkgs/tools/admin/certigo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "certigo"; diff --git a/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix b/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix index 6404eb92a26e..bbf8d7eaeb1c 100644 --- a/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix +++ b/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix @@ -1,4 +1,4 @@ -{ python, lib, stdenv }: +{ python, lib }: with python.pkgs; diff --git a/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix b/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix index 2a1ceb531a50..55af1679d7ad 100644 --- a/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "credhub-cli"; diff --git a/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix b/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix index 2ca0f2c4d084..7fb128caa19b 100644 --- a/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "docker-credential-gcr"; diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 2c5dca4a2fac..0db886595750 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-wjYO/tu+QrztGPvtz3YBZJ7/e+9TDEwJ542xIBuNaQo="; + sha256 = "sha256-1IhCBDMfGW9hDvQoGSJKJ1ZlShzVeIGjVOfiUspHRBw="; }; - vendorSha256 = "sha256-woEa/h6TKQD32BslmPBuILvBAObhWjT8XqnQmuweUx0="; + vendorSha256 = "sha256-fa8IrJhsy5cBzBs4tGIx7ykJcXjdvLqms3Dk97P4Vik="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 3fe3856d9c51..89b96824607d 100644 --- a/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "exoscale-cli"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-LVWUfaACdDp9xsuXHysPO/8QMdaDqS+yhP2U9cc4jh4="; + sha256 = "sha256-uriXZ4fEUswSBh9hv122wkAPHOnmt6+AodKkCHAMSh8="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 8830b0d7e04f..36af063c4481 100644 --- a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0ziz7cipi3m4aiba6ljz8419w2rps20rii6nwv0pyq5j7qvlvnqp"; + sha256 = "09pv1xvycgfai151z6kbsggyldcd3cx6x1p04dcim2xrawqvng6s"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1a9mqhqzmn0zfc1ab6jmac15yn192cmqkijw34di3ld6syqvaziw"; + sha256 = "1iybbvxjny33mw3h2f81fdvsvp65xa62c2qrzjv8hkrqkw69ckrp"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "323.0.0"; + version = "325.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/nixpkgs/pkgs/tools/admin/iamy/default.nix b/nixpkgs/pkgs/tools/admin/iamy/default.nix index e7481e16948f..dd35da451ad8 100644 --- a/nixpkgs/pkgs/tools/admin/iamy/default.nix +++ b/nixpkgs/pkgs/tools/admin/iamy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "iamy"; diff --git a/nixpkgs/pkgs/tools/admin/lego/default.nix b/nixpkgs/pkgs/tools/admin/lego/default.nix index e270e7a4c43f..a825908484c4 100644 --- a/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.1.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "05fy6826n449adlglwi8s31km4yhd8hbd9yml8k204cb81w00zyk"; + sha256 = "sha256-S9I6b9+FngX0/W5t3EHG+H1ULsZKoQw1/S4HnSITYG0="; }; - vendorSha256 = "0p2pibid2d761whfk7zgq230lyqi2f0wmfvxqkjzrd1sba40r9bp"; + vendorSha256 = "sha256-dVGSMPhAvN/kWgv3XHS+lOZdcbDNL44ELkv7fHAJWlI="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index aeff0d931f05..ba6f9d074b24 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, hwdata, pkg-config, lxc, buildGoPackage, fetchurl +{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap , libco-canonical, dqlite, raft-canonical, sqlite-replication, udev @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.10"; + version = "4.11"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0s8lbvh2vsqphvspyjyxp5s589gf2wrjpka8v496lf6fv1nsi5s8"; + sha256 = "1pcgxpmiiskq770sn25861dj0z8l24nzc1jbzyql7cxn0w5bnw1x"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix index 6727a8978788..c419c7e834a2 100644 --- a/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix +++ b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.12"; - versionMinor = "3"; - versionBuild_x86_64 = "7"; - versionBuild_i686 = "8"; + versionMajor = "7.0"; + versionMinor = "211"; + versionBuild_x86_64 = "4"; + versionBuild_i686 = "4"; in stdenv.mkDerivation rec { pname = "nomachine-client"; @@ -13,23 +13,18 @@ in src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - urls = [ - "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" - "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" - ]; - sha256 = "1dqsqwxbd77g6gc0hvjmmg4flm3vwwv5y98m8d9wxyybp37vkmgd"; + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; + sha256 = "06habqsl5gp13sym519r3qp188qwqqfw8p48wcs4zj3kcri6fjz0"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - urls = [ - "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" - "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" - ]; - sha256 = "1q14hxjy66s5cpq19rshscsm679csb6p16c5p2agh5zd64cr4am6"; + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; + sha256 = "1y4lr95mwilwr7gqsxqvygq4w3dcp4cjh8m06wdi3avwdzrjkgj9"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; + # nxusb-legacy is only needed for kernel versions < 3 postUnpack = '' mv $(find . -type f -name nxclient.tar.gz) . mv $(find . -type f -name nxplayer.tar.gz) . @@ -37,6 +32,8 @@ in tar xf nxclient.tar.gz tar xf nxplayer.tar.gz rm $(find . -maxdepth 1 -type f) + rm -r NX/share/src/nxusb-legacy + rm NX/bin/nxusbd-legacy NX/lib/libnxusb-legacy.so ''; nativeBuildInputs = [ file makeWrapper autoPatchelfHook ]; @@ -85,8 +82,8 @@ in description = "NoMachine remote desktop client (nxplayer)"; homepage = "https://www.nomachine.com/"; license = { - fullName = "NoMachine 6 End-User License Agreement"; - url = "https://www.nomachine.com/licensing-6"; + fullName = "NoMachine 7 End-User License Agreement"; + url = "https://www.nomachine.com/licensing-7"; free = false; }; maintainers = with maintainers; [ talyz ]; diff --git a/nixpkgs/pkgs/tools/admin/procs/default.nix b/nixpkgs/pkgs/tools/admin/procs/default.nix index 269e0e1df1fa..afdbbbe9450b 100644 --- a/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -1,17 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.10"; + version = "0.11.3"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "12p95nybsisqpji01qgkp5wfg7fwk814xdsz338q9wac8nvqw9w3"; + sha256 = "sha256-OaHsNxrOrPlAwtFDY3Tnx+nOabax98xcGQeNds32iOA="; }; - cargoSha256 = "13wfz0ig9dsl0h085rzlrx0dg9la957c50xyzjfxq1ybw2qr266b"; + cargoSha256 = "sha256-miOfm1Sw6tIICkT9T2V82cdGG2STo9vuLPWsAN/8wuM="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/procs --completion $shell > procs.$shell + installShellCompletion procs.$shell + done + ''; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/nixpkgs/pkgs/tools/admin/pulumi/data.nix index 135f6dcca4fa..0498b56dcf56 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,20 +1,20 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.18.2"; + version = "2.19.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.18.2-linux-x64.tar.gz"; - sha256 = "0ya8b77qjda5z6bkik2yxq30wi1753mgkbcshd3x8f4wkb7kvj3w"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-linux-x64.tar.gz"; + sha256 = "0641inzkbgrjarc7jdmi0iryx4swjh1ayf0j15ais3yij7jq4da2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-linux-amd64.tar.gz"; sha256 = "1jrv87r55m1kzl48zs5vh83v2kh011gm4dha80ijqjhryx0a94jy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.0-linux-amd64.tar.gz"; - sha256 = "1q9jz3p784x8k56an6hg9nazz44hlhdg9fawx6n0zrp6mh34kpsp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-linux-amd64.tar.gz"; + sha256 = "0yfrpih5q2hfj2555y26l1pqs22idh4hqn20gy310kg12r303hwk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-linux-amd64.tar.gz"; @@ -33,16 +33,16 @@ sha256 = "19cpq6hwj862wmfcfx732j66wjkfjnxjrqj4bgxpgah62hrl5lh2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.1-linux-amd64.tar.gz"; - sha256 = "1582h37z0971pd7xp6ss7r7742068pkbh2k5q8jj6ii3d7rwbbp1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-linux-amd64.tar.gz"; + sha256 = "0mb6ddidyk3g1ayk8y0ypb262fyv584w5cicvjc5r9670a1d2rcv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.8.0-linux-amd64.tar.gz"; - sha256 = "1an0i997bpnkf19zbgfjyl2h7sm21xsc564x6zwcg67sxcjaal0w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-linux-amd64.tar.gz"; + sha256 = "1b5m2620s4bqq6zlagki3w4fzph3lc5192falv8ick4rgbv714nb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.0-linux-amd64.tar.gz"; - sha256 = "0sglafpi7fjcrgky0a7xfra28ps55bb88mdi695i905ic8y071wa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-linux-amd64.tar.gz"; + sha256 = "10cmnsxpiy7bfxyrpwfqn5kgpijlkxrhfah40wd82j3j2b7wy33j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-linux-amd64.tar.gz"; @@ -53,8 +53,8 @@ sha256 = "0fi8qxv6ladpapb6j0w7zqk0hxj56iy1131dsipzkkx4p1jfg27r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.7-linux-amd64.tar.gz"; - sha256 = "1x0j93y65687qh2k62ks61q2rjdlr06kkhas07w82x36xl6r30h1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-linux-amd64.tar.gz"; + sha256 = "0ah0yhwf79dgk7biifnapz0366mm5a54rlqf8hffn13czqnc3qbq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-linux-amd64.tar.gz"; @@ -81,8 +81,8 @@ sha256 = "0jpv94kzsa794ds5bjj6j3pj1wxqicavpxjnycfa5cm8w71kmlsh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.1-linux-amd64.tar.gz"; - sha256 = "0saavajpnn5rx70n7rzfymrx8v17jf99n1zz20zgrhww67s3p2l6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-linux-amd64.tar.gz"; + sha256 = "069sq8lkw4n7ykh2b2fsaggxxr4731riyy9i15idffa52d1kkiq6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-linux-amd64.tar.gz"; @@ -91,16 +91,16 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.18.2-darwin-x64.tar.gz"; - sha256 = "0rrmiplwml864s6rsxmb0zprd8qnf6ss92hgay9xnr6bxs6gl8w2"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-darwin-x64.tar.gz"; + sha256 = "02wd0h5aq53zjy18xzbkv7nnl097ja0m783gsgrs1wdlqblwpqyw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-darwin-amd64.tar.gz"; sha256 = "1rqx2dyx3anmlv74whs587rs1bgyssqxfjzrx1cfpfnnnj5rkmry"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.0-darwin-amd64.tar.gz"; - sha256 = "0jxsh5af08sjj21ff484n1a9dylhmf02gzagw6r8x6lh247l5qp2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-darwin-amd64.tar.gz"; + sha256 = "1j4czx1iqfm95y14isl1sqwvsw690h9y0xf2jpynp2ygmc3szrkr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-darwin-amd64.tar.gz"; @@ -119,16 +119,16 @@ sha256 = "0kyw1csyzvkbzqxrgpf4d2zgydysd4mfb07igjv19m3f7gs8jhr9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.1-darwin-amd64.tar.gz"; - sha256 = "06q9pysql611p24padz6cz2fhf14bqkw7li504479sbnsxqk3g0s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-darwin-amd64.tar.gz"; + sha256 = "122cf7v12vzv1szi9adcccakbs3hs23qsjbykjrhwmk8hw21g4kb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.8.0-darwin-amd64.tar.gz"; - sha256 = "1x59xfzfgk02fmddbpvjk4cy8pnbgc65qwz9w70q59pyzyxl050s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-darwin-amd64.tar.gz"; + sha256 = "11w4ykh846byg05jxnddm6ln901pms8n5g0q5gj3ldfjrfl1cn2q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.0-darwin-amd64.tar.gz"; - sha256 = "0c9m036s690vrspklg1dxa6rnyqbfpspjn6lm64wj1w75qk9z746"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-darwin-amd64.tar.gz"; + sha256 = "1apaaa76dq53ppnmh4xi55zsrx1mwbnnsby63ymjw9xhdkc1sah6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-darwin-amd64.tar.gz"; @@ -139,8 +139,8 @@ sha256 = "05h8adn3q7nnhn75vircrnr9nxf15pf82n9gvz5rbq0hsdivh3l2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.7-darwin-amd64.tar.gz"; - sha256 = "1nvgvk2awimllmy0yj69250w06hy64zcml5mhn5i9i2zyhmnwb6q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-darwin-amd64.tar.gz"; + sha256 = "01xspqk3hzvrhka9nsxal8pwji3hm5qgkn49jjnk1cy01hy7s78q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-darwin-amd64.tar.gz"; @@ -167,8 +167,8 @@ sha256 = "0d578hqkhwlhx50k9qpw7ixjyy1p2fd6cywj86s870jzgl8zh4fv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.1-darwin-amd64.tar.gz"; - sha256 = "12nfk2pc380gnkblrviwyijr9ff5h1xv2ybv6frdczfd1kdjf9ar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "1qkh8hg7nplv0slq2xark57l547z63fy1l6zvrcblrqsqfw5zybv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-darwin-amd64.tar.gz"; diff --git a/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 231bdc099653..89fee3e61605 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -32,6 +32,7 @@ in stdenv.mkDerivation { ghuntley peterromfeldhk jlesquembre + cpcloud ]; }; } diff --git a/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/nixpkgs/pkgs/tools/admin/pulumi/update.sh index e3422214abe2..c1a0e6310166 100755 --- a/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -3,30 +3,30 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="2.18.2" +VERSION="2.19.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( "auth0=1.5.2" - "aws=3.25.0" + "aws=3.25.1" "cloudflare=2.11.1" "consul=2.7.0" "datadog=2.15.0" "digitalocean=3.3.0" - "docker=2.6.1" - "gcp=4.8.0" - "github=2.5.0" + "docker=2.7.0" + "gcp=4.9.0" + "github=2.5.1" "gitlab=3.5.0" "hcloud=0.5.1" - "kubernetes=2.7.7" + "kubernetes=2.7.8" "mailgun=2.3.2" "mysql=2.3.3" "openstack=2.11.0" "packet=3.2.2" "postgresql=2.5.3" "random=3.0.1" - "vault=3.2.1" + "vault=3.3.0" "vsphere=2.11.4" ) diff --git a/nixpkgs/pkgs/tools/admin/s3bro/default.nix b/nixpkgs/pkgs/tools/admin/s3bro/default.nix index bf807d149975..35cf7b11e645 100644 --- a/nixpkgs/pkgs/tools/admin/s3bro/default.nix +++ b/nixpkgs/pkgs/tools/admin/s3bro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "s3bro"; diff --git a/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix b/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix index 0aeccb755a1b..2a8f0d1f1148 100644 --- a/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "scaleway-cli"; diff --git a/nixpkgs/pkgs/tools/admin/sewer/default.nix b/nixpkgs/pkgs/tools/admin/sewer/default.nix index 42288bafe015..a6f511fe115a 100644 --- a/nixpkgs/pkgs/tools/admin/sewer/default.nix +++ b/nixpkgs/pkgs/tools/admin/sewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "sewer"; diff --git a/nixpkgs/pkgs/tools/admin/simp_le/default.nix b/nixpkgs/pkgs/tools/admin/simp_le/default.nix index fc064641943a..5bfc00ac0001 100644 --- a/nixpkgs/pkgs/tools/admin/simp_le/default.nix +++ b/nixpkgs/pkgs/tools/admin/simp_le/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, bash }: +{ lib, python3Packages, bash }: python3Packages.buildPythonApplication rec { pname = "simp_le-client"; diff --git a/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix b/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix index 6c8520648ec6..b6ca3135f561 100644 --- a/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix +++ b/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , fetchgit , requests , makeWrapper diff --git a/nixpkgs/pkgs/tools/admin/ssmsh/default.nix b/nixpkgs/pkgs/tools/admin/ssmsh/default.nix index 6b0d03809015..3ed29af25fdc 100644 --- a/nixpkgs/pkgs/tools/admin/ssmsh/default.nix +++ b/nixpkgs/pkgs/tools/admin/ssmsh/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ssmsh"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "bwhaley"; repo = pname; rev = "v${version}"; - sha256 = "0mgx4q21f6rxih79l0hwgzwafxviz5a33dpvc5k0z172sfw0dmj1"; + sha256 = "sha256-WZ2glv/f4LwTK/G8QdaVRIAHvgGLPLPL8xjAg/kUokQ="; }; - vendorSha256 = "147f02bl3sf073dy2ximbavdcbphdn7djgisla1cyyy4ng6dhf7f"; + vendorSha256 = "sha256-17fmdsfOrOaySPsXofLzz0+vmiemg9MbnWhRoZ67EuQ="; doCheck = true; diff --git a/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index c410bd81e89a..3d91847a9a69 100644 --- a/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "stripe-cli"; - version = "1.5.5"; + version = "1.5.9"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "0r0szzw3xl9cn5vcqgn6sc4wbk2j17r1rhg14qgix835lzp9wpdv"; + sha256 = "sha256-fR4MFEytYZA4zt4WFGnEp9YDCtX6peQoI+NynqyReT8="; }; - vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r"; + vendorSha256 = "sha256-GQACtHTid1Aq5iSQqks10hmGS+VUlwNoM1LG+liynhU="; subPackages = [ "cmd/stripe" diff --git a/nixpkgs/pkgs/tools/admin/trivy/default.nix b/nixpkgs/pkgs/tools/admin/trivy/default.nix index 0a4bf934d805..d2d2a138d65c 100644 --- a/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "11fd32qb69g23lxrynsnfy8a783sl60rzknvq4shdg41p2ikigdk"; + sha256 = "sha256-E/tPjVc+XLDCFYzloAipwWjB4I86kAe/6NVoJSCrY2M="; }; - vendorSha256 = "09birwc8x90l2y0znf4fwny3phnmq0cz0l2z3xzwg0j3msrdl2np"; + vendorSha256 = "sha256-YoQF0Eug747LhsR3V0IplwXgm0ndDqK1pUVjguOhjOU="; subPackages = [ "cmd/trivy" ]; diff --git a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index cb856ab72d0f..1478aa8c1e3a 100644 --- a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.01.21"; + version = "2021.01.25"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "184d59pc60dax60j3nzcsr5kflaygbjpbrwg6r4bky0q0sg17z5i"; + sha256 = "1c2jx03ssm9yyv6rgr5wfv88ivfgdgq3889yaghjyvllm3nv9380"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/nixpkgs/pkgs/tools/audio/beets/default.nix b/nixpkgs/pkgs/tools/audio/beets/default.nix index f72692c845c7..d531b22738ba 100644 --- a/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -2,6 +2,7 @@ , pythonPackages, imagemagick, gobject-introspection, gst_all_1 , runtimeShell , fetchpatch +, unstableGitUpdater # Attributes needed for tests of the external plugins , callPackage, beets @@ -132,13 +133,13 @@ in pythonPackages.buildPythonApplication rec { # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2020-12-22"; + version = "unstable-2021-01-29"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "53dcb24d10788897f20c341774b474808ec2c0b6"; - sha256 = "sha256-P++NA13T2TRHW3Se10np8BSe/WRBYAKRte5xKoHKW50="; + rev = "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2"; + sha256 = "sha256-BIa3hnOsBxThbA2WCE4q9eaFNtObr3erZBBqobVOSiQ="; }; propagatedBuildInputs = [ @@ -290,6 +291,7 @@ in pythonPackages.buildPythonApplication rec { passthru = { externalPlugins = plugins; + updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; }; }; meta = { diff --git a/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix b/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix index a64cc5ebcada..793611699ec8 100644 --- a/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, beets, pythonPackages }: +{ fetchFromGitHub, beets, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "beets-alternatives"; diff --git a/nixpkgs/pkgs/tools/audio/beets/plugins/check.nix b/nixpkgs/pkgs/tools/audio/beets/plugins/check.nix index 545e6d7cf2c7..441dcfe579f4 100644 --- a/nixpkgs/pkgs/tools/audio/beets/plugins/check.nix +++ b/nixpkgs/pkgs/tools/audio/beets/plugins/check.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }: +{ lib, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }: pythonPackages.buildPythonApplication rec { name = "beets-check"; diff --git a/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix index b339bc34ad20..5af52066caa7 100644 --- a/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, beets, pythonPackages, glibcLocales }: +{ fetchFromGitHub, beets, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication { name = "beets-copyartifacts"; diff --git a/nixpkgs/pkgs/tools/audio/mididings/default.nix b/nixpkgs/pkgs/tools/audio/mididings/default.nix index eedfd2f3dbbe..d5f78ada91c7 100644 --- a/nixpkgs/pkgs/tools/audio/mididings/default.nix +++ b/nixpkgs/pkgs/tools/audio/mididings/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: +{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: pythonPackages.buildPythonApplication { version = "2015-11-17"; diff --git a/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix b/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix index 801058e0496b..af4000dfa448 100644 --- a/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mpd-mpris"; diff --git a/nixpkgs/pkgs/tools/audio/mpdas/default.nix b/nixpkgs/pkgs/tools/audio/mpdas/default.nix index 255d28b62b1e..8b12b6fc16d7 100644 --- a/nixpkgs/pkgs/tools/audio/mpdas/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpdas/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, mpd_clientlib, curl }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libmpdclient +, curl +}: stdenv.mkDerivation rec { pname = "mpdas"; @@ -13,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mpd_clientlib curl ]; + buildInputs = [ libmpdclient curl ]; makeFlags = [ "CONFIG=/etc" "DESTDIR=" "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/tools/audio/mpdcron/default.nix b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix index 1fa0d155a3d1..afb1c9a3dcda 100644 --- a/nixpkgs/pkgs/tools/audio/mpdcron/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix @@ -1,5 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, libdaemon -, mpd_clientlib, curl, sqlite, bundlerEnv, libnotify, pandoc }: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, glib +, libdaemon +, libmpdclient +, curl +, sqlite +, bundlerEnv +, libnotify +, pandoc +}: let gemEnv = bundlerEnv { @@ -7,8 +21,8 @@ let gemdir = ./.; }; in stdenv.mkDerivation { - version = "20161228"; pname = "mpdcron"; + version = "20161228"; src = fetchFromGitHub { owner = "alip"; @@ -17,21 +31,33 @@ in stdenv.mkDerivation { sha256 = "0vdksf6lcgmizqr5mqp0bbci259k0dj7gpmhx32md41jlmw5skaw"; }; - meta = with lib; { - description = "A cron like daemon for mpd"; - homepage = "http://alip.github.io/mpdcron/"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ lovek323 manveru ]; - }; - - buildInputs = - [ autoconf automake libtool pkg-config glib libdaemon pandoc - mpd_clientlib curl sqlite gemEnv.wrappedRuby libnotify ]; + buildInputs = [ + autoconf + automake + libtool + pkg-config + glib + libdaemon + pandoc + libmpdclient + curl + sqlite + gemEnv.wrappedRuby + libnotify + ]; preConfigure = '' ./autogen.sh ''; configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ]; + + meta = with lib; { + description = "A cron like daemon for mpd"; + homepage = "http://alip.github.io/mpdcron/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ lovek323 manveru ]; + }; } +# TODO: autoreconfHook this diff --git a/nixpkgs/pkgs/tools/audio/mpdris2/default.nix b/nixpkgs/pkgs/tools/audio/mpdris2/default.nix index 30b0d90f5623..4cd3921fb550 100644 --- a/nixpkgs/pkgs/tools/audio/mpdris2/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpdris2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , autoreconfHook , fetchFromGitHub , glib diff --git a/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix b/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix index 911dbf752029..072482132137 100644 --- a/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -10,7 +10,7 @@ , pkg-config , scdoc , json_c -, xdg_utils +, xdg-utils }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/signon.c \ - --replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open" + --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix b/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix index c79204cffa2a..48f553d960dc 100644 --- a/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: mkDerivation rec { version = "1.5.1"; diff --git a/nixpkgs/pkgs/tools/audio/tts/default.nix b/nixpkgs/pkgs/tools/audio/tts/default.nix index 770e898f2eec..325039d68650 100644 --- a/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -1,42 +1,13 @@ { lib , python3Packages , fetchFromGitHub -, fetchpatch , python3 }: -# -# Tested in the following setup: -# -# TTS model: -# Tacotron2 DDC -# https://drive.google.com/drive/folders/1Y_0PcB7W6apQChXtbt6v3fAiNwVf4ER5 -# Vocoder model: -# Multi-Band MelGAN -# https://drive.google.com/drive/folders/1XeRT0q4zm5gjERJqwmX5w84pMrD00cKD -# -# Arrange /tmp/tts like this: -# scale_stats.npy -# tts -# tts/checkpoint_130000.pth.tar -# tts/checkpoint_130000_tf.pkl -# tts/checkpoint_130000_tf_2.3rc0.tflite -# tts/config.json -# tts/scale_stats.npy -# vocoder -# vocoder/checkpoint_1450000.pth.tar -# vocoder/checkpoint_2750000_tf.pkl -# vocoder/checkpoint_2750000_tf_v2.3rc.tflite -# vocoder/config.json -# vocoder/scale_stats.npy -# -# Start like this: -# cd /tmp/tts -# tts-server \ -# --vocoder_config ./tts/vocoder/config.json \ -# --vocoder_checkpoint ./tts/vocoder/checkpoint_1450000.pth.tar \ -# --tts_config ./tts/config.json \ -# --tts_checkpoint ./tts/checkpoint_130000.pth.tar +# USAGE: +# $ tts-server --list_models +# # pick your favorite vocoder/tts model +# $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 @@ -47,35 +18,31 @@ python3Packages.buildPythonApplication rec { # until https://github.com/mozilla/TTS/issues/424 is resolved # we treat released models as released versions: # https://github.com/mozilla/TTS/wiki/Released-Models - version = "unstable-2020-06-17"; + version = "0.0.9"; src = fetchFromGitHub { owner = "mozilla"; repo = "TTS"; - rev = "72a6ac54c8cfaa407fc64b660248c6a788bdd381"; - sha256 = "1wvs264if9n5xzwi7ryxvwj1j513szp6sfj6n587xk1fphi0921f"; + rev = "df5899daf4ba4ec89544edf94f9c2e105c544461"; + sha256 = "sha256-lklG8DqG04LKJY93z2axeYhW8gtpbRG41o9ow2gJjuA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/mozilla/TTS/commit/36fee428b9f3f4ec1914b090a2ec9d785314d9aa.patch"; - sha256 = "sha256-pP0NxiyrsvQ0A7GEleTdT87XO08o7WxPEpb6Bmj66dc="; - }) - ]; - preBuild = '' # numba jit tries to write to its cache directory export HOME=$TMPDIR - sed -i -e 's!tensorflow==.*!tensorflow!' requirements.txt + # we only support pytorch models right now + sed -i -e '/tensorflow/d' requirements.txt + sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt setup.py sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt setup.py sed -i -e 's!bokeh==[^"]*!bokeh!' requirements.txt setup.py sed -i -e 's!numba==[^"]*!numba!' requirements.txt setup.py # Not required for building/installation but for their development/ci workflow - sed -i -e '/pylint/d' requirements.txt setup.py + sed -i -e '/pylint/d' requirements.txt sed -i -e '/cardboardlint/d' requirements.txt setup.py ''; + nativeBuildInputs = [ python3Packages.cython ]; propagatedBuildInputs = with python3Packages; [ matplotlib @@ -88,17 +55,23 @@ python3Packages.buildPythonApplication rec { tqdm librosa unidecode + umap-learn phonemizer tensorboardx fuzzywuzzy - tensorflow_2 inflect gdown pysbd + pyworld ]; postInstall = '' cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server + # cython modules are not installed for some reasons + ( + cd TTS/tts/layers/glow_tts/monotonic_align + ${python3Packages.python.interpreter} setup.py install --prefix=$out + ) ''; checkInputs = with python3Packages; [ pytestCheckHook ]; @@ -114,6 +87,18 @@ python3Packages.buildPythonApplication rec { "test_parametrized_gan_dataset" ]; + preCheck = '' + # use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules. + mv TTS{,.old} + ''; + + pytestFlagsArray = [ + # requires tensorflow + "--ignore=tests/test_tacotron2_tf_model.py" + "--ignore=tests/test_vocoder_tf_melgan_generator.py" + "--ignore=tests/test_vocoder_tf_pqmf.py" + ]; + meta = with lib; { homepage = "https://github.com/mozilla/TTS"; description = "Deep learning for Text to Speech"; diff --git a/nixpkgs/pkgs/tools/audio/video2midi/default.nix b/nixpkgs/pkgs/tools/audio/video2midi/default.nix index 3ce76fb61fae..4eafd7f52e1f 100644 --- a/nixpkgs/pkgs/tools/audio/video2midi/default.nix +++ b/nixpkgs/pkgs/tools/audio/video2midi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, opencv3 }: +{ lib, fetchFromGitHub, pythonPackages, opencv3 }: let opencv3_ = pythonPackages.toPythonModule (opencv3.override { diff --git a/nixpkgs/pkgs/tools/audio/volctl/default.nix b/nixpkgs/pkgs/tools/audio/volctl/default.nix index 06b6079bde24..d05257f1d083 100644 --- a/nixpkgs/pkgs/tools/audio/volctl/default.nix +++ b/nixpkgs/pkgs/tools/audio/volctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }: +{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }: python3Packages.buildPythonApplication rec { pname = "volctl"; diff --git a/nixpkgs/pkgs/tools/backup/bacula/default.nix b/nixpkgs/pkgs/tools/backup/bacula/default.nix index 3d9772de404d..f35c7a44b586 100644 --- a/nixpkgs/pkgs/tools/backup/bacula/default.nix +++ b/nixpkgs/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "JmBTwI/wUEytkhu0SYbTX6/dDQG6xvN2odEYTVpztok="; + sha256 = "sha256-Lr2c24hZU8A/Cd8xGA7rfqga67ghz0XJ/cs/z/hSlPU="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/nixpkgs/pkgs/tools/backup/bupstash/default.nix b/nixpkgs/pkgs/tools/backup/bupstash/default.nix index 76a3d674ecbf..9ed70491fb32 100644 --- a/nixpkgs/pkgs/tools/backup/bupstash/default.nix +++ b/nixpkgs/pkgs/tools/backup/bupstash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: +{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; version = "0.6.4"; diff --git a/nixpkgs/pkgs/tools/backup/diskrsync/default.nix b/nixpkgs/pkgs/tools/backup/diskrsync/default.nix index d70efa1d2248..3b5d901daf0c 100644 --- a/nixpkgs/pkgs/tools/backup/diskrsync/default.nix +++ b/nixpkgs/pkgs/tools/backup/diskrsync/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv, openssh, makeWrapper }: +{ buildGoPackage, fetchFromGitHub, lib, openssh, makeWrapper }: buildGoPackage rec { pname = "diskrsync"; diff --git a/nixpkgs/pkgs/tools/backup/dump/default.nix b/nixpkgs/pkgs/tools/backup/dump/default.nix index a709d84a610f..75a449a1276a 100644 --- a/nixpkgs/pkgs/tools/backup/dump/default.nix +++ b/nixpkgs/pkgs/tools/backup/dump/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "dump"; - version = "0.4b46"; + version = "0.4b47"; src = fetchurl { url = "mirror://sourceforge/dump/dump-${version}.tar.gz"; - sha256 = "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0"; + sha256 = "sha256-0CGs3k+77T2T662YFCL2cfSNZrKeyI196DZC7Pv/T9A="; }; buildInputs = [ e2fsprogs pkg-config ncurses readline ]; diff --git a/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/nixpkgs/pkgs/tools/backup/duplicity/default.nix index 5b213db6385a..399d6b9ada32 100644 --- a/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -19,11 +19,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.15"; + version = "0.8.17"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "1kg467mxg5a97v1rlv4shk32krgv8ys4nczq4b11av4bp1lgysdc"; + sha256 = "114rwkf9b3h4fcagrx013sb7krc4hafbwl9gawjph2wd9pkv2wx2"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/backup/duply/default.nix b/nixpkgs/pkgs/tools/backup/duply/default.nix index d23198f6f0c0..15ac5acbe848 100644 --- a/nixpkgs/pkgs/tools/backup/duply/default.nix +++ b/nixpkgs/pkgs/tools/backup/duply/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "duply"; - version = "2.2"; + version = "2.3"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.2.x/duply_${version}.tgz"; - sha256 = "1bd7ivswxmxg64n0fnwgz6bkgckhdhz2qnnlkqqx4ccdxx15krbr"; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.3.x/duply_${version}.tgz"; + sha256 = "sha256-I1KkblFnZVOCvcWEarGsSXnzlod2+yZ4okaTpckLFbE="; }; buildInputs = [ txt2man makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/backup/grab-site/default.nix b/nixpkgs/pkgs/tools/backup/grab-site/default.nix index 2ef3b5f54209..2f2f01356b47 100644 --- a/nixpkgs/pkgs/tools/backup/grab-site/default.nix +++ b/nixpkgs/pkgs/tools/backup/grab-site/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python37, fetchFromGitHub }: +{ lib, python37, fetchFromGitHub }: let python = python37.override { self = python; diff --git a/nixpkgs/pkgs/tools/backup/httrack/qt.nix b/nixpkgs/pkgs/tools/backup/httrack/qt.nix index 736dfdb557d9..2a7c4ff51768 100644 --- a/nixpkgs/pkgs/tools/backup/httrack/qt.nix +++ b/nixpkgs/pkgs/tools/backup/httrack/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, makeWrapper +{ mkDerivation, lib, fetchurl, cmake, pkg-config, makeWrapper , httrack, qtbase, qtmultimedia }: mkDerivation rec { diff --git a/nixpkgs/pkgs/tools/backup/iceshelf/default.nix b/nixpkgs/pkgs/tools/backup/iceshelf/default.nix index eb5e883bdacf..c066cb766951 100644 --- a/nixpkgs/pkgs/tools/backup/iceshelf/default.nix +++ b/nixpkgs/pkgs/tools/backup/iceshelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, git, awscli, python3 }: +{ lib, fetchFromGitHub, git, awscli, python3 }: python3.pkgs.buildPythonApplication rec { pname = "iceshelf"; diff --git a/nixpkgs/pkgs/tools/backup/luckybackup/default.nix b/nixpkgs/pkgs/tools/backup/luckybackup/default.nix index 5a67bea41ea6..a8f88e88b0e2 100644 --- a/nixpkgs/pkgs/tools/backup/luckybackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/luckybackup/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl +{ mkDerivation, lib, fetchurl , pkg-config, libtool, qmake , rsync, ssh }: diff --git a/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix b/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix index f55f163dafb0..0d24e3df7206 100644 --- a/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, python2Packages, librsync, gnused }: +{lib, fetchurl, python2Packages, librsync, gnused }: python2Packages.buildPythonApplication { name = "rdiff-backup-1.3.3"; diff --git a/nixpkgs/pkgs/tools/backup/s3ql/default.nix b/nixpkgs/pkgs/tools/backup/s3ql/default.nix index 74b90236c4e9..70394afb50e4 100644 --- a/nixpkgs/pkgs/tools/backup/s3ql/default.nix +++ b/nixpkgs/pkgs/tools/backup/s3ql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, sqlite, which }: +{ lib, fetchFromGitHub, python3Packages, sqlite, which }: python3Packages.buildPythonApplication rec { pname = "s3ql"; diff --git a/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix index 99ddd62e6ae2..8c37a7b72ac7 100644 --- a/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix +++ b/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, eggDerivation, fetchegg }: +{ pkgs, lib, eggDerivation, fetchegg }: let eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { diff --git a/nixpkgs/pkgs/tools/backup/ugarit/default.nix b/nixpkgs/pkgs/tools/backup/ugarit/default.nix index 938c24f38ce1..39c11cc0c91a 100644 --- a/nixpkgs/pkgs/tools/backup/ugarit/default.nix +++ b/nixpkgs/pkgs/tools/backup/ugarit/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, eggDerivation, fetchegg }: +{ pkgs, lib, eggDerivation, fetchegg }: let eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { diff --git a/nixpkgs/pkgs/tools/backup/wal-e/default.nix b/nixpkgs/pkgs/tools/backup/wal-e/default.nix index 0ed2bf1bf8bf..8e54b58e2017 100644 --- a/nixpkgs/pkgs/tools/backup/wal-e/default.nix +++ b/nixpkgs/pkgs/tools/backup/wal-e/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, lzop, postgresql, pv }: +{ lib, fetchurl, python3Packages, lzop, postgresql, pv }: python3Packages.buildPythonApplication rec { pname = "wal-e"; diff --git a/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix b/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix index 02e3c19f0046..c167ad1fa018 100644 --- a/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix +++ b/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytestcov, pytestrunner, lib, stdenv, stringcase +, pytestcov, pytestrunner, lib, stringcase }: buildPythonApplication rec { diff --git a/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index da1c4bfa969e..69eeb3db7114 100644 --- a/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -1,11 +1,11 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 -, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute +, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute , gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: let pythonPackages = python3Packages; - binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp iproute ]; + binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute ]; in stdenv.mkDerivation rec { pname = "blueman"; diff --git a/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix index e5d95e96fbca..70ab6db07c2e 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -1,9 +1,11 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +}: -with lib; stdenv.mkDerivation { pname = "cue2pops"; - version = "git-2018-01-04"; + version = "unstable-2018-01-04"; src = fetchFromGitHub { owner = "makefu"; @@ -14,14 +16,14 @@ stdenv.mkDerivation { dontConfigure = true; - makeFlags = ["CC=cc"]; + makeFlags = [ "CC=cc" ]; installPhase = '' install --directory --mode=755 $out/bin install --mode=755 cue2pops $out/bin ''; - meta = { + meta = with lib; { description = "Convert CUE to ISO suitable to POPStarter"; homepage = "https://github.com/makefu/cue2pops-linux"; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/nixpkgs/pkgs/tools/cd-dvd/isolyzer/default.nix b/nixpkgs/pkgs/tools/cd-dvd/isolyzer/default.nix index 477fa337da84..c175eb45aa0d 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/isolyzer/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/isolyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3 , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/tools/compression/bzip2/default.nix b/nixpkgs/pkgs/tools/compression/bzip2/default.nix index ad680a69f850..bfaf359522f4 100644 --- a/nixpkgs/pkgs/tools/compression/bzip2/default.nix +++ b/nixpkgs/pkgs/tools/compression/bzip2/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "High-quality data compression program"; license = licenses.bsdOriginal; platforms = platforms.all; - maintainers = []; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/nixpkgs/pkgs/tools/compression/dtrx/default.nix b/nixpkgs/pkgs/tools/compression/dtrx/default.nix index 0abea9b12854..91d59a4de0f8 100644 --- a/nixpkgs/pkgs/tools/compression/dtrx/default.nix +++ b/nixpkgs/pkgs/tools/compression/dtrx/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, pythonPackages +{ lib, fetchurl, pythonPackages , gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield , bzip2, xz, lzip # unzip is handled by p7zip diff --git a/nixpkgs/pkgs/tools/compression/lzip/default.nix b/nixpkgs/pkgs/tools/compression/lzip/default.nix index 9826347cfbb1..aa6b6d31a897 100644 --- a/nixpkgs/pkgs/tools/compression/lzip/default.nix +++ b/nixpkgs/pkgs/tools/compression/lzip/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "lzip"; - version = "1.21"; + version = "1.22"; nativeBuildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; - sha256 = "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4"; + sha256 = "sha256-wzQtQuZxOcFluLEo0DO1yWiToTrF8lkzGQMVIU6HqUg="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/compression/ncompress/default.nix b/nixpkgs/pkgs/tools/compression/ncompress/default.nix index 0f79811f9669..438e169d23c9 100644 --- a/nixpkgs/pkgs/tools/compression/ncompress/default.nix +++ b/nixpkgs/pkgs/tools/compression/ncompress/default.nix @@ -1,7 +1,7 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ncompress-4.2.4.5"; + name = "ncompress-4.2.4.6"; builder = ./builder.sh; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; - sha256 = "0fwhfijnzggqpbmln82zq7zp6sra7p9arfakswicwi7qsp6vnxgm"; + sha256 = "0sw3c7h80v9pagfqfx16ws9w2y3yrajrdk54bgiwdm0b0q06lyzv"; }; meta = { diff --git a/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch b/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch index 49aa4e65c768..b61b1272f8bd 100644 --- a/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch +++ b/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch @@ -1,25 +1,6 @@ diff -Naur ncompress-4.2.4.2.orig/Makefile.def ncompress-4.2.4.2/Makefile.def --- ncompress-4.2.4.2.orig/Makefile.def 2007-09-06 22:28:42.000000000 -0500 +++ ncompress-4.2.4.2/Makefile.def 2009-08-18 12:30:53.000000000 -0500 -@@ -3,14 +3,16 @@ - # C complier - #CC=cc - -+PREFIX=/usr/local -+ - # Install prefix - DESTDIR= - - # Install directory for binarys --BINDIR=/usr/local/bin -+BINDIR=$(PREFIX)/bin - - # Install directory for manual --MANDIR=/usr/local/man/man1 -+MANDIR=$(PREFIX)/man/man1 - - # compiler options: - # options is a collection of: @@ -31,7 +33,7 @@ # -DDEF_ERRNO=1 Define error (not defined in errno.h). # -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286. diff --git a/nixpkgs/pkgs/tools/compression/pigz/default.nix b/nixpkgs/pkgs/tools/compression/pigz/default.nix index 7517e599e733..a4cdcc08549e 100644 --- a/nixpkgs/pkgs/tools/compression/pigz/default.nix +++ b/nixpkgs/pkgs/tools/compression/pigz/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, zlib, util-linux }: let name = "pigz"; - version = "2.4"; + version = "2.6"; in stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; - sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54"; + sha256 = "sha256-Lu17DXRJ0dcJA/KmLNYAXSYus6jJ6YaHvIy7WAnbKn0="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix index 68199a0938eb..f0efaaa32316 100644 --- a/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }: +{ lib, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }: mkDerivation rec { pname = "android-file-transfer"; diff --git a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index a8baeaf3ef55..cc6916869b6f 100644 --- a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -1,16 +1,14 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.14.8"; + version = "1.14.9"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5"; + sha256 = "0fnij365dn4ihkpfc92x63inxxwpminzffyj55krp1w02canpl5n"; }; - dontStrip = true; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; postFixup = '' diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 84ceea384c3a..ec9cd7ca61ae 100644 --- a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.9"; + version = "5.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "14d7hz07kfczfgmy1ixkgccjn393gpkjn7givz5kwxddcnk5i4xq"; + sha256 = "sha256-5xoNbdUE86XZV/zpowKB62Hs+ZHIrzFf4AYaG5eh0CE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix index 8f4e9941029b..2f179a151d1e 100644 --- a/nixpkgs/pkgs/tools/filesystems/catcli/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonApplication , docopt, anytree diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index c11828e24ca7..61cc4573693d 100644 --- a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, fetchurl +{ lib, stdenv, runCommand, fetchurl , fetchpatch , ensureNewerSourcesHook , cmake, pkg-config @@ -36,7 +36,6 @@ # We must have one crypto library assert cryptopp != null || (nss != null && nspr != null); -with stdenv; with lib; let shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; @@ -76,7 +75,7 @@ let none = [ ]; }; - getMeta = description: { + getMeta = description: with lib; { homepage = "https://ceph.com/"; inherit description; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; @@ -148,11 +147,11 @@ in rec { boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 rdma-core rabbitmq-c - ] ++ optionals hasRadosgw [ + ] ++ lib.optionals hasRadosgw [ optFcgi optExpat optCurl optFuse optLibedit ]; diff --git a/nixpkgs/pkgs/tools/filesystems/convoy/default.nix b/nixpkgs/pkgs/tools/filesystems/convoy/default.nix index 4c493ea22527..774568fdde17 100644 --- a/nixpkgs/pkgs/tools/filesystems/convoy/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/convoy/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: +{ lib, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { pname = "convoy"; diff --git a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index ffe716dceea2..154b0006663c 100644 --- a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -71,5 +71,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.eelco ]; + # imager.c:70:2: error: unknown type name 'loff_t'; did you mean 'off_t'? + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix index 1d1863ede968..e4a120264fd8 100644 --- a/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "gitfs"; diff --git a/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix index a1e9fad45405..4e8a3a991f51 100644 --- a/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix @@ -54,13 +54,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "8.3"; + version = "9.0"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "09vvbymiacz2pzwnq6f2dd7g2zszzsivdncz45sh977v3z0n84az"; + sha256 = "sha256-pjJQAFEb44yNqvNAOclZsiEDZBgcfIxliD3La1IsKPs="; }; inherit buildInputs propagatedBuildInputs; diff --git a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix index 318e39e8322e..b8b330c129a0 100644 --- a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , openssl diff --git a/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/nixpkgs/pkgs/tools/filesystems/irods/common.nix index 24697aaf8218..7b7eb7ba05a9 100644 --- a/nixpkgs/pkgs/tools/filesystems/irods/common.nix +++ b/nixpkgs/pkgs/tools/filesystems/irods/common.nix @@ -1,9 +1,7 @@ -{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: +{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: # Common attributes of irods packages -with stdenv; - { nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos boost libcxx catch2 ]; @@ -35,7 +33,7 @@ with stdenv; " ''; - meta = { + meta = with lib; { description = "Integrated Rule-Oriented Data System (iRODS)"; longDescription = '' The Integrated Rule-Oriented Data System (iRODS) is open source data management diff --git a/nixpkgs/pkgs/tools/filesystems/irods/default.nix b/nixpkgs/pkgs/tools/filesystems/irods/default.nix index 0dce22b8bbba..fe7a0d73f673 100644 --- a/nixpkgs/pkgs/tools/filesystems/irods/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/irods/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: - -with stdenv; +{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: let avro-cpp=avro-cpp_llvm; in let common = import ./common.nix { - inherit stdenv bzip2 zlib autoconf automake cmake gnumake + inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive jansson zeromq openssl pam libiodbc kerberos gcc libcxx boost avro-cpp which catch2; @@ -83,7 +81,7 @@ in rec { ''; cmakeFlags = common.cmakeFlags ++ [ - "-DCMAKE_INSTALL_PREFIX=${out}" + "-DCMAKE_INSTALL_PREFIX=${stdenv.out}" "-DIRODS_DIR=${irods}/lib/irods/cmake" "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/default.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/default.nix index 3a63ad9747fe..80ae8ca2b3cd 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonApplication, blivet }: +{ lib, fetchurl, buildPythonApplication, blivet }: buildPythonApplication rec { pname = "nixpart"; diff --git a/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix b/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix index a3056a80aa1f..ddd37387fae6 100644 --- a/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rar2fs"; - version = "1.29.2"; + version = "1.29.4"; src = fetchFromGitHub { owner = "hasse69"; repo = pname; rev = "v${version}"; - sha256 = "0j7ai0gcbln2lyfc87xxmj0zpf3lnqa6fdm5rar3kdqhczb7s93y"; + sha256 = "sha256-O14KuzngzsGazvwz3FCPe0SplO8I6CPJjpCLBPcZq6k="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/filesystems/sandboxfs/default.nix b/nixpkgs/pkgs/tools/filesystems/sandboxfs/default.nix index 8777fa50a5d8..32d186344dd7 100644 --- a/nixpkgs/pkgs/tools/filesystems/sandboxfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/sandboxfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform , fuse diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 593004d552c1..322f57fdca92 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "120x2hlbhpm90bzxz70z764552ffrjpidmp1y6gafx70zp0hrks4"; + sha256 = "04zvpws1nk3r2kr1k5in9di9fhn4zzciyndgnxnijmhiqpyrx072"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; diff --git a/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix index 7129de950136..1eac3e03ec92 100644 --- a/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: buildGoPackage rec { pname = "tmsu"; diff --git a/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix b/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix index 2787b87964fd..6a6409ad3251 100644 --- a/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }: +{ lib, fetchFromGitHub, python3, makeWrapper }: python3.pkgs.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix b/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix index 2489357f73f9..1447ca36a136 100644 --- a/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix @@ -1,6 +1,11 @@ -{ lib, stdenv, fetchurl, e2fsprogs }: +{ lib, stdenv, fetchurl, installShellFiles, e2fsprogs }: -stdenv.mkDerivation rec { +let + manpage = fetchurl { + url = "https://manpages.ubuntu.com/manpages.gz/xenial/man8/zerofree.8.gz"; + sha256 = "0y132xmjl02vw41k794psa4nmjpdyky9f6sf0h4f7rvf83z3zy4k"; + }; +in stdenv.mkDerivation rec { pname = "zerofree"; version = "1.1.1"; @@ -9,12 +14,14 @@ stdenv.mkDerivation rec { sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm"; }; - buildInputs = [ e2fsprogs ]; + buildInputs = [ e2fsprogs installShellFiles ]; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/share/zerofree cp zerofree $out/bin -''; + cp COPYING $out/share/zerofree/COPYING + installManPage ${manpage} + ''; meta = { homepage = "https://frippery.org/uml/"; diff --git a/nixpkgs/pkgs/tools/games/ajour/default.nix b/nixpkgs/pkgs/tools/games/ajour/default.nix new file mode 100644 index 000000000000..291c783c9148 --- /dev/null +++ b/nixpkgs/pkgs/tools/games/ajour/default.nix @@ -0,0 +1,81 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, autoPatchelfHook +, cmake +, makeWrapper +, pkg-config +, python3 +, expat +, freetype +, kdialog +, zenity +, openssl +, libX11 +, libxcb +, libXcursor +, libXi +, libxkbcommon +, libXrandr +, vulkan-loader +, wayland +}: + +let + rpathLibs = [ + libXcursor + libXi + libxkbcommon + libXrandr + libX11 + vulkan-loader + wayland + ]; + +in rustPlatform.buildRustPackage rec { + pname = "Ajour"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "casperstorm"; + repo = "ajour"; + rev = version; + sha256 = "1lwwj16q24k3d3vaj64zkai4cb15hxp6bzicp004q5az4gbriwih"; + }; + + cargoSha256 = "17j6v796ahfn07yjj9xd9kygy0sllz93ac4gky8w0hcixdwjp3i5"; + + nativeBuildInputs = [ + autoPatchelfHook + cmake + makeWrapper + pkg-config + python3 + ]; + + buildInputs = [ + expat + freetype + openssl + libxcb + libX11 + ]; + + fixupPhase = '' + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $out/bin/ajour)" $out/bin/ajour + wrapProgram $out/bin/ajour --prefix PATH ":" ${lib.makeBinPath [ zenity kdialog ]} + ''; + + meta = with lib; { + description = "World of Warcraft addon manager written in Rust"; + longDescription = '' + Ajour is a World of Warcraft addon manager written in Rust with a + strong focus on performance and simplicity. The project is + completely advertisement free, privacy respecting and open source. + ''; + homepage = "https://github.com/casperstorm/ajour"; + changelog = "https://github.com/casperstorm/ajour/blob/master/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix b/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix index 1fe254d77857..02bb022dfb47 100644 --- a/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, gawk +{ lib, fetchFromGitHub, makeWrapper, gawk , makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages }: diff --git a/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/nixpkgs/pkgs/tools/graphics/gifski/default.nix index 0ce24482164e..de8662212678 100644 --- a/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.2.6"; + version = "1.3.3"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-pnaNBjMKWfnCHG4MTLS2tJ2lrKxH6tcnvbOFZSDtPJY="; + sha256 = "sha256-dBgDIS6U2iKzyo5nO0NOD488zfEbaZJH7luJN6khrnc="; }; - cargoSha256 = "sha256-M5LEoEaWKT6nfQsnuqfyRBtDILewAxzMs7d6DvhkvFg="; + cargoSha256 = "sha256-/i5ZBCWFlhoheHsCI5f9yJ7sa6l/DB4AJckq5orinwI="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/nixpkgs/pkgs/tools/graphics/gmic/default.nix index 07d4d1dd303a..92956aa53e34 100644 --- a/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.4"; + version = "2.9.5"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "1ixcdq16gmgh1brrb6mgdibypq9lvh8gnz86b5mmyxlnyi4fw2vr"; + sha256 = "sha256-KV/Ti6mPW+FASjug6q8Qfgra8L/TIyl/Y6JwANzQreE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/graphics/graph-easy/default.nix b/nixpkgs/pkgs/tools/graphics/graph-easy/default.nix index 4ae68207aaec..341d6dea90ac 100644 --- a/nixpkgs/pkgs/tools/graphics/graph-easy/default.nix +++ b/nixpkgs/pkgs/tools/graphics/graph-easy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, perlPackages, fetchurl }: +{ lib, perlPackages, fetchurl }: perlPackages.buildPerlPackage { pname = "Graph-Easy"; diff --git a/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/default.nix b/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/default.nix index 000f227075ed..9316e9d38e04 100644 --- a/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/default.nix +++ b/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/default.nix @@ -1,7 +1,7 @@ # generated with cabal2nix by ./generate.sh { mkDerivation, aeson, base, cmdargs, containers, data-ordlist , directory, fetchgit, filepath, Glob, hpack, parallel-io, process -, safe, lib, stdenv, text, time, yaml +, safe, lib, text, time, yaml }: mkDerivation { pname = "ldgallery-compiler"; diff --git a/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/generate.sh b/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/generate.sh index 0874051b6765..f115fb11d9b9 100755 --- a/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/generate.sh +++ b/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/generate.sh @@ -24,11 +24,7 @@ node2nix \ --input ./package.json \ --lock ./package-lock.json \ --output node-packages.nix \ - --composition node-composition.nix + --composition node-composition.nix \ + --no-copy-node-env rm package.json package-lock.json - -# Temporary quickfix to accomodate for the util-linux package rename. -# See https://github.com/svanderburg/node2nix/issues/213 -git restore :/pkgs/development/node-packages/node-env.nix -sed -i 's/utillinux/util-linux/g' node-composition.nix diff --git a/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix index 55566aafc585..aaf54a05c884 100644 --- a/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix +++ b/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix b/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix index 9946ce0e63c6..ce00bdfd0971 100644 --- a/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix +++ b/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -13252,7 +13252,7 @@ let ]; buildInputs = globalBuildInputs; meta = { - homepage = https://ldgallery.pacien.org/; + homepage = "https://ldgallery.pacien.org/"; license = "AGPL-3"; }; production = false; @@ -13266,4 +13266,16 @@ in tarball = nodeEnv.buildNodeSourceDist args; package = nodeEnv.buildNodePackage args; shell = nodeEnv.buildNodeShell args; + nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { + src = stdenv.mkDerivation { + name = args.name + "-package-json"; + src = nix-gitignore.gitignoreSourcePure [ + "*" + "!package.json" + "!package-lock.json" + ] args.src; + dontBuild = true; + installPhase = "mkdir -p $out; cp -r ./* $out;"; + }; + }); } diff --git a/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix index c4b8622f479b..75e69a5d4996 100644 --- a/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix +++ b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,64 +1,58 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, python36 -, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase -, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core -, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre -, bison, flex, libpthreadstubs, libX11 -, embree2, makeWrapper, gsettings-desktop-schemas, glib -, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp, rocm-opencl-runtime -}: +{ lib, config, stdenv, fetchFromGitHub, symlinkJoin, wrapGAppsHook, cmake, boost172 +, pkg-config, flex, bison, libpng, libtiff, zlib, python3, embree, openexr +, openimagedenoise, openimageio, tbb, c-blosc, gtk3, pcre, doxygen +# OpenCL Support +, withOpenCL ? true, ocl-icd +# Cuda Support +, withCuda ? config.cudaSupport or false, cudatoolkit }: let - python = python36; - - boost_static = boost165.override { - inherit python; - enableStatic = true; - enablePython = true; - }; + boostWithPython = boost172.override { + enablePython = true; + enableNumpy = true; + python = python3; + }; - version = "2.0"; - sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + # Requires a version number like "<MAJOR><MINOR>" + pythonVersion = (lib.versions.major python3.version) + + (lib.versions.minor python3.version); -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "luxcorerender"; - inherit version; + version = "2.4"; src = fetchFromGitHub { owner = "LuxCoreRender"; repo = "LuxCore"; rev = "luxcorerender_v${version}"; - inherit sha256; + sha256 = "0xvivw79719fa1q762b76nyvzawfd3hmp8y5j04bax8a7f8mfa9k"; }; - nativeBuildInputs = [ cmake flex bison doxygen makeWrapper pkg-config ]; + nativeBuildInputs = [ pkg-config cmake flex bison doxygen wrapGAppsHook ]; + buildInputs = [ - embree2 zlib boost_static libjpeg - libtiff libpng ilmbase freetype openexr openimageio - tbb qt5.full c-blosc libGLU pcre - libX11 libpthreadstubs python libXdmcp libxkbcommon - epoxy at-spi2-core dbus - # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk3 - # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme - (lib.getLib dconf) - ] ++ lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ]; + libpng + libtiff + zlib + boostWithPython.dev + python3 + embree + openexr + openimagedenoise + tbb + c-blosc + gtk3 + pcre + openimageio.dev + openimageio.out + ] ++ lib.optionals withOpenCL [ ocl-icd ] + ++ lib.optionals withCuda [ cudatoolkit ]; - cmakeFlags = [ - "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" - "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR" - "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" - "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include" - "-DPYTHON_LIBRARY=${python}/lib/libpython3.so" - "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.pythonVersion}" - "-DEMBREE_INCLUDE_PATH=${embree2}/include" - "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" - "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" - ] ++ lib.optional withOpenCL - "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; + cmakeFlags = [ "-DPYTHON_V=${pythonVersion}" ] + ++ lib.optional (!withOpenCL) "-DLUXRAYS_DISABLE_OPENCL=1" + ++ lib.optional (!withCuda) "-DLUXRAYS_DISABLE_CUDA=1"; preConfigure = '' - NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}" NIX_LDFLAGS+=" -lpython3" ''; @@ -69,13 +63,6 @@ in stdenv.mkDerivation { cp -va lib/* $out/lib ''; - preFixup = '' - wrapProgram "$out/bin/luxcoreui" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ - --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" - ''; - meta = with lib; { description = "Open source, physically based, unbiased rendering engine"; homepage = "https://luxcorerender.org/"; @@ -85,7 +72,6 @@ in stdenv.mkDerivation { }; } - # TODO (might not be necessary): # # luxcoreui still gives warnings like: "failed to commit changes to diff --git a/nixpkgs/pkgs/tools/graphics/pdfredacttools/default.nix b/nixpkgs/pkgs/tools/graphics/pdfredacttools/default.nix index 71d927913c36..0a1cc111b541 100644 --- a/nixpkgs/pkgs/tools/graphics/pdfredacttools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pdfredacttools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }: +{ lib, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }: python2Packages.buildPythonApplication rec { pname = "pdf-redact-tools"; diff --git a/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix b/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix index 7fba539977f9..579dcad4ccb4 100644 --- a/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "pngcheck-2.3.0"; + name = "pngcheck-3.0.2"; src = fetchurl { url = "mirror://sourceforge/png-mng/${name}.tar.gz"; - sha256 = "0pzkj1bb4kdybk6vbfq9s0wzdm5szmrgixkas3xmbpv4mhws1w3p"; + sha256 = "sha256-DX4mLyQRb93yhHqM61yS2fXybvtC6f/2PsK7dnYTHKc="; }; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/tools/graphics/puppeteer-cli/default.nix b/nixpkgs/pkgs/tools/graphics/puppeteer-cli/default.nix index c01ee232fa7b..20dab27ddf07 100644 --- a/nixpkgs/pkgs/tools/graphics/puppeteer-cli/default.nix +++ b/nixpkgs/pkgs/tools/graphics/puppeteer-cli/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, makeWrapper, stdenv, chromium, mkYarnPackage +{ fetchFromGitHub, makeWrapper, chromium, mkYarnPackage }: mkYarnPackage rec { diff --git a/nixpkgs/pkgs/tools/graphics/qrcode/default.nix b/nixpkgs/pkgs/tools/graphics/qrcode/default.nix index 4f1770be17ed..93a620b57792 100644 --- a/nixpkgs/pkgs/tools/graphics/qrcode/default.nix +++ b/nixpkgs/pkgs/tools/graphics/qrcode/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' mkdir -p "$out"/{bin,share/doc/qrcode} cp qrcode "$out/bin" @@ -23,6 +25,6 @@ stdenv.mkDerivation { description = "A small QR-code tool"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/tools/graphics/resvg/default.nix b/nixpkgs/pkgs/tools/graphics/resvg/default.nix index 71df0186068a..8c8164a7e8ef 100644 --- a/nixpkgs/pkgs/tools/graphics/resvg/default.nix +++ b/nixpkgs/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "0iqlg0wmx9y81ncbw4ihd6pr7ddpfsvk35zmhzsq4plwzbxgp0w1"; + sha256 = "sha256-Jo+dx4+3GpEwOoE8HH0YahBmPvT9Oy2qXMvCJ/NZhF0="; }; - cargoSha256 = "0jgczhvm5rsv4vwd5wx6gshy6322im4c3wi79klk249czr6vlwsg"; + cargoSha256 = "sha256-8Es9NZYsC/9PZ6ytWZTAH42U3vxZtJERPSsno1s4TEc="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/graphics/rocket/default.nix b/nixpkgs/pkgs/tools/graphics/rocket/default.nix index ec32d6c7140f..070e359fe1c5 100644 --- a/nixpkgs/pkgs/tools/graphics/rocket/default.nix +++ b/nixpkgs/pkgs/tools/graphics/rocket/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }: mkDerivation { pname = "rocket"; diff --git a/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/nixpkgs/pkgs/tools/graphics/scrot/default.nix index 2fd56d0737d4..aa525abacb07 100644 --- a/nixpkgs/pkgs/tools/graphics/scrot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/scrot/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "scrot"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "12xq6glg70icwsvbnfw9gm4dahlbnrc7b6adpd0mpf89h4sj2gds"; + sha256 = "sha256-4vguodLnCj0sOBLM4oJXTfX1p8hIo3WTwIuViPtZxHQ="; }; nativeBuildInputs = [ autoreconfHook autoconf-archive ]; diff --git a/nixpkgs/pkgs/tools/graphics/shotgun/default.nix b/nixpkgs/pkgs/tools/graphics/shotgun/default.nix index 3c96584029e7..79ddd39ea792 100644 --- a/nixpkgs/pkgs/tools/graphics/shotgun/default.nix +++ b/nixpkgs/pkgs/tools/graphics/shotgun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }: rustPlatform.buildRustPackage rec { pname = "shotgun"; diff --git a/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix b/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix index 61ea43d3dbd0..cb5a37527bf6 100644 --- a/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix +++ b/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-cross"; - version = "2020-09-17"; + version = "2021-01-15"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = version; - sha256 = "03agx9f7klw96isfdz3xsw47308qxmgs24nsz7j9kx3f337fn435"; + sha256 = "/9/Owt7XcdOjujWZnaG1Q7FlywvsRo8/l8/CouS48Vk="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix b/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix index 653e585c6ed6..6c5e8569e853 100644 --- a/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix +++ b/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "svgcleaner"; diff --git a/nixpkgs/pkgs/tools/graphics/unpaper/default.nix b/nixpkgs/pkgs/tools/graphics/unpaper/default.nix index dd6ecb473e97..20dfe15dc6c6 100644 --- a/nixpkgs/pkgs/tools/graphics/unpaper/default.nix +++ b/nixpkgs/pkgs/tools/graphics/unpaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libav, libxslt }: +{ lib, stdenv, fetchurl, pkg-config, ffmpeg, libxslt }: stdenv.mkDerivation rec { pname = "unpaper"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libav libxslt ]; + buildInputs = [ ffmpeg libxslt ]; meta = with lib; { homepage = "https://www.flameeyes.eu/projects/unpaper"; diff --git a/nixpkgs/pkgs/tools/graphics/vips/default.nix b/nixpkgs/pkgs/tools/graphics/vips/default.nix index 9b29e114b887..333c4848db20 100644 --- a/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.10.2"; + version = "8.10.5"; outputs = [ "bin" "out" "man" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "1psi39a4h0awwbyizbsk467z0djwq0rh8hvkklbsd5b92m7768sp"; + sha256 = "sha256-h21Ep6f4/y+m0kdrCA5dcULFeOOyLtMx2etAziG6f9Y="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/nixpkgs/pkgs/tools/graphics/viu/default.nix b/nixpkgs/pkgs/tools/graphics/viu/default.nix index 39b12326e806..39aa8fe06e05 100644 --- a/nixpkgs/pkgs/tools/graphics/viu/default.nix +++ b/nixpkgs/pkgs/tools/graphics/viu/default.nix @@ -2,18 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "1q248jnbv64mkvg18465dpvjkw2v2hfqyvdvdixyrwyrnlv5cicv"; + sha256 = "1n1qwlh1zinq5ngx04cvs69z8zr12yywr70vbrc946kbh4hx6pk9"; }; - # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 + + # tests need an interactive terminal doCheck = false; - cargoSha256 = "18rskn8fchlgk295yk8sc2g1x6h43rmhqif871hgzdx1i35sbajr"; + cargoSha256 = "0bdjfcyx2cwz68gcx0393h4ysccarfp02pvvp0a5xgkq11bad0r0"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix b/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix new file mode 100644 index 000000000000..50cbe0481311 --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, glslang +, meson +, ninja +, pkg-config +, libX11 +, spirv-headers +, vulkan-headers +, vkBasalt32 +}: + +stdenv.mkDerivation rec { + pname = "vkBasalt"; + version = "0.3.2.4"; + + src = fetchFromGitHub { + owner = "DadSchoorse"; + repo = pname; + rev = "v${version}"; + sha256 = "01iplj6dlw2vl35hyci5m5yp8jmzcwng6c3jk3wn97jpv6m3hjqz"; + }; + + nativeBuildInputs = [ glslang meson ninja pkg-config ]; + buildInputs = [ libX11 spirv-headers vulkan-headers ]; + mesonFlags = [ "-Dappend_libdir_vkbasalt=true" ]; + + # Include 32bit layer in 64bit build + postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' + ln -s ${vkBasalt32}/share/vulkan/implicit_layer.d/vkBasalt.json \ + "$out/share/vulkan/implicit_layer.d/vkBasalt32.json" + ''; + + meta = with lib; { + description = "A Vulkan post processing layer for Linux"; + homepage = "https://github.com/DadSchoorse/vkBasalt"; + license = licenses.zlib; + maintainers = with maintainers; [ metadark ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 083db90a9b08..bffd9ea0378a 100644 --- a/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "waifu2x-converter-cpp"; - version = "5.3.3"; + version = "5.3.4"; src = fetchFromGitHub { owner = "DeadSix27"; repo = pname; rev = "v${version}"; - sha256 = "04r0xyjknvcwk70ilj1p3qwlcz3i6sqgcp0qbc9qwxnsgrrgz09w"; + sha256 = "0rv8bnyxz89za6gwk9gmdbaf3j7c1j52mip7h81rir288j35m84x"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix b/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix index cbcacfab3a81..2640769d186b 100644 --- a/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix +++ b/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook , fetchpatch }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - meta = let inherit (stdenv) lib; in { + meta = with lib; { description = "A graphical application for configuring displays in Wayland compositors"; homepage = "https://github.com/cyclopsian/wdisplays"; maintainers = with lib.maintainers; [ lheckemann ma27 ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix index 99f7231c58a4..73344ca26900 100644 --- a/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { pname = "evdevremapkeys"; diff --git a/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix b/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix index 01f312fa63d6..66f264bc7a36 100644 --- a/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "evscript"; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 923fd7c7a74e..6d3952c9c225 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchurl , fetchFromGitHub diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index ba006873c40a..b133d576c6cc 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , cmake diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 3f42894ef9f1..0daeaa794cee 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -7,6 +7,7 @@ , gobject-introspection , gtk2 , gtk3 +, gtk4 , pcre , libuuid , libselinux @@ -36,12 +37,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0" "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0" - # disabled since we currently don't have gtk4 in nixpkgs - "-DENABLE_GTK4_IM_MODULE=off" ] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; buildInputs = [ gtk3 + gtk4 gobject-introspection fcitx5 pcre diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 155f10fae26e..bfb06a98e8fd 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , cmake diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 8b5309219400..b51efc2cb810 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ibus-libpinyin"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; rev = version; - sha256 = "0b8rilk9zil9gvfhlk3rphcby6ph11dw66j175wp0na6h6hjlaf2"; + sha256 = "sha256-fEEiwRoGGFAki1DMQvGuzjz2NAjhExyH11l8KTwjjsI="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { isIbusEngine = true; description = "IBus interface to the libpinyin input method"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 07ab09b8e6c8..8fbd9254486a 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "0lb2vcnkzy64474j7306ydyw1ali0qbx07sxfms2fqv1nmh161i2"; + sha256 = "sha256-kPTysHTC+j8BMnzsddRa4Tg54idejApTqmLrP20pu5M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index a7a640b2c6e4..00a499fb104b 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.9.25"; + version = "1.12.3"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "0v570qpnb2q79aqr9f0xnska34y7hw34ibiwsf7ybcw69fhi1zkg"; + sha256 = "sha256-iVbct7p+i8ifSQzOFUUnJU0RHX36cFiTlv7p79iawj8="; }; postPatch = '' @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { -e "/export IBUS_LOCALEDIR=/ s/^.$//" \ -i "setup/ibus-setup-table.in" substituteInPlace engine/tabcreatedb.py --replace '/usr/share/ibus-table' $out/share/ibus-table + substituteInPlace engine/ibus_table_location.py \ + --replace '/usr/libexec' $out/libexec \ + --replace '/usr/share/ibus-table/' $out/share/ibus-table/ ''; buildInputs = [ @@ -34,6 +37,7 @@ stdenv.mkDerivation rec { gtk3 ibus (python3.withPackages (pypkgs: with pypkgs; [ + dbus-python pygobject3 (toPythonModule ibus) ])) diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus/wrapper.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/wrapper.nix index 74426b2b04ed..93078325a0d2 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, makeWrapper, lndir +{ lib, runCommand, makeWrapper, lndir , dconf, hicolor-icon-theme, ibus, librsvg, plugins ? [] }: diff --git a/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index c7a42e5a82c1..bc9aa73c2fc6 100644 --- a/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -3,33 +3,33 @@ let # kana to kanji small = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.S"; - sha256 = "15kp4iwz58fp1zg0i13x7w9wwm15v8n2hhm0nf2zsl7az5mn5yi4"; + url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.S"; + sha256 = "11cjrc8m99hj4xpl2nvzxanlswpapi92vmgk9d6yimdz0jidb6cq"; }; medium = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.M"; - sha256 = "1vhagixhrp9lq5x7dldxcanhznawazp00xivpp1z52kx10lnkmv0"; + url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.M"; + sha256 = "0pwjp9qjmn9sq6zc0k6632l7dc2dbjn45585ibckvvl9iwfqqxdp"; }; large = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.L"; - sha256 = "07cv0j95iajkr48j4ln411vnhl3z93yx96zjc03bgs10dbpagaaz"; + url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.L"; + sha256 = "0ps0a7sbkryd6hxvphq14i7g5wci4gvr0vraac8ia2ww67a2xbyc"; }; # english to japanese edict = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.edict"; - sha256 = "18k8z1wkgwgfwbs6sylf39h1nc1p5l2b00h7mfjlb8p91plkb45w"; + url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.edict"; + sha256 = "1vrwnq0vvjn61nijbln6wfinqg93802d2a8d4ad82n692v83b1li"; }; # misc assoc = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.assoc"; - sha256 = "12d6xpp1bfin9nwl35ydl5yc6vx0qpwhxss0khi19n1nsbyqnixm"; + url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.assoc"; + sha256 = "1smcbyv6srrhnpl7ic9nqds9nz3g2dgqngmhzkrdlwmvcpvakp1v"; }; in stdenv.mkDerivation { pname = "skk-dicts-unstable"; - version = "2017-10-26"; + version = "2020-03-24"; srcs = [ small medium large edict assoc ]; nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; diff --git a/nixpkgs/pkgs/tools/misc/3mux/default.nix b/nixpkgs/pkgs/tools/misc/3mux/default.nix index 3f1e981fd0e3..3c51210edc7a 100644 --- a/nixpkgs/pkgs/tools/misc/3mux/default.nix +++ b/nixpkgs/pkgs/tools/misc/3mux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "3mux"; diff --git a/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix b/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix index f51497376393..c9466f54a621 100644 --- a/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: with python3.pkgs; diff --git a/nixpkgs/pkgs/tools/misc/apt-offline/default.nix b/nixpkgs/pkgs/tools/misc/apt-offline/default.nix index 5c17b7f2d131..9c952cc7c302 100644 --- a/nixpkgs/pkgs/tools/misc/apt-offline/default.nix +++ b/nixpkgs/pkgs/tools/misc/apt-offline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.8.1"; diff --git a/nixpkgs/pkgs/tools/misc/aptly/default.nix b/nixpkgs/pkgs/tools/misc/aptly/default.nix index 369f7dd219f4..7f82aebabe4a 100644 --- a/nixpkgs/pkgs/tools/misc/aptly/default.nix +++ b/nixpkgs/pkgs/tools/misc/aptly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: let diff --git a/nixpkgs/pkgs/tools/misc/arp-scan/default.nix b/nixpkgs/pkgs/tools/misc/arp-scan/default.nix index f4786a57bd75..e25543b5145a 100644 --- a/nixpkgs/pkgs/tools/misc/arp-scan/default.nix +++ b/nixpkgs/pkgs/tools/misc/arp-scan/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation"; license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor mikoim ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ bjornfor mikoim r-burns ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix b/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix index 25bac9768438..f69916621146 100644 --- a/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix +++ b/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchCrate }: diff --git a/nixpkgs/pkgs/tools/misc/autorevision/default.nix b/nixpkgs/pkgs/tools/misc/autorevision/default.nix index 61bd5b5fc652..ab7add1261a9 100644 --- a/nixpkgs/pkgs/tools/misc/autorevision/default.nix +++ b/nixpkgs/pkgs/tools/misc/autorevision/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "autorevision"; - version = "1.21"; + version = "1.22"; src = fetchurl { url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; - sha256 = "07ssirjy2mgbqxr792n3rqa408hm7qnhwfjzd73rqfwvjcahy1q8"; + sha256 = "sha256-3ktLVC73m2xddq5BhxVKw/FJd6pZ5RVb7fv29dxUoRE="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix index f8a17790ba19..ad48eae7a87f 100644 --- a/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "azure-vhd-utils"; diff --git a/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix b/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix index cc3476f598b7..44d7e93355bb 100644 --- a/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix +++ b/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication { pname = "bashplotlib"; diff --git a/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix index ed42f31f26b3..79094dc9540a 100644 --- a/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages }: +{ lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { pname = "bmap-tools"; diff --git a/nixpkgs/pkgs/tools/misc/bonfire/default.nix b/nixpkgs/pkgs/tools/misc/bonfire/default.nix index cda58e80d87c..a3f1608c3ad1 100644 --- a/nixpkgs/pkgs/tools/misc/bonfire/default.nix +++ b/nixpkgs/pkgs/tools/misc/bonfire/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; diff --git a/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix b/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix index 53925b875916..cb5f582d2dec 100644 --- a/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication { pname = "broadlink-cli"; diff --git a/nixpkgs/pkgs/tools/misc/byobu/default.nix b/nixpkgs/pkgs/tools/misc/byobu/default.nix index 2008cf7b2079..c647d3b39028 100644 --- a/nixpkgs/pkgs/tools/misc/byobu/default.nix +++ b/nixpkgs/pkgs/tools/misc/byobu/default.nix @@ -3,7 +3,6 @@ , gettext, vim, bc, screen }: let - inherit (stdenv) lib; pythonEnv = python3.withPackages (ps: with ps; [ snack ]); in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index a671090460ea..e79774da9177 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.35.1"; + version = "3.2.36"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "s2wnwcdrcJLG5NhugSkntBCYfPuv3T/9+PclbmK0BJ4="; + sha256 = "sha256-pgA0mRglIBObNNUQIozNy6EvJQSmHRF+kN4EjqL4tt4="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 15a2a643d32d..dc1a49a40bf2 100644 --- a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "chezmoi"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-S1bnzuOZGQLdVJUH+A29KxF84dj2OeLJ4XajfTDdjUY="; + sha256 = "sha256-aWq36wQFxAyORifi5/9MOnqmR5FRyDAQj1tVFqoiFvA="; }; - vendorSha256 = "sha256-X1h0EcUf8MWt929huNjt0WnhFqhVZu07JGi7c5hdXoY="; + vendorSha256 = "sha256-ASTPb8Va3Gl/VtmPJIdlnlU3OspAxzZ5iSHVcZOh8CY="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/cht.sh/default.nix b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix index 3f2218ac871d..67249d76454b 100644 --- a/nixpkgs/pkgs/tools/misc/cht.sh/default.nix +++ b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2020-08-06"; + version = "unstable-2021-01-31"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "9f99bec1f0293e84d6d8a990a1940c1422e3b0ce"; - sha256 = "1n4lgzsgg4502zh113d7pb1hw6bykqx6vpfp8j08z7y5clmdiwa6"; + rev = "01e579176981356fb90d4aa58fea2d6c273a45a5"; + sha256 = "0d98v67ajsc80i962myh0j4ph7bn3csk8y9jf8b5rfqd1zg737hb"; }; # Fix ".cht.sh-wrapped" in the help message @@ -36,7 +36,9 @@ stdenv.mkDerivation { --prefix PATH : "${lib.makeBinPath [ curl rlwrap ncurses xsel ]}" ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/chubin/cheat.sh.git"; + }; meta = with lib; { description = "CLI client for cheat.sh, a community driven cheat sheet"; diff --git a/nixpkgs/pkgs/tools/misc/ckb-next/default.nix b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix index 6c13c3bbe6ae..9c6909d445d9 100644 --- a/nixpkgs/pkgs/tools/misc/ckb-next/default.nix +++ b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev +{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev , pkg-config, qtbase, cmake, zlib, kmod }: mkDerivation rec { diff --git a/nixpkgs/pkgs/tools/misc/claws/default.nix b/nixpkgs/pkgs/tools/misc/claws/default.nix index 20c8cc7af8f5..c28272e8bfa5 100644 --- a/nixpkgs/pkgs/tools/misc/claws/default.nix +++ b/nixpkgs/pkgs/tools/misc/claws/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "claws"; diff --git a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix index 11bfdc508ebc..552ea140d608 100644 --- a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "cloud-sql-proxy"; diff --git a/nixpkgs/pkgs/tools/misc/cod/default.nix b/nixpkgs/pkgs/tools/misc/cod/default.nix index 6dad6173ed4b..dfad9569d2a0 100644 --- a/nixpkgs/pkgs/tools/misc/cod/default.nix +++ b/nixpkgs/pkgs/tools/misc/cod/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1arllkiz1hk12hq5b2zpg3f8i9lxl66mil5sdv8gnhflmb37vbv3"; - buildFlagsArray = [ "-ldflags=-X main.GitSha=${src.rev}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.GitSha=${src.rev}" ]; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/code-minimap/default.nix b/nixpkgs/pkgs/tools/misc/code-minimap/default.nix index 0ccfe4246458..462fc51b2890 100644 --- a/nixpkgs/pkgs/tools/misc/code-minimap/default.nix +++ b/nixpkgs/pkgs/tools/misc/code-minimap/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "03azqy4i15kfpd0gzjaw2di9xva4xdf95yb65b93z3y9y5wy4krc"; + sha256 = "sha256-t+zHAneINLd8JHkhaR+aF55gAWJmphYEqbx74CqAmM8="; }; - cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww"; + cargoSha256 = "sha256-eVh+6gTzKTelZ3MypkqYMXHr9QwaNG8H0xS82kilR/s="; meta = with lib; { description = "A high performance code minimap render"; diff --git a/nixpkgs/pkgs/tools/misc/codebraid/default.nix b/nixpkgs/pkgs/tools/misc/codebraid/default.nix index a855dac5f124..0ecde80c238d 100644 --- a/nixpkgs/pkgs/tools/misc/codebraid/default.nix +++ b/nixpkgs/pkgs/tools/misc/codebraid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "codebraid"; diff --git a/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 4a4a9343c6a8..131ce2774d1a 100644 --- a/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -29,9 +29,8 @@ stdenv.mkDerivation (rec { sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo="; }; - patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch - # included on coreutils master; TODO: apply unconditionally, I guess - ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch + patches = [ ./sys-getdents-undeclared.patch ] + ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch # fix gnulib tests on 32-bit ARM. Included on coreutils master. # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html ++ optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; diff --git a/nixpkgs/pkgs/tools/misc/crudini/default.nix b/nixpkgs/pkgs/tools/misc/crudini/default.nix index a4b499a63235..6527a01e43b7 100644 --- a/nixpkgs/pkgs/tools/misc/crudini/default.nix +++ b/nixpkgs/pkgs/tools/misc/crudini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, help2man, installShellFiles }: +{ lib, fetchFromGitHub, python3Packages, help2man, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "crudini"; diff --git a/nixpkgs/pkgs/tools/misc/dashing/default.nix b/nixpkgs/pkgs/tools/misc/dashing/default.nix index 546daef5ecbd..496639ec07a5 100644 --- a/nixpkgs/pkgs/tools/misc/dashing/default.nix +++ b/nixpkgs/pkgs/tools/misc/dashing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "dashing"; diff --git a/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix index 604ba0cbf758..41f2bede9995 100644 --- a/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix @@ -1,21 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 -, pciutils, pkg-config, gtk2, ddccontrol-db -, makeDesktopItem +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, intltool +, libxml2 +, pciutils +, pkg-config +, gtk2 +, ddccontrol-db }: -let version = "0.4.4"; in stdenv.mkDerivation rec { pname = "ddccontrol"; - inherit version; + version = "0.5.1"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - rev = "0.4.4"; - sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2"; + rev = "0.5.1"; + sha256 = "sha256-e6Rzzz5S+Um2ZBuUkfAJQA4V+zqCqsUHB0f1t/dTU2w="; }; - nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + intltool + pkg-config + ]; buildInputs = [ libxml2 @@ -24,8 +34,6 @@ stdenv.mkDerivation rec { ddccontrol-db ]; - hardeningDisable = [ "format" "bindnow" ]; - prePatch = '' oldPath="\$""{datadir}/ddccontrol-db" newPath="${ddccontrol-db}/share/ddccontrol-db" @@ -37,29 +45,11 @@ stdenv.mkDerivation rec { intltoolize --force ''; - postInstall = '' - mkdir -p $out/share/applications/ - cp $desktopItem/share/applications/* $out/share/applications/ - for entry in $out/share/applications/*.desktop; do - substituteAllInPlace $entry - done - ''; - - desktopItem = makeDesktopItem { - name = "gddccontrol"; - desktopName = "gddccontrol"; - genericName = "DDC/CI control"; - comment = meta.description; - exec = "@out@/bin/gddccontrol"; - icon = "gddccontrol"; - categories = "Settings;HardwareSettings;"; - }; - meta = with lib; { description = "A program used to control monitor parameters by software"; homepage = "https://github.com/ddccontrol/ddccontrol"; - license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ lib.maintainers.pakhfn ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with lib.maintainers; [ pakhfn ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index 4f519d6858d7..1e2efc7f9cd3 100644 --- a/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "0.9.9"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1ppiddnrvkbb9iir28kl9hzpww0hpgb05jfxzf07xsqkdfb4qv71"; + sha256 = "sha256-F/tKW81bAyYtwpxhl5XC8YyMB+6S0XmqqigwJY2WFDU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 2d7715274bed..9437ef12f4b4 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man +{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man, installShellFiles , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R @@ -16,18 +16,17 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "163"; + version = "166"; src = fetchurl { - url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-pCAOMRZ3sn1jhdT5RuIZoMR1e6GEYJYyd4mZt7+0lWE="; + url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; + sha256 = "sha256-6VhHG3MxmIczolOYqU4D1m00h8w2n0ku4dy/dFEYqk0="; }; outputs = [ "out" "man" ]; patches = [ ./ignore_links.patch - ./skip-failing-test.patch ]; postPatch = '' @@ -38,7 +37,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace doc/Makefile --replace "../bin" "$out/bin" ''; - nativeBuildInputs = [ docutils help2man ]; + nativeBuildInputs = [ docutils help2man installShellFiles ]; # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh @@ -60,14 +59,19 @@ python3Packages.buildPythonApplication rec { hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt ] ++ (with python3Packages; [ binwalk guestfs h5py ])); - checkInputs = with python3Packages; [ pytest ] ++ pythonPath; + checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; postInstall = '' make -C doc - mkdir -p $out/share/man/man1 - cp doc/diffoscope.1 $out/share/man/man1/diffoscope.1 + installManPage doc/diffoscope.1 ''; + # Disable flaky test and a failing one + disabledTests = [ + "test_android_manifest" + "test_sbin_added_to_path" + ]; + meta = with lib; { description = "Perform in-depth comparison of files, archives, and directories"; longDescription = '' @@ -80,9 +84,9 @@ python3Packages.buildPythonApplication rec { diffoscope is developed as part of the "reproducible builds" Debian project and was formerly known as "debbindiff". ''; - homepage = "https://diffoscope.org/"; - license = licenses.gpl3Plus; + homepage = "https://diffoscope.org/"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ dezgeg ma27 danielfullmer ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch b/nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch deleted file mode 100644 index bf871d295bda..000000000000 --- a/nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/test_tools.py b/tests/test_tools.py -index f0010678..1c3c7ce1 100644 ---- a/tests/test_tools.py -+++ b/tests/test_tools.py -@@ -21,6 +21,7 @@ import os - import pytest - - -+@pytest.mark.skip() - def test_sbin_added_to_path(): - from diffoscope.tools import tool_required - diff --git a/nixpkgs/pkgs/tools/misc/dijo/default.nix b/nixpkgs/pkgs/tools/misc/dijo/default.nix index 2a3fa2426993..b8dc950773ba 100644 --- a/nixpkgs/pkgs/tools/misc/dijo/default.nix +++ b/nixpkgs/pkgs/tools/misc/dijo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.2.3"; in +let version = "0.2.5"; in rustPlatform.buildRustPackage { pname = "dijo"; inherit version; @@ -8,9 +8,9 @@ rustPlatform.buildRustPackage { owner = "NerdyPepper"; repo = "dijo"; rev = "v${version}"; - sha256 = "1lcvj0pri5v64zygkf2p24vr72y39agrq1r3kb8dfgz8yy3vcz0a"; + sha256 = "sha256-DdK9qdF+rFtAhemPwMpiZrtUdgD0iFqjgiZ3Yp/vLAI="; }; - cargoSha256 = "0pm048xf8hkva8q8fjmhrdnk7h2im28ix7xy784xwkkdnilm4j7f"; + cargoSha256 = "sha256-bdSXyxiHwGtdyce2YyPKq+3RfZIL425RvwRfKi59RVI="; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker"; diff --git a/nixpkgs/pkgs/tools/misc/diskonaut/default.nix b/nixpkgs/pkgs/tools/misc/diskonaut/default.nix index 6c295eb00e82..0fb316851702 100644 --- a/nixpkgs/pkgs/tools/misc/diskonaut/default.nix +++ b/nixpkgs/pkgs/tools/misc/diskonaut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "diskonaut"; diff --git a/nixpkgs/pkgs/tools/misc/disper/default.nix b/nixpkgs/pkgs/tools/misc/disper/default.nix index 5caa5eaf5391..ecbf298132f6 100644 --- a/nixpkgs/pkgs/tools/misc/disper/default.nix +++ b/nixpkgs/pkgs/tools/misc/disper/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "On-the-fly display switch utility"; - homepage = "http://willem.engen.nl/projects/disper/"; + homepage = "https://willem.engen.nl/projects/disper/"; platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; diff --git a/nixpkgs/pkgs/tools/misc/docker-ls/default.nix b/nixpkgs/pkgs/tools/misc/docker-ls/default.nix index df9755f863da..a56107ebce13 100644 --- a/nixpkgs/pkgs/tools/misc/docker-ls/default.nix +++ b/nixpkgs/pkgs/tools/misc/docker-ls/default.nix @@ -1,14 +1,14 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv, docker }: +{ buildGoModule, fetchFromGitHub, lib, docker }: buildGoModule rec { pname = "docker-ls"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mayflower"; repo = "docker-ls"; rev = "v${version}"; - sha256 = "sha256-VyVrCBdIZAQ+p0leD6i4sMxD4p6nEXG9Si+nJGdUQPM="; + sha256 = "sha256-4+REt0NH4S367qFsyJncVedUrC4t1zw5o0CLTiQfIz8="; }; vendorSha256 = "sha256-UulcjQOLEIP++eoYQTEIbCJW51jyE312dMxB8+AKcdU="; diff --git a/nixpkgs/pkgs/tools/misc/docui/default.nix b/nixpkgs/pkgs/tools/misc/docui/default.nix index e4934853e825..a1b2ad662bc6 100644 --- a/nixpkgs/pkgs/tools/misc/docui/default.nix +++ b/nixpkgs/pkgs/tools/misc/docui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "docui"; diff --git a/nixpkgs/pkgs/tools/misc/doitlive/default.nix b/nixpkgs/pkgs/tools/misc/doitlive/default.nix index 313dc9935faf..9edc078d9f9c 100644 --- a/nixpkgs/pkgs/tools/misc/doitlive/default.nix +++ b/nixpkgs/pkgs/tools/misc/doitlive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "doitlive"; diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index 7379c666e377..063442b75f2f 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.10.9"; + version = "2.10.10"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-Dx6yVgmi0CTKpBKQ5US+UpiI0d1S4vPZSbRWmmnHIMk="; + sha256 = "sha256-Rt+60j1+uwL6g4HGc+xdUzGK6nanGfRYbekO54iKsPE="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-OFmDllEQKeByzra/XttQzdlBlahHvKsZM1ShsmV1OcM="; + cargoSha256 = "sha256-6L1J5RHI657Z03rMmhwEzgpQ0//dykqGi8bI2Enc3N8="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/duf/default.nix b/nixpkgs/pkgs/tools/misc/duf/default.nix index ed8a11e182c9..ee3573f9f458 100644 --- a/nixpkgs/pkgs/tools/misc/duf/default.nix +++ b/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -2,26 +2,24 @@ buildGoModule rec { pname = "duf"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "0n0nvrqrlr75dmf2j6ja615ighzs35cfixn7z9cwdz3vhj1xhc5f"; + sha256 = "sha256-Wm3gfir6blQFLLi+2bT5Y/5tf7qUxEddJQ7tCYfBGgM="; }; - dontStrip = true; + vendorSha256 = "0icxy6wbqjqawr6i5skwp1z37fq303p8f95crd8lwn6pjjiqzk4i"; - vendorSha256 = "1jqilfsirj7bkhzywimzf98w2b4s777phb06nsw6lr3bi6nnwzr1"; - - buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ petabyteboy penguwin ]; + maintainers = with maintainers; [ petabyteboy penguwin SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/dust/default.nix b/nixpkgs/pkgs/tools/misc/dust/default.nix index c40753dcf99a..781ee30debaa 100644 --- a/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "du-dust"; @@ -8,11 +8,11 @@ rustPlatform.buildRustPackage rec { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-JwGa1icwV1yqxy90Psd9bzM7VzM7HPA6kONkI3Y745Q="; + sha256 = "1knl7kwngmq598bnlvlq9x8sqp914sv1abfm55kw9f7mja2d6pw0"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' - rm -rf $out/src/test_dir3/ + rm -r $out/tests/test_dir_unicode/ ''; }; @@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; license = licenses.asl20; - maintainers = [ maintainers.infinisil ]; + maintainers = with maintainers; [ infinisil SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/edir/default.nix b/nixpkgs/pkgs/tools/misc/edir/default.nix new file mode 100644 index 000000000000..7cd621be76a8 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/edir/default.nix @@ -0,0 +1,19 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "edir"; + version = "2.7.3"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "06nsy9ikljc437368l38hsw75whacn3j6jwmdgg766q61pnifhkp"; + }; + + meta = with lib; { + description = "Program to rename and remove files and directories using your editor"; + homepage = "https://github.com/bulletmark/edir"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ guyonvarch ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/entr/default.nix b/nixpkgs/pkgs/tools/misc/entr/default.nix index 29474a471c3a..581b39f3c4ce 100644 --- a/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.6"; + version = "4.7"; src = fetchurl { url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "0vcflgagna2gdlpjsd6748c73j2829xlhm276mi838zl1n121phn"; + sha256 = "sha256-tsGrdkTYO7Kiadx0Fghno74PXfEWx+tFPCUFMXNTRCk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/envdir-go/default.nix b/nixpkgs/pkgs/tools/misc/envdir-go/default.nix index 7ec763f16c6e..eafc71030ac8 100644 --- a/nixpkgs/pkgs/tools/misc/envdir-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/envdir-go/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "1.0.0"; diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index de06a60fbf29..dba1b4b44909 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -11,17 +11,17 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.15.3"; + version = "1.16.0"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "a75b53e76fb8b4b394eca18fe74f622ca740bc13b7cbc02e6af5f50126b7aa0b"; + sha256 = "0pvwzkdcpjqdf7lh1k3xv1la5v60lhjixzykapl7f2xh71fbm144"; }; ESPHOME_USE_SUBPROCESS = ""; propagatedBuildInputs = with python.pkgs; [ - voluptuous pyyaml paho-mqtt colorlog + voluptuous pyyaml paho-mqtt colorlog colorama tornado protobuf tzlocal pyserial ifaddr protobuf click ]; @@ -49,6 +49,6 @@ in python.pkgs.buildPythonApplication rec { description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; homepage = "https://esphome.io/"; license = licenses.mit; - maintainers = with maintainers; [ dotlambda globin ]; + maintainers = with maintainers; [ dotlambda globin elseym ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/esptool/default.nix b/nixpkgs/pkgs/tools/misc/esptool/default.nix index 89be1da8cc98..7c7f91621b82 100644 --- a/nixpkgs/pkgs/tools/misc/esptool/default.nix +++ b/nixpkgs/pkgs/tools/misc/esptool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, openssl }: +{ lib, fetchFromGitHub, python3, openssl }: python3.pkgs.buildPythonApplication rec { pname = "esptool"; diff --git a/nixpkgs/pkgs/tools/misc/eva/default.nix b/nixpkgs/pkgs/tools/misc/eva/default.nix index 65da084f8419..253e815008a7 100644 --- a/nixpkgs/pkgs/tools/misc/eva/default.nix +++ b/nixpkgs/pkgs/tools/misc/eva/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, fetchpatch }: +{ lib, fetchFromGitHub, rustPlatform, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "eva"; diff --git a/nixpkgs/pkgs/tools/misc/exa/default.nix b/nixpkgs/pkgs/tools/misc/exa/default.nix index 83aa6c505d32..f275d254677c 100644 --- a/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib -, darwin, libiconv, installShellFiles +, Security, libiconv, installShellFiles }: with rustPlatform; @@ -28,9 +28,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ - libiconv darwin.apple_sdk.frameworks.Security ] - ; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/tools/misc/expect/default.nix b/nixpkgs/pkgs/tools/misc/expect/default.nix index 6e8bb7fd96cd..12e63686d51f 100644 --- a/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }: stdenv.mkDerivation rec { - version = "5.45.4"; pname = "expect"; + version = "5.45.4"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for automating interactive applications"; homepage = "http://expect.sourceforge.net/"; - license = "Expect"; + license = licenses.publicDomain; platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/fselect/default.nix b/nixpkgs/pkgs/tools/misc/fselect/default.nix index 1076c44a1bb3..7416961e84e8 100644 --- a/nixpkgs/pkgs/tools/misc/fselect/default.nix +++ b/nixpkgs/pkgs/tools/misc/fselect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "fselect"; diff --git a/nixpkgs/pkgs/tools/misc/fsql/default.nix b/nixpkgs/pkgs/tools/misc/fsql/default.nix index 8e113ee871a1..100e70232321 100644 --- a/nixpkgs/pkgs/tools/misc/fsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "fsql"; diff --git a/nixpkgs/pkgs/tools/misc/g933-utils/default.nix b/nixpkgs/pkgs/tools/misc/g933-utils/default.nix index 9cb056097726..7fbfadfac76d 100644 --- a/nixpkgs/pkgs/tools/misc/g933-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/g933-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, udev, pkg-config }: +{ lib, fetchFromGitHub, rustPlatform, udev, pkg-config }: rustPlatform.buildRustPackage rec { pname = "g933-utils"; diff --git a/nixpkgs/pkgs/tools/misc/gawp/default.nix b/nixpkgs/pkgs/tools/misc/gawp/default.nix index d518ba88fb6c..5c7953a766ee 100644 --- a/nixpkgs/pkgs/tools/misc/gawp/default.nix +++ b/nixpkgs/pkgs/tools/misc/gawp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: with builtins; diff --git a/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/nixpkgs/pkgs/tools/misc/geekbench/default.nix index d6b0c84b61f2..17e67c0bc75e 100644 --- a/nixpkgs/pkgs/tools/misc/geekbench/default.nix +++ b/nixpkgs/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "0hil3mvrwpwy60x9s16bf8vgvfv11sdarcbk45zjlgjzfhh8h2qr"; + sha256 = "sha256-SdmcyOgK8k07pkjOVWLbNj36ktJnkQWJ8ObPiMgcMYk="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/tools/misc/gh-ost/default.nix b/nixpkgs/pkgs/tools/misc/gh-ost/default.nix index 6096dac96221..dd28ddfaff55 100644 --- a/nixpkgs/pkgs/tools/misc/gh-ost/default.nix +++ b/nixpkgs/pkgs/tools/misc/gh-ost/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gh-ost"; diff --git a/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix b/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix index e82cafdd64cd..bbb1b8b96402 100644 --- a/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: +{ lib, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: python3Packages.buildPythonApplication { pname = "gif-for-cli"; diff --git a/nixpkgs/pkgs/tools/misc/git-town/default.nix b/nixpkgs/pkgs/tools/misc/git-town/default.nix index cf3a6aba19f0..56f9452db7b7 100644 --- a/nixpkgs/pkgs/tools/misc/git-town/default.nix +++ b/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-town"; diff --git a/nixpkgs/pkgs/tools/misc/go.rice/default.nix b/nixpkgs/pkgs/tools/misc/go.rice/default.nix index 26b082e43b39..295bf0102796 100644 --- a/nixpkgs/pkgs/tools/misc/go.rice/default.nix +++ b/nixpkgs/pkgs/tools/misc/go.rice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go.rice"; diff --git a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 6611b3e9210a..febaa4415a25 100644 --- a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.155.0"; + version = "0.155.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wVHBcxbrU6WvBAegQYDRDvLbuoU49/Cm19ujghNyi2A="; + sha256 = "sha256-eVRsDyPlUvVhEnN8aJW8vPw4UqvK2/6pblgnwH2RhkY="; }; - vendorSha256 = "sha256-k4TphR8z3DtoqJm6o6QILvQ1rHIldi1BpQJbEyWKv9U="; + vendorSha256 = "sha256-VFFwp+n13NL3YpzdWPVzgrH8d4BQHffwpRXvYn9MSaQ="; buildFlagsArray = [ "-ldflags=" diff --git a/nixpkgs/pkgs/tools/misc/gosu/default.nix b/nixpkgs/pkgs/tools/misc/gosu/default.nix index 7bc7eab34562..033883ab1c8c 100644 --- a/nixpkgs/pkgs/tools/misc/gosu/default.nix +++ b/nixpkgs/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "gosu"; diff --git a/nixpkgs/pkgs/tools/misc/gparted/default.nix b/nixpkgs/pkgs/tools/misc/gparted/default.nix index b1884da55535..3b63d7c02039 100644 --- a/nixpkgs/pkgs/tools/misc/gparted/default.nix +++ b/nixpkgs/pkgs/tools/misc/gparted/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gparted-1.1.0"; + name = "gparted-1.2.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${name}.tar.gz"; - sha256 = "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2"; + sha256 = "sha256-bJBxXSVNen7AIIspAHtkFg3Z+330xKp/jsLJ0jEUxxk="; }; # Tries to run `pkexec --version` to get version. diff --git a/nixpkgs/pkgs/tools/misc/grc/default.nix b/nixpkgs/pkgs/tools/misc/grc/default.nix index 3188dcdafbf3..8fe35012090d 100644 --- a/nixpkgs/pkgs/tools/misc/grc/default.nix +++ b/nixpkgs/pkgs/tools/misc/grc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "grc"; diff --git a/nixpkgs/pkgs/tools/misc/grex/default.nix b/nixpkgs/pkgs/tools/misc/grex/default.nix index fca9cecc01c7..d58661babc60 100644 --- a/nixpkgs/pkgs/tools/misc/grex/default.nix +++ b/nixpkgs/pkgs/tools/misc/grex/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchpatch , rustPlatform -, darwin +, Security , libiconv }: @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs"; }; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; doInstallCheck = true; installCheckPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/hacksaw/default.nix b/nixpkgs/pkgs/tools/misc/hacksaw/default.nix index a0e884e82d90..419cff20087f 100644 --- a/nixpkgs/pkgs/tools/misc/hacksaw/default.nix +++ b/nixpkgs/pkgs/tools/misc/hacksaw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, libXrandr, libX11, python3 }: +{ lib, fetchCrate, rustPlatform, pkg-config, libXrandr, libX11, python3 }: rustPlatform.buildRustPackage rec { pname = "hacksaw"; diff --git a/nixpkgs/pkgs/tools/misc/hddtemp/default.nix b/nixpkgs/pkgs/tools/misc/hddtemp/default.nix index de57b2539904..3939d60144d9 100644 --- a/nixpkgs/pkgs/tools/misc/hddtemp/default.nix +++ b/nixpkgs/pkgs/tools/misc/hddtemp/default.nix @@ -1,32 +1,38 @@ { lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "hddtemp-0.3_beta15"; - - db = fetchurl{ +let + db = fetchurl { url = "mirror://savannah/hddtemp/hddtemp.db"; sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; }; +in +stdenv.mkDerivation rec { + pname = "hddtemp"; + version = "0.3-beta15"; + src = fetchurl { - url = "mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2"; - sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; + url = "mirror://savannah/hddtemp/hddtemp-${version}.tar.bz2"; + sha256 = "sha256-YYVBWEBUCT1TvootnoHJcXTzDwCvkcuHAKl+RC1571s="; }; # from Gentoo patches = [ ./byteswap.patch ./dontwake.patch ./execinfo.patch ./satacmds.patch ]; - configurePhase = - '' - mkdir -p $out/nix-support - cp $db $out/nix-support/hddtemp.db - ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db - ''; + configureFlags = [ + "--with-db-path=${placeholder "out"}/share/${pname}/hddtemp.db" + ]; + + postInstall = '' + install -Dm444 ${db} $out/share/${pname}/hddtemp.db + ''; + + enableParallelBuilding = true; meta = with lib; { description = "Tool for displaying hard disk temperature"; homepage = "https://savannah.nongnu.org/projects/hddtemp/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix b/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix index 6a6af1391bda..e5f3afb03d57 100644 --- a/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix @@ -1,20 +1,19 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , upx }: -let - version = "20202807"; +stdenv.mkDerivation rec { pname = "hdl-dump"; -in stdenv.mkDerivation { - inherit pname version; + version = "20202807"; # Using AkuHAK's repo because playstation2's repo is outdated src = fetchFromGitHub { owner = "AKuHAK"; repo = pname; - rev = "be37e112a44772a1341c867dc3dfee7381ce9e59"; - sha256 = "0akxak6hm11h8z6jczxgr795s4a8czspwnhl3swqxp803dvjdx41"; + rev = "0c98b235c83c0fca1da93648f05ea5f940a4aee0"; + sha256 = "1s3wflqjjlcslpa9n5chr8dbamhmfk88885dzw68apz4vf6g27iq"; }; buildInputs = [ upx ]; diff --git a/nixpkgs/pkgs/tools/misc/heatseeker/default.nix b/nixpkgs/pkgs/tools/misc/heatseeker/default.nix index 13933c6c28a6..9d50530df471 100644 --- a/nixpkgs/pkgs/tools/misc/heatseeker/default.nix +++ b/nixpkgs/pkgs/tools/misc/heatseeker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils }: +{ lib, fetchFromGitHub, rustPlatform, coreutils }: rustPlatform.buildRustPackage rec { pname = "heatseeker"; diff --git a/nixpkgs/pkgs/tools/misc/hexyl/default.nix b/nixpkgs/pkgs/tools/misc/hexyl/default.nix index e75d01057314..d825368cb970 100644 --- a/nixpkgs/pkgs/tools/misc/hexyl/default.nix +++ b/nixpkgs/pkgs/tools/misc/hexyl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "hexyl"; diff --git a/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix b/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix index 13a88dcba303..9f7fa31d3f2c 100644 --- a/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "hyperledger-fabric"; diff --git a/nixpkgs/pkgs/tools/misc/i3cat/default.nix b/nixpkgs/pkgs/tools/misc/i3cat/default.nix index d75b878ae6d4..e91b17856ed7 100644 --- a/nixpkgs/pkgs/tools/misc/i3cat/default.nix +++ b/nixpkgs/pkgs/tools/misc/i3cat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "i3cat"; diff --git a/nixpkgs/pkgs/tools/misc/i3minator/default.nix b/nixpkgs/pkgs/tools/misc/i3minator/default.nix index d58efd7a0d42..6e207ce69166 100644 --- a/nixpkgs/pkgs/tools/misc/i3minator/default.nix +++ b/nixpkgs/pkgs/tools/misc/i3minator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "i3minator"; diff --git a/nixpkgs/pkgs/tools/misc/ical2org/default.nix b/nixpkgs/pkgs/tools/misc/ical2org/default.nix index 58afffcd7061..78f40974ace4 100644 --- a/nixpkgs/pkgs/tools/misc/ical2org/default.nix +++ b/nixpkgs/pkgs/tools/misc/ical2org/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage}: +{ lib, fetchFromGitHub, buildGoPackage}: buildGoPackage rec { pname = "ical2org"; diff --git a/nixpkgs/pkgs/tools/misc/ili2c/default.nix b/nixpkgs/pkgs/tools/misc/ili2c/default.nix index c2f4c991a708..93b61ec12dd3 100644 --- a/nixpkgs/pkgs/tools/misc/ili2c/default.nix +++ b/nixpkgs/pkgs/tools/misc/ili2c/default.nix @@ -3,7 +3,7 @@ let jdk = jdk8; jre = jre8; in stdenv.mkDerivation rec { pname = "ili2c"; - version = "5.0.8"; + version = "5.1.1"; nativeBuildInputs = [ ant jdk makeWrapper ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "claeis"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1yhsyh940kb33y2n6xl7zhf0f6q0nrxbyg6c4g5n2imllpn54sgi"; + sha256 = "sha256-FHhx+f253+UdbFjd2fOlUY1tpQ6pA2aVu9CBSwUVoKQ="; }; buildPhase = "ant jar"; diff --git a/nixpkgs/pkgs/tools/misc/iotools/default.nix b/nixpkgs/pkgs/tools/misc/iotools/default.nix new file mode 100644 index 000000000000..12411aac6c6f --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/iotools/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "iotools"; + version = "unstable-2017-12-11"; + + src = fetchFromGitHub { + owner = "adurbin"; + repo = pname; + rev = "18949fdc4dedb1da3f51ee83a582b112fb9f2c71"; + sha256 = "0vymnah44d5bzsjhfmxkcrlrikkp0db22k7a1s8bknz7glk9fldn"; + }; + + makeFlags = [ "DEBUG=0" "STATIC=0" ]; + + installPhase = '' + install -Dm755 iotools -t $out/bin + ''; + + meta = with lib; { + description = "Set of simple command line tools which allow access to + hardware device registers"; + longDescription = '' + Provides a set of simple command line tools which allow access to + hardware device registers. Supported register interfaces include PCI, + IO, memory mapped IO, SMBus, CPUID, and MSR. Also included are some + utilities which allow for simple arithmetic, logical, and other + operations. + ''; + homepage = "https://github.com/adurbin/iotools"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ felixsinger ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/nixpkgs/pkgs/tools/misc/jdupes/default.nix index 4f13d0a17af2..c42abee5e23f 100644 --- a/nixpkgs/pkgs/tools/misc/jdupes/default.nix +++ b/nixpkgs/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1f6qv701c4c9s4hliha7kp8wraq4jfx1jdk86ii10akkm07fkdlz"; + sha256 = "sha256-1gx3rStqIxLt/iRgpdp5z7tX1/wA0miZ1y5WTeGQ1Vs="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/nixpkgs/pkgs/tools/misc/jstest-gtk/default.nix b/nixpkgs/pkgs/tools/misc/jstest-gtk/default.nix new file mode 100644 index 000000000000..6824753c73ce --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/jstest-gtk/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitLab, cmake, pkg-config, gtkmm3, libsigcxx, xorg }: + +stdenv.mkDerivation rec { + pname = "jstest-gtk"; + version = "2018-07-10"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = "62f6e2d7d44620e503149510c428df9e004c9f3b"; + sha256 = "0icbbhrj5aqljhiavdy3hic60vp0zzfzyg0d6vpjaqkbzd5pv9d8"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtkmm3 libsigcxx xorg.libX11 ]; + + meta = with lib; { + description = "A simple joystick tester based on Gtk+"; + longDescription = '' + It provides you with a list of attached joysticks, a way to display which + buttons and axis are pressed, a way to remap axis and buttons and a way + to calibrate your joystick. + ''; + homepage = "https://jstest-gtk.gitlab.io/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/kargo/default.nix b/nixpkgs/pkgs/tools/misc/kargo/default.nix index 00bf94034273..8c24848f4b59 100644 --- a/nixpkgs/pkgs/tools/misc/kargo/default.nix +++ b/nixpkgs/pkgs/tools/misc/kargo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages }: +{ lib, fetchurl, python3Packages }: with python3Packages; diff --git a/nixpkgs/pkgs/tools/misc/kt/default.nix b/nixpkgs/pkgs/tools/misc/kt/default.nix index 8d70b35584e7..e4713890ac40 100644 --- a/nixpkgs/pkgs/tools/misc/kt/default.nix +++ b/nixpkgs/pkgs/tools/misc/kt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "kt"; diff --git a/nixpkgs/pkgs/tools/misc/lazydocker/default.nix b/nixpkgs/pkgs/tools/misc/lazydocker/default.nix index ea66a04a40df..ed186772ab78 100644 --- a/nixpkgs/pkgs/tools/misc/lazydocker/default.nix +++ b/nixpkgs/pkgs/tools/misc/lazydocker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "lazydocker"; diff --git a/nixpkgs/pkgs/tools/misc/lf/default.nix b/nixpkgs/pkgs/tools/misc/lf/default.nix index 0dde65e10817..ec002ae4232b 100644 --- a/nixpkgs/pkgs/tools/misc/lf/default.nix +++ b/nixpkgs/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lf"; - version = "19"; + version = "20"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "096lb0kbiqchw8mfp1vbgn9p1bqnp3h5wn172s9q4jl55l5l0kn1"; + sha256 = "056g2g503ppbqqbq5nk90sl8ki1q4fixdc25a6wv15gm1inxrb4b"; }; vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg"; diff --git a/nixpkgs/pkgs/tools/misc/lice/default.nix b/nixpkgs/pkgs/tools/misc/lice/default.nix index f7a8c68ed062..3322196d6ed5 100644 --- a/nixpkgs/pkgs/tools/misc/lice/default.nix +++ b/nixpkgs/pkgs/tools/misc/lice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { diff --git a/nixpkgs/pkgs/tools/misc/licensor/default.nix b/nixpkgs/pkgs/tools/misc/licensor/default.nix index b7ea30f8d3f8..ef708ab9afe4 100644 --- a/nixpkgs/pkgs/tools/misc/licensor/default.nix +++ b/nixpkgs/pkgs/tools/misc/licensor/default.nix @@ -1,22 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "licensor"; - version = "2.1.0"; + version = "unstable-2021-02-03"; src = fetchFromGitHub { owner = "raftario"; repo = pname; - rev = "v${version}"; - sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p"; + rev = "1897882a708ec6ed65a9569ae0e07d6ea576c652"; + sha256 = "0x0lkfrj7jka0p6nx6i9syz0bnzya5z9np9cw09zm1c9njv9mm32"; }; - patches = [ (fetchpatch { - url = "https://github.com/raftario/licensor/commit/77ae1ea6d9b6de999ee7590d9dbd3c8465d70bb6.patch"; - sha256 = "0kfyg06wa2v7swm7hs9kkazjg34mircd4nm4qmljyzjh2yh8icg3"; - })]; - - cargoSha256 = "1z2r8nfizifj8sk1ghppyqk5r65sgmbk47fiq95pnwpadm5drvqa"; + cargoSha256 = "1yix40351yasg7mjmz7qwvwh1dq292dv47gy2a3bwkzhcn6whyjf"; meta = with lib; { description = "Write licenses to stdout"; diff --git a/nixpkgs/pkgs/tools/misc/lnch/default.nix b/nixpkgs/pkgs/tools/misc/lnch/default.nix index 377ba05eba69..a9c736525390 100644 --- a/nixpkgs/pkgs/tools/misc/lnch/default.nix +++ b/nixpkgs/pkgs/tools/misc/lnch/default.nix @@ -1,21 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "lnch"; - version = "2017-02-16"; + version = "unstable-2021-02-10"; goPackagePath = "github.com/oem/${pname}"; src = fetchFromGitHub { owner = "oem"; repo = pname; - rev = "f24eed5392f01d2c8a9cfe9cdf70dcfbbf4b6b36"; - sha256 = "0skzrjnbxq1yj7y64cq7angp4wqnrgw1xp9v8vw9zp8f8zwmpy0y"; + rev = "6ed336dd893afa071178b8ac6f6297d23fc55514"; + sha256 = "K2TV+mx6C3/REJyDpC6a/Zn/ZZFxkDMC3EnkveH6YNQ="; }; meta = with lib; { homepage = "https://github.com/oem/lnch"; - description = "A small go app that launches a process and moves it out of the process group"; - license = licenses.publicDomain; # really I don't know + description = "Launches a process and moves it out of the process group"; + license = licenses.mit; + platforms = with platforms; all; }; } diff --git a/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix b/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix index d469c43418ab..e6d19fc6d406 100644 --- a/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix +++ b/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix @@ -5,7 +5,7 @@ stdenv_32bit.mkDerivation rec { name = "loadlibrary-${version}"; - version = "20170525-${stdenv_32bit.lib.strings.substring 0 7 rev}"; + version = "20170525-${lib.strings.substring 0 7 rev}"; rev = "721b084c088d779075405b7f20c77c2578e2a961"; src = fetchFromGitHub { inherit rev; diff --git a/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix index 1b2fa9bda86b..ad1210e95404 100644 --- a/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "1iizyr6bv17dpv05whcx34498wbrs0q3gn8s50srvdqrdk9hs4gj"; + sha256 = "sha256-3kDaaPDRbhJyp/CblTKhB0dUeOjroCs3WkjEXL87Od4="; }; - vendorSha256 = "17nykcx47h1q55msh43mmf092y5cigarz5486yp6sqp79p6lbjk3"; + vendorSha256 = "sha256-iWYlbGeLp/SiF8/OyWGIHJQB1RJjma9/EDc3zOsjNG8="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/loop/default.nix b/nixpkgs/pkgs/tools/misc/loop/default.nix index b7bd7678535c..0c3e206a9f28 100644 --- a/nixpkgs/pkgs/tools/misc/loop/default.nix +++ b/nixpkgs/pkgs/tools/misc/loop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { pname = "loop"; diff --git a/nixpkgs/pkgs/tools/misc/lsd/default.nix b/nixpkgs/pkgs/tools/misc/lsd/default.nix index 239c9651b86d..c3c9fab8c1ed 100644 --- a/nixpkgs/pkgs/tools/misc/lsd/default.nix +++ b/nixpkgs/pkgs/tools/misc/lsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , nixosTests , fetchFromGitHub , rustPlatform diff --git a/nixpkgs/pkgs/tools/misc/mc/default.nix b/nixpkgs/pkgs/tools/misc/mc/default.nix index 99944c7f8247..d2456a08cbd7 100644 --- a/nixpkgs/pkgs/tools/misc/mc/default.nix +++ b/nixpkgs/pkgs/tools/misc/mc/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.25"; + version = "4.8.26"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "12jlnabnc91xsm35g99g2wnh96jmznvrhffd18rj7fqfy8brdhgz"; + sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix b/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix index 19f43f2c8c5f..5335624467db 100644 --- a/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix +++ b/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "me_cleaner"; diff --git a/nixpkgs/pkgs/tools/misc/microplane/default.nix b/nixpkgs/pkgs/tools/misc/microplane/default.nix index a0ac411f98e1..e6945f051298 100644 --- a/nixpkgs/pkgs/tools/misc/microplane/default.nix +++ b/nixpkgs/pkgs/tools/misc/microplane/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "microplane"; - version = "0.0.25"; + version = "0.0.26"; src = fetchFromGitHub { owner = "Clever"; repo = "microplane"; rev = "v${version}"; - sha256 = "0vynkv3d70q8d079kgdmwbavyyrjssqnd223dl1rikyy7sd5sli8"; + sha256 = "0dba8cz13ljcsfibcwycd9vb759fzlllh2bv31vgbs2pjgcinzvm"; }; goPackagePath = "github.com/Clever/microplane"; diff --git a/nixpkgs/pkgs/tools/misc/microplane/deps.nix b/nixpkgs/pkgs/tools/misc/microplane/deps.nix index defbd0d573ca..2c8266c2dc6e 100644 --- a/nixpkgs/pkgs/tools/misc/microplane/deps.nix +++ b/nixpkgs/pkgs/tools/misc/microplane/deps.nix @@ -194,8 +194,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "6e8e738ad208923de99951fe0b48239bfd864f28"; - sha256 = "1avk27pszd5l5df6ff7j78wgla46ir1hhy2jwfl9a3c0ys602yx9"; + rev = "09787c993a3ab68e3d1f5c9b2394ab9433f391be"; + sha256 = "1nv4mwi9njkkyc7lwmxrjr8ggfh2cf1c67a9bq85dnss81vpj61y"; }; } { diff --git a/nixpkgs/pkgs/tools/misc/mimeo/default.nix b/nixpkgs/pkgs/tools/misc/mimeo/default.nix index 6c332198fa75..ea79b8d2f0ff 100644 --- a/nixpkgs/pkgs/tools/misc/mimeo/default.nix +++ b/nixpkgs/pkgs/tools/misc/mimeo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, desktop-file-utils, file, python3Packages }: +{ lib, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { pname = "mimeo"; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Open files by MIME-type or file name using regular expressions"; - homepage = "http://xyne.archlinux.ca/projects/mimeo/"; + homepage = "https://xyne.archlinux.ca/projects/mimeo/"; license = [ licenses.gpl2 ]; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/mmake/default.nix b/nixpkgs/pkgs/tools/misc/mmake/default.nix index 5dcbcb065ecc..564e1989aee8 100644 --- a/nixpkgs/pkgs/tools/misc/mmake/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mmake"; diff --git a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix index 0415955e0927..7949a82edc48 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoPackage , fetchFromGitHub , openssl diff --git a/nixpkgs/pkgs/tools/misc/moreutils/default.nix b/nixpkgs/pkgs/tools/misc/moreutils/default.nix index 5d39cb00b95a..ad2d0127ab05 100644 --- a/nixpkgs/pkgs/tools/misc/moreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/moreutils/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { pname = "moreutils"; - version = "0.63"; + version = "0.65"; src = fetchgit { url = "git://git.joeyh.name/moreutils"; rev = "refs/tags/${version}"; - sha256 = "17sszmcdck4w01hgcq7vd25p2iw3yzvjwx1yf20jg85gzs1dplrd"; + sha256 = "17r80xs756c5vv4ghh901c8abraqqfp7ncagv9ys4il3jngfqbrb"; }; preBuild = '' diff --git a/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix b/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix index 182e844eb84a..fce376bb32ed 100644 --- a/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix +++ b/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix @@ -1,22 +1,38 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, boost, libgcrypt, systemd, mpd_clientlib, curl }: +{ lib +, stdenv +, fetchurl +, pkg-config +, meson +, ninja +, boost +, curl +, libgcrypt +, libmpdclient +, systemd +}: stdenv.mkDerivation rec { pname = "mpdscribble"; version = "0.23"; src = fetchurl { - url = - "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"; + url = "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"; sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53"; }; - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ mpd_clientlib curl boost libgcrypt systemd ]; + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + libmpdclient + curl + boost + libgcrypt + systemd + ]; meta = with lib; { - description = "A Music Player Daemon (MPD) client which submits information about tracks being played to a scrobbler (e.g. last.fm)"; + description = "A MPD client which submits info about tracks being played to a scrobbler"; homepage = "https://www.musicpd.org/clients/mpdscribble/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.sohalt ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix b/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix index 6297e6131222..783f93daab45 100644 --- a/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix +++ b/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mysqltuner"; - version = "1.7.17"; + version = "1.7.21"; src = fetchFromGitHub { owner = "major"; repo = "MySQLTuner-perl"; rev = version; - sha256 = "0wjdqraa6r6kd6rsgrn177dq6xsnnr1sgnbs9whknjbs4fn3wwl5"; + sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0="; }; buildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/tools/misc/nagstamon/default.nix b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix index 3bd297628b2d..e9f76dbf22d9 100644 --- a/nixpkgs/pkgs/tools/misc/nagstamon/default.nix +++ b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "nagstamon"; diff --git a/nixpkgs/pkgs/tools/misc/noteshrink/default.nix b/nixpkgs/pkgs/tools/misc/noteshrink/default.nix index 2d6f23de4687..67c49c3ad0d5 100644 --- a/nixpkgs/pkgs/tools/misc/noteshrink/default.nix +++ b/nixpkgs/pkgs/tools/misc/noteshrink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, imagemagick }: +{ lib, fetchFromGitHub, python3, imagemagick }: with python3.pkgs; diff --git a/nixpkgs/pkgs/tools/misc/ntfy/default.nix b/nixpkgs/pkgs/tools/misc/ntfy/default.nix index 9f28d99ba0f3..23d4fd57f620 100644 --- a/nixpkgs/pkgs/tools/misc/ntfy/default.nix +++ b/nixpkgs/pkgs/tools/misc/ntfy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "ntfy"; diff --git a/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/nixpkgs/pkgs/tools/misc/onefetch/default.nix index 12cd9990779d..5dab2044973a 100644 --- a/nixpkgs/pkgs/tools/misc/onefetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/onefetch/default.nix @@ -14,8 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-TqWe4eARQmmWcwnvb6BIZrzGeKMpiIObPv0cW1JvWj4="; - buildInputs = with stdenv; - lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; meta = with lib; { description = "Git repository summary on your terminal"; diff --git a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index d1fd243467df..168eda1cf3d5 100644 --- a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -32,5 +32,8 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = [ ]; + knownVulnerabilities = [ + "CVE-2020-35476" # https://github.com/OpenTSDB/opentsdb/issues/2051 + ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix b/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix index 922ef65be24b..ef464e7b755a 100644 --- a/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix +++ b/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "oppai-ng"; - version = "3.3.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Francesco149"; repo = pname; rev = version; - sha256 = "0ymprwyv92pr58851wzryymhfznnpwcbg4m1yri0c9cyzvabwmfk"; + sha256 = "sha256-fUtyQaHcNBmDs1BPbFGieKY/CFyETqBxYzzIXSERFJY="; }; buildPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/os-prober/default.nix b/nixpkgs/pkgs/tools/misc/os-prober/default.nix index f991b1bc26d6..07279400fc4d 100644 --- a/nixpkgs/pkgs/tools/misc/os-prober/default.nix +++ b/nixpkgs/pkgs/tools/misc/os-prober/default.nix @@ -11,14 +11,14 @@ lvm2 # lvs }: stdenv.mkDerivation rec { - version = "1.77"; + version = "1.78"; pname = "os-prober"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; rev = version; - sha256 = "05sji756xdl67pp2sf7rk0ih9h6f6kgk9nvxlyv1bzbmcizlh2d2"; + sha256 = "sha256-mfv1b40n/opXdyj6IXWVf/32sWlS+/DbXIRwE1zX4KM="; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix b/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix index e7a5d38a9161..cb3e8bd057ad 100644 --- a/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9"; + sha256 = "sha256-JV8ch4us7HDDAg/1qcsPa9hhygAJ8kYI31729i1SQ8A="; }; nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; diff --git a/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix index b3f4971a55ac..a6b8d01dd463 100644 --- a/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "1if76vw9jkc9jn4v0vvgwnpscjckk2cap93a8iqah8mqzx233y8s"; + sha256 = "0ld43k7xx395hd6kcn8wyacvb1cfjy670lh9w6yhfi78nxqj9mmy"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix b/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix new file mode 100644 index 000000000000..0b300b079db2 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, boost +, glibmm +, gtkmm2 +, gerbv +, librsvg +, bash +}: + +stdenv.mkDerivation rec { + pname = "pcb2gcode"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "pcb2gcode"; + repo = "pcb2gcode"; + rev = "v${version}"; + sha256 = "sha256-GSLWpLp/InAxVolKmBIjljpe3ZzmS/87TWKwzax5SkY="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ boost glibmm gtkmm2 gerbv librsvg ]; + + postPatch = '' + substituteInPlace ./Makefile.am \ + --replace '`git describe --dirty --always --tags`' '${version}' + ''; + + meta = with lib; { + description = "Command-line tool for isolation, routing and drilling of PCBs "; + longDescription = '' + pcb2gcode is a command-line software for the isolation, routing and drilling of PCBs. + It takes Gerber files as input and it outputs gcode files, suitable for the milling of PCBs. + It also includes an Autoleveller, useful for the automatic dynamic calibration of the milling depth. + ''; + homepage = "https://github.com/pcb2gcode/pcb2gcode"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kritnich ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/pdd/default.nix b/nixpkgs/pkgs/tools/misc/pdd/default.nix index b339f94deb18..916f15c94c6e 100644 --- a/nixpkgs/pkgs/tools/misc/pdd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pdd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, dateutil }: +{ lib, fetchFromGitHub, buildPythonApplication, dateutil }: buildPythonApplication rec { pname = "pdd"; diff --git a/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix b/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix index ceb8b4d68d99..f4572d0e5bcc 100644 --- a/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix +++ b/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchzip }: +{ lib, python3Packages, fetchzip }: python3Packages.buildPythonApplication { pname = "pdf-parser"; diff --git a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index 5a59e3030e64..8afaa61e35b5 100644 --- a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgcenter"; diff --git a/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index 70429ef811a6..54e7093747bf 100644 --- a/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgmetrics"; diff --git a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix index da69d5a8b931..348670c3bb1b 100644 --- a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.2.0"; + version = "10.2.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-eoKHgbSyOEkwzki5wWuZlOAmZljxOMXcztA/g8TtutQ="; + sha256 = "sha256-2HB4TPbyG+cTY6O1k0tRPrnKyg41SYnVM919Hii3gpg="; }; buildInputs = [ php ]; diff --git a/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix b/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix index 27c486f4bea3..12b11cf20d01 100644 --- a/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix +++ b/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "phraseapp-client"; diff --git a/nixpkgs/pkgs/tools/misc/pistol/default.nix b/nixpkgs/pkgs/tools/misc/pistol/default.nix index 874bbdbaf701..6eec45db0119 100644 --- a/nixpkgs/pkgs/tools/misc/pistol/default.nix +++ b/nixpkgs/pkgs/tools/misc/pistol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , file diff --git a/nixpkgs/pkgs/tools/misc/piston-cli/default.nix b/nixpkgs/pkgs/tools/misc/piston-cli/default.nix new file mode 100644 index 000000000000..bf9c7c9096cd --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/piston-cli/default.nix @@ -0,0 +1,24 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "piston-cli"; + version = "1.2.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "bf0hhKb+6+07HhrkFrsWCnUQfsQWOdK/dPTlt9iZTno="; + }; + + propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ]; + + checkPhase = '' + $out/bin/piston --help > /dev/null + ''; + + meta = with lib; { + description = "Piston api tool"; + homepage = "https://github.com/Shivansh-007/piston-cli"; + license = licenses.mit; + maintainers = with maintainers; [ ethancedwards8 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 0355c65ac6c1..eb267e6007a4 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.0"; + version = "1.2021.1"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-QERrsTB8GO+B8DZkl1Ruru9Bw+uL9ojQbJ321sbqIws="; + sha256 = "sha256-FOM+hao1lx6EJMccbhLzvVVmCR3F/igHTGN1vhhdmdQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix index 2b46e25c67e8..a4ee216288f9 100644 --- a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "powerline-go"; - version = "1.18.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - sha256 = "0dni842xzc8r6wbdfax25940jvxp69zk8xklczkjmyxqawvsxnjh"; + sha256 = "sha256-Pge57OXNE0MY2rlspVsqxdoe1r/XWjrq/q9ygdns2c8="; }; - vendorSha256 = "0dkgp9vlb76la0j439w0rb548qg5v8648zryk3rqgfhd4qywlk11"; + vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/pubs/default.nix b/nixpkgs/pkgs/tools/misc/pubs/default.nix index 82e7659d1524..be5fd6d499c3 100644 --- a/nixpkgs/pkgs/tools/misc/pubs/default.nix +++ b/nixpkgs/pkgs/tools/misc/pubs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib, fetchFromGitHub, fetchpatch, python3Packages }: python3Packages.buildPythonApplication rec { pname = "pubs"; diff --git a/nixpkgs/pkgs/tools/misc/rargs/default.nix b/nixpkgs/pkgs/tools/misc/rargs/default.nix index 834a62803f67..dc07e3dd4f40 100644 --- a/nixpkgs/pkgs/tools/misc/rargs/default.nix +++ b/nixpkgs/pkgs/tools/misc/rargs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "rargs"; diff --git a/nixpkgs/pkgs/tools/misc/rauc/default.nix b/nixpkgs/pkgs/tools/misc/rauc/default.nix index c5f84601a6dc..663768c1507c 100644 --- a/nixpkgs/pkgs/tools/misc/rauc/default.nix +++ b/nixpkgs/pkgs/tools/misc/rauc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "10v9nllfw5y53797p00hk6645zkaa6cacsim1rh6y2jngnqfkmw0"; + sha256 = "sha256-AIizbD2jaZ5SY0K/hwpHdGE20KEhWC53LWUiVYs9Oiw="; }; passthru = { diff --git a/nixpkgs/pkgs/tools/misc/rename/default.nix b/nixpkgs/pkgs/tools/misc/rename/default.nix index 63ceca8d9349..a9f42d1139e5 100644 --- a/nixpkgs/pkgs/tools/misc/rename/default.nix +++ b/nixpkgs/pkgs/tools/misc/rename/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perlPackages }: +{ lib, fetchFromGitHub, perlPackages }: perlPackages.buildPerlPackage { pname = "rename"; diff --git a/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index 9d95085296f3..0e094a4b2add 100644 --- a/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2020.8"; + version = "2021.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1iyl6bjkj3drlwds579bh25xcmlwj9lkkbdmcdanq5b3shbmpyhi"; + sha256 = "sha256-1GpM7IW27MgbXG6iVo5qnWaotwN1GgcXf7dFGRF8s0w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/sfeed/default.nix b/nixpkgs/pkgs/tools/misc/sfeed/default.nix index 6f205db432f4..57e49c887454 100644 --- a/nixpkgs/pkgs/tools/misc/sfeed/default.nix +++ b/nixpkgs/pkgs/tools/misc/sfeed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "sfeed"; - version = "0.9.20"; + version = "0.9.21"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "17bs31wns71fx7s06rdzqkghkgv86r9d9i3814rznyzi9484c7aq"; + sha256 = "010wasp6hcnwbf0d3gaxmjpkvr85zyv2xxz2pnkwxyk2bbr1h6q8"; }; installPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/shelldap/default.nix b/nixpkgs/pkgs/tools/misc/shelldap/default.nix index 41e4207d6c98..18c5aea3dfd8 100644 --- a/nixpkgs/pkgs/tools/misc/shelldap/default.nix +++ b/nixpkgs/pkgs/tools/misc/shelldap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages }: +{ lib, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "shelldap"; version = "1.4.0"; diff --git a/nixpkgs/pkgs/tools/misc/smenu/default.nix b/nixpkgs/pkgs/tools/misc/smenu/default.nix index 5da7f19b0609..1d1ed78b2faf 100644 --- a/nixpkgs/pkgs/tools/misc/smenu/default.nix +++ b/nixpkgs/pkgs/tools/misc/smenu/default.nix @@ -1,29 +1,28 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.16"; + version = "0.9.17"; pname = "smenu"; src = fetchFromGitHub { - owner = "p-gen"; - repo = "smenu"; - rev = "v${version}"; - sha256 = "1vlsrc071fznqnz67jbhrc4pcfwzc737lwd9jxpnidn0i08py5p2"; + owner = "p-gen"; + repo = "smenu"; + rev = "v${version}"; + sha256 = "1p8y1fgrfb7jxmv5ycvvnqaz7ghdi50paisgzk71169fqwp1crfa"; }; buildInputs = [ ncurses ]; meta = with lib; { - homepage = "https://github.com/p-gen/smenu"; - description = "Terminal selection utility"; + homepage = "https://github.com/p-gen/smenu"; + description = "Terminal selection utility"; longDescription = '' Terminal utility that allows you to use words coming from the standard input to create a nice selection window just below the cursor. Once done, your selection will be sent to standard output. ''; - license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.unix; + license = licenses.gpl2Only; + maintainers = with maintainers; [ matthiasbeyer SuperSandro2000 ]; + platforms = platforms.unix; }; } - diff --git a/nixpkgs/pkgs/tools/misc/snapper/default.nix b/nixpkgs/pkgs/tools/misc/snapper/default.nix index 5dfe76d7ebbb..03f24c16aab2 100644 --- a/nixpkgs/pkgs/tools/misc/snapper/default.nix +++ b/nixpkgs/pkgs/tools/misc/snapper/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for Linux filesystem snapshot management"; homepage = "http://snapper.io"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ tstrobel markuskowa ]; }; diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index 0089a551f0fe..a3543c433ae9 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , rustPlatform , pkg-config @@ -10,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.48.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1p37cfkcpqv74gp7g099alkqxanfc002kaq1cim6zkinx50gxjxw"; + sha256 = "1bnnqrxsmp3z2qksd8h4lfbq4kxxy1cg4yynadz66lxyzabv2v21"; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -31,18 +32,11 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "02djpwvwrrp7f0ifiypx1cr1v4bkqxrhqfhy0abfjszza95fjasv"; - - checkFlags = [ - "--skip=directory_in_home" - "--skip=home_directory" - "--skip=directory_in_root" - "--skip=truncation_symbol_not_truncated_home" - "--skip=truncation_symbol_truncated_home" - "--skip=folder_with_glide_yaml" - "--skip=shows_multiple_tfms" - "--skip=shows_pinned_in_project_below_root_with_global_json" - ]; + cargoSha256 = "0plk47i2xrn3x5yr3gw3pq74maqf4krb8d6i4sf8gil4mnpcgxir"; + + preCheck = '' + HOME=$TMPDIR + ''; meta = with lib; { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; diff --git a/nixpkgs/pkgs/tools/misc/staruml/default.nix b/nixpkgs/pkgs/tools/misc/staruml/default.nix index b6a78f85a35d..db3a065fdf4e 100644 --- a/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -4,7 +4,6 @@ , libXdamage, expat }: let - inherit (stdenv) lib; LD_LIBRARY_PATH = lib.makeLibraryPath [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; in diff --git a/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix b/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix index c24b12f95392..4bc5c28b5599 100644 --- a/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix +++ b/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, fetchFromGitHub, ncurses }: +{ lib, python3, fetchFromGitHub, ncurses }: python3.pkgs.buildPythonApplication rec { pname = "swaglyrics"; diff --git a/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix b/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix index e898ded81546..03d8e58f8b02 100644 --- a/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix +++ b/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: +{ lib, pkg-config, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "systrayhelper"; diff --git a/nixpkgs/pkgs/tools/misc/tagref/default.nix b/nixpkgs/pkgs/tools/misc/tagref/default.nix index 43a91eaca529..ba63ec290d4c 100644 --- a/nixpkgs/pkgs/tools/misc/tagref/default.nix +++ b/nixpkgs/pkgs/tools/misc/tagref/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "tagref"; version = "1.4.1"; diff --git a/nixpkgs/pkgs/tools/misc/tensorman/default.nix b/nixpkgs/pkgs/tools/misc/tensorman/default.nix index 84bfdc55d7fb..0e724059e99d 100644 --- a/nixpkgs/pkgs/tools/misc/tensorman/default.nix +++ b/nixpkgs/pkgs/tools/misc/tensorman/default.nix @@ -1,4 +1,4 @@ -{ pkg-config, lib, stdenv, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: +{ pkg-config, lib, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "tensorman"; diff --git a/nixpkgs/pkgs/tools/misc/tewisay/default.nix b/nixpkgs/pkgs/tools/misc/tewisay/default.nix index 0e07f3e53f32..3434ac110b35 100644 --- a/nixpkgs/pkgs/tools/misc/tewisay/default.nix +++ b/nixpkgs/pkgs/tools/misc/tewisay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper }: buildGoPackage rec { pname = "tewisay-unstable"; diff --git a/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/nixpkgs/pkgs/tools/misc/thefuck/default.nix index bf87505ab135..ff6a22cef8eb 100644 --- a/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication +{ lib, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six -, pytest, pytest-mock +, go, mock, pytestCheckHook, pytest-mock }: buildPythonApplication rec { @@ -16,22 +16,12 @@ buildPythonApplication rec { propagatedBuildInputs = [ colorama decorator psutil pyte six ]; - checkInputs = [ pytest pytest-mock ]; - - checkPhase = '' - export HOME=$TMPDIR - export LANG=en_US.UTF-8 - export XDG_CACHE_HOME=$TMPDIR/cache - export XDG_CONFIG_HOME=$TMPDIR/config - py.test - ''; - - doCheck = false; # The above is only enough for tests to pass outside the sandbox. + checkInputs = [ go mock pytestCheckHook pytest-mock ]; meta = with lib; { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ma27 SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix new file mode 100644 index 000000000000..2f9f436a1499 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "tmux-mem-cpu-load"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "thewtex"; + repo = "tmux-mem-cpu-load"; + rev = "v${version}"; + sha256 = "1ybj513l4953jhayrzb47dlh4yv9bkvs0q1lfvky17v9fdkxgn2j"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "CPU, RAM, and load monitor for use with tmux"; + homepage = https://github.com/thewtex/tmux-mem-cpu-load; + license = licenses.asl20; + maintainers = with maintainers; [ thomasjm ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix index 940ae130c846..57d320fd7906 100644 --- a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python }: +{ lib, python }: with python.pkgs; diff --git a/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix b/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix index c4d8b20ffdd6..812ad7900d01 100644 --- a/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix +++ b/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: +{ lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: pythonPackages.buildPythonApplication { diff --git a/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 6a21bc56789a..2fb41edaa7cb 100644 --- a/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.0.2"; + version = "6.4.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1pqf7rs9b8j54rwg8i8alvf65c4jfp5q2hv3yr60aiidfjrawp34"; + sha256 = "sha256-xrp2oGqJRhjYYZ0dDvYiUfgKM2mazOAlkJQyawDk2y4="; }; - cargoSha256 = "1wh7xywp92h3in9a2nr6sia6l3852kw4s688sr1c2wjdf2i58lsg"; + cargoSha256 = "sha256-EK48mrTYgh0AgC53rvVRFfdZP/FS9LOZWr8TF13qEl0="; buildInputs = lib.optional stdenv.isDarwin Foundation; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Upgrade all the things"; homepage = "https://github.com/r-darwish/topgrade"; - license = licenses.gpl3; - maintainers = with maintainers; [ Br1ght0ne hugoreeves ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Br1ght0ne hugoreeves SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/trash-cli/default.nix b/nixpkgs/pkgs/tools/misc/trash-cli/default.nix index 1da49a153b82..d199fd7fda3d 100644 --- a/nixpkgs/pkgs/tools/misc/trash-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/trash-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "trash-cli"; diff --git a/nixpkgs/pkgs/tools/misc/trillian/default.nix b/nixpkgs/pkgs/tools/misc/trillian/default.nix index 07b4d8349787..8a96248e718a 100644 --- a/nixpkgs/pkgs/tools/misc/trillian/default.nix +++ b/nixpkgs/pkgs/tools/misc/trillian/default.nix @@ -1,15 +1,11 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub }: -let + +buildGoModule rec { pname = "trillian"; version = "1.3.11"; - -in -buildGoModule { - inherit pname version; vendorSha256 = "0zxp1gjzcc3z6vkpc2bchbs1shwm1b28ks0jh4gf6zxpp4361j4l"; src = fetchFromGitHub { @@ -34,10 +30,10 @@ buildGoModule { "cmd/updatetree" ]; - meta = { + meta = with lib; { homepage = "https://github.com/google/trillian"; description = "A transparent, highly scalable and cryptographically verifiable data store."; - license = [ lib.licenses.asl20 ]; - maintainers = [ lib.maintainers.adisbladis ]; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.adisbladis ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/ttwatch/default.nix b/nixpkgs/pkgs/tools/misc/ttwatch/default.nix index 5e5413454106..ecfc40bdf6f3 100644 --- a/nixpkgs/pkgs/tools/misc/ttwatch/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttwatch/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "ttwatch"; - version = "2020-02-05"; + version = "2020-06-24"; src = fetchFromGitHub { owner = "ryanbinns"; repo = "ttwatch"; - rev = "bfdf1372515574e1fb3871dc1039f8d8a5dbdada"; - sha256 = "07nd4dbkchxy8js1h1f6pzn63pls2afww97wyiiw6zid43mpqyg4"; + rev = "260aff5869fd577d788d86b546399353d9ff72c1"; + sha256 = "0yd2hs9d03gfvwm1vywpg2qga6x5c74zrj665wf9aa8gmn96hv8r"; }; nativeBuildInputs = [ cmake perl pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/tydra/default.nix b/nixpkgs/pkgs/tools/misc/tydra/default.nix index 6714ee489f5c..00c8aa2a2c3b 100644 --- a/nixpkgs/pkgs/tools/misc/tydra/default.nix +++ b/nixpkgs/pkgs/tools/misc/tydra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "tydra"; diff --git a/nixpkgs/pkgs/tools/misc/uhubctl/default.nix b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix index bd7e956bb1cb..c1dfae680503 100644 --- a/nixpkgs/pkgs/tools/misc/uhubctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix @@ -1,22 +1,24 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , libusb1 }: stdenv.mkDerivation rec { pname = "uhubctl"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "mvp"; repo = "uhubctl"; - rev = "refs/tags/v${version}"; - sha256 = "0pimhw2a2wfg7nh1ahsxmzkb0j6bbncwdqsvyp8l23zhs5kx7wm9"; + rev = "v${version}"; + sha256 = "1wxsiygw6gwv1h90yassnxylkyi2dfz7y59qkmb7rs8a8javj7nv"; }; buildInputs = [ libusb1 ]; installFlags = [ "prefix=${placeholder "out"}" ]; + meta = with lib; { homepage = "https://github.com/mvp/uhubctl"; description = "Utility to control USB power per-port on smart USB hubs"; diff --git a/nixpkgs/pkgs/tools/misc/unicode/default.nix b/nixpkgs/pkgs/tools/misc/unicode/default.nix index c8e1a0f7ca4b..a2bc615ed86f 100644 --- a/nixpkgs/pkgs/tools/misc/unicode/default.nix +++ b/nixpkgs/pkgs/tools/misc/unicode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: +{ lib, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "unicode"; diff --git a/nixpkgs/pkgs/tools/misc/upower-notify/default.nix b/nixpkgs/pkgs/tools/misc/upower-notify/default.nix index ddc0fa42c691..79460f3a5b79 100644 --- a/nixpkgs/pkgs/tools/misc/upower-notify/default.nix +++ b/nixpkgs/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # diff --git a/nixpkgs/pkgs/tools/misc/upterm/default.nix b/nixpkgs/pkgs/tools/misc/upterm/default.nix new file mode 100644 index 000000000000..533ef192e8d7 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/upterm/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles }: + +buildGoModule rec { + pname = "upterm"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "owenthereal"; + repo = "upterm"; + rev = "v${version}"; + sha256 = "007hgkkn1cq1i0rkn45i3bz5q9irzm67cz0j5glr6f6d4s0nkjiq"; + }; + + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + $out/bin/gendoc + rm $out/bin/gendoc + installManPage etc/man/man*/* + installShellCompletion --bash --name upterm.bash etc/completion/upterm.bash_completion.sh + installShellCompletion --zsh --name _upterm etc/completion/upterm.zsh_completion + ''; + + doCheck = true; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Secure terminal-session sharing"; + homepage = "https://upterm.dev"; + license = licenses.asl20; + maintainers = with maintainers; [ hax404 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index f18deb0c83de..44871b07a8ea 100644 --- a/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" , Security }: +rustPlatform.buildRustPackage rec { + pname = "uutils-coreutils"; + version = "0.0.3"; -rustPlatform.buildRustPackage { - name = "uutils-coreutils-2019-05-03"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; - rev = "036dd812958ace22d973acf7b370f58072049dac"; - sha256 = "0d9w3iiphhsk7l5l34682wayp90rgq5a3d94l3qdvhcqkfmpg727"; + rev = version; + sha256 = "QWiEHk8aciiwQeyNgrr0M0c1EeAgE3gSqw0ly/YTwTQ="; }; # too many impure/platform-dependent tests doCheck = false; - cargoSha256 = "186hwzdpy7j0gw7491qx02vy4di5md47hipf1xxi1qccvmcfghwh"; + cargoSha256 = "m2a7WNkF5TxjJlytjdoQ/JZIF9gp9qBkH+UU/NVRJzA="; makeFlags = [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] @@ -34,7 +35,7 @@ rustPlatform.buildRustPackage { CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; homepage = "https://github.com/uutils/coreutils"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ siraben ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/venus/default.nix b/nixpkgs/pkgs/tools/misc/venus/default.nix deleted file mode 100644 index 28c4508525ec..000000000000 --- a/nixpkgs/pkgs/tools/misc/venus/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "venus"; - version = "unstable-2011-02-18"; - - src = fetchFromGitHub { - owner = "rubys"; - repo = "venus"; - rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b"; - sha256 = "10yyx4jaxxbwhica12aiw119aywghcr7b24gs9lrmafpa6xd3an2"; - }; - - preConfigure = '' - substituteInPlace tests/test_spider.py \ - --replace "urllib.urlopen('http://127.0.0.1:%d/' % _PORT).read()" "" \ - --replace "[200,200,200,200,404]" "[200,200,200,404]" - substituteInPlace planet.py \ - --replace "#!/usr/bin/env python" "#!${python}/bin/python" - substituteInPlace tests/test_apply.py \ - --replace "'xsltproc" "'${libxslt.bin}/bin/xsltproc" - substituteInPlace planet/shell/xslt.py \ - --replace "'xsltproc" "'${libxslt.bin}/bin/xsltproc" - ''; - - doCheck = true; - checkPhase = "python runtests.py"; - - buildInputs = [ python libxslt - libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - cp -R ./* $out/ - ln -s $out/planet.py $out/bin/venus-planet - wrapProgram $out/planet.py \ - --prefix PYTHONPATH : $PYTHONPATH:${pythonPackages.lxml}/lib/${python.libPrefix}/site-packages:${pythonPackages.genshi}/lib/${python.libPrefix}/site-packages - python runtests.py - ''; - - meta = { - description = "News feed reader"; - longDescription = '' - Planet Venus is an awesome ‘river of news’ feed reader. It downloads news - feeds published by web sites and aggregates their content together into a - single combined feed, latest news first. - ''; - homepage = "http://intertwingly.net/code/venus/docs/index.html"; - license = lib.licenses.psfl; - platforms = lib.platforms.all; - maintainers = []; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix b/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix index c1b1fce7abdd..18adf99b9c99 100644 --- a/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchPypi , markdown diff --git a/nixpkgs/pkgs/tools/misc/vivid/default.nix b/nixpkgs/pkgs/tools/misc/vivid/default.nix index dad352cc6577..e131d8bd4e73 100644 --- a/nixpkgs/pkgs/tools/misc/vivid/default.nix +++ b/nixpkgs/pkgs/tools/misc/vivid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "vivid"; diff --git a/nixpkgs/pkgs/tools/misc/void/default.nix b/nixpkgs/pkgs/tools/misc/void/default.nix index e6d36155732e..18699e5911dc 100644 --- a/nixpkgs/pkgs/tools/misc/void/default.nix +++ b/nixpkgs/pkgs/tools/misc/void/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "void"; diff --git a/nixpkgs/pkgs/tools/misc/vsh/default.nix b/nixpkgs/pkgs/tools/misc/vsh/default.nix index 1ad9ddd4debb..f3eb1f9ad8e5 100644 --- a/nixpkgs/pkgs/tools/misc/vsh/default.nix +++ b/nixpkgs/pkgs/tools/misc/vsh/default.nix @@ -2,17 +2,21 @@ buildGoModule rec { pname = "vsh"; - version = "0.7.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${version}"; - sha256 = "0k9bbfzqhijzimng8plk2xx9h37h7d2wj8g3plvvs3wrf7pmwxs7"; + sha256 = "1f6szcdakfx3zap1zpkrcs134plv7vnyilzcxs5jbhrrbr6q1807"; }; - # vendor dir is already part of repository - vendorSha256 = null; + vendorSha256 = "0a2kjql4ibglxkq5dgzr2sxxxm38nf83s4rsk2gd1cf7v0flr02j"; + + # vendor dir in vsh repo is incomplete + deleteVendor = true; + + runVend = true; # make sure version gets set at compile time buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/wakatime/default.nix b/nixpkgs/pkgs/tools/misc/wakatime/default.nix index 75f461062093..e8bd12d567b6 100644 --- a/nixpkgs/pkgs/tools/misc/wakatime/default.nix +++ b/nixpkgs/pkgs/tools/misc/wakatime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, glibcLocales }: +{ lib, python3Packages, fetchFromGitHub, glibcLocales }: with python3Packages; buildPythonApplication rec { diff --git a/nixpkgs/pkgs/tools/misc/wimboot/default.nix b/nixpkgs/pkgs/tools/misc/wimboot/default.nix index b25e0b55379d..04dbca9ed63f 100644 --- a/nixpkgs/pkgs/tools/misc/wimboot/default.nix +++ b/nixpkgs/pkgs/tools/misc/wimboot/default.nix @@ -14,12 +14,17 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-address-of-packed-member"; # Fails on gcc9 patches = [ - # Fix for newer binutils + # Fixes for newer binutils + # Add R_X86_64_PLT32 as known reloc target (fetchpatch { - url = - "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch"; + url = "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch"; sha256 = "113448n49hmk8nz1dxbhxiciwl281zwalvb8z5p9xfnjvibj8274"; }) + # Fix building with binutils 2.34 (bfd_get_section_* removed in favour of bfd_section_*) + (fetchpatch { + url = "https://github.com/ipxe/wimboot/commit/2f97e681703d30b33a4d5032a8025ab8b9f2de75.patch"; + sha256 = "0476mp74jaq3k099b654al6yi2yhgn37d9biz0wv3ln2q1gy94yf"; + }) ]; # We cannot use sourceRoot because the patch wouldn't apply @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://ipxe.org/wimboot"; description = "Windows Imaging Format bootloader"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ das_j ajs124 ]; platforms = platforms.x86; # Fails on aarch64 }; diff --git a/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix b/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix index 85011baacaef..b635316bf777 100644 --- a/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix +++ b/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wlr-randr"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "10c8zzp78s5bw34vvjhilipa28bsdx3jbyhnxgp8f8kawh3cvgsc"; + sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; }; nativeBuildInputs = [ meson ninja cmake pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/wob/default.nix b/nixpkgs/pkgs/tools/misc/wob/default.nix index cbc09b0ce649..e0622e5416aa 100644 --- a/nixpkgs/pkgs/tools/misc/wob/default.nix +++ b/nixpkgs/pkgs/tools/misc/wob/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "0v7xm8zd9237v5j5h79pd0x6dkal5fgg1ly9knssjpv3hswwyv40"; + sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; diff --git a/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix index 8d4998a9ff99..b898aa2fc242 100644 --- a/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { name = "xdxf2slob-unstable-2015-06-30"; diff --git a/nixpkgs/pkgs/tools/misc/xflux/gui.nix b/nixpkgs/pkgs/tools/misc/xflux/gui.nix index 378337f6232b..16379820653b 100644 --- a/nixpkgs/pkgs/tools/misc/xflux/gui.nix +++ b/nixpkgs/pkgs/tools/misc/xflux/gui.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook +{ lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook , xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk , pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3 }: diff --git a/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix b/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix index b8dd369cd6a8..acd4a9e1d46d 100644 --- a/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix +++ b/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "xmonad-log"; diff --git a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index 64568ca46b06..9ee81cd1b158 100644 --- a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }: +{ lib, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }: python3Packages.buildPythonApplication rec { pname = "yle-dl"; diff --git a/nixpkgs/pkgs/tools/misc/you-get/default.nix b/nixpkgs/pkgs/tools/misc/you-get/default.nix index 544430839965..f58fb349c959 100644 --- a/nixpkgs/pkgs/tools/misc/you-get/default.nix +++ b/nixpkgs/pkgs/tools/misc/you-get/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi }: +{ lib, buildPythonApplication, fetchPypi }: buildPythonApplication rec { pname = "you-get"; diff --git a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index fea9de8caca9..1fc8a3916bf9 100644 --- a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.01.24.1"; + version = "2021.02.10"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "001hs73fpm4nxcgn60n9wlsdmiv40f4b1k6hkl4g4wyywv9ic9fy"; + sha256 = "08liybkivqb32nbrzvvlv56yw6418zwmml7p6dbqcivhdgvas1yn"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index fd6610a1973e..0f81f132abdf 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , wrapQtAppsHook , pcsclite @@ -16,8 +17,6 @@ , yubikey-personalization }: -let inherit (stdenv) lib; in - stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; version = "1.1.5"; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index 505d26bb582f..07218d054df7 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "3.1.1"; + version = "3.1.2"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1yhc8j67phrj5xgx09b5h7c67pgc4wj4jnkmkq0r3s6j7jn43vv8"; + hash = "sha256-dwnIOuu0QyWRl6RSdyQw7dGsAZ4xpXpx6jOpCkp4efE="; }; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix index eeb4f5c1bd59..3991b99fcdcf 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python27Packages +{ lib, fetchurl, python27Packages , libykneomgr, yubikey-personalization, libu2f-host }: python27Packages.buildPythonPackage rec { diff --git a/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 6934791da8ea..af6843e38202 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick +{ lib, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick , libyubikey, yubikey-personalization }: mkDerivation rec { diff --git a/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/nixpkgs/pkgs/tools/misc/z-lua/default.nix index 419846a9d374..64ae387e1a6d 100644 --- a/nixpkgs/pkgs/tools/misc/z-lua/default.nix +++ b/nixpkgs/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "0q0qs07kmkpjv68j2bjgsrv6shl76mssnchfv82vjf8abkf8343b"; + sha256 = "sha256-k3Q4Fc2T7ElZb98+DVodC7zMHv5yfdwOIkSk0k04WCo="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix b/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix index 15add8ed1919..81d81b6794eb 100644 --- a/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "zabbixctl"; diff --git a/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/nixpkgs/pkgs/tools/misc/zoxide/default.nix index c5ca2965e9dd..1e1ec8723bfc 100644 --- a/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -4,7 +4,6 @@ , rustPlatform , withFzf ? true , fzf - # checkInputs , fish , powershell @@ -13,12 +12,10 @@ , xonsh , zsh }: -let - version = "0.5.0"; -in -rustPlatform.buildRustPackage { + +rustPlatform.buildRustPackage rec { pname = "zoxide"; - inherit version; + version = "0.5.0"; src = fetchFromGitHub { owner = "ajeetdsouza"; @@ -55,6 +52,6 @@ rustPlatform.buildRustPackage { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ysndr cole-h ]; + maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/acme-client/default.nix b/nixpkgs/pkgs/tools/networking/acme-client/default.nix index c669a3a3be2d..6de95b34e627 100644 --- a/nixpkgs/pkgs/tools/networking/acme-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/acme-client/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "acme-client"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.xz"; - sha256 = "0gmdvmyw8a61w08hrxllypf7rpnqg0fxipbk3zmvsxj7m5i6iysj"; + sha256 = "sha256-AYI7WfRTb5R0/hDX5Iqkq5nrLZ4gQecAGObSajSA+vw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix index 66e701626751..b43d29380090 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix @@ -1,16 +1,16 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "ajv-6.12.0" = { + "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; "asn1-0.2.4" = { @@ -19,7 +19,7 @@ let version = "0.2.4"; src = fetchurl { url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "assert-plus-1.0.0" = { @@ -49,13 +49,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.9.1" = { + "aws4-1.11.0" = { name = "aws4"; packageName = "aws4"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; - sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; "bcrypt-pbkdf-1.0.2" = { @@ -100,7 +100,7 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-0.6.1" = { @@ -166,13 +166,13 @@ let sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; - "debug-4.1.1" = { + "debug-4.3.2" = { name = "debug"; packageName = "debug"; - version = "4.1.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055"; + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; "delayed-stream-1.0.0" = { @@ -184,13 +184,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "denque-1.4.1" = { + "denque-1.5.0" = { name = "denque"; packageName = "denque"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz"; - sha512 = "2spb0s12jkarfiydj4sj4iw1yfjzaplakzw7bma0pwnbra23l1b85rsyzc25szlfdl3bm5bb42fmy4xhf1xdpxaywmwh6aa4swwzz1r"; + url = "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz"; + sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="; }; }; "ecc-jsbn-0.1.2" = { @@ -208,7 +208,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extsprintf-1.3.0" = { @@ -220,13 +220,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-3.1.1" = { + "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -235,7 +235,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; "forever-agent-0.6.1" = { @@ -253,7 +253,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "formidable-1.0.11" = { @@ -292,13 +292,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.1.3" = { + "har-validator-5.1.5" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.3"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; "http-signature-1.2.0" = { @@ -352,7 +352,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -391,22 +391,22 @@ let sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; }; }; - "mime-db-1.43.0" = { + "mime-db-1.45.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.43.0"; + version = "1.45.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; + sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; }; }; - "mime-types-2.1.26" = { + "mime-types-2.1.28" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.26"; + version = "2.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; + sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; }; }; "mkdirp-0.3.3" = { @@ -424,7 +424,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; "oauth-sign-0.9.0" = { @@ -433,7 +433,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; "pause-0.0.1" = { @@ -454,13 +454,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "psl-1.7.0" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "0whj0m29370fn3imrlj2dw0xmr33j2gn30kn96xpxckz7i1b21pj6vlgsn4ggxl79mz2ckng5mdxbkczcwkjry497s8xkgw7c815nz4"; + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "punycode-2.1.1" = { @@ -469,7 +469,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; "qs-0.5.1" = { @@ -487,7 +487,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "range-parser-0.0.4" = { @@ -499,13 +499,13 @@ let sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; }; }; - "redis-commands-1.5.0" = { + "redis-commands-1.6.0" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz"; - sha512 = "0kdmbh04hif6g8qr3zcwjkjg1v3rjgss0dq3sy144l5ja5vp4ndb5hdn2acrx57w01swbwpkskmy788lr2nxdq0g46azqsrmad5mb78"; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz"; + sha512 = "2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ=="; }; }; "redis-errors-1.2.0" = { @@ -526,13 +526,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "safe-buffer-5.2.0" = { + "safe-buffer-5.2.1" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; "safer-buffer-2.1.2" = { @@ -541,7 +541,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "send-0.1.0" = { @@ -559,7 +559,7 @@ let version = "1.16.1"; src = fetchurl { url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "tough-cookie-2.5.0" = { @@ -568,7 +568,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "tunnel-agent-0.6.0" = { @@ -589,22 +589,22 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "underscore-1.9.2" = { + "underscore-1.12.0" = { name = "underscore"; packageName = "underscore"; - version = "1.9.2"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz"; - sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz"; + sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ=="; }; }; - "uri-js-4.2.2" = { + "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; - version = "4.2.2"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9"; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; "uuid-3.4.0" = { @@ -613,7 +613,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; "verror-1.10.0" = { @@ -644,7 +644,7 @@ in sources."cookie-0.0.5" sources."cookie-signature-0.0.1" sources."crc-0.2.0" - sources."debug-4.1.1" + sources."debug-4.3.2" sources."formidable-1.0.11" sources."fresh-0.1.0" sources."methods-0.0.1" @@ -673,7 +673,7 @@ in sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f"; }; dependencies = [ - sources."underscore-1.9.2" + sources."underscore-1.12.0" ]; buildInputs = globalBuildInputs; meta = { @@ -706,11 +706,11 @@ in version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/redis/-/redis-3.0.2.tgz"; - sha512 = "26lf40x7al63vywd96j6idqbn8fagv4jp6ar9cc80aili5d59sy14hvb3haw8xhjqxc3481dkmbvza8x3p1dcn3p2az5snlp054pn1w"; + sha512 = "PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ=="; }; dependencies = [ - sources."denque-1.4.1" - sources."redis-commands-1.5.0" + sources."denque-1.5.0" + sources."redis-commands-1.6.0" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" ]; @@ -727,10 +727,10 @@ in connect-redis = nodeEnv.buildNodePackage { name = "connect-redis"; packageName = "connect-redis"; - version = "4.0.4"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect-redis/-/connect-redis-4.0.4.tgz"; - sha512 = "014p1jjd7bzdsd81v0918ac5j4k1qs4qi2nzzndyn50rznd04hx85l23jpicznwc2j3nkz5bj15zbi98ld3akxb5rwl46r5sdp3nyb9"; + url = "https://registry.npmjs.org/connect-redis/-/connect-redis-5.0.0.tgz"; + sha512 = "R4nTW5uXeG5s6zr/q4abmtcdloglZrL/A3cpa0JU0RLFJU4mTR553HUY8OZ0ngeySkGDclwQ5xmCcjjKkxdOSg=="; }; buildInputs = globalBuildInputs; meta = { @@ -748,7 +748,7 @@ in version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; - sha512 = "1kwiqca4ql149ywfzbp1lpmqixnh1y9i5aizcd0fvndrq9sn31j0cr38wdgbr5xqvlxgjfs3jwryg7ddnwc8n1b5nlksfjmj48sc7ad"; + sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; buildInputs = globalBuildInputs; meta = { @@ -766,15 +766,15 @@ in version = "2.88.2"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."combined-stream-1.0.8" @@ -784,13 +784,13 @@ in sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" @@ -799,20 +799,20 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" ]; diff --git a/nixpkgs/pkgs/tools/networking/airfield/node.nix b/nixpkgs/pkgs/tools/networking/airfield/node.nix index 6f3f95714a22..0bcd0eb4b851 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/node.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/tools/networking/amass/default.nix b/nixpkgs/pkgs/tools/networking/amass/default.nix index 39ab6b191146..67dce4c2e8b7 100644 --- a/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.11.1"; + version = "3.11.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "06nxjlbkzzdf4ag6c1fyszrrfj5hk5870cbqg4k7xz0faa25l6pw"; + sha256 = "sha256-3J4yT7GTuVzkxMb+fCD3S9u0XBHa4Y0W+BnkDJ4PhWI="; }; - vendorSha256 = "0i77m9h5pmshd5v390cisna1zr3x4lndqdcxfmynvbmzha29gyrq"; + vendorSha256 = "sha256-8GzzihKhrf71lLKgb2i3NnmSctvKb95V5pOGoWAgclk="; outputs = [ "out" "wordlists" ]; diff --git a/nixpkgs/pkgs/tools/networking/assh/default.nix b/nixpkgs/pkgs/tools/networking/assh/default.nix index 13018d183ca4..3995fc295d10 100644 --- a/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, openssh, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, openssh, makeWrapper }: buildGoModule rec { pname = "assh"; diff --git a/nixpkgs/pkgs/tools/networking/atftp/default.nix b/nixpkgs/pkgs/tools/networking/atftp/default.nix index 7fcd677044fe..0038a5e2e7f8 100644 --- a/nixpkgs/pkgs/tools/networking/atftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/atftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atftp"; - version = "0.7.2"; + version = "0.7.4"; src = fetchurl { url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; - sha256 = "0hah3fhzl6vfs381883vbvf4d13cdhsyf0x7ncbl55wz9rkq1l0s"; + sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo="; }; buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ]; diff --git a/nixpkgs/pkgs/tools/networking/autossh/default.nix b/nixpkgs/pkgs/tools/networking/autossh/default.nix index 49fb4d52e0b4..9b8e7f712fd0 100644 --- a/nixpkgs/pkgs/tools/networking/autossh/default.nix +++ b/nixpkgs/pkgs/tools/networking/autossh/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, openssh}: stdenv.mkDerivation rec { - name = "autossh-1.4g"; + pname = "autossh"; + version = "1.4g"; src = fetchurl { - url = "http://www.harding.motd.ca/autossh/${name}.tgz"; + url = "http://www.harding.motd.ca/autossh/${pname}-${version}.tgz"; sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz"; }; @@ -15,8 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ openssh ]; - installPhase = - '' + installPhase = '' install -D -m755 autossh $out/bin/autossh || return 1 install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1 install -D -m644 README $out/share/doc/autossh/README || return 1 @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.harding.motd.ca/autossh/"; description = "Automatically restart SSH sessions and tunnels"; + license = licenses.bsd1; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; diff --git a/nixpkgs/pkgs/tools/networking/boundary/default.nix b/nixpkgs/pkgs/tools/networking/boundary/default.nix new file mode 100644 index 000000000000..6c653125c33a --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchzip }: + +let + inherit (stdenv.hostPlatform) system; + suffix = { + x86_64-linux = "linux_amd64"; + aarch64-linux = "linux_arm64"; + x86_64-darwin = "darwin_amd64"; + }."${system}" or (throw "Unsupported system: ${system}"); + fetchsrc = version: sha256: fetchzip { + url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip"; + sha256 = sha256."${system}"; + }; +in +stdenv.mkDerivation rec { + pname = "boundary"; + version = "0.1.5"; + + src = fetchsrc version { + x86_64-linux = "sha256-A8dfmFjvOHDwotCyRq9QQ9uHJIkq1JkIwtHsqDqTSNo="; + aarch64-linux = "sha256-i2qc4bmoSzUwNCQmnXLFQ+W4VZjVwXzEBSF3NeTju3M="; + x86_64-darwin = "sha256-lKGTpS2TmgxFdjUsBXKg8Mu6oJA0VidHc/noWWEuUVo="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + install -D boundary $out/bin/boundary + ''; + + dontPatchELF = true; + dontPatchShebangs = true; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + homepage = "https://boundaryproject.io/"; + changelog = "https://github.com/hashicorp/boundary/blob/v${version}/CHANGELOG.md"; + description = "Enables identity-based access management for dynamic infrastructure"; + longDescription = '' + Boundary provides a secure way to access hosts and critical systems + without having to manage credentials or expose your network, and is + entirely open source. + + Boundary is designed to be straightforward to understand, highly scalable, + and resilient. It can run in clouds, on-prem, secure enclaves and more, + and does not require an agent to be installed on every end host. + ''; + license = licenses.mpl20; + maintainers = with maintainers; [ jk ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/boundary/update.sh b/nixpkgs/pkgs/tools/networking/boundary/update.sh new file mode 100755 index 000000000000..437339307104 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/boundary/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused gawk nix-prefetch + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/default.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find default.nix in $ROOT" + exit 1 +fi + +fetch_arch() { + VER="$1"; ARCH="$2" + URL="https://releases.hashicorp.com/boundary/${VER}/boundary_${VER}_${ARCH}.zip" + nix-prefetch "{ stdenv, fetchzip }: +stdenv.mkDerivation rec { + pname = \"boundary\"; version = \"${VER}\"; + src = fetchzip { url = \"$URL\"; }; +} +" +} + +replace_sha() { + sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" +} + +# https://releases.hashicorp.com/boundary/0.1.4/boundary_0.1.4_linux_amd64.zip +BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/boundary/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') + +BOUNDARY_LINUX_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_amd64") +BOUNDARY_DARWIN_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_amd64") +BOUNDARY_LINUX_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_arm64") + +sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV" + +replace_sha "x86_64-linux" "$BOUNDARY_LINUX_X64_SHA256" +replace_sha "x86_64-darwin" "$BOUNDARY_DARWIN_X64_SHA256" +replace_sha "aarch64-linux" "$BOUNDARY_LINUX_AARCH64_SHA256" diff --git a/nixpkgs/pkgs/tools/networking/brook/default.nix b/nixpkgs/pkgs/tools/networking/brook/default.nix index f84176495aa4..b6f7cb1869ad 100644 --- a/nixpkgs/pkgs/tools/networking/brook/default.nix +++ b/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "brook"; diff --git a/nixpkgs/pkgs/tools/networking/bukubrow/default.nix b/nixpkgs/pkgs/tools/networking/bukubrow/default.nix index 5188954b7634..157720651f43 100644 --- a/nixpkgs/pkgs/tools/networking/bukubrow/default.nix +++ b/nixpkgs/pkgs/tools/networking/bukubrow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, sqlite }: let +{ lib, rustPlatform, fetchFromGitHub, sqlite }: let manifest = { description = "Bukubrow extension host application"; diff --git a/nixpkgs/pkgs/tools/networking/cassowary/default.nix b/nixpkgs/pkgs/tools/networking/cassowary/default.nix index 7d9a07badbb3..b918516f926c 100644 --- a/nixpkgs/pkgs/tools/networking/cassowary/default.nix +++ b/nixpkgs/pkgs/tools/networking/cassowary/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cassowary"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HRshuMnRPMzatOYYI//yEtjC46kORGXaAWJJjLHW2+k="; + sha256 = "sha256-1so9EMry7U6GfpxgqLpcqC+ZaWAn4qAsnyDZvo0FAZY="; }; vendorSha256 = "sha256-d8JPsHBGkZ/MeoHTCLxi6JeNomER/0veWjqmqGal8eE="; diff --git a/nixpkgs/pkgs/tools/networking/chisel/default.nix b/nixpkgs/pkgs/tools/networking/chisel/default.nix new file mode 100644 index 000000000000..56868e07688f --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/chisel/default.nix @@ -0,0 +1,37 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: + +buildGoModule rec { + pname = "chisel"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "jpillora"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-1vg9tJLYbW8pfPpw3gQ15c9Kwj2lFfblMRhOK4yWKb8="; + }; + + vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; + + # tests require access to the network + doCheck = false; + + meta = with lib; { + description = "TCP/UDP tunnel over HTTP"; + longDescription = '' + Chisel is a fast TCP/UDP tunnel, transported over HTTP, secured via + SSH. Single executable including both client and server. Chisel is + mainly useful for passing through firewalls, though it can also be + used to provide a secure endpoint into your network. + ''; + homepage = "https://github.com/jpillora/chisel"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/circus/default.nix b/nixpkgs/pkgs/tools/networking/circus/default.nix index 891eb19c8352..f24c0e629cb0 100644 --- a/nixpkgs/pkgs/tools/networking/circus/default.nix +++ b/nixpkgs/pkgs/tools/networking/circus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: let python = python3.override { diff --git a/nixpkgs/pkgs/tools/networking/clash/default.nix b/nixpkgs/pkgs/tools/networking/clash/default.nix index 590fcf1dbafe..543c86db307f 100644 --- a/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "clash"; diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix index 9f0c9873e2a7..cbf500913038 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }: python3Packages.buildPythonApplication { pname = "connman-notify"; diff --git a/nixpkgs/pkgs/tools/networking/connman/connman.nix b/nixpkgs/pkgs/tools/networking/connman/connman.nix index 21fa038707c6..d8380340caea 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman.nix @@ -55,10 +55,10 @@ let inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "connman"; - version = "1.38"; + version = "1.39"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; - sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"; + sha256 = "sha256-n2KnFpt0kcZwof8uM1sNlmMI+y9i4oXHgRBeuQ8YGvM="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/corerad/default.nix b/nixpkgs/pkgs/tools/networking/corerad/default.nix index 64e8e09467d9..a7e5026d83af 100644 --- a/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/nixpkgs/pkgs/tools/networking/corerad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "corerad"; diff --git a/nixpkgs/pkgs/tools/networking/croc/default.nix b/nixpkgs/pkgs/tools/networking/croc/default.nix index 92493ab109f4..4a4578a73562 100644 --- a/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, callPackage}: +{ lib, buildGoModule, fetchFromGitHub, callPackage}: buildGoModule rec { pname = "croc"; diff --git a/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix b/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix index 84b5c1861cd3..ab4c3292ea51 100644 --- a/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, lib, stdenv, fetchFromGitHub }: +{ buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { name = "curl-unix-socket-2015-04-10"; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index d980d5702261..ad37245d57ca 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: +{ lib, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: let # keep this in sync with github.com/DataDog/agent-payload dependency diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index a77030bba930..e2c497dad405 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "datadog-process-agent"; diff --git a/nixpkgs/pkgs/tools/networking/ddclient/default.nix b/nixpkgs/pkgs/tools/networking/ddclient/default.nix index 3b52c2be2527..51454ac1197c 100644 --- a/nixpkgs/pkgs/tools/networking/ddclient/default.nix +++ b/nixpkgs/pkgs/tools/networking/ddclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, iproute, perl }: +{ lib, fetchurl, perlPackages, iproute, perl }: perlPackages.buildPerlPackage rec { pname = "ddclient"; diff --git a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 3526562e11c8..8aedb4032608 100644 --- a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dnscrypt-proxy2"; diff --git a/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix index b8b88e193955..d92408b36690 100644 --- a/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix @@ -12,11 +12,12 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.82"; + pname = "dnsmasq"; + version = "2.83"; src = fetchurl { - url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4"; + url = "http://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz"; + sha256 = "1sjamz1v588qf35m8z6wcqkjk5w12bqhj7d7p48dj8jyn3lgghgz"; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index a04244642ba5..68a6660db9f3 100644 --- a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "dnsproxy"; - version = "0.33.8"; + version = "0.34.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4QbIcg4C7TQJ1k+PQN0jwtZiXmcO8D609YkNLVyzW8w="; + sha256 = "sha256-XwXGhFyPsJWHWea3Cj3X6mOV/oseaRAMaEHoppX+WRw="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/driftnet/default.nix b/nixpkgs/pkgs/tools/networking/driftnet/default.nix index a9f9305169ce..042f29d3ca31 100644 --- a/nixpkgs/pkgs/tools/networking/driftnet/default.nix +++ b/nixpkgs/pkgs/tools/networking/driftnet/default.nix @@ -1,31 +1,64 @@ -{ stdenv, lib, fetchFromGitHub, libpcap, libjpeg , libungif, libpng -, giflib, glib, gtk2, cairo, pango, gdk-pixbuf, atk -, pkg-config, autoreconfHook }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, cairo +, giflib +, glib +, gtk2-x11 +, libjpeg +, libpcap +, libpng +, libwebsockets +, pkg-config +, libuv +, openssl +}: -with lib; - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "driftnet"; - version = "1.1.5"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libpcap libjpeg libungif libpng giflib - glib gtk2 glib cairo pango gdk-pixbuf atk autoreconfHook - ]; + version = "1.3.0"; src = fetchFromGitHub { owner = "deiv"; repo = "driftnet"; - rev = "0ae4a91"; - sha256 = "1sagpx0mw68ggvqd9c3crjhghqmj7391mf2cb6cjw1cpd2hcddsj"; + rev = "v${version}"; + sha256 = "0kd22aqb25kf54jjv3ml8wy8xm7lmbf0xz1wfp31m08cbzsbizib"; }; - meta = { + # https://github.com/deiv/driftnet/pull/33 + # remove on version bump from 1.3.0 + patches = [ + (fetchpatch { + name = "fix-darwin-build"; + url = "https://github.com/deiv/driftnet/pull/33/commits/bef5f3509ab5710161e9e21ea960a997eada534f.patch"; + sha256 = "1b7p9fkgp7dxv965l7q7y632s80h3nnrkaqnak2h0hakwv0i4pvm"; + }) + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = [ + cairo + giflib + glib + gtk2-x11 + libjpeg + libpcap + libpng + libwebsockets + openssl + libuv + ]; + + meta = with lib; { description = "Watches network traffic, and picks out and displays JPEG and GIF images for display"; homepage = "https://github.com/deiv/driftnet"; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/tools/networking/driftnet/fix-darwin-build.patch b/nixpkgs/pkgs/tools/networking/driftnet/fix-darwin-build.patch new file mode 100644 index 000000000000..d1bde0f2e605 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/driftnet/fix-darwin-build.patch @@ -0,0 +1,61 @@ +diff --git a/src/compat/compat.h b/src/compat/compat.h +index 6add422..ea80406 100644 +--- a/src/compat/compat.h ++++ b/src/compat/compat.h +@@ -17,7 +17,7 @@ + #include <config.h> + #endif + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__APPLE__) + #include <sys/types.h> + #endif + +diff --git a/src/network/layer2.c b/src/network/layer2.c +index 763f0ac..2497b72 100644 +--- a/src/network/layer2.c ++++ b/src/network/layer2.c +@@ -14,7 +14,7 @@ + + #include <string.h> + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__APPLE__) + #include <netinet/in_systm.h> + #include <netinet/in.h> + #else +@@ -29,7 +29,7 @@ + /* + * Freebsd and Cygwin doesn't define 'ethhdr' + */ +-#if defined(__FreeBSD__) || defined(__CYGWIN__) ++#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__APPLE__) + + #define ETH_ALEN 6 /* Octets in one ethernet addr */ + #define ETH_P_IP 0x0800 /* Internet Protocol packet */ +diff --git a/src/network/layer3.c b/src/network/layer3.c +index 7864126..aae2041 100644 +--- a/src/network/layer3.c ++++ b/src/network/layer3.c +@@ -15,7 +15,7 @@ + #include <string.h> + #include <assert.h> + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__APPLE__) + #include <netinet/in_systm.h> + #include <netinet/in.h> + #include <sys/socket.h> +diff --git a/src/pid.c b/src/pid.c +index 621834e..94e7dcc 100644 +--- a/src/pid.c ++++ b/src/pid.c +@@ -14,7 +14,7 @@ + + #include "compat/compat.h" + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__APPLE__) + #include <sys/stat.h> + #endif + #include <fcntl.h> diff --git a/nixpkgs/pkgs/tools/networking/filegive/default.nix b/nixpkgs/pkgs/tools/networking/filegive/default.nix index 3ed250ca4bcd..1d7bf884edd5 100644 --- a/nixpkgs/pkgs/tools/networking/filegive/default.nix +++ b/nixpkgs/pkgs/tools/networking/filegive/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, lib, stdenv, fetchurl }: +{ buildGoPackage, lib, fetchurl }: buildGoPackage rec { name = "filegive-0.7.4"; diff --git a/nixpkgs/pkgs/tools/networking/findomain/default.nix b/nixpkgs/pkgs/tools/networking/findomain/default.nix index f40161840294..480a64127cae 100644 --- a/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "2.1.5"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-sGco8ISbm3C8w6FsF5oq7G09WBBTO9cVeoFnuKauMWQ="; + sha256 = "sha256-eM3XTZ/Y0Kk5bdC+xskS/btGEVrC50342YBYJdXAlDg="; }; - cargoSha256 = "sha256-X7us7mLtOSST5LazxSkej9D2ezEk9GiWdudqy4peSJ8="; + cargoSha256 = "sha256-U3WXb6qGGshaWJ3GIC+c3W9Y8Cz0O23J7mVojCwitlk="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/tools/networking/frp/default.nix b/nixpkgs/pkgs/tools/networking/frp/default.nix index cc312b9240d7..bc92d465699f 100644 --- a/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frp"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T/j+avHRQUz1xPq+I4912ZPj3PqXZN4xo3lzChG+fZ8="; + sha256 = "sha256-QnD8Yo1GLlOuCnYgzAIGW8JQ5yihmAZGqDFJ412L+W0="; }; vendorSha256 = "sha256-odZPXLn5la2x9QIlT3g7+Rxb9tXGhjTycEvJPUPbM2s="; diff --git a/nixpkgs/pkgs/tools/networking/getmail/default.nix b/nixpkgs/pkgs/tools/networking/getmail/default.nix index d994d9d8cec9..4e20cbe74410 100644 --- a/nixpkgs/pkgs/tools/networking/getmail/default.nix +++ b/nixpkgs/pkgs/tools/networking/getmail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { pname = "getmail"; diff --git a/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/nixpkgs/pkgs/tools/networking/gobgp/default.nix new file mode 100644 index 000000000000..8c0e093f9dd1 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "gobgp"; + version = "2.23.0"; + + src = fetchFromGitHub { + owner = "osrg"; + repo = "gobgp"; + rev = "v${version}"; + sha256 = "0r7w1c3rh0wnsrhdpzr2fp1aqdqafrb42f2hra6xwwspr092ixq0"; + }; + + vendorSha256 = "0dmd4r6x76jn8pyvp47x4llzc2wij5m9lchgyaagcb5sfdgbns9x"; + + postConfigure = '' + export CGO_ENABLED=0 + ''; + + buildFlagsArray = '' + -ldflags= + -s -w -extldflags '-static' + ''; + + subPackages = [ "cmd/gobgp" ]; + + meta = with lib; { + description = "A CLI tool for GoBGP"; + homepage = "https://osrg.github.io/gobgp/"; + license = licenses.asl20; + maintainers = with maintainers; [ higebu ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix b/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix index 4232a5a4fedd..619e364c884f 100644 --- a/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix +++ b/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitLab, lib }: +{ buildGoPackage, fetchFromGitLab, lib, runtimeShell }: buildGoPackage rec { pname = "goimapnotify"; @@ -13,6 +13,10 @@ buildGoPackage rec { sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42"; }; + postPatch = '' + substituteInPlace command.go --replace '"sh"' '"${runtimeShell}"' + ''; + goDeps = ./deps.nix; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/goklp/default.nix b/nixpkgs/pkgs/tools/networking/goklp/default.nix index 78117a700bd3..10c5c8ea64fe 100644 --- a/nixpkgs/pkgs/tools/networking/goklp/default.nix +++ b/nixpkgs/pkgs/tools/networking/goklp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goklp"; diff --git a/nixpkgs/pkgs/tools/networking/goreplay/default.nix b/nixpkgs/pkgs/tools/networking/goreplay/default.nix index 564c45d2e144..14d0a16366ba 100644 --- a/nixpkgs/pkgs/tools/networking/goreplay/default.nix +++ b/nixpkgs/pkgs/tools/networking/goreplay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, libpcap }: +{ lib, buildGoPackage, fetchFromGitHub, libpcap }: buildGoPackage rec { pname = "goreplay"; diff --git a/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 50a19ff2d968..6ff8ba096b44 100644 --- a/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.2"; + version = "2.3.5"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1mcg0d6qiwl3xps65ir2sv5sc868zla5wnfhk24d2b0sg6xp7jwr"; + sha256 = "sha256-eSRTlTC79VWCnH9Yhr4Lf8+NnI/+CGe3AQvrZwq/vks="; }; buildInputs = [ openssl zlib ] diff --git a/nixpkgs/pkgs/tools/networking/http-prompt/default.nix b/nixpkgs/pkgs/tools/networking/http-prompt/default.nix index 59a3bffdc6db..3732fbd879f5 100644 --- a/nixpkgs/pkgs/tools/networking/http-prompt/default.nix +++ b/nixpkgs/pkgs/tools/networking/http-prompt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, httpie }: +{ lib, fetchFromGitHub, python3Packages, httpie }: python3Packages.buildPythonApplication rec { pname = "http-prompt"; diff --git a/nixpkgs/pkgs/tools/networking/httpie/default.nix b/nixpkgs/pkgs/tools/networking/httpie/default.nix index 66513819ab89..a323087575bf 100644 --- a/nixpkgs/pkgs/tools/networking/httpie/default.nix +++ b/nixpkgs/pkgs/tools/networking/httpie/default.nix @@ -1,31 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }: +{ lib, fetchFromGitHub, python3Packages, docutils }: python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { - owner = "jakubroztocil"; + owner = "httpie"; repo = "httpie"; rev = version; - sha256 = "0caazv24jr0844c4mdx77vzwwi5m869n10wa42cydb08ppx1xxj6"; + sha256 = "00lafjqg9nfnak0nhcr2l2hzzkwn2y6qv0wdkm6r6f69snizy3hf"; }; - outputs = [ "out" "doc" "man" ]; - - propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; - dontUseSetuptoolsCheck = true; patches = [ ./strip-venv.patch - - # Fix `test_ciphers_none_can_be_selected` - # TODO: remove on next release - (fetchpatch { - url = "https://github.com/jakubroztocil/httpie/commit/49e71d252f54871a6bc49cb1cba103d385a543b8.patch"; - sha256 = "13b2faf50gimj7f17dlx4gmd8ph8ipgihpzfqbvmfjlbf1v95fsj"; - }) ]; + outputs = [ "out" "doc" "man" ]; + + propagatedBuildInputs = with python3Packages; [ pygments requests requests-toolbelt setuptools ]; + checkInputs = with python3Packages; [ mock pytest @@ -70,15 +63,6 @@ python3Packages.buildPythonApplication rec { toHtml CHANGELOG.rst $docdir/html/CHANGELOG.html toHtml CONTRIBUTING.rst $docdir/html/CONTRIBUTING.html - # change a few links to the local files - substituteInPlace $docdir/html/index.html \ - --replace \ - 'https://github.com/jakubroztocil/httpie/blob/master/CHANGELOG.rst' \ - "CHANGELOG.html" \ - --replace \ - 'https://github.com/jakubroztocil/httpie/blob/master/CONTRIBUTING.rst' \ - "CONTRIBUTING.html" - ${docutils}/bin/rst2man \ --strip-elements-with-class=no-web \ --title=http \ @@ -94,10 +78,14 @@ python3Packages.buildPythonApplication rec { export PATH=${docutils}/bin:$PATH ''; - meta = { + checkPhase = '' + py.test ./httpie ./tests --doctest-modules --verbose ./httpie ./tests -k 'not test_chunked and not test_verbose_chunked and not test_multipart_chunked and not test_request_body_from_file_by_path_chunked' + ''; + + meta = with lib; { description = "A command line HTTP client whose goal is to make CLI human-friendly"; homepage = "https://httpie.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ antono relrod schneefux ]; + license = licenses.bsd3; + maintainers = with maintainers; [ antono relrod schneefux SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/httpie/strip-venv.patch b/nixpkgs/pkgs/tools/networking/httpie/strip-venv.patch index 99ea80a3f566..9cfddbfdf78f 100644 --- a/nixpkgs/pkgs/tools/networking/httpie/strip-venv.patch +++ b/nixpkgs/pkgs/tools/networking/httpie/strip-venv.patch @@ -1,11 +1,11 @@ diff --git a/tests/test_docs.py b/tests/test_docs.py -index 7a41822..720ecf6 100644 +index 340e64d..a6b4dc9 100644 --- a/tests/test_docs.py +++ b/tests/test_docs.py -@@ -41,12 +41,10 @@ assert filenames - +@@ -42,15 +42,10 @@ assert filenames # HACK: hardcoded paths, venv should be irrelevant, etc. - # TODO: replaces the process with Python code + # TODO: simplify by using the Python API instead of a subprocess + # then we wont’t need the paths. -VENV_BIN = Path(__file__).parent.parent / 'venv/bin' -VENV_PYTHON = VENV_BIN / 'python' -VENV_RST2PSEUDOXML = VENV_BIN / 'rst2pseudoxml.py' @@ -13,7 +13,10 @@ index 7a41822..720ecf6 100644 +VENV_RST2PSEUDOXML = 'rst2pseudoxml.py' --@pytest.mark.skipif(not os.path.exists(VENV_RST2PSEUDOXML), reason='docutils not installed') +-@pytest.mark.skipif( +- not VENV_RST2PSEUDOXML.exists(), +- reason='docutils not installed', +-) @pytest.mark.parametrize('filename', filenames) def test_rst_file_syntax(filename): p = subprocess.Popen( diff --git a/nixpkgs/pkgs/tools/networking/httplab/default.nix b/nixpkgs/pkgs/tools/networking/httplab/default.nix index 22dc500fd4cd..40851d370c79 100644 --- a/nixpkgs/pkgs/tools/networking/httplab/default.nix +++ b/nixpkgs/pkgs/tools/networking/httplab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "httplab"; diff --git a/nixpkgs/pkgs/tools/networking/httpstat/default.nix b/nixpkgs/pkgs/tools/networking/httpstat/default.nix index a8b9630aab21..27c2a145a659 100644 --- a/nixpkgs/pkgs/tools/networking/httpstat/default.nix +++ b/nixpkgs/pkgs/tools/networking/httpstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, curl, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "httpstat"; diff --git a/nixpkgs/pkgs/tools/networking/ipgrep/default.nix b/nixpkgs/pkgs/tools/networking/ipgrep/default.nix index dd85a5dcb617..d1f5316c27b4 100644 --- a/nixpkgs/pkgs/tools/networking/ipgrep/default.nix +++ b/nixpkgs/pkgs/tools/networking/ipgrep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.0.1"; diff --git a/nixpkgs/pkgs/tools/networking/isync/default.nix b/nixpkgs/pkgs/tools/networking/isync/default.nix index 365a0669e42d..59315c4bf4b3 100644 --- a/nixpkgs/pkgs/tools/networking/isync/default.nix +++ b/nixpkgs/pkgs/tools/networking/isync/default.nix @@ -1,18 +1,20 @@ { lib, stdenv, fetchurl, pkg-config, perl -, openssl, db, zlib, cyrus_sasl +, openssl, db, cyrus_sasl, zlib +, Security }: stdenv.mkDerivation rec { pname = "isync"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "10n8ykag0q3ws6fc15xqyg3v980v5nq3kzpablly2rh2z7vkn8gj"; + sha256 = "0pkqvsdmi85xrhzzc7mz87vdvvvp01lf8akhfdnmsdlks8zbzy44"; }; nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ openssl db cyrus_sasl zlib ]; + buildInputs = [ openssl db cyrus_sasl zlib ] + ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { homepage = "http://isync.sourceforge.net/"; diff --git a/nixpkgs/pkgs/tools/networking/kail/default.nix b/nixpkgs/pkgs/tools/networking/kail/default.nix index 2ddcd6c7d4bf..ae431b329eaf 100644 --- a/nixpkgs/pkgs/tools/networking/kail/default.nix +++ b/nixpkgs/pkgs/tools/networking/kail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "kail"; diff --git a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix index 746a99ede59f..ea96ab94037b 100644 --- a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix +++ b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "linkchecker"; - version = "unstable-2020-08-15"; + version = "10.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "0086c28b3a419faa60562f2713346996062c03c2"; - sha256 = "0am5id8vqlqn1gb9jri0vjgiq5ffgrjq8yzdk1zc98gn2n0397wl"; + rev = "v" + version; + sha256 = "sha256-gcaamRxGn124LZ8rU+WzjRookU3akDO0ZyzI7/S6kFA="; }; nativeBuildInputs = [ gettext ]; diff --git a/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/nixpkgs/pkgs/tools/networking/mailutils/default.nix index 4194605df531..f4ef542a9607 100644 --- a/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -64,8 +64,6 @@ stdenv.mkDerivation rec { (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; }) ]; - NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql"; - checkInputs = [ dejagnu ]; doCheck = false; # fails 1 out of a bunch of tests, looks like a bug doInstallCheck = false; # fails diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 3145f85186b9..130a7a18ae02 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "minio-client"; - version = "2021-01-16T02-45-34Z"; + version = "2021-02-10T07-32-57Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-1JUCoeLFMDvzT5KdQw+ZdYWPgdWKIL3kJ/LCIsqc6xE="; + sha256 = "sha256-dwgQ322KV1aR1RYSowHkb7Q0Pn7vuiV6Me1s6cMyaEs="; }; - vendorSha256 = "sha256-3wWUIFpNXom2MuUEDgAAEHlWRXhUzId+shZW/i5Rw4A="; + vendorSha256 = "sha256-MXCZZZ7NGDu8NMBzfIiNdRduvj7d7nboN2r8ObGx4dQ="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix index ec74d1a47a0b..06102ac2d903 100644 --- a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.14.8"; + version = "1.14.10"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "15cjy7zzsxagx649vz0990avin47vpgdmm4ss2msggdla6x2c6py"; + sha256 = "sha256-TqYLN1p2HhfnuwlbyolFee0OjjOyc9xpi1y+A5R/NX8="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/mosh/default.nix b/nixpkgs/pkgs/tools/networking/mosh/default.nix index b03678858ad0..5ddbf24bb6a9 100644 --- a/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config , makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion -, libutempter ? null, withUtempter ? stdenv.isLinux }: +, withUtempter ? stdenv.isLinux, libutempter }: stdenv.mkDerivation rec { pname = "mosh"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - meta = { + meta = with lib; { homepage = "https://mosh.org/"; description = "Mobile shell (ssh replacement)"; longDescription = '' @@ -56,8 +56,8 @@ stdenv.mkDerivation rec { Mosh is a replacement for SSH. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links. ''; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [viric]; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/mtr/default.nix b/nixpkgs/pkgs/tools/networking/mtr/default.nix index 8296bc479195..1257c167e768 100644 --- a/nixpkgs/pkgs/tools/networking/mtr/default.nix +++ b/nixpkgs/pkgs/tools/networking/mtr/default.nix @@ -1,17 +1,15 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config , libcap, ncurses -, withGtk ? false, gtk3 ? null }: - -assert withGtk -> gtk3 != null; +, withGtk ? false, gtk3 }: stdenv.mkDerivation rec { pname = "mtr${lib.optionalString withGtk "-gui"}"; version = "0.94"; src = fetchFromGitHub { - owner = "traviscross"; - repo = "mtr"; - rev = "v${version}"; + owner = "traviscross"; + repo = "mtr"; + rev = "v${version}"; sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6"; }; @@ -38,9 +36,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A network diagnostics tool"; - homepage = "https://www.bitwizard.nl/mtr/"; - license = licenses.gpl2; + homepage = "https://www.bitwizard.nl/mtr/"; + license = licenses.gpl2; maintainers = with maintainers; [ koral orivej raskin globin ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/nebula/default.nix b/nixpkgs/pkgs/tools/networking/nebula/default.nix index 61f0a00a9b81..06684016abcf 100644 --- a/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; - buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ]; + buildFlagsArray = [ "-ldflags=" "-X main.Build=${version}" ]; meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; diff --git a/nixpkgs/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch b/nixpkgs/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch new file mode 100644 index 000000000000..d3caea1b26fd --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch @@ -0,0 +1,26 @@ +diff --color -ur a/program/nikto.pl b/program/nikto.pl +--- a/program/nikto.pl 2021-01-30 12:05:54.915072538 +0100 ++++ b/program/nikto.pl 2021-01-30 12:36:42.877729231 +0100 +@@ -223,7 +223,8 @@ + # Guess Nikto current directory + my $NIKTODIR = abs_path($0); + chomp($NIKTODIR); +- $NIKTODIR =~ s#[\\/]nikto.pl$##; ++ $NIKTODIR =~ s#[\\/]bin[\\/]\.nikto-wrapped$##; ++ + + # Guess user's home directory -- to support Windows + foreach my $var (split(/ /, "HOME USERPROFILE")) { +@@ -231,10 +232,10 @@ + } + + # Read the conf files in order (previous values are over-written with each, if multiple found) +- push(@CF,"$NIKTODIR/nikto.conf.default"); ++ push(@CF,"$NIKTODIR/etc/nikto.conf.default"); + push(@CF,"/etc/nikto.conf"); + push(@CF,"$home/nikto.conf"); +- push(@CF,"$NIKTODIR/nikto.conf"); ++ push(@CF,"$NIKTODIR/etc/nikto.conf"); + push(@CF,"nikto.conf"); + push(@CF,"$VARIABLES{'configfile'}"); + diff --git a/nixpkgs/pkgs/tools/networking/nikto/default.nix b/nixpkgs/pkgs/tools/networking/nikto/default.nix new file mode 100644 index 000000000000..e1abcb6c140d --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/nikto/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, perlPackages +, makeWrapper +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "nikto"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "sullo"; + repo = "nikto"; + rev = "c83d0461edd75c02677dea53da2896644f35ecab"; + sha256 = "0vwq2zdxir67cn78ls11qf1smd54nppy266v7ajm5rqdc47q7fy2"; + }; + + # Nikto searches its configuration file based on its current path + # This fixes the current path regex for the wrapped executable. + patches = [ ./NIKTODIR-nix-wrapper-fix.patch ]; + + postPatch = '' + # EXECDIR needs to be changed to the path where we copy the programs stuff + # Forcing SSLeay is needed for SSL support (the auto mode doesn't seem to work otherwise) + substituteInPlace program/nikto.conf.default \ + --replace "# EXECDIR=/opt/nikto" "EXECDIR=$out/share" \ + --replace "LW_SSL_ENGINE=auto" "LW_SSL_ENGINE=SSLeay" + ''; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + propagatedBuildInputs = [ perlPackages.NetSSLeay ]; + + buildInputs = [ + perlPackages.perl + ]; + + installPhase = '' + runHook preInstall + install -d "$out/share" + cp -a program/* "$out/share" + install -Dm 755 "program/nikto.pl" "$out/bin/nikto" + install -Dm 644 program/nikto.conf.default "$out/etc/nikto.conf" + installManPage documentation/nikto.1 + install -Dm 644 program/docs/nikto_manual.html "$out/share/doc/${pname}/manual.html" + install -Dm 644 README.md "$out/share/doc/${pname}/README" + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/nikto \ + --prefix PERL5LIB : $PERL5LIB + ''; + + meta = with lib; { + description = "Web server scanner"; + license = licenses.gpl2Plus; + homepage = "https://cirt.net/Nikto2"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/offlineimap/default.nix b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix index 698046358e38..0de96169769a 100644 --- a/nixpkgs/pkgs/tools/networking/offlineimap/default.nix +++ b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, +{ lib, fetchFromGitHub, python2Packages, asciidoc, cacert, libxml2, libxslt, docbook_xsl }: python2Packages.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/tools/networking/openresolv/default.nix b/nixpkgs/pkgs/tools/networking/openresolv/default.nix index 068b3e4ae894..bc7db4fc6f36 100644 --- a/nixpkgs/pkgs/tools/networking/openresolv/default.nix +++ b/nixpkgs/pkgs/tools/networking/openresolv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openresolv"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { url = "mirror://roy/openresolv/${pname}-${version}.tar.xz"; - sha256 = "0g7wb2880hbr0x99n73m7fgjm7lcdbpxfy2i620zxcq73qfrvspa"; + sha256 = "sha256-QrMFCOhXoihTXGMeqsk2hi2G7KaMFLXAvzh7oXa5G5c="; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/networking/persepolis/default.nix b/nixpkgs/pkgs/tools/networking/persepolis/default.nix index 2ebec34b219a..5e4f0542d364 100644 --- a/nixpkgs/pkgs/tools/networking/persepolis/default.nix +++ b/nixpkgs/pkgs/tools/networking/persepolis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonApplication, fetchFromGitHub, makeWrapper +{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper , aria , libnotify , pulseaudio diff --git a/nixpkgs/pkgs/tools/networking/photon/default.nix b/nixpkgs/pkgs/tools/networking/photon/default.nix index 55dedc09bea5..d3f153e44aed 100644 --- a/nixpkgs/pkgs/tools/networking/photon/default.nix +++ b/nixpkgs/pkgs/tools/networking/photon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "photon"; diff --git a/nixpkgs/pkgs/tools/networking/pirate-get/default.nix b/nixpkgs/pkgs/tools/networking/pirate-get/default.nix index 76b77da1764b..dc9133229af7 100644 --- a/nixpkgs/pkgs/tools/networking/pirate-get/default.nix +++ b/nixpkgs/pkgs/tools/networking/pirate-get/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: with python3Packages; diff --git a/nixpkgs/pkgs/tools/networking/pixiecore/default.nix b/nixpkgs/pkgs/tools/networking/pixiecore/default.nix index ec275c5e6a81..6155d411e13b 100644 --- a/nixpkgs/pkgs/tools/networking/pixiecore/default.nix +++ b/nixpkgs/pkgs/tools/networking/pixiecore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pixiecore"; diff --git a/nixpkgs/pkgs/tools/networking/polysh/default.nix b/nixpkgs/pkgs/tools/networking/polysh/default.nix index 68cb8fed57a0..69e5d0427e58 100644 --- a/nixpkgs/pkgs/tools/networking/polysh/default.nix +++ b/nixpkgs/pkgs/tools/networking/polysh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: let inherit (python2Packages) buildPythonApplication; diff --git a/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/nixpkgs/pkgs/tools/networking/privoxy/default.nix index 2963f2aff523..efb57e7d247d 100644 --- a/nixpkgs/pkgs/tools/networking/privoxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/privoxy/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "privoxy"; - version = "3.0.29"; + version = "3.0.31"; src = fetchurl { url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "17a8fbdyb0ixc0wwq68fg7xn7l6n7jq67njpq93psmxgzng0dii5"; + sha256 = "sha256-B3cpo6rHkiKk6NiKZQ2QKNFv1LDWA42o9fXkcSDQBOs="; }; hardeningEnable = [ "pie" ]; diff --git a/nixpkgs/pkgs/tools/networking/proxify/default.nix b/nixpkgs/pkgs/tools/networking/proxify/default.nix index 7f45d53d41d1..6a0bfcc6ee22 100644 --- a/nixpkgs/pkgs/tools/networking/proxify/default.nix +++ b/nixpkgs/pkgs/tools/networking/proxify/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/networking/pssh/default.nix b/nixpkgs/pkgs/tools/networking/pssh/default.nix index b2b08cea8443..a17701644c87 100644 --- a/nixpkgs/pkgs/tools/networking/pssh/default.nix +++ b/nixpkgs/pkgs/tools/networking/pssh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }: +{ lib, fetchFromGitHub, pythonPackages, openssh, rsync }: pythonPackages.buildPythonApplication rec { pname = "pssh"; diff --git a/nixpkgs/pkgs/tools/networking/pykms/default.nix b/nixpkgs/pkgs/tools/networking/pykms/default.nix index f856f591bf48..d648ff3ec1ed 100644 --- a/nixpkgs/pkgs/tools/networking/pykms/default.nix +++ b/nixpkgs/pkgs/tools/networking/pykms/default.nix @@ -1,9 +1,13 @@ -{ lib, stdenv, runtimeShell, fetchFromGitHub, python3, writeText, writeScript -, coreutils, sqlite }: - -with python3.pkgs; - +{ lib +, fetchFromGitHub +, python3 +, writeText +, writeShellScript +, sqlite +}: let + pypkgs = python3.pkgs; + dbSql = writeText "create_pykms_db.sql" '' CREATE TABLE clients( clientMachineId TEXT, @@ -17,35 +21,31 @@ let ); ''; - dbScript = writeScript "create_pykms_db.sh" (with lib; '' - #!${runtimeShell} - + dbScript = writeShellScript "create_pykms_db.sh" '' set -eEuo pipefail - db=$1 + db=''${1:-/var/lib/pykms/clients.db} if [ ! -e $db ] ; then - ${getBin sqlite}/bin/sqlite3 $db < ${dbSql} + ${lib.getBin sqlite}/bin/sqlite3 $db < ${dbSql} fi - ''); + ''; -in buildPythonApplication rec { +in +pypkgs.buildPythonApplication rec { pname = "pykms"; - version = "20190611"; + version = "unstable-2021-01-25"; src = fetchFromGitHub { - owner = "SystemRage"; - repo = "py-kms"; - rev = "dead208b1593655377fe8bc0d74cc4bead617103"; - sha256 = "065qpkfqrahsam1rb43vnasmzrangan5z1pr3p6s0sqjz5l2jydp"; + owner = "SystemRage"; + repo = "py-kms"; + rev = "a3b0c85b5b90f63b33dfa5ae6085fcd52c6da2ff"; + sha256 = "sha256-u0R0uJMQxHnJUDenxglhQkZza3/1DcyXCILcZVceygA="; }; sourceRoot = "source/py-kms"; - propagatedBuildInputs = [ systemd pytz tzlocal ]; - - # Fix https://github.com/SystemRage/py-kms/issues/64 : - patches = [ ./log-to-current-directory-by-default.patch ]; + propagatedBuildInputs = with pypkgs; [ systemd pytz tzlocal ]; postPatch = '' siteDir=$out/${python3.sitePackages} @@ -66,25 +66,24 @@ in buildPythonApplication rec { mv * $siteDir for b in Client Server ; do - makeWrapper ${python.interpreter} $out/bin/''${b,,} \ - --argv0 ''${b,,} \ - --add-flags $siteDir/pykms_$b.py \ - --prefix PYTHONPATH : "$(toPythonPath ${systemd})" + makeWrapper ${python3.interpreter} $out/bin/''${b,,} \ + --argv0 pykms-''${b,,} \ + --add-flags $siteDir/pykms_$b.py done install -Dm755 ${dbScript} $out/libexec/create_pykms_db.sh install -Dm644 ../README.md -t $out/share/doc/pykms - ${python.interpreter} -m compileall $siteDir + ${python3.interpreter} -m compileall $siteDir runHook postInstall ''; meta = with lib; { description = "Windows KMS (Key Management Service) server written in Python"; - homepage = "https://github.com/SystemRage/py-kms"; - license = licenses.mit; + homepage = "https://github.com/SystemRage/py-kms"; + license = licenses.unlicense; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch b/nixpkgs/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch deleted file mode 100644 index 7c8c65b63a2a..000000000000 --- a/nixpkgs/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch +++ /dev/null @@ -1,20 +0,0 @@ -# By default, create log files in current directory, instead of the script directory. ---- ../original/py-kms/pykms_Client.py -+++ py-kms/pykms_Client.py -@@ -48,5 +48,5 @@ - 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, - 'lfile' : {'help' : 'Use this option to set an output log file. The default is \"pykms_logclient.log\" or type \"STDOUT\" to view log info on stdout.', -- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logclient.log", 'des' : "logfile"}, -+ 'def' : "pykms_logclient.log", 'des' : "logfile"}, - 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, - } ---- ../original/py-kms/pykms_Server.py -+++ py-kms/pykms_Server.py -@@ -85,5 +85,5 @@ - 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, - 'lfile' : {'help' : 'Use this option to set or not an output log file. The default is \"pykms_logserver.log\" or type \"STDOUT\" to view log info on stdout.', -- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logserver.log", 'des' : "logfile"}, -+ 'def' : "pykms_logserver.log", 'des' : "logfile"}, - 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, - } - ''); diff --git a/nixpkgs/pkgs/tools/networking/radvd/default.nix b/nixpkgs/pkgs/tools/networking/radvd/default.nix index 6a4c8a3d4f60..ddd196ebe567 100644 --- a/nixpkgs/pkgs/tools/networking/radvd/default.nix +++ b/nixpkgs/pkgs/tools/networking/radvd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "radvd"; - version = "2.18"; + version = "2.19"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${pname}-${version}.tar.xz"; - sha256 = "1p2wlv3djvla0r84hdncc3wfa530xigs7z9ssc2v5r1pcpzgxgz1"; + sha256 = "0h722f17h7cra1sjgrxhrrvx54mm47fs039909yhbabigxch8kjn"; }; nativeBuildInputs = [ pkg-config bison flex check ]; diff --git a/nixpkgs/pkgs/tools/networking/rcon/default.nix b/nixpkgs/pkgs/tools/networking/rcon/default.nix index 1ec988676e4a..03c2a1ae1a37 100644 --- a/nixpkgs/pkgs/tools/networking/rcon/default.nix +++ b/nixpkgs/pkgs/tools/networking/rcon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rcon"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "n0la"; repo = "rcon"; rev = version; - sha256 = "1jsnmsm2qkiv8dan1yncx0qp6zfkcbyvf81c7xwpv6r499ijw1nb"; + sha256 = "sha256-bHm6JeWmpg42VZQXikHl+BMx9zimRLBQWemTqOxyLhw="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/s3cmd/default.nix b/nixpkgs/pkgs/tools/networking/s3cmd/default.nix index 06f51b0c5063..15f6ff3dfa0c 100644 --- a/nixpkgs/pkgs/tools/networking/s3cmd/default.nix +++ b/nixpkgs/pkgs/tools/networking/s3cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: +{ lib, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: buildPythonApplication rec { pname = "s3cmd"; diff --git a/nixpkgs/pkgs/tools/networking/s3gof3r/default.nix b/nixpkgs/pkgs/tools/networking/s3gof3r/default.nix index 390b35b0297f..4623b68ad4cf 100644 --- a/nixpkgs/pkgs/tools/networking/s3gof3r/default.nix +++ b/nixpkgs/pkgs/tools/networking/s3gof3r/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "s3gof3r"; diff --git a/nixpkgs/pkgs/tools/networking/s4cmd/default.nix b/nixpkgs/pkgs/tools/networking/s4cmd/default.nix index 80874649072a..95dc02cb5cd4 100644 --- a/nixpkgs/pkgs/tools/networking/s4cmd/default.nix +++ b/nixpkgs/pkgs/tools/networking/s4cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "s4cmd"; diff --git a/nixpkgs/pkgs/tools/networking/s6-networking/default.nix b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix index 3f10b850ca7a..e7dd075df138 100644 --- a/nixpkgs/pkgs/tools/networking/s6-networking/default.nix +++ b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages +{ lib, stdenv, skawarePackages # Whether to build the TLS/SSL tools and what library to use # acceptable values: "libressl", false @@ -8,7 +8,6 @@ with skawarePackages; let - inherit (stdenv) lib; sslSupportEnabled = sslSupport != false; sslLibs = { libressl = libressl; diff --git a/nixpkgs/pkgs/tools/networking/shadowfox/default.nix b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix index c7507925f5f8..e6b1c823eb88 100644 --- a/nixpkgs/pkgs/tools/networking/shadowfox/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "shadowfox"; diff --git a/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/nixpkgs/pkgs/tools/networking/subfinder/default.nix index 4474cba6aee0..2844cc2dac08 100644 --- a/nixpkgs/pkgs/tools/networking/subfinder/default.nix +++ b/nixpkgs/pkgs/tools/networking/subfinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "subfinder"; diff --git a/nixpkgs/pkgs/tools/networking/swaks/default.nix b/nixpkgs/pkgs/tools/networking/swaks/default.nix index 85e899894759..fb822177725a 100644 --- a/nixpkgs/pkgs/tools/networking/swaks/default.nix +++ b/nixpkgs/pkgs/tools/networking/swaks/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "swaks"; - version = "20190914.0"; + version = "20201014.0"; src = fetchurl { url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz"; - sha256 = "12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp"; + sha256 = "0c2sx4nrh4whsqzj6m5ay8d7yqan3aqgg436p8jb25bs91ykn2pv"; }; buildInputs = [ perl makeWrapper ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.jetmore.org/john/code/swaks/"; description = "A featureful, flexible, scriptable, transaction-oriented SMTP test tool"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; []; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index 0c322fe9f63f..a33bb4865687 100644 --- a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -31,5 +31,9 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd3 gpl3 ]; maintainers = with maintainers; [ eleanor ]; platforms = platforms.unix; + knownVulnerabilities = [ + "CVE-2020-24265" # https://github.com/appneta/tcpreplay/issues/616 + "CVE-2020-24266" # https://github.com/appneta/tcpreplay/issues/617 + ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix b/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix index 0ed7922874dc..9d786d60b12e 100644 --- a/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { name = "tdns-cli"; diff --git a/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/nixpkgs/pkgs/tools/networking/tendermint/default.nix index bd280e75379d..059c531cc612 100644 --- a/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "tendermint"; - version = "0.34.0"; + version = "0.34.3"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "1fnykdk35937ld8dyzjs571klz187jr8wlj8ljn78pajx1cd84k6"; + sha256 = "sha256-tkIoLYfqlnyyAAgEKyQgE317uwyhc8xRTCTUXi+9r9s="; }; - vendorSha256 = "19qx7ab6ar609cxxdsb9i2c3h7icqgf5bhi28lnsdk3bdjxr27vz"; + vendorSha256 = "sha256-DviK+MkJwcv2Dhwmqra5G/fTaWxXFbUSUVnAkSHjeII="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/termshark/default.nix b/nixpkgs/pkgs/tools/networking/termshark/default.nix index f4e790fea36f..7b9a3c42d606 100644 --- a/nixpkgs/pkgs/tools/networking/termshark/default.nix +++ b/nixpkgs/pkgs/tools/networking/termshark/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: +{ lib, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: buildGoModule rec { pname = "termshark"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gcla"; repo = "termshark"; rev = "v${version}"; - sha256 = "14h548apg3zvjvq6yy22hpw2ziy5vmwyr04vv59ls1mjg4qf2v8b"; + sha256 = "sha256-vS6j8Mcri3SI/6HqtFX/EzVl8S0lx8fWU+0ddjzJz8g="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - vendorSha256 = "14apff3vcbndr30765lzi4qswakavb4396bjixxvpxv6i5c04dq7"; + vendorSha256 = "sha256-md9HHiYOsBimCBjD1FyjTqnskCZksQiEggWd5UW0RPM="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/nixpkgs/pkgs/tools/networking/tox-node/default.nix index 85fcea008de0..f250b8d6b65e 100644 --- a/nixpkgs/pkgs/tools/networking/tox-node/default.nix +++ b/nixpkgs/pkgs/tools/networking/tox-node/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub +{ lib, rustPlatform, fetchFromGitHub , libsodium, openssl , pkg-config }: @@ -7,13 +7,13 @@ with rustPlatform; buildRustPackage rec { pname = "tox-node"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "tox-rs"; repo = "tox-node"; rev = "v${version}"; - sha256 = "0bar42nigjwn7dq48rmg74sm3gnfqvb6gnd9g1n0i8nmynd00wvn"; + sha256 = "sha256-tB6v2NEBdTNHf89USdQOr/pV0mbxxb8ftOYPPJMvz5Y="; }; buildInputs = [ libsodium openssl ]; @@ -31,7 +31,7 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "087ccb824hmmxmnn5c2bzww2q888a8zy6y7rwgsdfr8rbay2c909"; + cargoSha256 = "sha256-kCT2ulB+c2OlsABkyXyzrHfD/G92EPCdTO34FR5oSws="; meta = with lib; { description = "A server application to run tox node written in pure Rust"; diff --git a/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix b/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix index 2e17f753a5b6..ce7325975fb3 100644 --- a/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix +++ b/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.20.3"; + version = "1.20.4"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "064cl9m4hdv69q1af0xjcf2rf30n3pvz6ym2l53w90aq3217amps"; + sha256 = "sha256-BjjRB9VadQ/MSwNK2QLbcTDoRs6Ua+5MONHtmfq4xz0="; }; sourceRoot = "source/native"; diff --git a/nixpkgs/pkgs/tools/networking/ua/default.nix b/nixpkgs/pkgs/tools/networking/ua/default.nix index 69bc3fc409b7..feb17b283de5 100644 --- a/nixpkgs/pkgs/tools/networking/ua/default.nix +++ b/nixpkgs/pkgs/tools/networking/ua/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit +{ lib, buildGoPackage, fetchgit , pkg-config , glib, libxml2 }: diff --git a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix index 10bbc963a28d..1cea3989ed26 100644 --- a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix +++ b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "urlwatch"; diff --git a/nixpkgs/pkgs/tools/networking/waitron/default.nix b/nixpkgs/pkgs/tools/networking/waitron/default.nix index 7efe7018d318..8364cd5763dc 100644 --- a/nixpkgs/pkgs/tools/networking/waitron/default.nix +++ b/nixpkgs/pkgs/tools/networking/waitron/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "waitron-unstable-${version}"; diff --git a/nixpkgs/pkgs/tools/networking/weighttp/default.nix b/nixpkgs/pkgs/tools/networking/weighttp/default.nix index 72bd29247abb..7c3d23c0d17f 100644 --- a/nixpkgs/pkgs/tools/networking/weighttp/default.nix +++ b/nixpkgs/pkgs/tools/networking/weighttp/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchgit, python, libev, wafHook }: + stdenv.mkDerivation rec { pname = "weighttp"; version = "0.4"; @@ -10,11 +11,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wafHook ]; + buildInputs = [ python libev ]; - meta = { - platforms = lib.platforms.unix; + meta = with lib; { + description = "Lightweight and simple webserver benchmarking tool"; homepage = "https://redmine.lighttpd.net/projects/weighttp/wiki"; - description = "A lightweight and simple webserver benchmarking tool"; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/tools/networking/wifite2/default.nix b/nixpkgs/pkgs/tools/networking/wifite2/default.nix index 3b1c3f14ac53..054b77f8c9b8 100644 --- a/nixpkgs/pkgs/tools/networking/wifite2/default.nix +++ b/nixpkgs/pkgs/tools/networking/wifite2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, python3, wirelesstools +{ lib, fetchFromGitHub, fetchpatch, python3, wirelesstools , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools , hcxdumptool, pyrit, which }: diff --git a/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix index 100de62683db..35c5371113c1 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchzip }: +{ lib, buildGoPackage, fetchzip }: buildGoPackage rec { pname = "wireguard-go"; diff --git a/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix b/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix index 6476d4f43b1e..48f842f60ced 100644 --- a/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix +++ b/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "wormhole-william"; diff --git a/nixpkgs/pkgs/tools/networking/wstunnel/default.nix b/nixpkgs/pkgs/tools/networking/wstunnel/default.nix index 161b08a7d39e..a851dcd4ead5 100644 --- a/nixpkgs/pkgs/tools/networking/wstunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/wstunnel/default.nix @@ -1,6 +1,6 @@ { mkDerivation, async, base, base64-bytestring, binary, bytestring , classy-prelude, cmdargs, connection, hslogger, mtl, network -, network-conduit-tls, stdenv, streaming-commons, text +, network-conduit-tls, streaming-commons, text , unordered-containers, websockets , hspec, iproute , lib, fetchFromGitHub, fetchpatch diff --git a/nixpkgs/pkgs/tools/networking/wuzz/default.nix b/nixpkgs/pkgs/tools/networking/wuzz/default.nix index 73db27f1a942..156841be3344 100644 --- a/nixpkgs/pkgs/tools/networking/wuzz/default.nix +++ b/nixpkgs/pkgs/tools/networking/wuzz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "wuzz"; diff --git a/nixpkgs/pkgs/tools/networking/xh/default.nix b/nixpkgs/pkgs/tools/networking/xh/default.nix new file mode 100644 index 000000000000..b7246959017a --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + pname = "xh"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "ducaale"; + repo = "xh"; + rev = "v${version}"; + sha256 = "0b7q0xbfbrhvpnxbm9bd1ncdza9k2kcmcir3qhqzb2pgsb5b5njx"; + }; + + cargoSha256 = "02fgqys9qf0jzs2n230pyj151v6xbm6wm2rd9qm5gsib6zaq7gfa"; + + buildInputs = lib.optional stdenv.isDarwin Security; + + checkFlagsArray = [ "--skip=basic_options" ]; + + doInstallCheck = true; + postInstallCheck = '' + $out/bin/xh --help > /dev/null + ''; + + meta = with lib; { + description = "Yet another HTTPie clone in Rust"; + homepage = "https://github.com/ducaale/xh"; + license = licenses.mit; + maintainers = with maintainers; [ payas SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/yrd/default.nix b/nixpkgs/pkgs/tools/networking/yrd/default.nix index 7f946718588b..75a89b859fe8 100644 --- a/nixpkgs/pkgs/tools/networking/yrd/default.nix +++ b/nixpkgs/pkgs/tools/networking/yrd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: let pname = "yrd"; diff --git a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index 96de4fc34e46..c17023103f8b 100644 --- a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "0lky68fjrqjsd62g97jkn5a9hzj53g8wb6d2ncx8s21rknpncdar"; + sha256 = "0a9sjcri96pv4pvvi94g7jyldwfhqqsi1k58maymm0jnqnj91z25"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix b/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix index b495a3026188..853bf87346f2 100644 --- a/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, pkg-config, ronn, rustPlatform }: +{ lib, fetchFromGitHub, openssl, pkg-config, ronn, rustPlatform }: let blake3-src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/nix/nar-serve/default.nix b/nixpkgs/pkgs/tools/nix/nar-serve/default.nix index 4b0239a2fa23..146165d880de 100644 --- a/nixpkgs/pkgs/tools/nix/nar-serve/default.nix +++ b/nixpkgs/pkgs/tools/nix/nar-serve/default.nix @@ -1,7 +1,7 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv + }: let pname = "nar-serve"; diff --git a/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix b/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix index 38e2b060c0c1..b177b9a233ad 100644 --- a/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,5 +1,5 @@ { mkDerivation, ansi-terminal, async, attoparsec, base, containers -, directory, HUnit, mtl, nix-derivation, process, relude, lib, stdenv +, directory, HUnit, mtl, nix-derivation, process, relude, lib , stm, text, time, unix, fetchFromGitHub }: mkDerivation { diff --git a/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix index f820f36e49f8..353aafa2a7e4 100644 --- a/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }: +{ lib, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "nix-query-tree-viewer"; diff --git a/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix b/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix index c1141362f820..fed7de01b98e 100644 --- a/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix +++ b/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix @@ -1,20 +1,29 @@ -{ stdenv, lib, fetchurl, lua, openssl, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitLab, pkg-config, scdoc, openssl, zlib +, luaSupport ? stdenv.hostPlatform == stdenv.buildPlatform, lua +}: stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.10.5"; + version = "2.12.2"; - src = fetchurl { - url = "https://dev.alpinelinux.org/archive/apk-tools/apk-tools-${version}.tar.xz"; - sha256 = "00z3fqnv8vk2czdm4p2q4sldq0n8sxyf2qfwppyk7wj59d2sq8dp"; + src = fetchFromGitLab { + domain = "gitlab.alpinelinux.org"; + owner = "alpine"; + repo = "apk-tools"; + rev = "v${version}"; + sha256 = "1crx2xlswi7i0mwgzrfphpf49ghfnh79fi5dn1sl611j9sy9wa29"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ lua openssl zlib ]; + nativeBuildInputs = [ pkg-config scdoc ] + ++ lib.optionals luaSupport [ lua lua.pkgs.lua-zlib ]; + buildInputs = [ openssl zlib ] ++ lib.optional luaSupport lua; + strictDeps = true; makeFlags = [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" "SBINDIR=$(out)/bin" "LIBDIR=$(out)/lib" + "LUA=${if luaSupport then "lua" else "no"}" "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua.version}" "MANDIR=$(out)/share/man" "DOCDIR=$(out)/share/doc/apk" @@ -30,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.alpinelinux.org/alpine/apk-tools"; description = "Alpine Package Keeper"; maintainers = with maintainers; [ qyliss ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; broken = stdenv.isDarwin; }; diff --git a/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix b/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix index 3bc59f2ad148..98a04dff8f89 100644 --- a/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix +++ b/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }: +{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [], appimage-run-tests ? null }: let fhsArgs = appimageTools.defaultFhsEnvArgs; @@ -8,4 +8,6 @@ in buildFHSUserEnv (fhsArgs // { targetPkgs = pkgs: [ appimageTools.appimage-exec ] ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; runScript = "appimage-exec.sh"; + + passthru.tests.appimage-run = appimage-run-tests; }) diff --git a/nixpkgs/pkgs/tools/package-management/appimage-run/test.nix b/nixpkgs/pkgs/tools/package-management/appimage-run/test.nix new file mode 100644 index 000000000000..c9bc63c08a8e --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/appimage-run/test.nix @@ -0,0 +1,24 @@ +{ runCommand, fetchurl, appimage-run, glibcLocales, file }: +let + # any AppImage usable on cli, really + sample-appImage = fetchurl { + url = "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage"; + sha256 = "04ws94q71bwskmhizhwmaf41ma4wabvfgjgkagr8wf3vakgv866r"; + }; +in + runCommand "appimage-run-tests" { + buildInputs = [ appimage-run glibcLocales file ]; + meta.platforms = [ "x86_64-linux" ]; + } + '' + export HOME=$(mktemp -d) + set -x + # regression test for #101137, must come first + LANG=fr_FR appimage-run ${sample-appImage} --list ${sample-appImage} + # regression test for #108426 + cp ${sample-appImage} foo.appImage + LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage + set +x + touch $out + '' + diff --git a/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix index 6b825919b60f..8b2dbe3e4892 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix index 810aa6baa622..80c69d74abf2 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.13"; + version = "0.9.14"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "1dbhaaw1c3ww0s33r7z8kxks00f9gxv1ppcbmk2fbflhp7caf7fy"; + sha256 = "sha256-80H0yblEcxP6TTil0dJPZhvMivDLuyvoV0Rmcrykgjs="; }; - cargoSha256 = "0nlfn9g7hrzz72lya2p5qb8wwj66300d33hjhnw2ambpj4347rh4"; + cargoSha256 = "sha256-RACdzaCWfm5rrIX0wrvKSmhLQt1a+2MQqrjTx+etpGo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix index 3a1aa5e464e8..704c3ad64094 100644 --- a/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix +++ b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix @@ -70,5 +70,8 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; license = lib.licenses.gpl2; + knownVulnerabilities = [ + "CVE-2020-25031" + ]; }; } diff --git a/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix deleted file mode 100644 index ba3c51822e90..000000000000 --- a/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: - -stdenv.mkDerivation { - name = "DisnixWebService-0.10"; - src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; - sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; - }; - buildInputs = [ apacheAnt jdk ]; - PREFIX = "\${env.out}"; - AXIS2_LIB = "${axis2}/lib"; - AXIS2_WEBAPP = "${axis2}/webapps/axis2"; - DBUS_JAVA_LIB = "${dbus_java}/share/java"; - prePatch = '' - sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ - -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ - scripts/disnix-soap-client - ''; - buildPhase = "ant"; - installPhase = "ant install"; - - meta = { - description = "A SOAP interface and client for Disnix"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/package-management/disnix/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/default.nix deleted file mode 100644 index 14be0924f271..000000000000 --- a/nixpkgs/pkgs/tools/package-management/disnix/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: - -stdenv.mkDerivation { - name = "disnix-0.10"; - - src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; - sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; - - meta = { - description = "A Nix-based distributed service deployment tool"; - license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ sander tomberek ]; - platforms = lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix deleted file mode 100644 index 1b9d2eaefcd8..000000000000 --- a/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }: - -stdenv.mkDerivation { - name = "disnixos-0.9"; - - src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; - sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ socat dysnomia disnix getopt ]; - - meta = { - description = "Provides complementary NixOS infrastructure deployment to Disnix"; - license = lib.licenses.lgpl21Plus; - maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix deleted file mode 100644 index b4c3851a50ff..000000000000 --- a/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: - -stdenv.mkDerivation rec { - version="2020-07-04"; - name = "dydisnix-${version}"; - - src = fetchFromGitHub { - owner = "svanderburg"; - repo = "dydisnix"; - rev = "e99091f1c2329d562097e35faedee80622d387f0"; - sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; - }; - - nativeBuildInputs = [ pkg-config autoconf automake libtool ]; - buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; - preConfigure = '' - ./bootstrap - ''; - - meta = { - description = "A toolset enabling self-adaptive redeployment on top of Disnix"; - longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems."; - license = lib.licenses.lgpl21Plus; - maintainers = [ lib.maintainers.tomberek ]; - platforms = lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix deleted file mode 100644 index 56ba16afb47b..000000000000 --- a/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv, fetchurl, netcat -, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null -, enableApacheWebApplication ? false -, enableAxis2WebService ? false -, enableEjabberdDump ? false -, enableMySQLDatabase ? false -, enablePostgreSQLDatabase ? false -, enableSubversionRepository ? false -, enableTomcatWebApplication ? false -, enableMongoDatabase ? false -, enableInfluxDatabase ? false -, enableSupervisordProgram ? false -, enableDockerContainer ? true -, enableLegacy ? false -, catalinaBaseDir ? "/var/tomcat" -, jobTemplate ? "systemd" -, getopt -}: - -assert enableMySQLDatabase -> mysql != null; -assert enablePostgreSQLDatabase -> postgresql != null; -assert enableSubversionRepository -> subversion != null; -assert enableEjabberdDump -> ejabberd != null; -assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); -assert enableInfluxDatabase -> influxdb != null; -assert enableSupervisordProgram -> supervisor != null; -assert enableDockerContainer -> docker != null; - -stdenv.mkDerivation { - name = "dysnomia-0.10"; - src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; - sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; - }; - - preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - - configureFlags = [ - (if enableApacheWebApplication then "--with-apache" else "--without-apache") - (if enableAxis2WebService then "--with-axis2" else "--without-axis2") - (if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd") - (if enableMySQLDatabase then "--with-mysql" else "--without-mysql") - (if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql") - (if enableSubversionRepository then "--with-subversion" else "--without-subversion") - (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") - (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") - (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") - (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") - (if enableDockerContainer then "--with-docker" else "--without-docker") - "--with-job-template=${jobTemplate}" - ] ++ lib.optional enableLegacy "--enable-legacy"; - - buildInputs = [ getopt netcat ] - ++ lib.optional stdenv.isLinux systemd - ++ lib.optional enableEjabberdDump ejabberd - ++ lib.optional enableMySQLDatabase mysql.out - ++ lib.optional enablePostgreSQLDatabase postgresql - ++ lib.optional enableSubversionRepository subversion - ++ lib.optional enableMongoDatabase mongodb - ++ lib.optional enableMongoDatabase mongodb-tools - ++ lib.optional enableInfluxDatabase influxdb - ++ lib.optional enableSupervisordProgram supervisor - ++ lib.optional enableDockerContainer docker; - - meta = { - description = "Automated deployment of mutable components and services for Disnix"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/nixpkgs/pkgs/tools/package-management/emplace/default.nix index eb6b2b88354d..e5da9a1d7b42 100644 --- a/nixpkgs/pkgs/tools/package-management/emplace/default.nix +++ b/nixpkgs/pkgs/tools/package-management/emplace/default.nix @@ -2,21 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.4.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-74jv5GvBSErU5qjd4QmAK4JZhqFoqBf3cNxOGLIqt9U="; + sha256 = "sha256-dDFc13IVD4f5UgiHXAcqRKoZEPTn/iBOogT3XfdstK0="; }; - cargoSha256 = "sha256-SPHXkvtUL6hdYOE1fUIQLEqWzn68RVBiu6zJQJ/3BxQ="; + cargoSha256 = "sha256-QsYOR7tk5cRCF0+xkpJ/F+Z3pjBPxTDFvA1gEi82AOQ="; meta = with lib; { description = "Mirror installed software on multiple machines"; homepage = "https://github.com/tversteeg/emplace"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/nixpkgs/pkgs/tools/package-management/gx/default.nix b/nixpkgs/pkgs/tools/package-management/gx/default.nix index 920b23f36abf..60fbdd4941f7 100644 --- a/nixpkgs/pkgs/tools/package-management/gx/default.nix +++ b/nixpkgs/pkgs/tools/package-management/gx/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gx"; diff --git a/nixpkgs/pkgs/tools/package-management/gx/go/default.nix b/nixpkgs/pkgs/tools/package-management/gx/go/default.nix index dd14976e6332..ad4435c9e2d3 100644 --- a/nixpkgs/pkgs/tools/package-management/gx/go/default.nix +++ b/nixpkgs/pkgs/tools/package-management/gx/go/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub +{ lib, buildGoPackage, fetchFromGitHub , gx }: diff --git a/nixpkgs/pkgs/tools/package-management/holo-build/default.nix b/nixpkgs/pkgs/tools/package-management/holo-build/default.nix new file mode 100644 index 000000000000..8f88ae08762b --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/holo-build/default.nix @@ -0,0 +1,59 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, perl, file }: + +buildGoModule rec { + pname = "holo-build"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "holocm"; + repo = pname; + rev = "v${version}"; + sha256 = "0lypbgf96bcc4m3968xa4il1zwprsdyc0pw6pl9mqq7djxabikd0"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace 'VERSION :=' 'VERSION ?=' + substituteInPlace src/holo-build.sh \ + --replace '/usr/lib/holo/holo-build' '${placeholder "out"}/lib/holo/holo-build' + ''; + + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles perl ]; + + subPackages = [ "src/holo-build" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" ]; + + postBuild = '' + make build/man/holo-build.8 VERSION=${version} + ''; + + checkInputs = [ file ]; + + checkPhase = '' + ln -s ../../go/bin/holo-build build/holo-build + go build -ldflags "-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" -o build/dump-package ./src/dump-package + bash test/compiler/run_tests.sh + bash test/interface/run_tests.sh + ''; + + postInstall = '' + installManPage build/man/* + installShellCompletion --bash --name holo-build util/autocomplete.bash + installShellCompletion --zsh --name _holo-build util/autocomplete.zsh + + # install wrapper script + mkdir -p $out/lib/holo + mv $out/bin/holo-build $out/lib/holo/holo-build + cp src/holo-build.sh $out/bin/holo-build + ''; + + meta = with lib; { + description = "Cross-distribution system package compiler"; + homepage = "http://holocm.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch b/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch index 56bafb2f7b82..53f2c04f9ef4 100644 --- a/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch +++ b/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch @@ -1,5 +1,25 @@ ---- src/libdnf/hy-iutil.cpp 2020-12-02 07:53:42.000000000 -0800 -+++ src/libdnf/hy-iutil.cpp 2020-12-21 14:24:14.000000000 -0800 +diff --git src/libdnf/config.h src/libdnf/config.h +index 16121f6f..737d0bc4 100644 +--- src/libdnf/config.h ++++ src/libdnf/config.h +@@ -18,7 +18,12 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++ ++#ifdef __APPLE__ ++#include <stdint.h> ++#else + #include <bits/wordsize.h> ++#endif + + + #if __WORDSIZE == 32 + #include "config-32.h" +diff --git src/libdnf/hy-iutil.cpp src/libdnf/hy-iutil.cpp +index 497c560d..5de077fa 100644 +--- src/libdnf/hy-iutil.cpp ++++ src/libdnf/hy-iutil.cpp @@ -22,7 +22,7 @@ #include <errno.h> #include <dirent.h> @@ -9,8 +29,10 @@ #include <pwd.h> #include <unistd.h> #include <stdio.h> ---- src/libdnf/hy-util.cpp 2020-12-02 07:53:42.000000000 -0800 -+++ src/libdnf/hy-util.cpp 2020-12-21 14:23:21.000000000 -0800 +diff --git src/libdnf/hy-util.cpp src/libdnf/hy-util.cpp +index 295fdc1b..9d584b8a 100644 +--- src/libdnf/hy-util.cpp ++++ src/libdnf/hy-util.cpp @@ -24,7 +24,20 @@ #include <ctype.h> #include <sys/utsname.h> diff --git a/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/nixpkgs/pkgs/tools/package-management/libdnf/default.nix index 08702e8bf6b1..59df56f86fa9 100644 --- a/nixpkgs/pkgs/tools/package-management/libdnf/default.nix +++ b/nixpkgs/pkgs/tools/package-management/libdnf/default.nix @@ -1,15 +1,15 @@ { gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check -, pcre, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: +, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.55.2"; + version = "0.58.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq"; + sha256 = "0an8giv0lm0qqc76fpmqg42ra081mlj62b9r0s1p0sgb3270l76l"; }; patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; diff --git a/nixpkgs/pkgs/tools/package-management/librepo/default.nix b/nixpkgs/pkgs/tools/package-management/librepo/default.nix index 9ec5c3c13b39..4009d1113073 100644 --- a/nixpkgs/pkgs/tools/package-management/librepo/default.nix +++ b/nixpkgs/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.12.1"; + version = "1.13.0"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "0793j35fcv6bbz2pkd5rcsmx37hb1f0y48r4758cbfnl9rbp9y4z"; + sha256 = "sha256-gK1pkcZAJVXx0cYGs8PA4iPSMOwgJZI9Hqrrs1ZITDo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/package-management/microdnf/default.nix b/nixpkgs/pkgs/tools/package-management/microdnf/default.nix index 8e866abb3cca..498d6d21f39c 100644 --- a/nixpkgs/pkgs/tools/package-management/microdnf/default.nix +++ b/nixpkgs/pkgs/tools/package-management/microdnf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microdnf"; - version = "3.6.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "0a7lc3qsnblvznzsz3544l3n84184xi85zf7c3m3jhnmpmxsg39h"; + sha256 = "1is8hqckjdz1h9w44iq1ljyfs5b0qd2cyivl30ny4dv8m8zba4zv"; }; nativeBuildInputs = [ pkg-config cmake gettext help2man ]; diff --git a/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix b/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix index 2390c33ca031..dd5c36019f20 100644 --- a/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "mynewt-newt"; diff --git a/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index d22b4216ea9f..bd19f30f1c12 100644 --- a/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F3SDcO5E0d5/aEJLdy0fJqB6brwf4C9Imtk1R5zOT5A="; + sha256 = "sha256-EIHEdU1H5XhhzuWJUEvnKNsuNV8CBJrHBlaZlSfrSro="; }; - vendorSha256 = "sha256-fGhe0EukTWk/4tGPiFMit7zBD4380AkgxrQ3pzImsFU="; + vendorSha256 = "sha256-aSoryidfAfqPBpOtAXFJsq1ZcqJqpGiX3pZz5GpkKqQ="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix b/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix index 66691d9f5c5a..695cd2976d88 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: +{ lib, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: rustPlatform.buildRustPackage rec { pname = "nix-doc"; diff --git a/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix b/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix index 47734f73fd65..91f9a39514b6 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "nix-simple-deploy"; diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index c980fda3c861..9ab08007ec71 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -226,6 +226,12 @@ in rec { url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch"; sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y="; }) + # Fix the ETag bug. PR merged. Remove when updating to >= 20210125 + # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750 + (fetchpatch { + url = "https://github.com/NixOS/nix/commit/c5b42c5a42138329c6d02da0d8a53cb59c6077f4.patch"; + sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4="; + }) ]; inherit storeDir stateDir confDir boehmgc; diff --git a/nixpkgs/pkgs/tools/package-management/nixops/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/default.nix index 96e6ec3f55a0..0dcbeb8abfed 100644 --- a/nixpkgs/pkgs/tools/package-management/nixops/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nixops/default.nix @@ -1,16 +1,70 @@ -{ callPackage, fetchurl, fetchpatch }: +{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? [] +, fetchurl, fetchpatch +}: -callPackage ./generic.nix (rec { +let version = "1.7"; + +in python2Packages.buildPythonApplication { + pname = "nixops"; + inherit version; + src = fetchurl { url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3"; }; + patches = [ - # follow redirect in nixos-infect. Remove with the next release. (fetchpatch { url = "https://github.com/NixOS/nixops/commit/fb6d4665e8efd858a215bbaaf079ec3f5ebc49b8.patch"; sha256 = "1hbhykl811zsqlaj3y5m9d8lfsal6ps6n5p16ah6lqy2s18ap9d0"; }) + ./optional-virtd.patch ]; -}) + + buildInputs = [ libxslt ]; + + pythonPath = with python2Packages; + [ prettytable + boto + boto3 + hetzner + libcloud + adal + # Go back to sqlite once Python 2.7.13 is released + pysqlite + datadog + digital-ocean + typing + ] + ++ lib.optional (!libvirt.passthru.libvirt.meta.insecure or true) libvirt + ++ nixopsAzurePackages; + + checkPhase = + # Ensure, that there are no (python) import errors + '' + SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt \ + HOME=$(pwd) \ + $out/bin/nixops --version + ''; + + postInstall = '' + make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ + docdir=$out/share/doc/nixops mandir=$out/share/man + + mkdir -p $out/share/nix/nixops + cp -av "nix/"* $out/share/nix/nixops + + # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL + # the version of openssh is causing errors when have big networks (40+) + wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" + ''; + + meta = { + homepage = "https://github.com/NixOS/nixops"; + description = "NixOS cloud provisioning and deployment tool"; + maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/nixops/generic.nix b/nixpkgs/pkgs/tools/package-management/nixops/generic.nix deleted file mode 100644 index 564256de35d1..000000000000 --- a/nixpkgs/pkgs/tools/package-management/nixops/generic.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? [] -# version args -, src, version -, meta ? {} -, patches ? null -}: - -python2Packages.buildPythonApplication { - name = "nixops-${version}"; - inherit version src patches; - - buildInputs = [ libxslt ]; - - pythonPath = with python2Packages; - [ prettytable - boto - boto3 - hetzner - libcloud - adal - # Go back to sqlite once Python 2.7.13 is released - pysqlite - datadog - digital-ocean - libvirt - typing - ] ++ nixopsAzurePackages; - - checkPhase = - # Ensure, that there are no (python) import errors - '' - SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt \ - HOME=$(pwd) \ - $out/bin/nixops --version - ''; - - postInstall = '' - make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ - docdir=$out/share/doc/nixops mandir=$out/share/man - - mkdir -p $out/share/nix/nixops - cp -av "nix/"* $out/share/nix/nixops - - # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL - # the version of openssh is causing errors when have big networks (40+) - wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" - ''; - - meta = { - homepage = "https://github.com/NixOS/nixops"; - description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl3; - } // meta; -} diff --git a/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix deleted file mode 100644 index dc0c733ca7b1..000000000000 --- a/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ callPackage, newScope, pkgs, fetchurl }: - -callPackage ./generic.nix (rec { - version = "1.6.1"; - src = fetchurl { - url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; - }; - nixopsAzurePackages = with python2Packages; [ - azure-storage - azure-mgmt-compute - azure-mgmt-network - azure-mgmt-resource - azure-mgmt-storage - ]; - # nixops is incompatible with the most recent versions of listed - # azure-mgmt-* packages, therefore we are pinning them to - # package-private versions, so that they don't get trampled by - # updates. - # see - # https://github.com/NixOS/nixops/issues/1065 - python2Packages = pkgs.python2Packages.override { - overrides = (self: super: let callPackage = newScope self; in { - azure-mgmt-compute = callPackage ./azure-mgmt-compute { }; - azure-mgmt-network = callPackage ./azure-mgmt-network { }; - azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; - azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; - azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; - azure-storage = callPackage ./azure-storage { }; - }); - }; -}) diff --git a/nixpkgs/pkgs/tools/package-management/nixops/optional-virtd.patch b/nixpkgs/pkgs/tools/package-management/nixops/optional-virtd.patch new file mode 100644 index 000000000000..3697fdde8f26 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/nixops/optional-virtd.patch @@ -0,0 +1,24 @@ +diff --git a/nixops/backends/libvirtd.py b/nixops/backends/libvirtd.py +index bc5f4af7..edd1348b 100644 +--- a/nixops/backends/libvirtd.py ++++ b/nixops/backends/libvirtd.py +@@ -8,12 +8,18 @@ import shutil + import string + import subprocess + import time +-import libvirt + + from nixops.backends import MachineDefinition, MachineState + import nixops.known_hosts + import nixops.util + ++try: ++ import libvirt ++except: ++ class libvirt(object): ++ def __getattribute__(self, name): ++ raise ValueError("The libvirt backend has been disabled because of security issues.") ++ + # to prevent libvirt errors from appearing on screen, see + # https://www.redhat.com/archives/libvirt-users/2017-August/msg00011.html + diff --git a/nixpkgs/pkgs/tools/package-management/nixops/unstable.nix b/nixpkgs/pkgs/tools/package-management/nixops/unstable.nix deleted file mode 100644 index 94975807dea6..000000000000 --- a/nixpkgs/pkgs/tools/package-management/nixops/unstable.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, fetchurl }: - -# To upgrade pick the hydra job of the nixops revision that you want to upgrade -# to from: https://hydra.nixos.org/job/nixops/master/tarball -# Then copy the URL to the tarball. - -callPackage ./generic.nix (rec { - version = "1.7pre2764_932bf43"; - src = fetchurl { - url = "https://hydra.nixos.org/build/92372343/download/2/nixops-${version}.tar.bz2"; - sha256 = "f35bf81bf2805473ea54248d0ee92d163d00a1992f3f75d17e8cf430db1f9919"; - }; -}) diff --git a/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix index b1a86f3137e4..d3fcac6277f5 100644 --- a/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -1,9 +1,8 @@ -{ stdenv +{ lib , python3 , fetchFromGitHub , nixFlakes , git -, lib }: python3.pkgs.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix index 6f3f95714a22..0bcd0eb4b851 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix index b5b42e9164a2..0b6857cf716a 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -49,22 +49,22 @@ let sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593"; }; }; - "underscore-1.4.4" = { + "underscore-1.12.0" = { name = "underscore"; packageName = "underscore"; - version = "1.4.4"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz"; + sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ=="; }; }; - "underscore-1.9.2" = { + "underscore-1.4.4" = { name = "underscore"; packageName = "underscore"; - version = "1.9.2"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz"; - sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; }; @@ -93,7 +93,7 @@ in sources."underscore-1.4.4" ]; }) - sources."underscore-1.9.2" + sources."underscore-1.12.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/nixpkgs/pkgs/tools/package-management/protontricks/default.nix b/nixpkgs/pkgs/tools/package-management/protontricks/default.nix index e4e60442c8fb..ec5017c54c7e 100644 --- a/nixpkgs/pkgs/tools/package-management/protontricks/default.nix +++ b/nixpkgs/pkgs/tools/package-management/protontricks/default.nix @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "0a5727igwafwvj8rr5lv0lx8rlfji3qkzmrbp0d15w5dc4fhknp0"; + sha256 = "0i7p0jj7avmq3b2qlcpwcflipndrnwsvwvhc5aal7rm95aa7xhja"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch b/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch index 536072cafc48..619d80bd8a7a 100644 --- a/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,5 +1,5 @@ diff --git a/src/protontricks/cli.py b/src/protontricks/cli.py -index 6506dae..2f762c9 100755 +index fec0563..d158b96 100755 --- a/src/protontricks/cli.py +++ b/src/protontricks/cli.py @@ -14,7 +14,7 @@ import os @@ -38,7 +38,7 @@ index 6506dae..2f762c9 100755 else: logger.info("Steam Runtime disabled.") -@@ -194,7 +189,7 @@ def main(args=None): +@@ -201,7 +196,7 @@ def main(args=None): winetricks_path=winetricks_path, proton_app=proton_app, steam_app=steam_app, @@ -46,8 +46,8 @@ index 6506dae..2f762c9 100755 + steam_runtime=steam_runtime, command=[winetricks_path, "--gui"] ) - return -@@ -261,7 +256,7 @@ def main(args=None): + +@@ -269,7 +264,7 @@ def main(args=None): winetricks_path=winetricks_path, proton_app=proton_app, steam_app=steam_app, @@ -56,7 +56,7 @@ index 6506dae..2f762c9 100755 command=[winetricks_path] + args.winetricks_command) elif args.command: run_command( -@@ -269,7 +264,7 @@ def main(args=None): +@@ -277,7 +272,7 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, command=args.command, @@ -66,7 +66,7 @@ index 6506dae..2f762c9 100755 # escaping it cwd=steam_app.install_path, diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index 215b31d..aa545b8 100644 +index fa5772d..4f30cd3 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py @@ -11,7 +11,7 @@ from .util import lower_dict @@ -78,7 +78,7 @@ index 215b31d..aa545b8 100644 "find_appid_proton_prefix", "get_steam_lib_paths", "get_steam_apps", "get_custom_proton_installations" ) -@@ -245,37 +245,6 @@ def find_steam_path(): +@@ -254,37 +254,6 @@ def find_steam_path(): return None, None @@ -117,7 +117,7 @@ index 215b31d..aa545b8 100644 APPINFO_STRUCT_SECTION = "<LLLLQ20sL" diff --git a/src/protontricks/util.py b/src/protontricks/util.py -index a850427..390fc01 100644 +index d513b46..c48e41f 100644 --- a/src/protontricks/util.py +++ b/src/protontricks/util.py @@ -6,7 +6,7 @@ import stat @@ -129,7 +129,7 @@ index a850427..390fc01 100644 logger = logging.getLogger("protontricks") -@@ -25,70 +25,10 @@ def lower_dict(d): +@@ -25,93 +25,10 @@ def lower_dict(d): return {k.lower(): v for k, v in d.items()} @@ -155,26 +155,49 @@ index a850427..390fc01 100644 - return ":".join(paths) - - +-RUNTIME_ROOT_GLOB_PATTERNS = ( +- "var/*/files/", +- "*/files/" +-) +- +- -def get_runtime_library_paths(steam_runtime_path, proton_app): - """ - Get LD_LIBRARY_PATH value to run a command using Steam Runtime - """ -- if proton_app.required_tool_app: +- def find_runtime_app_root(runtime_app): +- """ +- Find the runtime root (the directory containing the root fileystem +- used for the container) for separately installed Steam Runtime app +- """ +- for pattern in RUNTIME_ROOT_GLOB_PATTERNS: +- try: +- return next( +- runtime_app.install_path.glob(pattern) +- ) +- except StopIteration: +- pass +- +- raise RuntimeError( +- "Could not find Steam Runtime runtime root for {}".format( +- runtime_app.name +- ) +- ) +- +- if proton_app.required_tool_appid: - # bwrap based Steam Runtime is used for Proton installations that - # use separate Steam runtimes - # TODO: Try to run the Wine binaries inside an user namespace somehow. - # Newer Steam Runtime environments may rely on a newer glibc than what - # is available on the host system, which may cause potential problems - # otherwise. -- runtime_root = next( -- proton_app.required_tool_app.install_path.glob("*/files/") -- ) +- runtime_root = find_runtime_app_root(proton_app.required_tool_app) - return "".join([ - str(proton_app.install_path / "dist" / "lib"), os.pathsep, - str(proton_app.install_path / "dist" / "lib64"), os.pathsep, - get_host_library_paths(), os.pathsep, -- str(runtime_root / "i686-pc-linux-gnu" / "lib"), os.pathsep, -- str(runtime_root / "x86_64-pc-linux-gnu" / "lib") +- str(runtime_root / "lib" / "i386-linux-gnu"), os.pathsep, +- str(runtime_root / "lib" / "x86_64-linux-gnu") - ]) - - # Traditional LD_LIBRARY_PATH based Steam Runtime is used otherwise @@ -202,7 +225,7 @@ index a850427..390fc01 100644 ) -@@ -149,7 +89,7 @@ def create_wine_bin_dir(proton_app): +@@ -172,7 +89,7 @@ def create_wine_bin_dir(proton_app): def run_command( winetricks_path, proton_app, steam_app, command, @@ -211,16 +234,23 @@ index a850427..390fc01 100644 **kwargs): """Run an arbitrary command with the correct environment variables for the given Proton app -@@ -157,7 +97,7 @@ def run_command( +@@ -180,13 +97,13 @@ def run_command( The environment variables are set for the duration of the call and restored afterwards - If 'steam_runtime_path' is provided, run the command using Steam Runtime + If 'steam_runtime' is provided, run the command using Steam Runtime """ - # Make a copy of the environment variables to restore later - environ_copy = os.environ.copy() -@@ -200,7 +140,7 @@ def run_command( + # Check for incomplete Steam Runtime installation + runtime_install_incomplete = \ + proton_app.required_tool_appid and not proton_app.required_tool_app + +- if steam_runtime_path and runtime_install_incomplete: ++ if steam_runtime and runtime_install_incomplete: + raise RuntimeError( + "{} is missing the required Steam Runtime. You may need to launch " + "a Steam app using this Proton version to finish the " +@@ -234,7 +151,7 @@ def run_command( os.environ.pop("WINEARCH", "") wine_bin_dir = None @@ -229,7 +259,7 @@ index a850427..390fc01 100644 if proton_app.required_tool_app: runtime_name = proton_app.required_tool_app.name logger.info( -@@ -217,8 +157,6 @@ def run_command( +@@ -251,8 +168,6 @@ def run_command( # that load the underlying Proton Wine executables with Steam Runtime # and Proton libraries instead of system libraries wine_bin_dir = create_wine_bin_dir(proton_app=proton_app) @@ -239,10 +269,10 @@ index a850427..390fc01 100644 str(wine_bin_dir), os.pathsep, os.environ["PATH"] ]) diff --git a/tests/test_cli.py b/tests/test_cli.py -index 19e1137..2ef56d6 100644 +index b612dfa..c4d1de0 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py -@@ -114,9 +114,6 @@ class TestCLIRun: +@@ -115,9 +115,6 @@ class TestCLIRun: assert str(command.args[0]).endswith(".local/bin/winetricks") assert command.args[1] == "winecfg" assert command.env["PATH"].startswith(str(wine_bin_dir)) diff --git a/nixpkgs/pkgs/tools/package-management/python2nix/default.nix b/nixpkgs/pkgs/tools/package-management/python2nix/default.nix index 3cce599c052a..b6ffe9abc024 100644 --- a/nixpkgs/pkgs/tools/package-management/python2nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/python2nix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication { name = "python2nix-20140927"; diff --git a/nixpkgs/pkgs/tools/package-management/smlpkg/default.nix b/nixpkgs/pkgs/tools/package-management/smlpkg/default.nix new file mode 100644 index 000000000000..f3f7750f1bdd --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/smlpkg/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, mlton, unzip }: + +stdenv.mkDerivation rec { + pname = "smlpkg"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "diku-dk"; + repo = "smlpkg"; + rev = "v${version}"; + sha256 = "1xmbdnfc34ia0a78dhkfv5jyadxndinhw8c47l1mjd4l7n8vqnph"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ mlton ]; + + # Set as an environment variable in all the phase scripts. + MLCOMP = "mlton"; + + buildFlags = ["all"]; + installFlags = ["prefix=$(out)"]; + + doCheck = true; + + checkInputs = [ unzip ]; + + # We cannot run the pkgtests, as Nix does not allow network + # connections. + checkPhase = '' + runHook preCheck + make -C src test + runHook postCheck + ''; + + meta = with lib; { + description = "Generic package manager for Standard ML libraries and programs"; + homepage = "https://github.com/diku-dk/smlpkg"; + license = licenses.mit; + maintainers = with maintainers; [ athas ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/1password-gui/default.nix b/nixpkgs/pkgs/tools/security/1password-gui/default.nix index ead8aae7d1c8..709d16672098 100644 --- a/nixpkgs/pkgs/tools/security/1password-gui/default.nix +++ b/nixpkgs/pkgs/tools/security/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.9-3"; + version = "0.9.12-3"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-REuES0yTjTsBHapmj1YLCTIq2cIVtr7Z8ZiEgMCrwrs="; + hash = "sha256-IK4BuZKM2U8vz7m8waJhoh3tQ539wGLcIDNiYGUou24="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/2fa/default.nix b/nixpkgs/pkgs/tools/security/2fa/default.nix index c8518ef0a9fb..b06454e736c8 100644 --- a/nixpkgs/pkgs/tools/security/2fa/default.nix +++ b/nixpkgs/pkgs/tools/security/2fa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "1.2.0"; diff --git a/nixpkgs/pkgs/tools/security/aide/default.nix b/nixpkgs/pkgs/tools/security/aide/default.nix index 49291775e379..8993208e16ec 100644 --- a/nixpkgs/pkgs/tools/security/aide/default.nix +++ b/nixpkgs/pkgs/tools/security/aide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "aide"; - version = "0.16.2"; + version = "0.17"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"; + sha256 = "sha256-T9iNHV3ccMaYxlGeu8BcjTLD9tgTe7/e/q66r9bbhns="; }; buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ]; diff --git a/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix b/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix index 851eed43adef..f0eda76821db 100644 --- a/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -1,18 +1,22 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.4.0"; - - goPackagePath = "github.com/kubernetes-sigs/aws-iam-authenticator"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "1ghl2vms9wmvczdl2raqhy0gffxmk24h158gjb5mlw7rggzvb7bg"; + sha256 = "1xfc3a0dik4930va30sbl6687v6i5irv96fwis9lrqh5rjqnblqp"; }; + vendorSha256 = null; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=v${version}" ]; + + subPackages = [ "cmd/aws-iam-authenticator" ]; + meta = with lib; { homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; description = "AWS IAM credentials for Kubernetes authentication"; diff --git a/nixpkgs/pkgs/tools/security/aws-okta/default.nix b/nixpkgs/pkgs/tools/security/aws-okta/default.nix index 73d95f52b8cf..08508dd157a0 100644 --- a/nixpkgs/pkgs/tools/security/aws-okta/default.nix +++ b/nixpkgs/pkgs/tools/security/aws-okta/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, stdenv, libiconv }: +{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, libiconv }: buildGoPackage rec { pname = "aws-okta"; diff --git a/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix b/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix index 9276c9b11677..3eb192e8fcc6 100644 --- a/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix +++ b/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation { pname = "bash-supergenpass"; - version = "unstable-2018-04-18"; + version = "unstable-2020-02-03"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "lanzz"; repo = "bash-supergenpass"; - rev = "ece772b9ec095946ac4ea985cda5561b211e56f0"; - sha256 = "1gkbrycyyl7y3klbfx7xjvvfw5df1h4fj6x1f73gglfy6nk8ffnd"; + rev = "e5d96599b65d65a37148996f00f9d057e522e4d8"; + sha256 = "1d8csp94l2p5y5ln53aza5qf246rwmd10043x0x1yrswqrrya40f"; }; installPhase = '' @@ -24,7 +24,9 @@ stdenv.mkDerivation { wrapProgram "$out/bin/supergenpass" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnugrep ]}" ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/lanzz/bash-supergenpass.git"; + }; meta = with lib; { description = "Bash shell-script implementation of SuperGenPass password generation"; diff --git a/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/nixpkgs/pkgs/tools/security/bitwarden/default.nix index 8763c361d70d..8f264ef942e4 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.23.1"; + x86_64-linux = "1.24.6"; }.${system} or ""; sha256 = { - x86_64-linux = "1jv6w1g6b9c4xa5zy7pgzrkn8k4pyy3cdkh0nw2czn1cw2gaccs1"; + x86_64-linux = "sha256-PaquU2CrtIJS1s9TKshmKxfs0L3Jhvs/sgO4ZrlJFzA="; }.${system} or ""; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix b/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix index 3b623cefd0de..2cce00693a4f 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.17.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "0hi29vy23a5r23pgzdssd2gvim8vw2vmykck5cl5phq11a3az31p"; + sha256 = "1iww8fhh4indmgw1j35whqyakd4bppmiyjpcdf2qrzg52x5binh0"; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "0hv3k5l85nz4syzamranhi237fiwkjnda8v5ssnm2nsmcm7ih9k8"; + cargoSha256 = "0ga7ahlszja8ilng8xsrwdy7zy6bbci4mf00lknladjhlw16wibf"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' @@ -40,7 +40,7 @@ in rustPlatform.buildRustPackage rec { meta = with lib; { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/bitwarden_rs"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ msteen ]; }; } diff --git a/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix b/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix index bef7fc8d6be4..57f52d91bb06 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.17.1"; + version = "2.18.1b"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1kd21higniszk1na5ag7q4g0l7h6ddl91gpbjbwym28hsbjvxla7"; + sha256 = "sha256-MwHTx4ITr2GuBS6qXD4m3aCinpJHQa0Wp0Bbmgg7ATQ="; }; buildCommand = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Integrates the web vault into bitwarden_rs"; homepage = "https://github.com/dani-garcia/bw_web_builds"; platforms = platforms.all; - license = licenses.gpl3; - maintainers = with maintainers; [ msteen ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ msteen mic92 ]; }; } diff --git a/nixpkgs/pkgs/tools/security/ccid/default.nix b/nixpkgs/pkgs/tools/security/ccid/default.nix index b20b513ac282..e715cf504185 100644 --- a/nixpkgs/pkgs/tools/security/ccid/default.nix +++ b/nixpkgs/pkgs/tools/security/ccid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.4.33"; + version = "1.4.34"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "0974h2v9wq0j0ajw3c7yckaw8wqcppb2npfhfhmv9phijy9xlmjj"; + sha256 = "sha256-5vdkW1mpooROtLGn7/USlg1/BKRlSvAvf9L4re1dtAo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/security/certmgr/default.nix b/nixpkgs/pkgs/tools/security/certmgr/default.nix index 47848b25b435..e2318c853f11 100644 --- a/nixpkgs/pkgs/tools/security/certmgr/default.nix +++ b/nixpkgs/pkgs/tools/security/certmgr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: let generic = { patches ? [] }: diff --git a/nixpkgs/pkgs/tools/security/certstrap/default.nix b/nixpkgs/pkgs/tools/security/certstrap/default.nix index f0c756f54f9d..ff6522f1d35f 100644 --- a/nixpkgs/pkgs/tools/security/certstrap/default.nix +++ b/nixpkgs/pkgs/tools/security/certstrap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "certstrap"; diff --git a/nixpkgs/pkgs/tools/security/cfssl/default.nix b/nixpkgs/pkgs/tools/security/cfssl/default.nix index 835c5daa72c5..e92fe7b951f6 100644 --- a/nixpkgs/pkgs/tools/security/cfssl/default.nix +++ b/nixpkgs/pkgs/tools/security/cfssl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, go-rice }: +{ lib, buildGoModule, fetchFromGitHub, go-rice }: buildGoModule rec { pname = "cfssl"; diff --git a/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix b/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix index 4966c6412ab6..5c2e6b4de152 100644 --- a/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix +++ b/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkg-config, opensc }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkg-config, opensc }: mkDerivation rec { pname = "chrome-token-signing"; diff --git a/nixpkgs/pkgs/tools/security/clamav/default.nix b/nixpkgs/pkgs/tools/security/clamav/default.nix index eb9fc8e7b957..bad5f3f476e3 100644 --- a/nixpkgs/pkgs/tools/security/clamav/default.nix +++ b/nixpkgs/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "0.103.0"; + version = "0.103.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - sha256 = "0ih5x1rscg2m64y0z20njj7435q8k7ss575cfw7aipdzfx979a9j"; + sha256 = "sha256-cwjEe4myaK87nzYUBSiSekn/PmM6nJwKrCcS2BBW4lc="; }; # don't install sample config files into the absolute sysconfdir folder diff --git a/nixpkgs/pkgs/tools/security/cloudbrute/default.nix b/nixpkgs/pkgs/tools/security/cloudbrute/default.nix index 06f0dd413a5f..84a59ec495f2 100644 --- a/nixpkgs/pkgs/tools/security/cloudbrute/default.nix +++ b/nixpkgs/pkgs/tools/security/cloudbrute/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/creddump/default.nix b/nixpkgs/pkgs/tools/security/creddump/default.nix index 7a936408433a..e9e5685acf4a 100644 --- a/nixpkgs/pkgs/tools/security/creddump/default.nix +++ b/nixpkgs/pkgs/tools/security/creddump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python2, python2Packages }: +{ lib, fetchFromGitLab, python2, python2Packages }: python2Packages.buildPythonApplication rec { pname = "creddump"; diff --git a/nixpkgs/pkgs/tools/security/crlfuzz/default.nix b/nixpkgs/pkgs/tools/security/crlfuzz/default.nix index feddd893cece..88bd45bb5e16 100644 --- a/nixpkgs/pkgs/tools/security/crlfuzz/default.nix +++ b/nixpkgs/pkgs/tools/security/crlfuzz/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/crowbar/default.nix b/nixpkgs/pkgs/tools/security/crowbar/default.nix index 2f197421e1f7..e58f77457de2 100644 --- a/nixpkgs/pkgs/tools/security/crowbar/default.nix +++ b/nixpkgs/pkgs/tools/security/crowbar/default.nix @@ -3,7 +3,7 @@ , nmap , openvpn , python3Packages -, lib, stdenv +, lib , tigervnc }: diff --git a/nixpkgs/pkgs/tools/security/crunch/default.nix b/nixpkgs/pkgs/tools/security/crunch/default.nix index 2422a2278bb5..0c7620124d15 100644 --- a/nixpkgs/pkgs/tools/security/crunch/default.nix +++ b/nixpkgs/pkgs/tools/security/crunch/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "crunch"; version = "3.6"; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "Wordlist generator"; homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = platforms.unix; + license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ lethalman lnl7 ]; }; } diff --git a/nixpkgs/pkgs/tools/security/deepsea/default.nix b/nixpkgs/pkgs/tools/security/deepsea/default.nix index 855549bb0c81..e351eb7a79d4 100644 --- a/nixpkgs/pkgs/tools/security/deepsea/default.nix +++ b/nixpkgs/pkgs/tools/security/deepsea/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/dnsrecon/default.nix b/nixpkgs/pkgs/tools/security/dnsrecon/default.nix index 65b18c5c8226..5eda4e75f94b 100644 --- a/nixpkgs/pkgs/tools/security/dnsrecon/default.nix +++ b/nixpkgs/pkgs/tools/security/dnsrecon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; diff --git a/nixpkgs/pkgs/tools/security/dnsx/default.nix b/nixpkgs/pkgs/tools/security/dnsx/default.nix index 1a82467201df..35f033cb983f 100644 --- a/nixpkgs/pkgs/tools/security/dnsx/default.nix +++ b/nixpkgs/pkgs/tools/security/dnsx/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/doas/default.nix b/nixpkgs/pkgs/tools/security/doas/default.nix index 6867256ea90c..7da3b8e9f068 100644 --- a/nixpkgs/pkgs/tools/security/doas/default.nix +++ b/nixpkgs/pkgs/tools/security/doas/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , bison , pam @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "doas"; - version = "6.8"; + version = "6.8.1"; src = fetchFromGitHub { owner = "Duncaen"; repo = "OpenDoas"; rev = "v${version}"; - sha256 = "1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb"; + sha256 = "sha256-F0FVVspGDZmzxy4nsb/wsEoCw4eHscymea7tIKrWzD0="; }; # otherwise confuses ./configure diff --git a/nixpkgs/pkgs/tools/security/doppler/default.nix b/nixpkgs/pkgs/tools/security/doppler/default.nix index 08a83f8c9b2d..1222ade4ad70 100644 --- a/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.21.0"; + version = "3.22.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-ll4PabDy5xnyi+cZdjvSySizRCxthRY7uHLzdYP6U5M="; + sha256 = "sha256-Vx+f2IgCOdRxCVppkJNzVDBnsWjt4X96PyCJl9MmfWI="; }; vendorSha256 = "sha256-rQrlnIYYnRc+cqyiyJoh1YqxD61doyjte7ehrX4RDTI="; diff --git a/nixpkgs/pkgs/tools/security/enpass/default.nix b/nixpkgs/pkgs/tools/security/enpass/default.nix index 3b25dd58b347..7e2c0fcdb338 100644 --- a/nixpkgs/pkgs/tools/security/enpass/default.nix +++ b/nixpkgs/pkgs/tools/security/enpass/default.nix @@ -79,7 +79,9 @@ let # lsof must be in PATH for proper operation wrapProgram $out/bin/Enpass \ --set LD_LIBRARY_PATH "${libPath}" \ - --prefix PATH : ${lsof}/bin + --prefix PATH : ${lsof}/bin \ + --unset QML2_IMPORT_PATH \ + --unset QT_PLUGIN_PATH ''; }; updater = { diff --git a/nixpkgs/pkgs/tools/security/ffuf/default.nix b/nixpkgs/pkgs/tools/security/ffuf/default.nix index 084601a41222..6af8b6fcba9e 100644 --- a/nixpkgs/pkgs/tools/security/ffuf/default.nix +++ b/nixpkgs/pkgs/tools/security/ffuf/default.nix @@ -1,20 +1,20 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { pname = "ffuf"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1jb2x0ybcb9zkqm7flpmr0hd3171xvnn6kxmfcgds4x8l9fbmxnr"; + sha256 = "sha256-XSdFLfSYDdKI7BYo9emYanvZeSFGxiNLYxuw5QKAyRc="; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU="; # tests don't pass due to an issue with the memory addresses # https://github.com/ffuf/ffuf/issues/367 diff --git a/nixpkgs/pkgs/tools/security/fido2luks/default.nix b/nixpkgs/pkgs/tools/security/fido2luks/default.nix index e0dcdadb7b07..24115ba923f4 100644 --- a/nixpkgs/pkgs/tools/security/fido2luks/default.nix +++ b/nixpkgs/pkgs/tools/security/fido2luks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , cryptsetup @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "1v5gxcz4zbc673i5kbsnjq8bikf7jdbn3wjfz1wppjrgwnkgvsh9"; + sha256 = "sha256-WOdbdJAcMZHSnf7AkGnEumjaDut9J8VwSJYjqLUtPXs="; }; buildInputs = [ cryptsetup ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang}/lib" ''; - cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k"; + cargoSha256 = "sha256-4VuM1bPkl9XCI9XsZIJvw3kHSKgT4P7x6I83F2KCFD0="; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; diff --git a/nixpkgs/pkgs/tools/security/fierce/default.nix b/nixpkgs/pkgs/tools/security/fierce/default.nix index 3d6472cbb44f..797a2db211b2 100644 --- a/nixpkgs/pkgs/tools/security/fierce/default.nix +++ b/nixpkgs/pkgs/tools/security/fierce/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "fierce"; diff --git a/nixpkgs/pkgs/tools/security/gau/default.nix b/nixpkgs/pkgs/tools/security/gau/default.nix index 98045a107e50..46498e49cffe 100644 --- a/nixpkgs/pkgs/tools/security/gau/default.nix +++ b/nixpkgs/pkgs/tools/security/gau/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix b/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix index db0e88a805ba..a94be8295ea0 100644 --- a/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix +++ b/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , fetchpatch , python3 diff --git a/nixpkgs/pkgs/tools/security/go-cve-search/default.nix b/nixpkgs/pkgs/tools/security/go-cve-search/default.nix new file mode 100644 index 000000000000..e68970b0b267 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/go-cve-search/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "go-cve-search"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "s-index"; + repo = pname; + rev = "v${version}"; + sha256 = "0hbv829daviskwsyp9xjcvl52m22986b2cylf2rldnxw5x8zqdvd"; + }; + + vendorSha256 = "0bhxk39ivbkhwjvq6415lax1pzn208b7px1id0d1nry93bk2zynd"; + + # Tests requires network access + doCheck = false; + + meta = with lib; { + description = "A lightweight CVE search tool"; + longDescription = '' + go-cve-search is a lightweight tool to search CVE (Common Vulnerabilities + and Exposures). + ''; + homepage = "https://github.com/s-index/go-cve-search"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/gopass/default.nix b/nixpkgs/pkgs/tools/security/gopass/default.nix index d85c6ca28693..c208b44bfd6e 100644 --- a/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , makeWrapper , buildGoModule , fetchFromGitHub @@ -12,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.11.0"; + version = "1.12.0"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -20,10 +21,12 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0plg3hck6yqxcazjczx9m5palzz5h3qs5minzmmq8yzvfwi0shic"; + sha256 = "0y3dcikw6gl436mhza5j0b3lm49jzl590a9ry53rkmzrv2lqx9w6"; }; - vendorSha256 = "1sycbcld5qyriqb771l52drxy4vhzm4nh9q5s6kn70nq1s2a3h7x"; + vendorSha256 = "09lbkm7c361c2s87qi1wpfsqgpp3r862wcn98dzdg5j6pvpgwbag"; + + subPackages = [ "." ]; doCheck = false; @@ -47,9 +50,7 @@ buildGoModule rec { ''; postFixup = '' - for bin in $out/bin/*; do - wrapProgram $bin --prefix PATH : "${wrapperPath}" - done + wrapProgram $out/bin/gopass --prefix PATH : "${wrapperPath}" ''; meta = with lib; { @@ -57,6 +58,7 @@ buildGoModule rec { homepage = "https://www.gopass.pw/"; license = licenses.mit; maintainers = with maintainers; [ andir rvolosatovs ]; + changelog = "https://github.com/gopasspw/gopass/blob/v${version}/CHANGELOG.md"; platforms = platforms.unix; longDescription = '' diff --git a/nixpkgs/pkgs/tools/security/gospider/default.nix b/nixpkgs/pkgs/tools/security/gospider/default.nix index f32ecdc94e65..f4b750d394a0 100644 --- a/nixpkgs/pkgs/tools/security/gospider/default.nix +++ b/nixpkgs/pkgs/tools/security/gospider/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/grype/default.nix b/nixpkgs/pkgs/tools/security/grype/default.nix index 495302139855..dc4b487747c6 100644 --- a/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/nixpkgs/pkgs/tools/security/grype/default.nix @@ -1,21 +1,21 @@ { buildGoModule , docker , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { pname = "grype"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "0schq11vckvdj538mnkdzhxl452nrssqrfapab9qc44yxdi1wf8k"; + sha256 = "sha256-co00Ye/QVNSG4h67m56+37JLilBVzHxUwMs1vS3wYX4="; }; - vendorSha256 = "0lna7zhsj3wnw83nv0dp93aj869pplb51gqzrkka7vnqp0rjcw50"; + vendorSha256 = "sha256-q7n8WLw/A2wr3z5h7zaFERY7lO5UIsmTD2mrcH/vpNs="; propagatedBuildInputs = [ docker ]; diff --git a/nixpkgs/pkgs/tools/security/hologram/default.nix b/nixpkgs/pkgs/tools/security/hologram/default.nix index 6ec4d7776e1f..9c1c896d889d 100644 --- a/nixpkgs/pkgs/tools/security/hologram/default.nix +++ b/nixpkgs/pkgs/tools/security/hologram/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "hologram-2018-03-19"; diff --git a/nixpkgs/pkgs/tools/security/httpdump/default.nix b/nixpkgs/pkgs/tools/security/httpdump/default.nix new file mode 100644 index 000000000000..c2e5a62969be --- /dev/null +++ b/nixpkgs/pkgs/tools/security/httpdump/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, libpcap +}: + +buildGoModule rec { + pname = "httpdump"; + version = "20210126-${lib.strings.substring 0 7 rev}"; + rev = "d2e0deadca5f9ec2544cb252da3c450966d1860e"; + + src = fetchFromGitHub { + owner = "hsiafan"; + repo = pname; + inherit rev; + sha256 = "0yh8kxy1k23lln09b614limwk9y59r7cn5qhbnzc06ga4mxfczv2"; + }; + + vendorSha256 = "0lb1p63lzn1ngj54bar9add7w0azvgcq3azhv9c5glk3ykv9c3iy"; + + propagatedBuildInputs = [ libpcap ]; + + meta = with lib; { + description = "Parse and display HTTP traffic from network device or pcap file"; + homepage = "https://github.com/hsiafan/httpdump"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/httpx/default.nix b/nixpkgs/pkgs/tools/security/httpx/default.nix index 7135baab3759..bff9e03bc6f4 100644 --- a/nixpkgs/pkgs/tools/security/httpx/default.nix +++ b/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/keybase/default.nix b/nixpkgs/pkgs/tools/security/keybase/default.nix index 50724d1199ae..f1268717a917 100644 --- a/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.5.2"; + version = "5.6.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "01k50mank6cdc7q3yd8m7xi8vmyklsqlmz7hw17a35lqcsjzy9zj"; + sha256 = "12b0jdwhnvxb51x3pq0g0f23grv9yjbxmpsz36n8ab3j0fvmfg0g"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/security/keybase/gui.nix b/nixpkgs/pkgs/tools/security/keybase/gui.nix index 54be692b007b..cfc282c303cd 100644 --- a/nixpkgs/pkgs/tools/security/keybase/gui.nix +++ b/nixpkgs/pkgs/tools/security/keybase/gui.nix @@ -4,17 +4,17 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20201016183637.d4ebf7d999"; + versionSuffix = "20210125164223.f3b21527b9"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.5.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.6.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "0qwbqnc6dhfnx3gdwl1lyhdsbclaxpkv3zr3dmxfx1242s64v0c1"; + sha256 = "12ckfd02j0f3p3pdlwc640f61z1wzblf2414h6fkf5vzd289h35p"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/keybase/kbfs.nix b/nixpkgs/pkgs/tools/security/keybase/kbfs.nix index 6916d6b99bd8..67abb57394cd 100644 --- a/nixpkgs/pkgs/tools/security/keybase/kbfs.nix +++ b/nixpkgs/pkgs/tools/security/keybase/kbfs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, keybase }: +{ lib, buildGoPackage, fetchFromGitHub, keybase }: buildGoPackage { pname = "kbfs"; diff --git a/nixpkgs/pkgs/tools/security/keycard-cli/default.nix b/nixpkgs/pkgs/tools/security/keycard-cli/default.nix index 4c276cb6e900..6e67358b675a 100644 --- a/nixpkgs/pkgs/tools/security/keycard-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/keycard-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "keycard-cli"; - version = "0.4.0"; + version = "0.6.0"; goPackagePath = "github.com/status-im/keycard-cli"; subPackages = [ "." ]; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "status-im"; repo = pname; rev = version; - sha256 = "0917vl5lw8wgvyn5l8q6xa8bqh342fibaa38syr8hmz8b09qkh38"; + sha256 = "sha256-ejFvduZs3eWc6efr9o4pXb6qw2QWWQTtkTxF80vOGNU="; }; buildFlagsArray = [ diff --git a/nixpkgs/pkgs/tools/security/knockknock/default.nix b/nixpkgs/pkgs/tools/security/knockknock/default.nix index 7a00f183f15d..960667e72def 100644 --- a/nixpkgs/pkgs/tools/security/knockknock/default.nix +++ b/nixpkgs/pkgs/tools/security/knockknock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, hping }: +{ lib, fetchFromGitHub, python2Packages, hping }: let rev = "bf14bbff"; in python2Packages.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix b/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix index 20473d1003e4..ce64b6847fe2 100644 --- a/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: let inherit (python3.pkgs) buildPythonApplication pytest mock pexpect; diff --git a/nixpkgs/pkgs/tools/security/masscan/default.nix b/nixpkgs/pkgs/tools/security/masscan/default.nix index 0f45edcff6cf..b58163630c69 100644 --- a/nixpkgs/pkgs/tools/security/masscan/default.nix +++ b/nixpkgs/pkgs/tools/security/masscan/default.nix @@ -1,17 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, libpcap }: +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, makeWrapper +, libpcap +}: stdenv.mkDerivation rec { pname = "masscan"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { - owner = "robertdavidgraham"; - repo = "masscan"; - rev = version; - sha256 = "04nlnficybgxa16kq9fwrrfjsbyiaps4mikfqgdr206fkqk9i05y"; + owner = "robertdavidgraham"; + repo = "masscan"; + rev = version; + sha256 = "sha256-mnGC/moQANloR5ODwRjzJzBa55OEZ9QU+9WpAHxQE/g="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ]; @@ -20,13 +26,13 @@ stdenv.mkDerivation rec { ''; postInstall = '' - mkdir -p $out/share/man/man8 + installManPage doc/masscan.8 + mkdir -p $out/share/{doc,licenses}/masscan mkdir -p $out/etc/masscan cp data/exclude.conf $out/etc/masscan cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.html - cp doc/masscan.8 $out/share/man/man8/masscan.8 cp LICENSE $out/share/licenses/masscan/LICENSE wrapProgram $out/bin/masscan --prefix LD_LIBRARY_PATH : "${libpcap}/lib" @@ -34,9 +40,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast scan of the Internet"; - homepage = "https://github.com/robertdavidgraham/masscan"; - license = licenses.agpl3; - platforms = platforms.unix; + homepage = "https://github.com/robertdavidgraham/masscan"; + changelog = "https://github.com/robertdavidgraham/masscan/releases/tag/${version}"; + license = licenses.agpl3Only; + platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/nixpkgs/pkgs/tools/security/metasploit/Gemfile index b7be0d586f09..7ffbb5c03235 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.27" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.29" diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 3195fbfd4304..926d955d2e85 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 025cd522b2ab698130cf964c8e7ca91b0729e07a - ref: refs/tags/6.0.27 + revision: f54a838fa686f495854a71cb32fadcb1853b6201 + ref: refs/tags/6.0.29 specs: - metasploit-framework (6.0.27) + metasploit-framework (6.0.29) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,9 +31,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.27) + metasploit-payloads (= 2.0.28) metasploit_data_models - metasploit_payloads-mettle (= 1.0.5) + metasploit_payloads-mettle (= 1.0.6) mqtt msgpack nessus_rest @@ -92,7 +92,7 @@ GIT GEM remote: https://rubygems.org/ specs: - Ascii85 (1.0.3) + Ascii85 (1.1.0) actionpack (5.2.4.4) actionview (= 5.2.4.4) activesupport (= 5.2.4.4) @@ -124,23 +124,23 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.418.0) - aws-sdk-core (3.111.2) + aws-partitions (1.424.0) + aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.221.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-ec2 (1.224.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.46.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-iam (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.41.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.88.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@ -183,10 +183,10 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.7) + i18n (1.8.8) concurrent-ruby (~> 1.0) io-console (0.5.7) - irb (1.3.2) + irb (1.3.3) reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) @@ -214,7 +214,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.27) + metasploit-payloads (2.0.28) metasploit_data_models (4.1.1) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -224,12 +224,12 @@ GEM pg railties (~> 5.2.2) recog (~> 2.0) - metasploit_payloads-mettle (1.0.5) + metasploit_payloads-mettle (1.0.6) method_source (1.0.0) mini_portile2 (2.5.0) minitest (5.14.3) mqtt (0.5.0) - msgpack (1.3.3) + msgpack (1.4.2) multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -238,7 +238,7 @@ GEM net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.2.1) - nio4r (2.5.4) + nio4r (2.5.5) nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -252,15 +252,15 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.13.0) - pdf-reader (2.4.1) - Ascii85 (~> 1.0.0) + pdf-reader (2.4.2) + Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.1.1) + puma (5.2.1) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -281,10 +281,10 @@ GEM thor (>= 0.19.0, < 2.0) rake (13.0.3) rb-readline (0.5.5) - recog (2.3.18) + recog (2.3.19) nokogiri redcarpet (3.5.1) - reline (0.2.2) + reline (0.2.3) io-console (~> 0.5) rex-arch (0.1.14) rex-text @@ -294,7 +294,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.14) + rex-core (0.1.15) rex-encoder (0.1.5) metasm rex-arch @@ -343,7 +343,7 @@ GEM openssl-cmac rubyntlm windows_error - rubyntlm (0.6.2) + rubyntlm (0.6.3) rubyzip (2.3.0) sawyer (0.8.2) addressable (>= 2.3.5) @@ -367,13 +367,14 @@ GEM ttfunk (1.7.0) tzinfo (1.2.9) thread_safe (~> 0.1) - tzinfo-data (1.2020.6) + tzinfo-data (1.2021.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext unf_ext (0.0.7.7) warden (1.2.9) rack (>= 2.0.9) + webrick (1.7.0) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -381,7 +382,8 @@ GEM xdr (3.0.2) activemodel (>= 4.2, < 7.0) activesupport (>= 4.2, < 7.0) - xmlrpc (0.3.1) + xmlrpc (0.3.2) + webrick zeitwerk (2.4.2) PLATFORMS diff --git a/nixpkgs/pkgs/tools/security/metasploit/default.nix b/nixpkgs/pkgs/tools/security/metasploit/default.nix index bf9d8628cf1f..e11b1dd29908 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.27"; + version = "6.0.29"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-G+Ki0YyuY7XxLegmQhDkR9XQurSWG8K40n+8pwJnvZU="; + sha256 = "sha256-QDgInLW/uOBGf0ioPPBMUZv/c9tA7OtTOfp2CEAjf24="; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index d1dbb26ec28e..d33ca7ce03fb 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -94,10 +94,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs"; + sha256 = "1ds4v9xgsyvijnlflak4dzf1qwmda9yd5bv8jwsb56nngd399rlw"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; aws-eventstream = { groups = ["default"]; @@ -114,60 +114,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p4w1sxxrpvngw54q2z8dm3plljzc7pysvd2716fd3sf7g8907zr"; + sha256 = "1dxyx3pnih7g23hq794ldapsszddcmldxf6pq3z99q4d8rg8rrqp"; type = "gem"; }; - version = "1.418.0"; + version = "1.424.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4"; + sha256 = "15lynby6r91p9hh5h92pg4jr8xgnjr52px5ax0p0wncdw4vz0skp"; type = "gem"; }; - version = "3.111.2"; + version = "3.112.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mwd98gmnakz9bkn5kqn5wbk5q2iz7hsbd1xi8256f6ppw07wzi3"; + sha256 = "1lg8vh124viba77b0qhi5j8xx8b4wxdiyycl4kaawmddwhr33zx9"; type = "gem"; }; - version = "1.221.0"; + version = "1.224.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j0llz7m9qymfn54vim99k0fjg6vsw71ylcagz1csay6qkjxipg7"; + sha256 = "16152qidkisakl2iqvghrjnccq279pahb953q5a4q0ipk5imw2c1"; type = "gem"; }; - version = "1.46.0"; + version = "1.47.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm"; + sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i"; type = "gem"; }; - version = "1.41.0"; + version = "1.42.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; + sha256 = "029iqr52fxxz8d6jb2g4k76i7nnjyspvjdlx52xah25zzhp3bx7v"; type = "gem"; }; - version = "1.87.0"; + version = "1.88.0"; }; aws-sigv4 = { groups = ["default"]; @@ -424,10 +424,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; + sha256 = "0k7q3pwm0l1qvx6sc3d4dxmdxqx2pc63lbfjwv0k0higq94rinvs"; type = "gem"; }; - version = "1.8.7"; + version = "1.8.8"; }; io-console = { groups = ["default"]; @@ -444,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "166xravh6r82w46d8hcjrg55gnyjdf0501g16lb48i2h06k363l2"; + sha256 = "00c95xk8c9wzcs5imsrm85jk06y8l4dbnzhvqap98nprr9mxxnvl"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.3"; }; jmespath = { groups = ["default"]; @@ -524,12 +524,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "025cd522b2ab698130cf964c8e7ca91b0729e07a"; - sha256 = "15dxcw1agg3zsawc46wnnjxd1ma7wh8449p85pqvaqxfik8s5qhv"; + rev = "f54a838fa686f495854a71cb32fadcb1853b6201"; + sha256 = "0vkz4d00hxps759ypv20vdrzz6si9kq3ra28gx3f1f5znnf0hf20"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.27"; + version = "6.0.29"; }; metasploit-model = { groups = ["default"]; @@ -546,10 +546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3jn9gjy1bknyd7wrwwfbcjwlmijd6nnsjzyqc7yszjjy0yqca2"; + sha256 = "1xln6zgdiimrbwjbdhi9008bjhmwqm13zky4310pvr7g8riffwqx"; type = "gem"; }; - version = "2.0.27"; + version = "2.0.28"; }; metasploit_data_models = { groups = ["default"]; @@ -566,10 +566,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z6gnidpcpdm80vvl0yw1h10kchkaw9whcsv2kwy7ih6247l7nbq"; + sha256 = "1mxhybic6myh993fs4jmp0hz998ryf362y0b33wqanff1n8aj75k"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; method_source = { groups = ["default"]; @@ -616,10 +616,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; + sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; type = "gem"; }; - version = "1.3.3"; + version = "1.4.2"; }; multipart-post = { groups = ["default"]; @@ -696,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + sha256 = "0xbrmq1pvmszrwf40lzwmf8krs2b56720i7wsz9gh274qljkzklf"; type = "gem"; }; - version = "2.5.4"; + version = "2.5.5"; }; nokogiri = { groups = ["default"]; @@ -786,10 +786,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0987glcd02mqglplmp1camivqx61jsyik21n99vrmi8s2p7h4mbh"; + sha256 = "1cxladxy18dhk4a3b263crq8hyxb3q0c7ifxrb5nr1bs6y0pk8i6"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; pg = { groups = ["default"]; @@ -816,10 +816,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b"; + sha256 = "10kj484ppkjdg1j8jac4bxdv1082bd6g6xhrj70chlp7lkgl8ggh"; type = "gem"; }; - version = "5.1.1"; + version = "5.2.1"; }; racc = { groups = ["default"]; @@ -916,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inz904fbsjscjs71lxxj4070lm1klm27m9prmrhqybc0hr95l69"; + sha256 = "00czf392immsaff10snjxky2vpnfck1bgszpckx15y2kydag5k9i"; type = "gem"; }; - version = "2.3.18"; + version = "2.3.19"; }; redcarpet = { groups = ["default"]; @@ -936,10 +936,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zinl7l63gzy6y477j8w1azfm5655h2026hxl49w4c73qcfdjj3x"; + sha256 = "18xpix2hn4x4hihn0fjsv6i7jr7zjfbwzs94hwn48klyq3yrym2h"; type = "gem"; }; - version = "0.2.2"; + version = "0.2.3"; }; rex-arch = { groups = ["default"]; @@ -966,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mmsckkrds6jvg1b4sdq4cv9s1q0idjiy1k8kjfvgylz96ap0vlw"; + sha256 = "1bjz0mhxijvfq535hpzswr83yrq3ghkkmqna63yjsabh61qpxx16"; type = "gem"; }; - version = "0.1.14"; + version = "0.1.15"; }; rex-encoder = { groups = ["default"]; @@ -1176,10 +1176,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; rubyzip = { groups = ["default"]; @@ -1306,10 +1306,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131dgg2sz3j15vp71xaijlb72nlii9fn8v5dc4vr6q7hrdq4kjf4"; + sha256 = "0ik16lnsyr2739jzwl4r5sz8q639lqw8f9s68iszwhm2pcq8p4w2"; type = "gem"; }; - version = "1.2020.6"; + version = "1.2021.1"; }; unf = { groups = ["default"]; @@ -1341,6 +1341,16 @@ }; version = "1.2.9"; }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; + }; websocket-driver = { groups = ["default"]; platforms = []; @@ -1386,10 +1396,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yihlrbipgiivgpkbx06qx8wgbic0jm26by6jymdwxb01zsd0yj1"; + sha256 = "1xa79ry3976ylap38cr5g6q3m81plm611flqd3dwgnmgbkycb6jp"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; zeitwerk = { groups = ["default"]; diff --git a/nixpkgs/pkgs/tools/security/notary/default.nix b/nixpkgs/pkgs/tools/security/notary/default.nix index fa3db0c3623c..ab6ec0b16818 100644 --- a/nixpkgs/pkgs/tools/security/notary/default.nix +++ b/nixpkgs/pkgs/tools/security/notary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, libtool }: +{ lib, fetchFromGitHub, buildGoPackage, libtool }: buildGoPackage rec { pname = "notary"; diff --git a/nixpkgs/pkgs/tools/security/nuclei/default.nix b/nixpkgs/pkgs/tools/security/nuclei/default.nix index 7e9d3d52e56b..2df24e63d894 100644 --- a/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/onioncircuits/default.nix b/nixpkgs/pkgs/tools/security/onioncircuits/default.nix index bdaf087004a1..8c5083ee8af6 100644 --- a/nixpkgs/pkgs/tools/security/onioncircuits/default.nix +++ b/nixpkgs/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: +{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; diff --git a/nixpkgs/pkgs/tools/security/pcsc-safenet/default.nix b/nixpkgs/pkgs/tools/security/pcsc-safenet/default.nix new file mode 100644 index 000000000000..3610343fc273 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/pcsc-safenet/default.nix @@ -0,0 +1,96 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, dpkg +, gtk2 +, openssl +, pcsclite +}: + +stdenv.mkDerivation rec { + pname = "pcsc-safenet"; + version = "10.0.37-0"; + + # https://aur.archlinux.org/packages/sac-core/ + src = fetchurl { + url = "https://storage.spidlas.cz/public/soft/safenet/SafenetAuthenticationClient-core-${version}_amd64.deb"; + sha256 = "1r9739bhal7ramj1rpawaqvik45xbs1c756l1da96din638gzy5l"; + }; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x $src . + ''; + + buildInputs = [ + gtk2 + openssl + pcsclite + ]; + + runtimeDependencies = [ + openssl + ]; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + installPhase = '' + # Set up for pcsc drivers + mkdir -p pcsc/drivers + mv usr/share/eToken/drivers/* pcsc/drivers/ + rm -r usr/share/eToken/drivers + + # Move binaries out + mv usr/bin bin + + # Move UI to bin + mv usr/share/SAC/SACUIProcess bin/ + rm -r usr/share/SAC + + mkdir $out + cp -r {bin,etc,lib,pcsc,usr,var} $out/ + + cd "$out/lib/" + ln -sf libeToken.so.10.0.37 libeTPkcs11.so + ln -sf libeToken.so.10.0.37 libeToken.so.10.0 + ln -sf libeToken.so.10.0.37 libeToken.so.10 + ln -sf libeToken.so.10.0.37 libeToken.so + ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so.10.0 + ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so.10 + ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so + + cd $out/pcsc/drivers/aks-ifdh.bundle/Contents/Linux/ + ln -sf libAksIfdh.so.10.0 libAksIfdh.so + ln -sf libAksIfdh.so.10.0 libAksIfdh.so.10 + + ln -sf ${openssl.out}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 + ''; + + dontAutoPatchelf = true; + + # Patch DYN shared libraries (autoPatchElfHook only patches EXEC | INTERP). + postFixup = '' + autoPatchelf "$out" + + runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" + + for mod in $(find "$out" -type f -name '*.so.*'); do + mod_rpath="$(patchelf --print-rpath "$mod")" + patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" + done; + ''; + + meta = with lib; { + homepage = "https://safenet.gemalto.com/multi-factor-authentication/security-applications/authentication-client-token-management"; + description = "Safenet Authentication Client"; + platforms = [ "x86_64-linux" ]; + license = licenses.unfree; + maintainers = with maintainers; [ wldhx ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/pinentry/mac.nix b/nixpkgs/pkgs/tools/security/pinentry/mac.nix index f208576561e4..9c328d472c4b 100644 --- a/nixpkgs/pkgs/tools/security/pinentry/mac.nix +++ b/nixpkgs/pkgs/tools/security/pinentry/mac.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }: stdenv.mkDerivation { - name = "pinentry-mac-0.9.4"; + pname = "pinentry-mac"; + version = "0.9.4"; src = fetchFromGitHub { owner = "matthewbauer"; diff --git a/nixpkgs/pkgs/tools/security/pius/default.nix b/nixpkgs/pkgs/tools/security/pius/default.nix index 7d038a1aeabb..3612caa196c2 100644 --- a/nixpkgs/pkgs/tools/security/pius/default.nix +++ b/nixpkgs/pkgs/tools/security/pius/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, python3Packages, gnupg, perl }: +{ fetchFromGitHub, lib, python3Packages, gnupg, perl }: let version = "3.0.0"; in python3Packages.buildPythonApplication { diff --git a/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index bf1bcd67d11d..04def66d03c9 100644 --- a/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 , readline , hardwarePlatform ? "PM3RDV4" @@ -29,7 +29,7 @@ mkDerivation rec { install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Client for proxmark3, powerful general purpose RFID tool"; homepage = "https://rfidresearchgroup.com/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/security/pyrit/default.nix b/nixpkgs/pkgs/tools/security/pyrit/default.nix index ead55036425f..dc1d0b97f879 100644 --- a/nixpkgs/pkgs/tools/security/pyrit/default.nix +++ b/nixpkgs/pkgs/tools/security/pyrit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }: +{ lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }: let version = "2019-12-13"; diff --git a/nixpkgs/pkgs/tools/security/qdigidoc/default.nix b/nixpkgs/pkgs/tools/security/qdigidoc/default.nix index 2b769ee0a15c..8ba6937c4486 100644 --- a/nixpkgs/pkgs/tools/security/qdigidoc/default.nix +++ b/nixpkgs/pkgs/tools/security/qdigidoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config +{ lib, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }: mkDerivation rec { diff --git a/nixpkgs/pkgs/tools/security/rage/default.nix b/nixpkgs/pkgs/tools/security/rage/default.nix index d70e58d72939..3724637c6047 100644 --- a/nixpkgs/pkgs/tools/security/rage/default.nix +++ b/nixpkgs/pkgs/tools/security/rage/default.nix @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { Security ]; + # cargo test has an x86-only dependency + doCheck = stdenv.hostPlatform.isx86; + postBuild = '' cargo run --example generate-docs cargo run --example generate-completions diff --git a/nixpkgs/pkgs/tools/security/rng-tools/default.nix b/nixpkgs/pkgs/tools/security/rng-tools/default.nix index 617224a6af36..76aea2bbd514 100644 --- a/nixpkgs/pkgs/tools/security/rng-tools/default.nix +++ b/nixpkgs/pkgs/tools/security/rng-tools/default.nix @@ -14,13 +14,13 @@ with lib; stdenv.mkDerivation rec { pname = "rng-tools"; - version = "6.9"; + version = "6.11"; src = fetchFromGitHub { owner = "nhorman"; repo = "rng-tools"; rev = "v${version}"; - sha256 = "065jf26s8zkicb95zc9ilksjdq9gqrh5vcx3mhi6mypbnamn6w98"; + sha256 = "sha256-qheJaeVX2zuv0mvKEd6wcbSHFjiJE0t5hVCJiRSKm3M="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/security/safe/default.nix b/nixpkgs/pkgs/tools/security/safe/default.nix index 2f0f4501fd2f..503cfbd9e868 100644 --- a/nixpkgs/pkgs/tools/security/safe/default.nix +++ b/nixpkgs/pkgs/tools/security/safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoPackage , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/nixpkgs/pkgs/tools/security/saml2aws/default.nix index ade299ec5893..57a92ef4b996 100644 --- a/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "saml2aws"; diff --git a/nixpkgs/pkgs/tools/security/sequoia/default.nix b/nixpkgs/pkgs/tools/security/sequoia/default.nix index 706c9edc481c..b0172ff1d501 100644 --- a/nixpkgs/pkgs/tools/security/sequoia/default.nix +++ b/nixpkgs/pkgs/tools/security/sequoia/default.nix @@ -23,16 +23,18 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "1.0.0"; + # Upstream has separate version numbering for the library and the CLI frontend. + # This derivation provides the CLI frontend, and thus uses its version number. + version = "0.24.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia"; - rev = "v${version}"; - sha256 = "0y80bl786m29ww3272qsl1ql0xc3pwd6iiqlkv3nmhnjsmygbn0d"; + rev = "sq/v${version}"; + sha256 = "0zavkf0grkqljyiywcprsiv8igidk8vc3yfj3fzqvbhm43vnnbdw"; }; - cargoSha256 = "03ngywa5z0c7qmdmhynk13xcivhg8gpivvpzg2gxp34gfr7j438l"; + cargoSha256 = "172f0gsy5hssrqv0l1np3c0qd1ayp6nqbpqmgwrkc4l37y5fn232"; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/security/sops/default.nix b/nixpkgs/pkgs/tools/security/sops/default.nix index 9eddc308a4ff..ae6f000fe3f7 100644 --- a/nixpkgs/pkgs/tools/security/sops/default.nix +++ b/nixpkgs/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "sops"; diff --git a/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix b/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix new file mode 100644 index 000000000000..487cc44cdd73 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, buildGoModule, gnupg }: + +buildGoModule rec { + pname = "ssh-to-pgp"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "ssh-to-pgp"; + rev = version; + sha256 = "sha256-TDrpnWAez8muysMdmKFBDZfK8CyhGn1VqHB8+zD6jSk="; + }; + + vendorSha256 = "sha256-ZF/WsmqmGHZIAGTPKJ70UhtmssNhiInEZfzrKxQLw9I="; + + checkInputs = [ gnupg ]; + checkPhase = '' + HOME=$TMPDIR go test . + ''; + + doCheck = true; + + meta = with lib; { + description = "Convert ssh private keys to PGP"; + homepage = "https://github.com/Mic92/ssh-to-pgp"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/subjs/default.nix b/nixpkgs/pkgs/tools/security/subjs/default.nix index 5b9a237d49cb..1b7986c0a77a 100644 --- a/nixpkgs/pkgs/tools/security/subjs/default.nix +++ b/nixpkgs/pkgs/tools/security/subjs/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix b/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix index bdaf8f129d02..53f99636b458 100644 --- a/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix +++ b/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix, then modified by hand for Darwin support. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, darwin }: +{ lib, buildGoPackage, fetchFromGitHub, darwin }: buildGoPackage rec { pname = "sudolikeaboss-unstable"; diff --git a/nixpkgs/pkgs/tools/security/teler/default.nix b/nixpkgs/pkgs/tools/security/teler/default.nix index 1acb9e5609eb..4a971243ad1b 100644 --- a/nixpkgs/pkgs/tools/security/teler/default.nix +++ b/nixpkgs/pkgs/tools/security/teler/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/terrascan/default.nix b/nixpkgs/pkgs/tools/security/terrascan/default.nix index fddd10da6180..b37273aeb1d2 100644 --- a/nixpkgs/pkgs/tools/security/terrascan/default.nix +++ b/nixpkgs/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.2.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "1kjis0ylvmv1gvzp5qvi9a7x4611bjv8yx5mb6nkc0a8lscwb4c3"; + sha256 = "sha256-RZFh9RVU8RwtLGIP7OWnf0yNsXfElqWSXieljqp8ahU="; }; - vendorSha256 = "0yfybzwjvnan4qf5w25k22iwh5hp9v8si93p4jv9bx25rw91swws"; + vendorSha256 = "sha256-Ya/33ocPhY5OSnCEyULsOIHaxwb1yNEle3JEYo/7/Yk="; # tests want to download a vulnerable Terraform project doCheck = false; diff --git a/nixpkgs/pkgs/tools/security/tor/default.nix b/nixpkgs/pkgs/tools/security/tor/default.nix index b4adbfe8c644..8766e957aaf3 100644 --- a/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/nixpkgs/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.4.6"; + version = "0.4.4.7"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "1p0zpqmbskygx0wmiijhprg8r45n2wqbbjl7kv4gbb83b0alq5az"; + sha256 = "1vh5kdx7s74il8a6gr7jydbpv0an01nla4y2r8w7h33z2wk2jv9j"; }; outputs = [ "out" "geoip" ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { passthru = { tests.tor = nixosTests.tor; updateScript = import ./update.nix { - inherit (stdenv) lib; + inherit lib; inherit writeScript common-updater-scripts diff --git a/nixpkgs/pkgs/tools/security/tpm-luks/default.nix b/nixpkgs/pkgs/tools/security/tpm-luks/default.nix index 25e28f158315..2af4a742208c 100644 --- a/nixpkgs/pkgs/tools/security/tpm-luks/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm-luks/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { description = "LUKS key storage in TPM NVRAM"; homepage = "https://github.com/shpedoikal/tpm-luks/"; maintainers = [ maintainers.tstrobel ]; + license = with licenses; [ gpl2Only ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/security/urlhunter/default.nix b/nixpkgs/pkgs/tools/security/urlhunter/default.nix index 3364b622ad63..ebc628e563c6 100644 --- a/nixpkgs/pkgs/tools/security/urlhunter/default.nix +++ b/nixpkgs/pkgs/tools/security/urlhunter/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/nixpkgs/pkgs/tools/security/vault/default.nix b/nixpkgs/pkgs/tools/security/vault/default.nix index 3af00b9a22b3..512617685501 100644 --- a/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/nixpkgs/pkgs/tools/security/vault/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: +{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: buildGoPackage rec { pname = "vault"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1pgyyl2zgnr3wy4k8c5xsk2s5dpl97xdfq67lpfss7fz1bij8x47"; + sha256 = "1g6fz6dl90cb5pnvvmkndqgncfjy50j9jw3xzn8s91yzvvld8ds7"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index 775bd8c6951e..b30f8d1af13d 100644 --- a/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip }: let - version = "1.6.1"; + version = "1.6.2"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1la2pylcj9y5gr7hr4aaa49427y3lgxi2phhl46pqmr7an62pkbm"; + sha256 = "1vcxnky8qnn2ib33r9604cbjrgm939ddrhwqcjylbv217cmc9alf"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "1a2rhv5bpv43qp74a49msrwr7djzy86irsn73jl0xnkh0k6ijci1"; + sha256 = "0mcav36dcmvky8v4y65jvh837i72aqz7arv2ivjpajym3gf7qrq1"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "0snswwai2ya26crm3ksifrmbdnajr36v4vamh7g65plg6vzban9a"; + sha256 = "1is7s445jc4ll2lyfxgjwwl89fly1l8kskqp2p8z179d8hhgd0ms"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0ix99da3xd4z200dgvpfc2h1sfx6l8cipichvfjlj39md45grs89"; + sha256 = "0i5d87a393464r68rjv83bjhg51yaysccqbwaaydmzk1m45icg7x"; }; }; diff --git a/nixpkgs/pkgs/tools/security/volatility/default.nix b/nixpkgs/pkgs/tools/security/volatility/default.nix index 80cd0d971a3f..6cc5ddbfb4cf 100644 --- a/nixpkgs/pkgs/tools/security/volatility/default.nix +++ b/nixpkgs/pkgs/tools/security/volatility/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "volatility"; diff --git a/nixpkgs/pkgs/tools/security/vulnix/default.nix b/nixpkgs/pkgs/tools/security/vulnix/default.nix index e95adf3e1e6c..a7ce0fb4b6e4 100644 --- a/nixpkgs/pkgs/tools/security/vulnix/default.nix +++ b/nixpkgs/pkgs/tools/security/vulnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3Packages , nix , ronn diff --git a/nixpkgs/pkgs/tools/security/xortool/default.nix b/nixpkgs/pkgs/tools/security/xortool/default.nix new file mode 100644 index 000000000000..1e8b6aee5d37 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/xortool/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonApplication +, docopt +, fetchFromGitHub +, importlib-metadata +, poetry-core +}: + +buildPythonApplication rec { + pname = "xortool"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hellman"; + repo = pname; + rev = "v${version}"; + sha256 = "19lfadi28r89bl5q8fhrxgjgs3nx3kgjd4rdg7wbvzi1cn29c5n7"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ docopt importlib-metadata ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "xortool" ]; + + meta = with lib; { + description = "Tool to analyze multi-byte XOR cipher"; + homepage = "https://github.com/hellman/xortool"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix b/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix index 5a94cff19e16..b4bef5fc5e39 100644 --- a/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix +++ b/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; diff --git a/nixpkgs/pkgs/tools/system/awstats/default.nix b/nixpkgs/pkgs/tools/system/awstats/default.nix index b04532d842ff..88162780cb70 100644 --- a/nixpkgs/pkgs/tools/system/awstats/default.nix +++ b/nixpkgs/pkgs/tools/system/awstats/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, jdk }: +{ lib, fetchurl, perlPackages, jdk }: perlPackages.buildPerlPackage rec { pname = "awstats"; diff --git a/nixpkgs/pkgs/tools/system/bottom/default.nix b/nixpkgs/pkgs/tools/system/bottom/default.nix index d138ed4d8c1d..29c1d6376fe0 100644 --- a/nixpkgs/pkgs/tools/system/bottom/default.nix +++ b/nixpkgs/pkgs/tools/system/bottom/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-88uEEsb+coX8PTKrem+0t5AkamCmqJsFYsENFTZSsys="; + sha256 = "sha256-9L7FtYIaWSOwNQ8zOLvxjt51o8A5MqqfF/iIyJs2TJA="; }; prePatch = '' @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; - cargoSha256 = "sha256-qnh4Tl6JRgxBJbu+t9IJX/XChIR15rTRLvsl+/ZvPxY="; + cargoSha256 = "sha256-4oH1A88Qn0c6hkE/1b6mTrEIph8xT98j+DkP9/5JALs="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/system/bpytop/default.nix b/nixpkgs/pkgs/tools/system/bpytop/default.nix index b59222200c12..6754d0806b6b 100644 --- a/nixpkgs/pkgs/tools/system/bpytop/default.nix +++ b/nixpkgs/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.59"; + version = "1.0.61"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RlrUUIbZRNTvxU8LVW0/ZcARlKDVvSMlkN0+6BgAink="; + sha256 = "sha256-E6blMhDkZa3Wbdbsw7f8jdHwHFINOQ48XC5pQdkVPtQ="; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/system/cm-rgb/default.nix b/nixpkgs/pkgs/tools/system/cm-rgb/default.nix index 9c75fe78c996..47fdba50c5e8 100644 --- a/nixpkgs/pkgs/tools/system/cm-rgb/default.nix +++ b/nixpkgs/pkgs/tools/system/cm-rgb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchFromGitHub , atk diff --git a/nixpkgs/pkgs/tools/system/consul-template/default.nix b/nixpkgs/pkgs/tools/system/consul-template/default.nix index 7604584e1675..a285c720eaaa 100644 --- a/nixpkgs/pkgs/tools/system/consul-template/default.nix +++ b/nixpkgs/pkgs/tools/system/consul-template/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "consul-template"; diff --git a/nixpkgs/pkgs/tools/system/di/default.nix b/nixpkgs/pkgs/tools/system/di/default.nix index fcf4054c1820..6dcd3e87f68f 100644 --- a/nixpkgs/pkgs/tools/system/di/default.nix +++ b/nixpkgs/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "di"; - version = "4.48"; + version = "4.48.0.1"; src = fetchurl { url = "https://gentoo.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0crvvfsxh8ryc0j19a2x52i9zacvggm8zi6j3kzygkcwnpz4km8r"; + sha256 = "sha256-YFCFRDGeq2h/UXKme/NnnCuFdtw2Vim6Y3SbytaItGc="; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/nixpkgs/pkgs/tools/system/envconsul/default.nix b/nixpkgs/pkgs/tools/system/envconsul/default.nix index 1706b32449eb..9e8180b318a6 100644 --- a/nixpkgs/pkgs/tools/system/envconsul/default.nix +++ b/nixpkgs/pkgs/tools/system/envconsul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "envconsul"; diff --git a/nixpkgs/pkgs/tools/system/facter/default.nix b/nixpkgs/pkgs/tools/system/facter/default.nix index 2f2d35ef1e7a..906ca618e468 100644 --- a/nixpkgs/pkgs/tools/system/facter/default.nix +++ b/nixpkgs/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.14"; + version = "3.14.16"; src = fetchFromGitHub { - sha256 = "07pfa11i3nn2dk5g3c1qj3g7d2s8gd2fr0lmfijndaqxm7gjrn1a"; + sha256 = "sha256-VZIeyLJBlh5/r0EHinSiPiQyCNUBFBYjDZ6nTVnZBbE="; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/nixpkgs/pkgs/tools/system/gdu/default.nix b/nixpkgs/pkgs/tools/system/gdu/default.nix index 53e69cd8cd6a..0c63bf651bae 100644 --- a/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -7,16 +6,16 @@ buildGoModule rec { pname = "gdu"; - version = "4.2.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "0ppsz7ys08lmg5s7lszqc2zcp2vjm54aai3yr3sb4jf3knbmyg5g"; + sha256 = "sha256-m4J797bmQzKuyA01JgDLVlf+PbXDVXWtYbID/0QVLxE="; }; - vendorSha256 = "058h71gmgi3n4b697myi5890arzw8fkzmxlm1aiwzyfh3k9iv0wh"; + vendorSha256 = "sha256-kIMd0xzQ+c+jCpX2+qdD/GcFEirR15PMInbEV184EBU="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/system/gotop/default.nix b/nixpkgs/pkgs/tools/system/gotop/default.nix index b49307f500f6..1cc0ba877399 100644 --- a/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gotop"; - version = "4.0.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "xxxserxxx"; repo = pname; rev = "v${version}"; - sha256 = "10qfzmq1wdgpvv319khzicalix1x4fqava0wry3bzz84k5c9dabs"; + sha256 = "sha256-3t6I4ah9gUmPlIBRL86BdgiUaMNiKNEeoUSRMASz1Yc="; }; runVend = true; - vendorSha256 = "09vdhdgj74ifdhl6rmxddkvk7ls26jn8gswzcxf9389zkjzi7822"; + vendorSha256 = "sha256-GcIaUIuTiSY1aKxRtclfl7hMNaZZx4uoVG7ahjF/4Hs="; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; preCheck = '' export HOME=$(mktemp -d) @@ -21,7 +23,8 @@ buildGoModule rec { meta = with lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; homepage = "https://github.com/xxxserxxx/gotop"; - license = licenses.agpl3; + changelog = "https://github.com/xxxserxxx/gotop/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/system/honcho/default.nix b/nixpkgs/pkgs/tools/system/honcho/default.nix index f39c7dd793c4..b653f2407244 100644 --- a/nixpkgs/pkgs/tools/system/honcho/default.nix +++ b/nixpkgs/pkgs/tools/system/honcho/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: let inherit (pythonPackages) python; diff --git a/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/nixpkgs/pkgs/tools/system/hwinfo/default.nix index 925b60d54346..9048aa966f78 100644 --- a/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.71"; + version = "21.72"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "1g671fvkg6r30n9vwwlqpdd6yn6jf7n9ynjmslblk7kbnabzayby"; + sha256 = "sha256-T/netiZqox+qa19wH+h8cbsGbiM+9VrSEIjccrPYqws="; }; patchPhase = '' diff --git a/nixpkgs/pkgs/tools/system/inxi/default.nix b/nixpkgs/pkgs/tools/system/inxi/default.nix index 1ef871c9d30f..b941c5f7275b 100644 --- a/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.2.02-2"; + version = "3.3.01-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "sha256-WHfW0empveOxC3jvYq46jlvVZDb8JLne5JHPtFE6nTs="; + sha256 = "sha256-wY9wsxBByxqy9qk/7UoKiUSpFGS1rFpdyTs3ig6OJRs="; }; buildInputs = [ perl makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/system/journalwatch/default.nix b/nixpkgs/pkgs/tools/system/journalwatch/default.nix index 0ec7ef36623e..3d85d13149c3 100644 --- a/nixpkgs/pkgs/tools/system/journalwatch/default.nix +++ b/nixpkgs/pkgs/tools/system/journalwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }: buildPythonPackage rec { pname = "journalwatch"; diff --git a/nixpkgs/pkgs/tools/system/localtime/default.nix b/nixpkgs/pkgs/tools/system/localtime/default.nix index 99e0674016b6..798e3b3e8831 100644 --- a/nixpkgs/pkgs/tools/system/localtime/default.nix +++ b/nixpkgs/pkgs/tools/system/localtime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, m4 }: +{ lib, fetchFromGitHub, buildGoPackage, m4 }: buildGoPackage rec { name = "localtime-2017-11-07"; diff --git a/nixpkgs/pkgs/tools/system/logcheck/default.nix b/nixpkgs/pkgs/tools/system/logcheck/default.nix index bdf2a4bcd302..6fd66b40e15e 100644 --- a/nixpkgs/pkgs/tools/system/logcheck/default.nix +++ b/nixpkgs/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "logcheck"; - version = "1.3.20"; + version = "1.3.22"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "1rmkvxhcwr9gb6z4dlgr6rrx5l70hshlxdggs6qx0w1ljcmx1dlz"; + sha256 = "sha256-e7XeRNlFsexlVskK2OnLTmNV/ES2xWU+/+AElexV6E4="; }; prePatch = '' diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index 44c5e42a4906..e727734be6d0 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -15,14 +15,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.28.0"; + version = "1.29.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1266jbfw55r1zh00xi6c90j2fs9hw8hmsb7686rh04l8mffny9f4"; + sha256 = "sha256-Wmfqxjy0kCy8vsegoe+Jn5Az/XEZxeHZDRMLmOrp+Iw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/system/nq/default.nix b/nixpkgs/pkgs/tools/system/nq/default.nix index 9e6522b20284..551d18618a7e 100644 --- a/nixpkgs/pkgs/tools/system/nq/default.nix +++ b/nixpkgs/pkgs/tools/system/nq/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Unix command line queue utility"; homepage = "https://github.com/chneukirchen/nq"; license = licenses.publicDomain; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/nixpkgs/pkgs/tools/system/pcstat/default.nix b/nixpkgs/pkgs/tools/system/pcstat/default.nix index 9e0f6fe147e6..d01b08a14343 100644 --- a/nixpkgs/pkgs/tools/system/pcstat/default.nix +++ b/nixpkgs/pkgs/tools/system/pcstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "pcstat-unstable"; diff --git a/nixpkgs/pkgs/tools/system/ps_mem/default.nix b/nixpkgs/pkgs/tools/system/ps_mem/default.nix index dcca1a86da74..152bb1150e59 100644 --- a/nixpkgs/pkgs/tools/system/ps_mem/default.nix +++ b/nixpkgs/pkgs/tools/system/ps_mem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchFromGitHub }: +{ lib, pythonPackages, fetchFromGitHub }: let version = "3.13"; diff --git a/nixpkgs/pkgs/tools/system/s-tui/default.nix b/nixpkgs/pkgs/tools/system/s-tui/default.nix index 51c47ab10507..3943a8f4eef8 100644 --- a/nixpkgs/pkgs/tools/system/s-tui/default.nix +++ b/nixpkgs/pkgs/tools/system/s-tui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "s-tui"; diff --git a/nixpkgs/pkgs/tools/system/s6-rc/default.nix b/nixpkgs/pkgs/tools/system/s6-rc/default.nix index 30467926f5df..20c23e150519 100644 --- a/nixpkgs/pkgs/tools/system/s6-rc/default.nix +++ b/nixpkgs/pkgs/tools/system/s6-rc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, skawarePackages }: +{ lib, skawarePackages }: with skawarePackages; diff --git a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix index ae4ee9efa6e5..cf88dc846fb1 100644 --- a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix +++ b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - version = "4.6.5"; + version = "4.10.1"; pname = "sleuthkit"; src = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; rev = "${pname}-${version}"; - sha256 = "1q1cdixnfv9v4qlzza8xwdsyvq1vdw6gjgkd41yc1d57ldp1qm0c"; + sha256 = "142kkpkpawpqyc88pr6xdvlagw6djaah1schyjxq9qdq9cnqx0dw"; }; postPatch = '' - substituteInPlace tsk/img/ewf.c --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset + substituteInPlace tsk/img/ewf.cpp --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 9eaf00b537a3..954c9eb4110c 100644 --- a/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, autoreconfHook -, mailutils, inetutils +, mailutils, enableMail ? true +, inetutils , IOKit, ApplicationServices }: let @@ -26,7 +27,7 @@ in stdenv.mkDerivation rec { postPatch = "cp -v ${driverdb} drivedb.h"; configureFlags = [ - "--with-scriptpath=${lib.makeBinPath [ mailutils inetutils ]}" + "--with-scriptpath=${lib.makeBinPath ([ inetutils ] ++ lib.optional enableMail mailutils)}" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix index 7ac5d7cf210f..62a7c9d8aeae 100644 --- a/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "SystemdJournal2Gelf-unstable"; diff --git a/nixpkgs/pkgs/tools/system/thinkfan/default.nix b/nixpkgs/pkgs/tools/system/thinkfan/default.nix index c9af119fb737..97c61d2da0e7 100644 --- a/nixpkgs/pkgs/tools/system/thinkfan/default.nix +++ b/nixpkgs/pkgs/tools/system/thinkfan/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libyamlcpp, pkg-config -, smartSupport ? false, libatasmart }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libyamlcpp +, pkg-config +, procps +, coreutils +, smartSupport ? false, libatasmart +}: stdenv.mkDerivation rec { pname = "thinkfan"; @@ -12,36 +20,40 @@ stdenv.mkDerivation rec { sha256 = "18vgm5w5pjnpipa34j4x87q10695w2jnqwvc2f027afy7mnzw7kz"; }; + postPatch = '' + # fix hardcoded install path + substituteInPlace CMakeLists.txt --replace /etc $out/etc + + # fix command paths in unit files + for unit in rcscripts/systemd/*; do + substituteInPlace "$unit" \ + --replace /bin/kill ${procps}/bin/kill \ + --replace /usr/bin/pkill ${procps}/bin/pkill \ + --replace /usr/bin/sleep ${coreutils}/bin/sleep + done + ''; + cmakeFlags = [ "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}" "-DUSE_NVML=OFF" + # force install unit files + "-DSYSTEMD_FOUND=ON" ] ++ lib.optional smartSupport "-DUSE_ATASMART=ON"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart; - installPhase = '' - runHook preInstall - - install -Dm755 {.,$out/bin}/thinkfan - - cd "$NIX_BUILD_TOP"; cd "$sourceRoot" # attempt to be a bit robust - install -Dm644 {.,$out/share/doc/thinkfan}/README.md - cp -R examples $out/share/doc/thinkfan - install -Dm644 {src,$out/share/man/man1}/thinkfan.1 - - runHook postInstall - ''; - - meta = with lib; { - description = "A minimalist fan control program"; - longDescription = "A minimalist fan control program. Originally designed -specifically for IBM/Lenovo Thinkpads, it now supports any kind of system via -the sysfs hwmon interface (/sys/class/hwmon)."; - license = licenses.gpl3; + meta = { + description = "A simple, lightweight fan control program"; + longDescription = '' + Thinkfan is a minimalist fan control program. Originally designed + specifically for IBM/Lenovo Thinkpads, it now supports any kind of + system via the sysfs hwmon interface (/sys/class/hwmon). + ''; + license = lib.licenses.gpl3Plus; homepage = "https://github.com/vmatare/thinkfan"; - maintainers = with maintainers; [ domenkozar ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ domenkozar rnhmjoj ]; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/system/tre-command/default.nix b/nixpkgs/pkgs/tools/system/tre-command/default.nix index 5a2ad41c7447..638caa3c62bc 100644 --- a/nixpkgs/pkgs/tools/system/tre-command/default.nix +++ b/nixpkgs/pkgs/tools/system/tre-command/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, stdenv, installShellFiles }: +{ rustPlatform, fetchFromGitHub, lib, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "tre-command"; diff --git a/nixpkgs/pkgs/tools/system/tuptime/default.nix b/nixpkgs/pkgs/tools/system/tuptime/default.nix index 92878c5386bc..0d3b6f4d6b82 100644 --- a/nixpkgs/pkgs/tools/system/tuptime/default.nix +++ b/nixpkgs/pkgs/tools/system/tuptime/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tuptime"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "rfrail3"; repo = "tuptime"; rev = version; - sha256 = "0nk3yyjavgmc435vj3f0siw4y5nwipsbcsvsf5m7mgvq0xi8f3ls"; + sha256 = "sha256-2Q1czKvwdVq+2+64k4SOghw05CUlT5HdZpvKMRbGdDY="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/system/vbetool/default.nix b/nixpkgs/pkgs/tools/system/vbetool/default.nix index ed0cf5f13c64..ebdeae60c386 100644 --- a/nixpkgs/pkgs/tools/system/vbetool/default.nix +++ b/nixpkgs/pkgs/tools/system/vbetool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Video BIOS execution tool"; - homepage = "http://www.codon.org.uk/~mjg59/vbetool/"; + homepage = "https://www.codon.org.uk/~mjg59/vbetool/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/text/angle-grinder/default.nix b/nixpkgs/pkgs/tools/text/angle-grinder/default.nix index 82ca3ff0f603..66441d737132 100644 --- a/nixpkgs/pkgs/tools/text/angle-grinder/default.nix +++ b/nixpkgs/pkgs/tools/text/angle-grinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform }: diff --git a/nixpkgs/pkgs/tools/text/ansifilter/default.nix b/nixpkgs/pkgs/tools/text/ansifilter/default.nix index 5b03f6e89a6a..97b06b9a0c7e 100644 --- a/nixpkgs/pkgs/tools/text/ansifilter/default.nix +++ b/nixpkgs/pkgs/tools/text/ansifilter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ansifilter"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - sha256 = "0by4rhy30l7jgxvq6mwf8p43s1472q96l3g7n2skq2lnkjrvx1ar"; + sha256 = "sha256-Zs8BfTakPV9q4gYJzjtYZHSU7mwOQfxoLFmL/859fTk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/text/choose/default.nix b/nixpkgs/pkgs/tools/text/choose/default.nix index 20d651df008e..7816f79649c3 100644 --- a/nixpkgs/pkgs/tools/text/choose/default.nix +++ b/nixpkgs/pkgs/tools/text/choose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform }: diff --git a/nixpkgs/pkgs/tools/text/codesearch/default.nix b/nixpkgs/pkgs/tools/text/codesearch/default.nix index bdb273de372b..9c3e9fbd8409 100644 --- a/nixpkgs/pkgs/tools/text/codesearch/default.nix +++ b/nixpkgs/pkgs/tools/text/codesearch/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "codesearch"; diff --git a/nixpkgs/pkgs/tools/text/colordiff/default.nix b/nixpkgs/pkgs/tools/text/colordiff/default.nix index 04d41b74db0f..364d3c6edc45 100644 --- a/nixpkgs/pkgs/tools/text/colordiff/default.nix +++ b/nixpkgs/pkgs/tools/text/colordiff/default.nix @@ -1,26 +1,36 @@ -{ lib, stdenv, fetchurl, perl /*, xmlto */}: +{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto }: stdenv.mkDerivation rec { - name = "colordiff-1.0.19"; + pname = "colordiff"; + version = "1.0.19"; - src = fetchurl { - urls = [ - "https://www.colordiff.org/${name}.tar.gz" - "http://www.colordiff.org/archive/${name}.tar.gz" - ]; - sha256 = "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26"; + src = fetchFromGitHub { + owner = "daveewart"; + repo = "colordiff"; + rev = "v${version}"; + sha256 = "1v7s1yn0qvn08iwm5js8mxn442392qyr7s9ij506byfd497ag7qk"; }; - buildInputs = [ perl /* xmlto */ ]; + nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m xmlto ]; - dontBuild = 1; # do not build doc yet. + buildInputs = [ perl ]; - installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/share/man/man1 DESTDIR="$out" install''; + postPatch = '' + substituteInPlace Makefile \ + --replace 'TMPDIR=colordiff-''${VERSION}' "" + ''; + + installFlags = [ + "INSTALL_DIR=/bin" + "MAN_DIR=/share/man/man1" + "DESTDIR=${placeholder "out"}" + ]; meta = with lib; { description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting"; homepage = "https://www.colordiff.org/"; - license = licenses.gpl3; - platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/text/each/default.nix b/nixpkgs/pkgs/tools/text/each/default.nix new file mode 100644 index 000000000000..a1d14ed21108 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/each/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "each"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "arraypad"; + repo = pname; + rev = "v${version}"; + sha256 = "04rx8jf871l4darfx6029dhpnbpmzwjgzazayp1qcaadsk8207z5"; + }; + + cargoSha256 = "1rcmymjff9sc0dv4zplklivfws14wqx6q4ky47arg6jkj3dyprp8"; + + meta = with lib; { + description = " A better way of working with structured data on the command line"; + homepage = "https://github.com/arraypad/each"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ thiagokokada ]; + }; +} diff --git a/nixpkgs/pkgs/tools/text/fanficfare/default.nix b/nixpkgs/pkgs/tools/text/fanficfare/default.nix index ad92ffa9350b..e1db7d3d39c0 100644 --- a/nixpkgs/pkgs/tools/text/fanficfare/default.nix +++ b/nixpkgs/pkgs/tools/text/fanficfare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "FanFicFare"; diff --git a/nixpkgs/pkgs/tools/text/gjo/default.nix b/nixpkgs/pkgs/tools/text/gjo/default.nix index 27dcf633fe7a..0ab9a54c47b7 100644 --- a/nixpkgs/pkgs/tools/text/gjo/default.nix +++ b/nixpkgs/pkgs/tools/text/gjo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/nixpkgs/pkgs/tools/text/gnused/default.nix b/nixpkgs/pkgs/tools/text/gnused/default.nix index 9115efa22dd3..23b2794bf13f 100644 --- a/nixpkgs/pkgs/tools/text/gnused/default.nix +++ b/nixpkgs/pkgs/tools/text/gnused/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mic92 ]; }; } diff --git a/nixpkgs/pkgs/tools/text/grin/default.nix b/nixpkgs/pkgs/tools/text/grin/default.nix index dd3568ef0bbe..5d89619001b4 100644 --- a/nixpkgs/pkgs/tools/text/grin/default.nix +++ b/nixpkgs/pkgs/tools/text/grin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages }: +{ lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { program = "grin"; diff --git a/nixpkgs/pkgs/tools/text/gucci/default.nix b/nixpkgs/pkgs/tools/text/gucci/default.nix index 4e938787ff46..943b86d3b051 100644 --- a/nixpkgs/pkgs/tools/text/gucci/default.nix +++ b/nixpkgs/pkgs/tools/text/gucci/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gucci"; diff --git a/nixpkgs/pkgs/tools/text/highlight/default.nix b/nixpkgs/pkgs/tools/text/highlight/default.nix index 033b9c44aa54..56d0a2345270 100644 --- a/nixpkgs/pkgs/tools/text/highlight/default.nix +++ b/nixpkgs/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.59"; + version = "3.60"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "0sqdzivnak3gcinvkf6rkgp1p5gjx5my6cb2790nh0v53y67v2pb"; + sha256 = "sha256-1EBdtORd9P5DJUmbZa9KjR3UUoHOKLbjqbxpFi5WFvQ="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/text/icdiff/default.nix b/nixpkgs/pkgs/tools/text/icdiff/default.nix index 07082c4c56f3..3ead56298cf6 100644 --- a/nixpkgs/pkgs/tools/text/icdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/icdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "icdiff"; diff --git a/nixpkgs/pkgs/tools/text/invoice2data/default.nix b/nixpkgs/pkgs/tools/text/invoice2data/default.nix index 87f3f3daff3b..8007724f4a53 100644 --- a/nixpkgs/pkgs/tools/text/invoice2data/default.nix +++ b/nixpkgs/pkgs/tools/text/invoice2data/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, xpdf, imagemagick, tesseract }: +{ lib, python3Packages, xpdf, imagemagick, tesseract }: python3Packages.buildPythonPackage rec { pname = "invoice2data"; diff --git a/nixpkgs/pkgs/tools/text/kdiff3/default.nix b/nixpkgs/pkgs/tools/text/kdiff3/default.nix index 862faadea3f1..c230278c0a02 100644 --- a/nixpkgs/pkgs/tools/text/kdiff3/default.nix +++ b/nixpkgs/pkgs/tools/text/kdiff3/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1f1vyhvc31yfxspv5lzw8qjd2w8x74s2fmij1921m307g84qxqbn"; + sha256 = "sha256-vJL30E6xI/nFbb4wR69nv3FSQPqZSHrB0czypF4IVME="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/tools/text/mark/default.nix b/nixpkgs/pkgs/tools/text/mark/default.nix new file mode 100644 index 000000000000..dbfb85fc5831 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/mark/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "mark"; + version = "5.2"; + + src = fetchFromGitHub { + owner = "kovetskiy"; + repo = "mark"; + rev = version; + sha256 = "sha256-bjDQwtIsY+Dvv270DACvyU+MNPyI7EZcob6F/aebVac="; + }; + + vendorSha256 = "sha256-l6zHsis2fais5HQJQdfsSC0sPdcF4BeWoUznpl3Fh1g="; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + + meta = with lib; { + description = "A tool for syncing your markdown documentation with Atlassian Confluence pages"; + homepage = "https://github.com/kovetskiy/mark"; + license = licenses.asl20; + maintainers = with maintainers; [ rguevara84 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/text/markdown-pp/default.nix b/nixpkgs/pkgs/tools/text/markdown-pp/default.nix index 55febe117298..50ef560f6c3f 100644 --- a/nixpkgs/pkgs/tools/text/markdown-pp/default.nix +++ b/nixpkgs/pkgs/tools/text/markdown-pp/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, pythonPackages, lib, stdenv }: +{ fetchFromGitHub, pythonPackages, lib }: with pythonPackages; buildPythonApplication rec { diff --git a/nixpkgs/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch b/nixpkgs/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch deleted file mode 100644 index 967bcd3948c2..000000000000 --- a/nixpkgs/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4315b58e0bffedd145cec61f96062292cd98278e Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@nextrem.ch> -Date: Thu, 23 Jul 2020 21:37:33 +0200 -Subject: [PATCH] Make compatible with pdfminer.six version 20200720 - ---- - setup.py | 2 +- - src/ocrmypdf/pdfinfo/layout.py | 8 ++++++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index bd95ed9..d1f4ab1 100644 ---- a/setup.py -+++ b/setup.py -@@ -83,7 +83,7 @@ setup( - 'cffi >= 1.9.1', # must be a setup and install requirement - 'coloredlogs >= 14.0', # strictly optional - 'img2pdf >= 0.3.0, < 0.4', # pure Python, so track HEAD closely -- 'pdfminer.six >= 20191110, <= 20200517', -+ 'pdfminer.six >= 20191110, <= 20200720', - 'pikepdf >= 1.14.0, < 2', - 'Pillow >= 7.0.0', - 'pluggy >= 0.13.0', -diff --git a/src/ocrmypdf/pdfinfo/layout.py b/src/ocrmypdf/pdfinfo/layout.py -index 98bd82e..8b41e14 100644 ---- a/src/ocrmypdf/pdfinfo/layout.py -+++ b/src/ocrmypdf/pdfinfo/layout.py -@@ -26,7 +26,11 @@ import pdfminer.pdfdevice - import pdfminer.pdfinterp - from pdfminer.converter import PDFLayoutAnalyzer - from pdfminer.layout import LAParams, LTChar, LTPage, LTTextBox --from pdfminer.pdfdocument import PDFTextExtractionNotAllowed -+try: -+ from pdfminer.pdfdocument import PDFTextExtractionNotAllowedError -+except ImportError: -+ # Fallback for pdfminer < 20200720 -+ from pdfminer.pdfdocument import PDFTextExtractionNotAllowed as PDFTextExtractionNotAllowedError - from pdfminer.pdffont import PDFSimpleFont, PDFUnicodeNotDefined - from pdfminer.pdfpage import PDFPage - from pdfminer.utils import bbox2str, matrix2str -@@ -239,7 +243,7 @@ def get_page_analysis(infile, pageno, pscript5_mode): - with Path(infile).open('rb') as f: - page = PDFPage.get_pages(f, pagenos=[pageno], maxpages=0) - interp.process_page(next(page)) -- except PDFTextExtractionNotAllowed: -+ except PDFTextExtractionNotAllowedError: - raise EncryptedPdfError() - finally: - if pscript5_mode: --- -2.27.0 - diff --git a/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix index f68e15581398..6843e945fd90 100644 --- a/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix +++ b/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix @@ -7,7 +7,8 @@ , python3 , python3Packages , qpdf -, lib, stdenv +, lib +, stdenv , tesseract4 , unpaper , substituteAll @@ -29,18 +30,17 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "11.3.3"; + version = "11.6.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0qv34clid65p11dgqalyk7b7myn5ibiz8i9xxhxkmjblw297p6ak"; + sha256 = "0inmmpam0vcm5n4sm6lh9p5swk44clknvm1cdwk9cax01mdqljza"; }; nativeBuildInputs = with python3Packages; [ - pytestrunner setuptools setuptools-scm-git-archive setuptools_scm @@ -65,8 +65,7 @@ buildPythonApplication rec { pytest pytest-helpers-namespace pytest_xdist - pytestcov - pytestrunner + pytest-cov python-xmp-toolkit pytestCheckHook ] ++ runtimeDeps; @@ -83,7 +82,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/jbarlow83/OCRmyPDF"; description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; - license = licenses.gpl3; + license = with licenses; [ mpl20 mit ]; platforms = platforms.linux; maintainers = [ maintainers.kiwi ]; }; diff --git a/nixpkgs/pkgs/tools/text/pbgopy/default.nix b/nixpkgs/pkgs/tools/text/pbgopy/default.nix index 5e1473f8a3c9..d4ed4eb0f03a 100644 --- a/nixpkgs/pkgs/tools/text/pbgopy/default.nix +++ b/nixpkgs/pkgs/tools/text/pbgopy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pbgopy"; diff --git a/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix b/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix index 30e7e58345d6..ca89b7dc2d8a 100644 --- a/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix +++ b/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "the_platinum_searcher"; diff --git a/nixpkgs/pkgs/tools/text/proselint/default.nix b/nixpkgs/pkgs/tools/text/proselint/default.nix index ea72468dc693..143c43f660d1 100644 --- a/nixpkgs/pkgs/tools/text/proselint/default.nix +++ b/nixpkgs/pkgs/tools/text/proselint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonApplication, click, future, six }: +{ lib, fetchurl, buildPythonApplication, click, future, six }: buildPythonApplication rec { pname = "proselint"; diff --git a/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock b/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock index 6c3ce51c6ac2..b1bfe4aaa8bd 100644 --- a/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock +++ b/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock @@ -4,7 +4,7 @@ GEM chronic (0.10.2) highline (2.0.3) rchardet (1.8.0) - reckon (0.6.0) + reckon (0.7.1) chronic (>= 0.3.0) highline (>= 1.5.2) rchardet (>= 1.8.0) @@ -16,4 +16,4 @@ DEPENDENCIES reckon BUNDLED WITH - 2.1.4 + 1.17.2 diff --git a/nixpkgs/pkgs/tools/text/reckon/default.nix b/nixpkgs/pkgs/tools/text/reckon/default.nix index 261149229b64..bbefa94637db 100644 --- a/nixpkgs/pkgs/tools/text/reckon/default.nix +++ b/nixpkgs/pkgs/tools/text/reckon/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { gemdir = ./.; }; in '' + runHook preInstall mkdir -p $out/bin makeWrapper ${env}/bin/reckon $out/bin/reckon + runHook postInstall ''; passthru.updateScript = bundlerUpdateScript "reckon"; diff --git a/nixpkgs/pkgs/tools/text/reckon/gemset.nix b/nixpkgs/pkgs/tools/text/reckon/gemset.nix index 50802ccd805b..09a4e704d08e 100644 --- a/nixpkgs/pkgs/tools/text/reckon/gemset.nix +++ b/nixpkgs/pkgs/tools/text/reckon/gemset.nix @@ -1,5 +1,7 @@ { chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -11,7 +13,7 @@ groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; + remotes = ["https://rubygems.org"]; sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; @@ -21,7 +23,7 @@ groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; + remotes = ["https://rubygems.org"]; sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; type = "gem"; }; @@ -33,9 +35,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zkbmwx5bp2dr54bwhkn831918ijwh022rq45qg38wz2skih7izp"; + sha256 = "0hsmzjxj1f5ma816gag1b3bdjbynhj2szgar955fcs3gbbzv4sk7"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; } diff --git a/nixpkgs/pkgs/tools/text/robodoc/default.nix b/nixpkgs/pkgs/tools/text/robodoc/default.nix new file mode 100644 index 000000000000..e30e8739797a --- /dev/null +++ b/nixpkgs/pkgs/tools/text/robodoc/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "robodoc"; + version = "4.99.44"; + + src = fetchFromGitHub { + owner = "gumpu"; + repo = "ROBODoc"; + rev = "v${version}"; + sha256 = "l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://github.com/gumpu/ROBODoc"; + description = "Documentation Extraction Tool"; + longDescription = '' + ROBODoc is program documentation tool. The idea is to include for every + function or procedure a standard header containing all sorts of + information about the procedure or function. ROBODoc extracts these + headers from the source file and puts them in a separate + autodocs-file. ROBODoc thus allows you to include the program + documentation in the source code and avoid having to maintain two separate + documents. Or as Petteri puts it: "robodoc is very useful - especially for + programmers who don't like writing documents with Word or some other + strange tool." + + ROBODoc can format the headers in a number of different formats: HTML, + RTF, LaTeX, or XML DocBook. In HTML mode it can generate cross links + between headers. You can even include parts of your source code. + + ROBODoc works with many programming languages: For instance C, Pascal, + Shell Scripts, Assembler, COBOL, Occam, Postscript, Forth, Tcl/Tk, C++, + Java -- basically any program in which you can use remarks/comments. + ''; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; all; + }; +} diff --git a/nixpkgs/pkgs/tools/text/rpl/default.nix b/nixpkgs/pkgs/tools/text/rpl/default.nix index f53a1d790806..97a30211621c 100644 --- a/nixpkgs/pkgs/tools/text/rpl/default.nix +++ b/nixpkgs/pkgs/tools/text/rpl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "rpl"; diff --git a/nixpkgs/pkgs/tools/text/schema2ldif/default.nix b/nixpkgs/pkgs/tools/text/schema2ldif/default.nix index 409bbc16a93f..84196ae11197 100644 --- a/nixpkgs/pkgs/tools/text/schema2ldif/default.nix +++ b/nixpkgs/pkgs/tools/text/schema2ldif/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: + +stdenv.mkDerivation rec { pname = "schema2ldif"; version = "1.3"; diff --git a/nixpkgs/pkgs/tools/text/shfmt/default.nix b/nixpkgs/pkgs/tools/text/shfmt/default.nix index 705999639053..cb5bb8a28e81 100644 --- a/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shfmt"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "1kp4ib0a64cc9qylny48ff5q9ciklzx93yhv7fgqhl1v2c7fm1jp"; + sha256 = "sha256-ZeyHidw8iHboo/LHTR9E3Sqj8euaRvDaYbPQMdecsrk="; }; vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29"; diff --git a/nixpkgs/pkgs/tools/text/source-highlight/default.nix b/nixpkgs/pkgs/tools/text/source-highlight/default.nix index 2e60d2a31c0c..c8eb43a51c9d 100644 --- a/nixpkgs/pkgs/tools/text/source-highlight/default.nix +++ b/nixpkgs/pkgs/tools/text/source-highlight/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, boost }: -let - name = "source-highlight"; +stdenv.mkDerivation rec { + pname = "source-highlight"; version = "3.1.9"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz"; + url = "mirror://gnu/src-highlite/${pname}-${version}.tar.gz"; sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs"; }; @@ -26,15 +23,15 @@ stdenv.mkDerivation { enableParallelBuilding = false; - meta = { + meta = with lib; { description = "Source code renderer with syntax highlighting"; + longDescription = '' + GNU Source-highlight, given a source file, produces a document + with syntax highlighting. + ''; homepage = "https://www.gnu.org/software/src-highlite/"; - license = lib.licenses.gpl3Plus; - platforms = with lib.platforms; linux ++ darwin; - longDescription = - '' - GNU Source-highlight, given a source file, produces a document - with syntax highlighting. - ''; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/text/transifex-client/default.nix b/nixpkgs/pkgs/tools/text/transifex-client/default.nix index 411c9cb98998..a0f3ad1c5e37 100644 --- a/nixpkgs/pkgs/tools/text/transifex-client/default.nix +++ b/nixpkgs/pkgs/tools/text/transifex-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi +{ lib, buildPythonApplication, fetchPypi , python-slugify, requests, urllib3, six, setuptools }: buildPythonApplication rec { diff --git a/nixpkgs/pkgs/tools/text/vale/default.nix b/nixpkgs/pkgs/tools/text/vale/default.nix index bc7c43ca6ec4..59f5e7c0c0f8 100644 --- a/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.8.1"; + version = "2.9.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0xvsg5j0nv6p6wskxg4gz79di6p495c78xbwl3xmh0wyk7g78lkx"; + sha256 = "sha256-ItkWmBq1mBVZfHcnqDp8koEAWBH3k9Et2bFA2mNYjVY="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/text/wdiff/default.nix b/nixpkgs/pkgs/tools/text/wdiff/default.nix index afcb649d921d..4d0f87354ad3 100644 --- a/nixpkgs/pkgs/tools/text/wdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/wdiff/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, texinfo, which }: stdenv.mkDerivation rec { - name = "wdiff-1.2.2"; + pname = "wdiff"; + version = "1.2.2"; src = fetchurl { - url = "mirror://gnu/wdiff/${name}.tar.gz"; + url = "mirror://gnu/wdiff/${pname}-${version}.tar.gz"; sha256 = "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl"; }; @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { checkInputs = [ which ]; - meta = { + meta = with lib; { homepage = "https://www.gnu.org/software/wdiff/"; description = "Comparing files on a word by word basis"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ eelco SuperSandro2000 ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/text/xurls/default.nix b/nixpkgs/pkgs/tools/text/xurls/default.nix index b1fd02ca75bb..fa5418b45818 100644 --- a/nixpkgs/pkgs/tools/text/xurls/default.nix +++ b/nixpkgs/pkgs/tools/text/xurls/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, lib, stdenv, fetchFromGitHub }: +{ buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { version = "2.2.0"; diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix index 1326c9175938..61af8102f51e 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, lib, stdenv, python2 - +{ fetchurl, lib, stdenv, python3 +, fetchFromGitHub, autoreconfHook , enableStandardFeatures ? false , sourceHighlight ? null , highlight ? null @@ -144,14 +144,17 @@ let in stdenv.mkDerivation rec { - name = "asciidoc-8.6.9"; + pname = "asciidoc"; + version = "9.0.4"; - src = fetchurl { - url = "mirror://sourceforge/asciidoc/${name}.tar.gz"; - sha256 = "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"; + src = fetchFromGitHub { + owner = "asciidoc"; + repo = "asciidoc-py3"; + rev = version; + sha256 = "1gspxw5i0axymxdjzj5rmhf10gyl2gqr666gz141nv042l9dm5vi"; }; - buildInputs = [ python2 unzip ]; + nativeBuildInputs = [ python3 unzip autoreconfHook ]; # install filters early, so their shebangs are patched too patchPhase = with lib; '' @@ -212,7 +215,7 @@ stdenv.mkDerivation rec { # the odp backend already has that fix. Copy it here until fixed upstream. sed -i "s|'/etc/asciidoc/backends/odt/asciidoc.ott'|os.path.dirname(__file__),'asciidoc.ott'|" \ "$out/etc/asciidoc/backends/odt/a2x-backend.py" - '' + optionalString enableStandardFeatures '' + '' + (if enableStandardFeatures then '' sed -e "s|dot|${graphviz}/bin/dot|g" \ -e "s|neato|${graphviz}/bin/neato|g" \ -e "s|twopi|${graphviz}/bin/twopi|g" \ @@ -222,7 +225,8 @@ stdenv.mkDerivation rec { sed -e "s|run('latex|run('${texlive}/bin/latex|g" \ -e "s|cmd = 'dvipng'|cmd = '${texlive}/bin/dvipng'|g" \ - -i "filters/latex/latex2png.py" + -e "s|cmd = 'dvisvgm'|cmd = '${texlive}/bin/dvisvgm'|g" \ + -i "filters/latex/latex2img.py" sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \ -e "s|run('lilypond|run('${lilypond}/bin/lilypond|g" \ @@ -249,11 +253,13 @@ stdenv.mkDerivation rec { -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ -e "s|^EPUBCHECK =.*|EPUBCHECK = 'nixpkgs_is_missing_epubcheck'|" \ -i a2x.py - '' + '' - for n in $(find "$out" . -name \*.py); do - sed -i -e "s,^#![[:space:]]*.*/bin/env python,#!${python2}/bin/python,g" "$n" - chmod +x "$n" - done + '' else '' + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml')|" \ + -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ + -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ + -i a2x.py + '') + '' + patchShebangs . sed -i -e "s,/etc/vim,,g" Makefile.in ''; diff --git a/nixpkgs/pkgs/tools/typesetting/hevea/default.nix b/nixpkgs/pkgs/tools/typesetting/hevea/default.nix index 97b020d3e21c..ad6427e56224 100644 --- a/nixpkgs/pkgs/tools/typesetting/hevea/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.34"; + name = "hevea-2.35"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "1pzyszxw90klpcmhjqrjfc8cw6c0gm4w2blim8ydyxb6rq6qml1s"; + sha256 = "sha256-8Ym62l0+WzWFXf39tbJwyZT8eiNmsBJQ12E1mtZsnss="; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; diff --git a/nixpkgs/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch b/nixpkgs/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch new file mode 100644 index 000000000000..b146822c9c51 --- /dev/null +++ b/nixpkgs/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch @@ -0,0 +1,95 @@ +--- a/externs.h ++++ b/externs.h +@@ -260,6 +260,9 @@ If you're compiling this, you've got the + /* that can appear correctly on one page. Can be */ + /* increased to any small positive integer. */ + /* */ ++/* MAX_FORMAT The maximum number of characters for sscanf formats */ ++/* for splitting strings with tab-delimited fields. */ ++/* */ + /*****************************************************************************/ + + #define MAX_FULL_LENGTH 8388607 /* 2**23 - 1, about 148 metres */ +@@ -275,6 +278,7 @@ If you're compiling this, you've got the + #define MAX_LEX_STACK 20 + #define MAX_CHARS 256 + #define MAX_HCOPIES 3 ++#define MAX_FORMAT 100 + + /*****************************************************************************/ + /* */ +--- a/z02.c ++++ b/z02.c +@@ -378,7 +378,7 @@ static void srcnext(void) + if( blksize != 0 && chpt < limit ) + { debugcond0(DLA, DD, stack_free <= 1, "srcnext: transferring."); + col = buf; +- while( chtbl[(*--col = *--limit)] != NEWLINE ); ++ while( col > mem_block && chtbl[(*--col = *--limit)] != NEWLINE ); + frst = col + 1; limit++; blksize = 0; + } + +--- a/z33.c ++++ b/z33.c +@@ -847,6 +847,7 @@ BOOLEAN DbRetrieve(OBJECT db, BOOLEAN ga + BOOLEAN DbRetrieveNext(OBJECT db, BOOLEAN *gall, OBJECT *sym, FULL_CHAR *tag, + FULL_CHAR *seq, FILE_NUM *dfnum, long *dfpos, int *dlnum, long *cont) + { FULL_CHAR line[MAX_BUFF], *cline, fname[MAX_BUFF]; int symnum; ++ char format[MAX_FORMAT]; + ifdebug(DPP, D, ProfileOn("DbRetrieveNext")); + debug2(DBS, DD, "DbRetrieveNext( %s, %ld )", string(db), *cont); + assert(reading(db), "DbRetrieveNext: not reading"); +@@ -858,6 +859,8 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA + return FALSE; + } + ++ sprintf(format, "%%d&%%%d[^\t]\t%%%d[^\t]\t%%*[^\t]\t%%ld\t%%d\t%%%d[^\n\f]", MAX_BUFF-1, MAX_BUFF-1, MAX_BUFF-1); ++ + if( in_memory(db) ) + { + /* get next entry from internal database */ +@@ -868,7 +871,7 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA + } + cline = (FULL_CHAR *) db_lines(db)[*cont]; + *gall = (cline[0] == '0' ? 1 : 0); +- sscanf((char *)&cline[*gall], "%d&%[^\t]\t%[^\t]\t%*[^\t]\t%ld\t%d\t%[^\n\f]", ++ sscanf((char *)&cline[*gall], format, + &symnum, tag, seq, dfpos, dlnum, fname); + *cont = *cont + 1; + } +@@ -882,7 +885,7 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA + return FALSE; + } + *gall = (line[0] == '0' ? 1 : 0); +- sscanf((char *)&line[*gall], "%d&%[^\t]\t%[^\t]\t%*[^\t]\t%ld\t%d\t%[^\n\f]", ++ sscanf((char *)&line[*gall], format, + &symnum, tag, seq, dfpos, dlnum, fname); + *cont = ftell(db_filep(db)); + } +--- a/z39.c ++++ b/z39.c +@@ -79,11 +79,13 @@ int strcollcmp(char *a, char *b) + int strcollcmp(char *a, char *b) + { char a1[MAX_BUFF], a2[MAX_BUFF], a3[MAX_BUFF]; + char b1[MAX_BUFF], b2[MAX_BUFF], b3[MAX_BUFF]; ++ char format[MAX_FORMAT]; + int order; ++ sprintf(format, "%%%d[^\t]\t%%%d[^\t]\t%%%d[^\t]", MAX_BUFF-1, MAX_BUFF-1, MAX_BUFF-1); + a1[0] = a2[0] = a3[0] = '\0'; +- sscanf(a, "%[^\t]\t%[^\t]\t%[^\t]", a1, a2, a3); ++ sscanf(a, format, a1, a2, a3); + b1[0] = b2[0] = b3[0] = '\0'; +- sscanf(b, "%[^\t]\t%[^\t]\t%[^\t]", b1, b2, b3); ++ sscanf(b, format, b1, b2, b3); + order = strcoll(a1, b1); + if( order == 0 ) + { +@@ -251,7 +253,7 @@ FULL_CHAR *StringQuotedWord(OBJECT x) + *q++ = CH_QUOTE; + for( p = string(x); *p != '\0'; p++ ) + { +- for( r = (FULL_CHAR *) quoted_string[*p]; *r != '\0'; *q++ = *r++ ); ++ for( r = (FULL_CHAR *) quoted_string[*p]; *r != '\0' && q < &buff[MAX_BUFF-2]; *q++ = *r++ ); + } + *q++ = CH_QUOTE; + *q++ = '\0'; diff --git a/nixpkgs/pkgs/tools/typesetting/lout/default.nix b/nixpkgs/pkgs/tools/typesetting/lout/default.nix index eaeaeb406069..4737c5d74097 100644 --- a/nixpkgs/pkgs/tools/typesetting/lout/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/lout/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { sha256 = "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix"; }; + patches = [ + # https://build.opensuse.org/request/show/843612 + ./CVE-2019-19917-and-CVE-2019-19918.patch + ]; + buildInputs = [ ghostscript ]; builder = ./builder.sh; diff --git a/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index 40606199b83d..805373e8ee6c 100644 --- a/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -2,23 +2,25 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.9"; + version = "0.8.1"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "18q8i8lh8w127vzw697n0bzv4mchhna1p4s672hjvy39l3ls8rlj5nwq5npr5fry06yil62sjmq4652vw29r8l49wwk5j82a8l2nr7c"; + sha512 = "28kwj053lm3510cq7pg4rqx6linv5zphhm2h6r9icigclfq7j9ybnd7vqbn2v4ay0r8ghac5cjbqab5zy8cjlgllwhwsxg0dnk75x2i"; }; nativeBuildInputs = [ which ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; configurePhase = '' + runHook preConfigure ./configure PREFIX=''${!outputDev} \ BINDIR=''${!outputBin}/bin \ LIBDIR=''${!outputLib}/lib \ MANDIR=''${!outputMan}/share/man + runHook postConfigure ''; # Fix lib extension so that fixDarwinDylibNames detects it diff --git a/nixpkgs/pkgs/tools/typesetting/mmark/default.nix b/nixpkgs/pkgs/tools/typesetting/mmark/default.nix index 70f7e8f53ca8..bc5ddcc9d751 100644 --- a/nixpkgs/pkgs/tools/typesetting/mmark/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/mmark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mmark"; diff --git a/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix b/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix index 989f61f4592e..7b20d230b9f7 100644 --- a/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, libreoffice }: +{ lib, fetchurl, pythonPackages, libreoffice }: pythonPackages.buildPythonApplication rec { diff --git a/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix b/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix index 03ce2eb5ee80..73370eb011e4 100644 --- a/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages +{ lib, stdenv, fetchFromGitHub, ruby, dune_2, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let @@ -35,12 +35,12 @@ let in stdenv.mkDerivation rec { pname = "satysfi"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "gfngfn"; repo = "SATySFi"; rev = "v${version}"; - sha256 = "1y72by6d15bc6qb1lv1ch6cm1i74gyr0w127nnvs2s657snm0y1n"; + sha256 = "1wdmcz2b7v37msmsvjvbyj7x5a80qfws8a7w72q0g5959pw5fdxj"; fetchSubmodules = true; }; @@ -70,7 +70,8 @@ in meta = with lib; { homepage = "https://github.com/gfngfn/SATySFi"; description = "A statically-typed, functional typesetting system"; - license = licenses.lgpl3; + changelog = "https://github.com/gfngfn/SATySFi/blob/v${version}/CHANGELOG.md"; + license = licenses.lgpl3Only; maintainers = [ maintainers.mt-caret maintainers.marsam ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/typesetting/sile/default.nix b/nixpkgs/pkgs/tools/typesetting/sile/default.nix index db4fb9d0f72e..eef7768be8fd 100644 --- a/nixpkgs/pkgs/tools/typesetting/sile/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/sile/default.nix @@ -30,6 +30,7 @@ let luarepl luasec luasocket + luautf8 penlight stdlib vstruct @@ -38,11 +39,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.13"; + version = "0.10.14"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "19k4r7wfszml4dac8cm1hx9rb1im3psigcidz8bdm9j9jzpd01yj"; + sha256 = "100f6iangpiwlv8k55d134w856r0xwsgw90s1rkkmqa5syziwni5"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index f66469f5ba43..fd1815efa945 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -2,7 +2,7 @@ , texlive , zlib, libiconv, libpng, libX11 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext -, perl, perlPackages, python2Packages, pkg-config +, perl, perlPackages, python3Packages, pkg-config , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr , brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , makeWrapper, shortenPerlShebang @@ -321,13 +321,13 @@ latexindent = perlPackages.buildPerlPackage rec { }; -pygmentex = python2Packages.buildPythonApplication rec { +pygmentex = python3Packages.buildPythonApplication rec { pname = "pygmentex"; inherit (src) version; src = lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); - propagatedBuildInputs = with python2Packages; [ pygments chardet ]; + propagatedBuildInputs = with python3Packages; [ pygments chardet ]; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix index bf7b7952f514..9993263c1f6f 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -29,7 +29,7 @@ let [ "de-macro" "pythontex" "dviasm" "texliveonfly" ]; pkgNeedsRuby = pkg: pkg.tlType == "run" && pkg.pname == "match-parens"; extraInputs = - lib.optional (lib.any pkgNeedsPython splitBin.wrong) python + lib.optional (lib.any pkgNeedsPython splitBin.wrong) python3 ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index cc30024ca0f3..72b54f5ebef5 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min -, makeWrapper, python, ruby, perl +, makeWrapper, python3, ruby, perl , useFixedHashes ? true , recurseIntoAttrs }: @@ -25,7 +25,7 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv lib makeWrapper writeText - stdenv python ruby perl; + stdenv python3 ruby perl; ghostscript = ghostscriptX; # could be without X, probably, but we use X above }; diff --git a/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix index 29fd21ed31fe..2f6d169d0cb5 100644 --- a/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }: mkDerivation { pname = "tikzit"; diff --git a/nixpkgs/pkgs/tools/video/atomicparsley/default.nix b/nixpkgs/pkgs/tools/video/atomicparsley/default.nix index 41d4dd63d589..d07d6e534297 100644 --- a/nixpkgs/pkgs/tools/video/atomicparsley/default.nix +++ b/nixpkgs/pkgs/tools/video/atomicparsley/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "atomicparsley"; - version = "20210114.184825.1dbe1be"; + version = "20210124.204813.840499f"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "sha256-dyrfr3bsRzEWaAr9K+7SchFVl63cZawyIjmstOI9e5I="; + sha256 = "sha256-/bkfgIWlQobaiad2WD7DUUrTwfYurP7YAINaLTwBEcE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/video/rav1e/default.nix b/nixpkgs/pkgs/tools/video/rav1e/default.nix index ae300f47b19e..ca3fd72e878d 100644 --- a/nixpkgs/pkgs/tools/video/rav1e/default.nix +++ b/nixpkgs/pkgs/tools/video/rav1e/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.4.0-alpha"; + version = "0.4.0"; src = stdenv.mkDerivation rec { name = "${pname}-${version}-source"; @@ -11,12 +11,12 @@ rustPlatform.buildRustPackage rec { owner = "xiph"; repo = "rav1e"; rev = "v${version}"; - sha256 = "1fw1gxi8330kfhl9hfzpn0lcmyn5604lc74d6g6iadzz2hmv4mb9"; + sha256 = "09w4476x6bdmh9pv4lchrzvfvbjvxxraa9f4dlbwgli89lcg9fcf"; }; cargoLock = fetchurl { - url = "https://github.com/xiph/rav1e/releases/download/v0.4.0-alpha/Cargo.lock"; - sha256 = "002s2wlzpifn5p2ahdrjdkjl48c1wr6fslg0if4gf9qpl8qj05fl"; + url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock"; + sha256 = "0rkyi010z6qmwdpvzlzyrrhs8na929g11lszhbqx5y0gh3y5nyik"; }; installPhase = '' @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1i5ldqb77rrhfxxf9krp7f6yj3h6rsqak6hf23fd2znhgmi7psb1"; + cargoSha256 = "1iza2cws28hd4a3q90mc90l8ql4bsgapdznfr6bl65cjam43i5sg"; nativeBuildInputs = [ nasm cargo-c ]; postBuild = '' diff --git a/nixpkgs/pkgs/tools/video/untrunc/default.nix b/nixpkgs/pkgs/tools/video/untrunc/default.nix deleted file mode 100644 index 3ef025f5875c..000000000000 --- a/nixpkgs/pkgs/tools/video/untrunc/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, gcc, libav_12, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "untrunc"; - version = "2020.02.09"; - - src = fetchFromGitHub { - owner = "ponchio"; - repo = "untrunc"; - rev = "4eed44283168c727ace839ff7590092fda2e0848"; - sha256 = "0nfj67drc6bxqlkf8a1iazqhi0w38a7rjrb2bpa74gwq6xzygvbr"; - }; - - buildInputs = [ gcc libav_12 ]; - - # Untrunc uses the internal libav headers 'h264dec.h' and 'config.h'. - # The latter must be created through 'configure'. - libavConfiguredSrc = libav_12.overrideAttrs (oldAttrs: { - name = "libav-configured-src"; - outputs = [ "out" ]; - phases = [ "unpackPhase" "patchPhase" "configurePhase" "installPhase" ]; - installPhase = "cp -r . $out"; - }); - - buildCommand = '' - mkdir -p $out/bin - g++ -o $out/bin/untrunc \ - -Wno-deprecated-declarations \ - $src/file.cpp $src/main.cpp $src/track.cpp $src/atom.cpp $src/mp4.cpp \ - -I$libavConfiguredSrc -lavformat -lavcodec -lavutil - ''; - - meta = with lib; { - description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video"; - license = licenses.gpl2; - homepage = "https://github.com/ponchio/untrunc"; - maintainers = [ maintainers.earvstedt ]; - }; -} diff --git a/nixpkgs/pkgs/tools/video/vnc2flv/default.nix b/nixpkgs/pkgs/tools/video/vnc2flv/default.nix index ba28ef08c8f9..88ec2f22b89b 100644 --- a/nixpkgs/pkgs/tools/video/vnc2flv/default.nix +++ b/nixpkgs/pkgs/tools/video/vnc2flv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "vnc2flv"; diff --git a/nixpkgs/pkgs/tools/virtualization/awless/default.nix b/nixpkgs/pkgs/tools/virtualization/awless/default.nix index 3faf90ab4ac6..061dd486e0d8 100644 --- a/nixpkgs/pkgs/tools/virtualization/awless/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/awless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "awless"; diff --git a/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix index fa8e96def24a..796ea36eacfd 100644 --- a/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, glibcLocales }: +{ lib, python3, glibcLocales }: let localPython = python3.override { diff --git a/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix b/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix index a7de9ae8b595..d06a2b4a17ef 100644 --- a/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, buildGoPackage, fetchFromGitHub +{ lib, pkg-config, buildGoPackage, fetchFromGitHub , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap }: diff --git a/nixpkgs/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix b/nixpkgs/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix new file mode 100644 index 000000000000..4068d71383c3 --- /dev/null +++ b/nixpkgs/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, boto3 }: + +buildPythonPackage rec { + pname = "ec2instanceconnectcli"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-VaCyCnEhSx1I3bNo57p0IXf92+tO1tT7KSUXzO1IyIU="; + }; + + propagatedBuildInputs = [ boto3 ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "ec2instanceconnectcli" ]; + + meta = with lib; { + description = "Command Line Interface for AWS EC2 Instance Connect"; + homepage = "https://github.com/aws/aws-ec2-instance-connect-cli"; + license = licenses.apsl20; + maintainers = with maintainers; [ yurrriq ]; + }; +} diff --git a/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix b/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix index 371a867d4ddb..88e83f42733e 100644 --- a/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python2Packages }: +{ lib, fetchgit, python2Packages }: let inherit (python2Packages) buildPythonApplication boto m2crypto; diff --git a/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix b/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix index 6f036795e720..fe31c64952a5 100644 --- a/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "marathonctl-unstable"; diff --git a/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix index e3017e98a070..511c61caf578 100644 --- a/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.1.17"; + version = "0.1.18"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "13cp7qpxchnyxdm26xwdcp557nj16f4h8vlj0p4h79z5g7pcklln"; + sha256 = "sha256-ZrzW1sx0wCuaICONS3SR0VsqDj2ZUM53LaB5Wj1s9uc="; }; - vendorSha256 = "0gib9s09lz91wawbms9zq4wc5k6bdxfzpxm8q92h0bsjw1bj1hzs"; + vendorSha256 = "sha256-eeR316CKlAqWxlYcPZVlP260NR7WHfmCVE3PywMay/w="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" diff --git a/nixpkgs/pkgs/tools/virtualization/udocker/default.nix b/nixpkgs/pkgs/tools/virtualization/udocker/default.nix index c971dfcb1bd0..fb067de82125 100644 --- a/nixpkgs/pkgs/tools/virtualization/udocker/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/udocker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: +{ lib, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: buildPythonApplication rec { diff --git a/nixpkgs/pkgs/top-level/agda-packages.nix b/nixpkgs/pkgs/top-level/agda-packages.nix index 601ab6d42b9d..7434134d28f2 100644 --- a/nixpkgs/pkgs/top-level/agda-packages.nix +++ b/nixpkgs/pkgs/top-level/agda-packages.nix @@ -11,6 +11,8 @@ let in { inherit mkDerivation; + lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; }); + agda = withPackages [] // { inherit withPackages; }; standard-library = callPackage ../development/libraries/agda/standard-library { diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index 77f7516810ae..19b1cf91c1b1 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -85,6 +85,8 @@ mapAliases ({ buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 bundler_HEAD = bundler; # added 2015-11-15 + calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 + calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02 cantarell_fonts = cantarell-fonts; # added 2018-03-03 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20 @@ -113,16 +115,23 @@ mapAliases ({ cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 + cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 cv = progress; # added 2015-09-06 d1x_rebirth = dxx-rebirth; # added 2018-04-25 d2x_rebirth = dxx-rebirth; # added 2018-04-25 + dart_dev = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 + dart_old = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 + dart_stable = dart; # added 2020-01-15 dat = nodePackages.dat; dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # added 2020-09-20 dbus_daemon = dbus.daemon; # added 2018-04-25 dbus_glib = dbus-glib; # added 2018-02-25 dbus_libs = dbus; # added 2018-04-25 diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 + disnix = throw "disnix has been removed."; # added 2021-01-27 + disnixos = throw "disnixos has been removed."; # added 2021-01-27 + DisnixWebService = throw "DisnixWebService has been removed."; # added 2021-01-27 dbus_tools = dbus.out; # added 2018-04-25 deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 deadpixi-sam = deadpixi-sam-unstable; @@ -139,7 +148,10 @@ mapAliases ({ docker_compose = docker-compose; # 2018-11-10 draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 + dydisnix = throw "dydisnix has been removed."; # added 2021-01-27 + dysnomia = throw "dysnomia has been removed."; # added 2021-01-27 dwarf_fortress = dwarf-fortress; # added 2016-01-23 + dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 @@ -168,6 +180,12 @@ mapAliases ({ firestr = throw "firestr has been removed."; # added 2019-12-08 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 flameGraph = flamegraph; # added 2018-04-25 + flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 + flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 + flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 + flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25 + flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 + flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 foldingathome = fahclient; # added 2020-09-03 font-awesome-ttf = font-awesome; # 2018-02-25 @@ -229,6 +247,7 @@ mapAliases ({ gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 + gobby5 = gobby; # added 2021-02-01 gobjectIntrospection = gobject-introspection; # added 2018-12-02 goimports = gotools; # added 2018-09-16 gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 @@ -247,10 +266,12 @@ mapAliases ({ gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 + hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 heimdalFull = heimdal; # added 2018-05-01 hepmc = hepmc2; # added 2019-08-05 hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 + ht-rust = xh; # added 2021-02-13 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 @@ -370,6 +391,7 @@ mapAliases ({ mono-zeroconf = throw "mono-zeroconf was deprecated on 2019-09-20: abandoned by upstream."; mozart = mozart2-binary; # added 2019-09-23 mozart-binary = mozart2-binary; # added 2019-09-23 + mpd_clientlib = libmpdclient; # added 2021-02-11 mpich2 = mpich; # added 2018-08-06 msf = metasploit; # added 2018-04-25 libmsgpack = msgpack; # added 2018-08-17 @@ -401,7 +423,9 @@ mapAliases ({ oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 - openjpeg_2_1 = openjpeg_2; # added 2018-10-25 + openisns = open-isns; # added 2020-01-28 + openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 + openjpeg_2 = openjpeg; # added 2021-01-25 opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 @@ -475,6 +499,7 @@ mapAliases ({ piwik = matomo; # added 2018-01-16 pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18 pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 + planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # added 2021-02-02 pltScheme = racket; # just to be sure plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 pmtools = acpica-tools; # added 2018-11-01 @@ -511,6 +536,7 @@ mapAliases ({ pyo3-pack = maturin; pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10 pulseaudioLight = pulseaudio; # added 2018-04-25 + pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and pulseeffects-pw if you use PipeWire."; # added 2021-02-13, move back once we default to PipeWire audio server. phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 @@ -594,6 +620,7 @@ mapAliases ({ smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 + solr_8 = solr; # added 2021-01-30 spectral = neochat; # added 2020-12-27 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; @@ -689,6 +716,7 @@ mapAliases ({ ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 unifiStable = unifi6; # added 2020-12-28 + untrunc = untrunc-anthwlock; # added 2021-02-01 usb_modeswitch = usb-modeswitch; # added 2016-05-10 usbguard-nox = usbguard; # added 2019-09-04 utillinux = util-linux; # added 2020-11-24 @@ -697,6 +725,7 @@ mapAliases ({ v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38"; vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 + venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 vimbWrapper = vimb; # added 2015-01 vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 @@ -715,6 +744,7 @@ mapAliases ({ wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 xp-pen-g430 = pentablet-driver; # added 2020-05-03 + xdg_utils = xdg-utils; # added 2021-02-01 xfceUnstable = xfce4-14; # added 2019-09-17 xfce4-14 = xfce; xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 @@ -733,6 +763,7 @@ mapAliases ({ xv = xxv; # added 2020-02-22 youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; + yuzu = yuzu-mainline; # added 2021-01-25 zdfmediathk = mediathekview; # added 2019-01-19 gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell @@ -816,7 +847,7 @@ mapAliases ({ todolist = throw "todolist is now ultralist."; # added 2020-12-27 - /* Cleanup before 21.03 */ + /* Cleanup before 21.05 */ riot-desktop = throw "riot-desktop is now element-desktop!"; riot-web = throw "riot-web is now element-web"; @@ -825,6 +856,8 @@ mapAliases ({ /* Added 2021-01-02 */ ttyrec = ovh-ttyrec; + zplugin = zinit; # Added 2021-01-30 + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 2848e160b9d0..4590c46fe5b3 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -112,17 +112,21 @@ in { name = "auto-blas-hook"; deps = [ blas lapack ]; } ../build-support/setup-hooks/audit-blas.sh; - autoreconfHook = makeSetupHook - { deps = [ autoconf automake gettext libtool ]; } - ../build-support/setup-hooks/autoreconf.sh; - - autoreconfHook264 = makeSetupHook - { deps = [ autoconf264 automake111x gettext libtool ]; } - ../build-support/setup-hooks/autoreconf.sh; + autoreconfHook = callPackage ( + { makeSetupHook, autoconf, automake, gettext, libtool }: + makeSetupHook + { deps = [ autoconf automake gettext libtool ]; } + ../build-support/setup-hooks/autoreconf.sh + ) { }; + + autoreconfHook264 = autoreconfHook.override { + autoconf = autoconf264; + automake = automake111x; + }; - autoreconfHook269 = makeSetupHook - { deps = [ autoconf269 automake gettext libtool ]; } - ../build-support/setup-hooks/autoreconf.sh; + autoreconfHook269 = autoreconfHook.override { + autoconf = autoconf269; + }; autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; @@ -152,6 +156,8 @@ in fiche = callPackage ../servers/fiche { }; + fishnet = callPackage ../servers/fishnet { }; + avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; @@ -212,6 +218,8 @@ in containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; + coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; + cp437 = callPackage ../tools/misc/cp437 { }; cpu-x = callPackage ../applications/misc/cpu-x { }; @@ -224,6 +232,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + each = callPackage ../tools/text/each { }; + eclipse-mat = callPackage ../development/tools/eclipse-mat { }; glade = callPackage ../development/tools/glade { }; @@ -287,6 +297,8 @@ in docker-sync = callPackage ../tools/misc/docker-sync { }; + dockle = callPackage ../development/tools/dockle { }; + docui = callPackage ../tools/misc/docui { }; dotfiles = callPackage ../applications/misc/dotfiles { }; @@ -695,6 +707,10 @@ in afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; + agate = callPackage ../servers/gemini/agate { + inherit (darwin.apple_sdk.frameworks) Security; + }; + agda-pkg = callPackage ../development/tools/agda-pkg { }; agrep = callPackage ../tools/text/agrep { }; @@ -721,8 +737,15 @@ in aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; + ajour = callPackage ../tools/games/ajour { + inherit (gnome3) zenity; + inherit (plasma5Packages) kdialog; + }; + albert = libsForQt5.callPackage ../applications/misc/albert {}; + gobgp = callPackage ../tools/networking/gobgp { }; + metapixel = callPackage ../tools/graphics/metapixel { }; ### APPLICATIONS/TERMINAL-EMULATORS @@ -884,7 +907,12 @@ in inherit (androidenv.androidPkgs_9_0) build-tools; }; - appimage-run = callPackage ../tools/package-management/appimage-run {}; + appimage-run = callPackage ../tools/package-management/appimage-run { }; + appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix { + appimage-run = appimage-run.override { + appimage-run-tests = null; /* break boostrap cycle for passthru.tests */ + }; + }; appimagekit = callPackage ../tools/package-management/appimagekit {}; @@ -989,6 +1017,8 @@ in aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; + aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { }; + aws-nuke = callPackage ../tools/admin/aws-nuke { }; aws-okta = callPackage ../tools/security/aws-okta { }; @@ -1019,6 +1049,8 @@ in boxes = callPackage ../tools/text/boxes { }; + boundary = callPackage ../tools/networking/boundary { }; + chamber = callPackage ../tools/admin/chamber { }; charm = callPackage ../applications/misc/charm { }; @@ -1086,6 +1118,8 @@ in bmap-tools = callPackage ../tools/misc/bmap-tools { }; + bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; + bonnie = callPackage ../tools/filesystems/bonnie { }; bonfire = callPackage ../tools/misc/bonfire { }; @@ -1101,6 +1135,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + callaudiod = callPackage ../applications/audio/callaudiod { }; + calls = callPackage ../applications/networking/calls { }; inherit (nodePackages) castnow; @@ -1136,6 +1172,8 @@ in go-check = callPackage ../development/tools/check { }; + go-cve-search = callPackage ../tools/security/go-cve-search { }; + chkcrontab = callPackage ../tools/admin/chkcrontab { }; claws = callPackage ../tools/misc/claws { }; @@ -1231,6 +1269,8 @@ in fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + flavours = callPackage ../applications/misc/flavours { }; + flood = nodePackages.flood; fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; @@ -1245,6 +1285,8 @@ in gaia = callPackage ../development/libraries/gaia { }; + galene = callPackage ../servers/web-apps/galene {}; + gamecube-tools = callPackage ../development/tools/gamecube-tools { }; gammy = qt5.callPackage ../tools/misc/gammy { }; @@ -1295,7 +1337,9 @@ in gremlin-console = callPackage ../applications/misc/gremlin-console { }; - grex = callPackage ../tools/misc/grex { }; + grex = callPackage ../tools/misc/grex { + inherit (darwin.apple_sdk.frameworks) Security; + }; gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; @@ -1840,6 +1884,8 @@ in chelf = callPackage ../tools/misc/chelf { }; + chisel = callPackage ../tools/networking/chisel { }; + cht-sh = callPackage ../tools/misc/cht.sh { }; ckbcomp = callPackage ../tools/X11/ckbcomp { }; @@ -2098,6 +2144,8 @@ in dosage = callPackage ../applications/graphics/dosage { }; + dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { }; + dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; dozenal = callPackage ../applications/misc/dozenal { }; @@ -2418,6 +2466,8 @@ in interlock = callPackage ../servers/interlock {}; + iotools = callPackage ../tools/misc/iotools { }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; @@ -2626,10 +2676,10 @@ in pbgopy = callPackage ../tools/text/pbgopy { }; - pbpst = callPackage ../applications/misc/pbpst { }; - pbzx = callPackage ../tools/compression/pbzx { }; + pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; + persepolis = python3Packages.callPackage ../tools/networking/persepolis { wrapQtAppsHook = qt5.wrapQtAppsHook; }; @@ -2825,25 +2875,28 @@ in appleseed = callPackage ../tools/graphics/appleseed { }; + apple-music-electron = callPackage ../applications/audio/apple-music-electron { }; + arping = callPackage ../tools/networking/arping { }; arpoison = callPackage ../tools/networking/arpoison { }; asciidoc = callPackage ../tools/typesetting/asciidoc { - inherit (python2Packages) matplotlib numpy aafigure recursivePthLoader; - w3m = w3m-batch; + inherit (python3.pkgs) matplotlib numpy aafigure recursivePthLoader; enableStandardFeatures = false; }; asciidoc-full = appendToName "full" (asciidoc.override { - inherit (python2Packages) pygments; + inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; + w3m = w3m-batch; enableStandardFeatures = true; }); asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { - inherit (python2Packages) pygments; + inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; + w3m = w3m-batch; enableStandardFeatures = true; enableExtraPlugins = true; }); @@ -2883,6 +2936,16 @@ in beanstalkd = callPackage ../servers/beanstalkd { }; + bee = callPackage ../applications/networking/bee/bee.nix { + version = "release"; + }; + + bee-unstable = bee.override { + version = "unstable"; + }; + + bee-clef = callPackage ../applications/networking/bee/bee-clef.nix { }; + beets = callPackage ../tools/audio/beets { pythonPackages = python3Packages; }; @@ -3045,6 +3108,8 @@ in cjdns = callPackage ../tools/networking/cjdns { }; + cjson = callPackage ../development/libraries/cjson { }; + cksfv = callPackage ../tools/networking/cksfv { }; clementine = libsForQt514.callPackage ../applications/audio/clementine { @@ -3062,7 +3127,7 @@ in circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_20_12_0; + citrix_workspace = citrix_workspace_21_01_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_20_04_0 @@ -3070,6 +3135,7 @@ in citrix_workspace_20_09_0 citrix_workspace_20_10_0 citrix_workspace_20_12_0 + citrix_workspace_21_01_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -3683,6 +3749,8 @@ in edid-generator = callPackage ../tools/misc/edid-generator { }; + edir = callPackage ../tools/misc/edir { }; + editres = callPackage ../tools/graphics/editres { }; edit = callPackage ../applications/editors/edit { }; @@ -3767,7 +3835,7 @@ in volctl = callPackage ../tools/audio/volctl { }; - vorta = python3Packages.callPackage ../applications/backup/vorta { }; + vorta = libsForQt5.callPackage ../applications/backup/vorta { }; utahfs = callPackage ../applications/networking/utahfs { }; @@ -3791,7 +3859,7 @@ in wsl-open = callPackage ../tools/misc/wsl-open { }; - xkcdpass = with pythonPackages; toPythonApplication xkcdpass; + xkcdpass = with python3Packages; toPythonApplication xkcdpass; xob = callPackage ../tools/X11/xob { }; @@ -3930,7 +3998,9 @@ in eva = callPackage ../tools/misc/eva { }; - exa = callPackage ../tools/misc/exa { }; + exa = callPackage ../tools/misc/exa { + inherit (darwin.apple_sdk.frameworks) Security; + }; exempi = callPackage ../development/libraries/exempi { stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv; @@ -4219,6 +4289,8 @@ in mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; + freedroid = callPackage ../games/freedroid { }; + freedroidrpg = callPackage ../games/freedroidrpg { }; freenukum = callPackage ../games/freenukum { }; @@ -4295,6 +4367,8 @@ in gtk = gtk3; }; + free42 = callPackage ../applications/misc/free42 { }; + galen = callPackage ../development/tools/galen {}; gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; @@ -4775,6 +4849,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + robodoc = callPackage ../tools/text/robodoc { }; + ucg = callPackage ../tools/text/ucg { }; grive2 = callPackage ../tools/filesystems/grive2 { }; @@ -4930,9 +5006,7 @@ in hdf4 = null; }; - haproxy = callPackage ../tools/networking/haproxy { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; + haproxy = callPackage ../tools/networking/haproxy { }; hackertyper = callPackage ../tools/misc/hackertyper { }; @@ -4958,8 +5032,6 @@ in haste-client = callPackage ../tools/misc/haste-client { }; - hal-flash = callPackage ../os-specific/linux/hal-flash { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; half = callPackage ../development/libraries/half { }; @@ -5076,6 +5148,8 @@ in http-getter = callPackage ../applications/networking/flent/http-getter.nix { }; + httpdump = callPackage ../tools/security/httpdump { }; + httpie = callPackage ../tools/networking/httpie { }; httping = callPackage ../tools/networking/httping {}; @@ -5170,6 +5244,8 @@ in packages = config.ihaskell.packages or (self: []); }; + ijq = callPackage ../development/tools/ijq { }; + iruby = callPackage ../applications/editors/jupyter-kernels/iruby { }; ike-scan = callPackage ../tools/security/ike-scan { }; @@ -5276,7 +5352,9 @@ in ispike = callPackage ../development/libraries/science/robotics/ispike { }; - isync = callPackage ../tools/networking/isync { }; + isync = callPackage ../tools/networking/isync { + inherit (darwin.apple_sdk.frameworks) Security; + }; itm-tools = callPackage ../development/tools/misc/itm-tools { }; @@ -5363,7 +5441,7 @@ in jo = callPackage ../development/tools/jo { }; - jrnl = callPackage ../applications/misc/jrnl { }; + jrnl = python3Packages.callPackage ../applications/misc/jrnl { }; jsawk = callPackage ../tools/text/jsawk { }; @@ -5767,6 +5845,8 @@ in np2kai = callPackage ../misc/emulators/np2kai { }; + ox = callPackage ../applications/editors/ox { }; + file-rename = callPackage ../tools/filesystems/file-rename { }; kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {}; @@ -5929,7 +6009,8 @@ in inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets_4_0; + libwebsockets_4_0 + libwebsockets_4_1; libwebsockets = libwebsockets_3_2; licensee = callPackage ../tools/package-management/licensee { }; @@ -5992,7 +6073,7 @@ in lzip = callPackage ../tools/compression/lzip { }; - luxcorerender = callPackage ../tools/graphics/luxcorerender { qt5 = qt514; }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { }; xz = callPackage ../tools/compression/xz { }; lzma = xz; # TODO: move to aliases.nix @@ -6007,6 +6088,8 @@ in madlang = haskell.lib.justStaticExecutables haskellPackages.madlang; + maeparser = callPackage ../development/libraries/maeparser { }; + mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { }; maildrop = callPackage ../tools/networking/maildrop { }; @@ -6439,16 +6522,13 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = nomad_0_12; + nomad = nomad_1_0; # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. - nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { - buildGoPackage = buildGo114Package; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; - }; + # Upstream partially documents used Go versions here + # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { buildGoPackage = buildGo114Package; inherit (linuxPackages) nvidia_x11; @@ -6608,6 +6688,8 @@ in opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; + openfpgaloader = callPackage ../development/tools/misc/openfpgaloader { }; + openfortivpn = callPackage ../tools/networking/openfortivpn { }; obexfs = callPackage ../tools/bluetooth/obexfs { }; @@ -6795,6 +6877,8 @@ in ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; + ovito = libsForQt5.callPackage ../applications/graphics/ovito { }; + owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -6914,6 +6998,8 @@ in pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; + pcsc-safenet = callPackage ../tools/security/pcsc-safenet { }; + pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { }; ifdnfc = callPackage ../tools/security/ifdnfc { }; @@ -7043,6 +7129,8 @@ in tautulli = python3Packages.callPackage ../servers/tautulli { }; + pleroma-otp = callPackage ../servers/pleroma-otp { }; + ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; }; @@ -7105,6 +7193,8 @@ in povray = callPackage ../tools/graphics/povray { }; + power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; + ppl = callPackage ../development/libraries/ppl { }; pplatex = callPackage ../tools/typesetting/tex/pplatex { }; @@ -7157,6 +7247,8 @@ in pastebinit = callPackage ../tools/misc/pastebinit { }; + pifi = callPackage ../applications/audio/pifi { }; + pmacct = callPackage ../tools/networking/pmacct { }; pmix = callPackage ../development/libraries/pmix { }; @@ -7235,9 +7327,15 @@ in rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; - rtaudio = callPackage ../development/libraries/audio/rtaudio { }; + rtaudio = callPackage ../development/libraries/audio/rtaudio { + jack = libjack2; + inherit (darwin.apple_sdk.frameworks) CoreAudio; + }; - rtmidi = callPackage ../development/libraries/audio/rtmidi { }; + rtmidi = callPackage ../development/libraries/audio/rtmidi { + jack = libjack2; + inherit (darwin.apple_sdk.frameworks) CoreMIDI CoreAudio CoreServices; + }; openmpi = callPackage ../development/libraries/openmpi { }; @@ -7860,6 +7958,8 @@ in soapui = callPackage ../applications/networking/soapui { }; + spglib = callPackage ../development/libraries/spglib { }; + ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; sshguard = callPackage ../tools/security/sshguard {}; @@ -7868,6 +7968,8 @@ in ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { }; + ssh-to-pgp = callPackage ../tools/security/ssh-to-pgp { }; + suricata = callPackage ../applications/networking/ids/suricata { python = python3; }; @@ -7882,8 +7984,6 @@ in sonar-scanner-cli = callPackage ../tools/security/sonar-scanner-cli { }; solr = callPackage ../servers/search/solr { }; - solr_7 = solr; - solr_8 = solr; solvespace = callPackage ../applications/graphics/solvespace { }; @@ -7915,6 +8015,8 @@ in stubby = callPackage ../tools/networking/stubby { }; + surface-control = callPackage ../applications/misc/surface-control { }; + syntex = callPackage ../tools/graphics/syntex {}; sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; @@ -8195,7 +8297,7 @@ in textadept11 = callPackage ../applications/editors/textadept/11 { }; - texworks = libsForQt514.callPackage ../applications/editors/texworks { }; + texworks = libsForQt5.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; @@ -8281,6 +8383,8 @@ in tmuxinator = callPackage ../tools/misc/tmuxinator { }; + tmux-mem-cpu-load = callPackage ../tools/misc/tmux-mem-cpu-load { }; + tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { }; tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); @@ -8289,7 +8393,9 @@ in toilet = callPackage ../tools/misc/toilet { }; - tokei = callPackage ../development/tools/misc/tokei { }; + tokei = callPackage ../development/tools/misc/tokei { + inherit (darwin.apple_sdk.frameworks) Security; + }; toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; @@ -8333,10 +8439,14 @@ in trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules {}; + trezorctl = with python3Packages; toPythonApplication trezor; + trezord = callPackage ../servers/trezord { }; trezor_agent = with python3Packages; toPythonApplication trezor_agent; + trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -8421,6 +8531,8 @@ in libX11 = xorg.libX11; }; + twitch-chat-downloader = python3Packages.callPackage ../applications/misc/twitch-chat-downloader { }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; twtxt = callPackage ../applications/networking/twtxt { }; @@ -8477,12 +8589,12 @@ in untex = callPackage ../tools/text/untex { }; - untrunc = callPackage ../tools/video/untrunc { }; - untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; up = callPackage ../tools/misc/up { }; + upterm = callPackage ../tools/misc/upterm { }; + upx = callPackage ../tools/compression/upx { }; uq = callPackage ../misc/uq { }; @@ -8588,6 +8700,10 @@ in vix = callPackage ../tools/misc/vix { }; + vkBasalt = callPackage ../tools/graphics/vkBasalt { + vkBasalt32 = pkgsi686Linux.vkBasalt; + }; + vnc2flv = callPackage ../tools/video/vnc2flv {}; vncrec = callPackage ../tools/video/vncrec { }; @@ -8736,6 +8852,8 @@ in inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; }; + htmltest = callPackage ../development/tools/htmltest { }; + rcm = callPackage ../tools/misc/rcm {}; td = callPackage ../tools/misc/td { }; @@ -8888,10 +9006,6 @@ in hitch = callPackage ../servers/hitch { }; - venus = callPackage ../tools/misc/venus { - python = python27; - }; - veracrypt = callPackage ../applications/misc/veracrypt { wxGTK = wxGTK30; }; @@ -9151,10 +9265,12 @@ in zplug = callPackage ../shells/zsh/zplug { }; - zplugin = callPackage ../shells/zsh/zplugin {} ; + zinit = callPackage ../shells/zsh/zinit {} ; zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; + zsh-autopair = callPackage ../shells/zsh/zsh-autopair { }; + zsh-bd = callPackage ../shells/zsh/zsh-bd { }; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; @@ -9169,6 +9285,8 @@ in zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; + zsh-system-clipboard = callPackage ../shells/zsh/zsh-system-clipboard { }; + zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { }; @@ -9529,13 +9647,14 @@ in crystal_0_33 crystal_0_34 crystal_0_35 + crystal_0_36 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; icr = callPackage ../development/tools/icr { }; - scry = callPackage ../development/tools/scry {}; + scry = callPackage ../development/tools/scry { }; dasm = callPackage ../development/compilers/dasm/default.nix { }; @@ -9576,8 +9695,6 @@ in flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter = flutterPackages.stable; - flutter-beta = flutterPackages.beta; - flutter-dev = flutterPackages.dev; fpc = callPackage ../development/compilers/fpc { }; @@ -9958,7 +10075,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104; inherit (haskellPackages) ghc; @@ -10092,6 +10209,8 @@ in inherit (emacs.pkgs.melpaStablePackages) irony; }; + holo-build = callPackage ../tools/package-management/holo-build { }; + hugs = callPackage ../development/interpreters/hugs { }; openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; @@ -10162,6 +10281,7 @@ in headless = true; inherit (gnome2) GConf gnome_vfs; openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; @@ -10219,9 +10339,9 @@ in inherit (darwin) libiconv libobjc libresolv; }) mx jvmci8 graalvm8; - inherit (callPackages ../development/compilers/graalvm/community-edition.nix { }) - graalvm8-ce - graalvm11-ce; + inherit (callPackages ../development/compilers/graalvm/community-edition.nix { + inherit (darwin.apple_sdk.frameworks) Foundation; + }) graalvm8-ce graalvm11-ce; inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) graalvm8-ee @@ -10558,6 +10678,8 @@ in inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; + opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { }; + open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { }; pforth = callPackage ../development/compilers/pforth {}; @@ -10709,6 +10831,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; + cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -10721,6 +10844,7 @@ in cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -10736,7 +10860,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - maturin = callPackage ../development/tools/rust/maturin { }; + maturin = callPackage ../development/tools/rust/maturin { + inherit (darwin.apple_sdk.frameworks) Security; + }; + inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { @@ -10789,6 +10916,8 @@ in smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage ../development/compilers/smlnj { }; + smlpkg = callPackage ../tools/package-management/smlpkg { }; + solc = callPackage ../development/compilers/solc { }; souffle = callPackage ../development/compilers/souffle { @@ -10803,6 +10932,8 @@ in jdk = oraclejdk; }; + sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { }; + squeak = callPackage ../development/compilers/squeak { }; squirrel-sql = callPackage ../development/tools/database/squirrel-sql { @@ -11000,12 +11131,15 @@ in }; beam = callPackage ./beam-packages.nix { }; + beam_nox = callPackage ./beam-packages.nix { wxSupport = false; }; inherit (beam.interpreters) erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 - erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 + erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + erlang_nox = beam_nox.interpreters.erlang; + inherit (beam.packages.erlang) rebar rebar3 fetchHex beamPackages @@ -11622,6 +11756,8 @@ in avrdude = callPackage ../development/tools/misc/avrdude { }; + b4 = callPackage ../development/tools/b4 { }; + babeltrace = callPackage ../development/tools/misc/babeltrace { }; bam = callPackage ../development/tools/build-managers/bam {}; @@ -11662,13 +11798,23 @@ in bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8_headless; - buildJdkName = "jdk8"; + buildJdk = jdk11_headless; + buildJdkName = "java11"; runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; bazel_self = bazel_3; }; + bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk11_headless; + buildJdkName = "java11"; + runJdk = jdk11_headless; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + bazel_self = bazel_4; + }; + bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; buildozer = bazel-buildtools; @@ -11840,7 +11986,7 @@ in cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {}; - cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; + cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { }; clpm = callPackage ../development/tools/clpm {}; @@ -12043,6 +12189,8 @@ in editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; + edb = libsForQt5.callPackage ../development/tools/misc/edb { }; + eggdbus = callPackage ../development/tools/misc/eggdbus { }; effitask = callPackage ../applications/misc/effitask { }; @@ -12188,7 +12336,7 @@ in gradle_4_10 = res.gradleGen.gradle_4_10; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; - gradle_6 = res.gradleGen.gradle_6_7; + gradle_6 = res.gradleGen.gradle_6_8; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -12266,6 +12414,10 @@ in jam = callPackage ../development/tools/build-managers/jam { }; + javacc = callPackage ../development/tools/parsing/javacc { + jdk = jdk8; + }; + jbake = callPackage ../development/tools/jbake { }; jbang = callPackage ../development/tools/jbang { }; @@ -12549,7 +12701,7 @@ in pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { }; + qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -12902,6 +13054,8 @@ in yaml2json = callPackage ../development/tools/yaml2json { }; + yams = callPackage ../applications/audio/yams { }; + ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; python = python3; @@ -12917,6 +13071,8 @@ in ytt = callPackage ../development/tools/ytt {}; + zydis = callPackage ../development/libraries/zydis { }; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { }; @@ -13153,6 +13309,8 @@ in capnproto = callPackage ../development/libraries/capnproto { }; + capnproto-java = callPackage ../development/tools/capnproto-java { }; + captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; @@ -13311,6 +13469,8 @@ in cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { }; + cxxopts = callPackage ../development/libraries/cxxopts { }; + cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { }; cypress = callPackage ../development/web/cypress { }; @@ -13664,7 +13824,7 @@ in gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; - gdal_2 = callPackage ../development/libraries/gdal/2.4.0.nix { }; + gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { }; gdcm = callPackage ../development/libraries/gdcm { }; @@ -13698,6 +13858,10 @@ in rev = "v${version}"; sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; }; + meta.knownVulnerabilities = [ + "CVE-2020-12278" + "CVE-2020-12279" + ]; }); libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -13997,6 +14161,11 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; + gtk4 = callPackage ../development/libraries/gtk/4.x.nix { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + }; + + # On darwin gtk uses cocoa by default instead of x11. gtk3-x11 = gtk3.override { cairo = cairo.override { x11Support = true; }; @@ -14434,6 +14603,8 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; + libaudec = callPackage ../development/libraries/libaudec { }; + libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackages ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_11 libav_12; @@ -14701,6 +14872,8 @@ in libgda = callPackage ../development/libraries/libgda { }; + libgda6 = callPackage ../development/libraries/libgda/6.x.nix { }; + libgdamm = callPackage ../development/libraries/libgdamm { }; libgdata = callPackage ../development/libraries/libgdata { }; @@ -15064,6 +15237,8 @@ in libkate = callPackage ../development/libraries/libkate { }; + libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; + libkml = callPackage ../development/libraries/libkml { }; libksba = callPackage ../development/libraries/libksba { }; @@ -15547,6 +15722,8 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + libcyaml = callPackage ../development/libraries/libcyaml { }; + rang = callPackage ../development/libraries/rang { }; libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { @@ -15809,6 +15986,8 @@ in nika-fonts = callPackage ../data/fonts/nika-fonts { }; + nikto = callPackage ../tools/networking/nikto { }; + nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; nntp-proxy = callPackage ../applications/networking/nntp-proxy { }; @@ -15972,9 +16151,7 @@ in openh264 = callPackage ../development/libraries/openh264 { }; - openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; - openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { }; - openjpeg = openjpeg_2; + openjpeg = callPackage ../development/libraries/openjpeg { }; openpa = callPackage ../development/libraries/openpa { }; @@ -16078,7 +16255,7 @@ in poco = callPackage ../development/libraries/poco { }; - podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; + podofo = callPackage ../development/libraries/podofo { }; polkit = callPackage ../development/libraries/polkit { }; @@ -16521,6 +16698,8 @@ in shapelib = callPackage ../development/libraries/shapelib { }; + sharness = callPackage ../development/libraries/sharness { }; + shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; skaffold = callPackage ../development/tools/skaffold { }; @@ -16764,6 +16943,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; + tageditor = libsForQt5.callPackage ../applications/audio/tageditor { }; + taglib = callPackage ../development/libraries/taglib { }; taglib_extras = callPackage ../development/libraries/taglib-extras { }; @@ -16772,6 +16953,8 @@ in talloc = callPackage ../development/libraries/talloc { }; + tagparser = callPackage ../development/libraries/tagparser { }; + tclap = callPackage ../development/libraries/tclap {}; tcllib = callPackage ../development/libraries/tcllib { }; @@ -16837,6 +17020,8 @@ in tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { }; tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; }; + tkrzw = callPackage ../development/libraries/tkrzw { }; + tl-expected = callPackage ../development/libraries/tl-expected { }; tnt = callPackage ../development/libraries/tnt { }; @@ -17755,6 +17940,8 @@ in mailman-web = with python3.pkgs; toPythonApplication mailman-web; + mastodon = callPackage ../servers/mastodon { }; + mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; @@ -17792,7 +17979,7 @@ in inherit (callPackages ../servers/mpd { }) mpd mpd-small mpdWithFeatures; - mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; + libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; mpdscribble = callPackage ../tools/misc/mpdscribble { }; @@ -17956,7 +18143,11 @@ in libpulseaudio = libpulseaudio-vanilla; - pulseeffects = callPackage ../applications/audio/pulseeffects { + pulseeffects-pw = callPackage ../applications/audio/pulseeffects { + boost = boost172; + }; + + pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { boost = boost172; }; @@ -18154,6 +18345,7 @@ in prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; + prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; @@ -18219,7 +18411,7 @@ in rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; - elixir = elixir_1_8; + elixir = beam_nox.interpreters.elixir_1_8; erlang = erlang_nox; }; @@ -18348,6 +18540,8 @@ in storm = callPackage ../servers/computing/storm { }; + switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { }; + slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; @@ -18544,6 +18738,8 @@ in libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches; + aseq2json = callPackage ../os-specific/linux/aseq2json {}; + atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; @@ -18663,9 +18859,10 @@ in erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; + fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; - fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; + fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl/legacy.nix { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; @@ -18844,7 +19041,7 @@ in openiscsi = callPackage ../os-specific/linux/open-iscsi { }; - openisns = callPackage ../os-specific/linux/open-isns { }; + open-isns = callPackage ../os-specific/linux/open-isns { }; osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp { inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; @@ -18939,7 +19136,6 @@ in # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions."4.14" ]; }; @@ -18948,7 +19144,6 @@ in [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions."4.14" ]; }; @@ -18957,7 +19152,6 @@ in kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.rtl8761b_support - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18965,7 +19159,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18973,7 +19166,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18981,7 +19173,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18989,7 +19180,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" kernelPatches.export-rt-sched-migrate ]; }; @@ -19020,7 +19210,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -19028,7 +19217,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -19038,10 +19226,10 @@ in for a specific kernel. This function can then be called for whatever kernel you're using. */ - linuxPackagesFor = kernel: lib.makeExtensible (self: with self; { + linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; { callPackage = newScope self; - inherit kernel; + kernel = kernel_; inherit (kernel) stdenv; # in particular, use the same compiler by default # to help determine module compatibility @@ -19311,7 +19499,7 @@ in kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit lib stdenv; + inherit lib; inherit (kernel) version; }; kernelPatches = kernel.kernelPatches ++ [ @@ -19446,6 +19634,8 @@ in enableCmdlib = true; }; + maddy = callPackage ../servers/maddy/default.nix { }; + mbelib = callPackage ../development/libraries/audio/mbelib { }; mbpfan = callPackage ../os-specific/linux/mbpfan { }; @@ -19565,6 +19755,8 @@ in go-migrate = callPackage ../development/tools/go-migrate { }; + gomacro = callPackage ../development/tools/gomacro { }; + gomodifytags = callPackage ../development/tools/gomodifytags { }; go-langserver = callPackage ../development/tools/go-langserver { }; @@ -19675,6 +19867,7 @@ in prototool = callPackage ../development/tools/prototool { }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); + qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; }); # See `xenPackages` source for explanations. # Building with `xen` instead of `xen-slim` is possible, but makes no sense. @@ -20260,6 +20453,12 @@ in greybird = callPackage ../data/themes/greybird { }; + gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { }; + + gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk { + inherit (plasma5Packages) breeze-icons; + }; + gubbi-font = callPackage ../data/fonts/gubbi { }; gyre-fonts = callPackage ../data/fonts/gyre {}; @@ -20692,6 +20891,8 @@ in inter-ui = callPackage ../data/fonts/inter-ui { }; inter = callPackage ../data/fonts/inter { }; + scientifica = callPackage ../data/fonts/scientifica { }; + siji = callPackage ../data/fonts/siji { inherit (buildPackages.xorg) mkfontscale fonttosfnt; }; @@ -20765,9 +20966,7 @@ in ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { }; - twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { - inherit (nodePackages) svgo; - }; + twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { }; twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { }; @@ -21214,14 +21413,9 @@ in calculix = callPackage ../applications/science/math/calculix {}; - calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; - - calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; - - calibre = calibre-py3; + calibre = libsForQt5.callPackage ../applications/misc/calibre { }; calligra = libsForQt5.callPackage ../applications/office/calligra { - openjpeg = openjpeg_1; # Must use the same Qt version as Calligra itself: poppler = libsForQt5.poppler_0_61; }; @@ -21327,7 +21521,7 @@ in cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { - inherit (darwin.apple_sdk.frameworks) CoreAudio; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; libjack = libjack2; ffmpeg = ffmpeg_2; }; @@ -21565,14 +21759,9 @@ in inherit (gnome2) libgnomeui; }; - dwm = callPackage ../applications/window-managers/dwm { - patches = config.dwm.patches or []; - }; + dwl = callPackage ../applications/window-managers/dwl { }; - dwm-git = callPackage ../applications/window-managers/dwm/git.nix { - patches = config.dwm.patches or []; - conf = config.dwm.conf or null; - }; + dwm = callPackage ../applications/window-managers/dwm { }; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; @@ -21731,6 +21920,8 @@ in eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; + etebase-server = with python3Packages; toPythonApplication etebase-server; + etesync-dav = callPackage ../applications/misc/etesync-dav {}; etherape = callPackage ../applications/networking/sniffers/etherape { }; @@ -21793,6 +21984,8 @@ in fdr = libsForQt5.callPackage ../applications/science/programming/fdr { }; + feedbackd = callPackage ../applications/misc/feedbackd { }; + fehlstart = callPackage ../applications/misc/fehlstart { }; fetchmail = callPackage ../applications/misc/fetchmail { }; @@ -21818,7 +22011,6 @@ in fldigi = callPackage ../applications/radio/fldigi { }; flink = callPackage ../applications/networking/cluster/flink { }; - flink_1_5 = flink.override { version = "1.5"; }; fllog = callPackage ../applications/radio/fllog { }; @@ -22141,14 +22333,6 @@ in flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; - flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); - - flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix (config.flashplayer or {}); - - flashplayer-standalone-debugger = flashplayer-standalone.override { - debug = true; - }; - fluxbox = callPackage ../applications/window-managers/fluxbox { }; fme = callPackage ../applications/misc/fme { @@ -22224,6 +22408,19 @@ in gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {}); + glimpse = callPackage ../applications/graphics/glimpse { + autoreconfHook = buildPackages.autoreconfHook269; + gegl = gegl_0_4; + lcms = lcms2; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + }; + + glimpse-with-plugins = callPackage ../applications/graphics/glimpse/wrapper.nix { + plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied + }; + + glimpsePlugins = recurseIntoAttrs (callPackage ../applications/graphics/glimpse/plugins {}); + girara = callPackage ../applications/misc/girara { gtk = gtk3; }; @@ -22372,7 +22569,7 @@ in gocr = callPackage ../applications/graphics/gocr { }; - gobby5 = callPackage ../applications/editors/gobby { }; + gobby = callPackage ../applications/editors/gobby { }; gphoto2 = callPackage ../applications/misc/gphoto2 { }; @@ -22557,6 +22754,10 @@ in ht = callPackage ../applications/editors/ht { }; + xh = callPackage ../tools/networking/xh { + inherit (darwin.apple_sdk.frameworks) Security; + }; + hubstaff = callPackage ../applications/misc/hubstaff { }; hue-cli = callPackage ../tools/networking/hue-cli { }; @@ -22662,6 +22863,8 @@ in waybar = callPackage ../applications/misc/waybar {}; + wbg = callPackage ../applications/misc/wbg { }; + hikari = callPackage ../applications/window-managers/hikari { }; i3 = callPackage ../applications/window-managers/i3 { @@ -22718,6 +22921,8 @@ in i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; + waybox = callPackage ../applications/window-managers/waybox { }; + windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; @@ -22955,6 +23160,8 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; + kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { @@ -22982,7 +23189,7 @@ in keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; - keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; + keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { }; kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; @@ -23019,9 +23226,7 @@ in kpt = callPackage ../applications/networking/cluster/kpt { }; - krita = libsForQt5.callPackage ../applications/graphics/krita { - openjpeg = openjpeg_1; - }; + krita = libsForQt5.callPackage ../applications/graphics/krita { }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -23075,6 +23280,8 @@ in lame = callPackage ../development/libraries/lame { }; + labwc = callPackage ../applications/window-managers/labwc { }; + larswm = callPackage ../applications/window-managers/larswm { }; lash = callPackage ../applications/audio/lash { }; @@ -23135,11 +23342,10 @@ in }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libsForQt514.callPackage ../applications/office/libreoffice + libreoffice = libsForQt5.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; - jdk = jdk11; }); }); @@ -23147,7 +23353,6 @@ in libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { variant = "fresh"; - jdk = jdk11; }); }); libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; @@ -23155,10 +23360,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { - stdenv = gcc9Stdenv; # Fails in multiple ways with gcc10 - icu = icu64; variant = "still"; - jdk = jdk8; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -23273,6 +23475,8 @@ in lyx = libsForQt5.callPackage ../applications/misc/lyx { }; + m4acut = callPackage ../applications/audio/m4acut { }; + mac = callPackage ../development/libraries/mac { }; macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; }; @@ -23306,6 +23510,8 @@ in markdown-pp = callPackage ../tools/text/markdown-pp { }; + mark = callPackage ../tools/text/mark { }; + marp = callPackage ../applications/office/marp { }; magnetico = callPackage ../applications/networking/p2p/magnetico { }; @@ -23428,6 +23634,8 @@ in mmsd = callPackage ../tools/networking/mmsd { }; + mmtc = callPackage ../applications/audio/mmtc { }; + moc = callPackage ../applications/audio/moc { }; mod-distortion = callPackage ../applications/audio/mod-distortion { }; @@ -23486,6 +23694,7 @@ in mopidy-soundcloud mopidy-spotify mopidy-spotify-tunigo + mopidy-subidy mopidy-tunein mopidy-youtube; @@ -23594,7 +23803,6 @@ in jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or stdenv.isLinux; - qt5 = qt514; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -23699,8 +23907,6 @@ in plank = callPackage ../applications/misc/plank { }; - planner = callPackage ../applications/office/planner { }; - playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; }; @@ -23718,6 +23924,8 @@ in i3GapsSupport = false; }; + yambar = callPackage ../applications/misc/yambar { }; + polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { @@ -23787,6 +23995,8 @@ in rep-gtk = callPackage ../development/libraries/rep-gtk { }; + reproc = callPackage ../development/libraries/reproc { }; + sawfish = callPackage ../applications/window-managers/sawfish { }; sc68 = callPackage ../applications/audio/sc68 { }; @@ -23919,6 +24129,8 @@ in obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; + obs-gstreamer = callPackage ../applications/video/obs-studio/obs-gstreamer.nix { }; + obs-move-transition = callPackage ../applications/video/obs-studio/obs-move-transition.nix { }; obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; @@ -23996,10 +24208,7 @@ in osmium-tool = callPackage ../applications/misc/osmium-tool { }; - osu-lazer = callPackage ../games/osu-lazer { - dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-netcore = dotnetCorePackages.netcore_3_1; - }; + osu-lazer = callPackage ../games/osu-lazer { }; owamp = callPackage ../applications/networking/owamp { }; @@ -24028,8 +24237,8 @@ in osmo = callPackage ../applications/office/osmo { }; palemoon = callPackage ../applications/networking/browsers/palemoon { - # https://www.palemoon.org/sourcecode.shtml - stdenv = gcc7Stdenv; + # https://developer.palemoon.org/build/linux/ + stdenv = gcc8Stdenv; }; webbrowser = callPackage ../applications/networking/browsers/webbrowser {}; @@ -24208,6 +24417,8 @@ in pistol = callPackage ../tools/misc/pistol { }; + piston-cli = callPackage ../tools/misc/piston-cli { }; + plater = libsForQt5.callPackage ../applications/misc/plater { }; plexamp = callPackage ../applications/audio/plexamp { }; @@ -24486,7 +24697,7 @@ in rclone = callPackage ../applications/networking/sync/rclone { }; - rclone-browser = libsForQt514.callPackage ../applications/networking/sync/rclone/browser.nix { }; + rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; rcs = callPackage ../applications/version-management/rcs { }; @@ -24715,6 +24926,8 @@ in insync = callPackage ../applications/networking/insync { }; + insync-v3 = libsForQt515.callPackage ../applications/networking/insync/v3.nix { }; + libstrangle = callPackage ../tools/X11/libstrangle { stdenv = stdenv_32bit; }; @@ -24808,8 +25021,6 @@ in }; spotify-unwrapped = callPackage ../applications/audio/spotify { - libgcrypt = libgcrypt_1_5; - libpng = libpng12; curl = curl.override { sslSupport = false; gnutlsSupport = true; }; @@ -24980,6 +25191,8 @@ in tabula = callPackage ../applications/misc/tabula { }; + tabula-java = callPackage ../applications/misc/tabula-java { }; + tasknc = callPackage ../applications/misc/tasknc { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -25066,7 +25279,9 @@ in ticpp = callPackage ../development/libraries/ticpp { }; - tickrs = callPackage ../applications/misc/tickrs { }; + tickrs = callPackage ../applications/misc/tickrs { + inherit (darwin.apple_sdk.frameworks) Security; + }; tig = callPackage ../applications/version-management/git-and-tools/tig { }; @@ -25277,7 +25492,7 @@ in }).overrideAttrs (oldAttrs: rec { pname = "vim-darwin"; meta = { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; }); @@ -25431,7 +25646,9 @@ in volnoti = callPackage ../applications/misc/volnoti { }; - vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; + vorbis-tools = callPackage ../applications/audio/vorbis-tools { + autoreconfHook = buildPackages.autoreconfHook269; + }; vscode = callPackage ../applications/editors/vscode/vscode.nix { }; @@ -25443,7 +25660,10 @@ in vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; - code-server = callPackage ../servers/code-server { }; + code-server = callPackage ../servers/code-server { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; + inherit (darwin) cctools; + }; vue = callPackage ../applications/misc/vue { }; @@ -25820,7 +26040,7 @@ in xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; - xdg_utils = callPackage ../tools/X11/xdg-utils { + xdg-utils = callPackage ../tools/X11/xdg-utils { w3m = w3m-batch; }; @@ -25858,6 +26078,8 @@ in xineUI = callPackage ../applications/video/xine-ui { }; + xlsxgrep = callPackage ../applications/search/xlsxgrep { }; + xmind = callPackage ../applications/misc/xmind { }; xneur = callPackage ../applications/misc/xneur { @@ -26224,6 +26446,8 @@ in abbaye-des-morts = callPackage ../games/abbaye-des-morts { }; + abuse = callPackage ../games/abuse { }; + adom = callPackage ../games/adom { }; airstrike = callPackage ../games/airstrike { }; @@ -26256,6 +26480,8 @@ in armagetronad = callPackage ../games/armagetronad { }; + armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; }; + arena = callPackage ../games/arena {}; arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; @@ -26515,6 +26741,9 @@ in gemrb = callPackage ../games/gemrb { }; + gimx = callPackage ../games/gimx {}; + gimx-afterglow = lowPrio (gimx.override { gimxAuth = "afterglow"; }); + gl117 = callPackage ../games/gl-117 {}; globulation2 = callPackage ../games/globulation { @@ -27120,9 +27349,7 @@ in wesnoth-dev = wesnoth; - widelands = callPackage ../games/widelands { - lua = lua5_2; - }; + widelands = callPackage ../games/widelands { }; worldofgoo = callPackage ../games/worldofgoo { }; @@ -27214,6 +27441,8 @@ in zeroad = zeroadPackages.zeroad; + _0verkill = callPackage ../games/0verkill { }; + ### DESKTOP ENVIRONMENTS cdesktopenv = callPackage ../desktops/cdesktopenv { }; @@ -27244,6 +27473,7 @@ in easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { }; emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; freon = callPackage ../desktops/gnome-3/extensions/freon { }; + fuzzy-app-search = callPackage ../desktops/gnome-3/extensions/fuzzy-app-search { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; impatience = callPackage ../desktops/gnome-3/extensions/impatience { }; @@ -27276,6 +27506,8 @@ in gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { }; + hhexen = callPackage ../games/hhexen { }; + hsetroot = callPackage ../tools/X11/hsetroot { }; imwheel = callPackage ../tools/X11/imwheel { }; @@ -27323,6 +27555,8 @@ in eigen = eigen2; }; + chemtool = callPackage ../applications/science/chemistry/chemtool { }; + d-seams = callPackage ../applications/science/chemistry/d-seams {}; gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; @@ -28396,8 +28630,6 @@ in cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; - cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { }; - # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; @@ -28583,6 +28815,8 @@ in libjack2 = jack2.override { prefix = "lib"; }; jack2Full = jack2; # TODO: move to aliases.nix + jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; + keynav = callPackage ../tools/X11/keynav { }; kmon = callPackage ../tools/system/kmon { }; @@ -28660,9 +28894,7 @@ in nixops = callPackage ../tools/package-management/nixops { }; - nixops_1_6_1 = callPackage ../tools/package-management/nixops/nixops-v1_6_1.nix {}; - - nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { }); + nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; @@ -28888,18 +29120,6 @@ in solfege = python3Packages.callPackage ../misc/solfege { }; - disnix = callPackage ../tools/package-management/disnix { }; - - dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { - inherit (pythonPackages) supervisor; - }); - - dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; - - disnixos = callPackage ../tools/package-management/disnix/disnixos { }; - - DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; - lkproof = callPackage ../tools/typesetting/tex/lkproof { }; lice = callPackage ../tools/misc/lice {}; @@ -29215,6 +29435,8 @@ in ssh-audit = callPackage ../tools/security/ssh-audit { }; + ssh-tools = callPackage ../applications/misc/ssh-tools { }; + auto-cpufreq = callPackage ../tools/system/auto-cpufreq { }; thermald = callPackage ../tools/system/thermald { }; @@ -29382,6 +29604,8 @@ in xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xortool = python3Packages.callPackage ../tools/security/xortool { }; + xow = callPackage ../misc/drivers/xow { }; xbps = callPackage ../tools/package-management/xbps { }; @@ -29452,8 +29676,13 @@ in yaxg = callPackage ../tools/graphics/yaxg {}; - yuzu = libsForQt5.callPackage ../misc/emulators/yuzu { - stdenv = gcc10Stdenv; + yuzu-mainline = import ../misc/emulators/yuzu { + branch = "mainline"; + inherit (pkgs) libsForQt5 fetchFromGitHub; + }; + yuzu-ea = import ../misc/emulators/yuzu { + branch = "early-access"; + inherit (pkgs) libsForQt5 fetchFromGitHub; }; zap = callPackage ../tools/networking/zap { }; @@ -29491,6 +29720,9 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; + x16-emulator = callPackage ../misc/emulators/commander-x16/emulator.nix { }; + x16-rom = callPackage ../misc/emulators/commander-x16/rom.nix { }; + bullet = callPackage ../development/libraries/bullet { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; @@ -29505,9 +29737,6 @@ in spdlog = spdlog_1; dart = callPackage ../development/interpreters/dart { }; - dart_old = dart.override { version = "1.24.3"; }; - dart_stable = dart.override { version = "2.7.2"; }; - dart_dev = dart.override { version = "2.9.0-4.0.dev"; }; httrack = callPackage ../tools/backup/httrack { }; @@ -29544,7 +29773,9 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - sccache = callPackage ../development/tools/misc/sccache { }; + sccache = callPackage ../development/tools/misc/sccache { + inherit (darwin.apple_sdk.frameworks) Security; + }; sequeler = callPackage ../applications/misc/sequeler { }; @@ -29552,7 +29783,7 @@ in snowsql = callPackage ../applications/misc/snowsql {}; - snowmachine = python3Packages.callPackage ../applications/snowmachine {}; + snowmachine = python3Packages.callPackage ../applications/misc/snowmachine {}; sidequest = callPackage ../applications/misc/sidequest {}; diff --git a/nixpkgs/pkgs/top-level/beam-packages.nix b/nixpkgs/pkgs/top-level/beam-packages.nix index fb331b85eb94..aae127fd04e3 100644 --- a/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/nixpkgs/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ callPackage, wxGTK30, openssl_1_0_2, buildPackages }: +{ callPackage, wxGTK30, openssl_1_0_2, buildPackages, wxSupport ? true }: rec { lib = callPackage ../development/beam-modules/lib.nix { }; @@ -11,7 +11,6 @@ rec { erlang_odbc = erlangR23_odbc; erlang_javac = erlangR23_javac; erlang_odbc_javac = erlangR23_odbc_javac; - erlang_nox = erlangR23_nox; # Standard Erlang versions, using the generic builder. @@ -21,6 +20,7 @@ rec { # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; }; @@ -28,7 +28,6 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR23_nox = erlangR23.override { wxSupport = false; }; # R22 erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { @@ -36,6 +35,7 @@ rec { # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; }; @@ -43,12 +43,12 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR22_nox = erlangR22.override { wxSupport = false; }; # R21 erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; }; @@ -56,12 +56,12 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR21_nox = erlangR21.override { wxSupport = false; }; # R20 erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { wxGTK = wxGTK30; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR20_odbc = erlangR20.override { odbcSupport = true; }; erlangR20_javac = erlangR20.override { javacSupport = true; }; @@ -69,13 +69,13 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR20_nox = erlangR20.override { wxSupport = false; }; # R19 erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; }; @@ -83,13 +83,13 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR19_nox = erlangR19.override { wxSupport = false; }; # R18 erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; }; @@ -97,12 +97,12 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR18_nox = erlangR18.override { wxSupport = false; }; # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { odbcSupport = true; }; diff --git a/nixpkgs/pkgs/top-level/darwin-packages.nix b/nixpkgs/pkgs/top-level/darwin-packages.nix index 6fafe09438cd..2197f128388a 100644 --- a/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -4,9 +4,11 @@ let apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; + + impure-cmds = callPackage ../os-specific/darwin/impure-cmds { }; in -(apple-source-releases // { +(impure-cmds // apple-source-releases // { callPackage = newScope (darwin.apple_sdk.frameworks // darwin); diff --git a/nixpkgs/pkgs/top-level/haskell-packages.nix b/nixpkgs/pkgs/top-level/haskell-packages.nix index 46e222261fc8..6c8e3e7d855d 100644 --- a/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -114,6 +114,16 @@ in { buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; + ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { bootPkgs = packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; @@ -221,6 +231,11 @@ in { ghc = bh.compiler.ghc8103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc8104 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8104; + ghc = bh.compiler.ghc8104; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + }; ghc901 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc901; ghc = bh.compiler.ghc901; diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index d65c90fe7733..c0faba640a26 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -130,6 +130,22 @@ let cairo2 = callPackage ../development/ocaml-modules/cairo2 { }; + caqti = callPackage ../development/ocaml-modules/caqti { }; + + caqti-async = callPackage ../development/ocaml-modules/caqti/async.nix { }; + + caqti-driver-mariadb = callPackage ../development/ocaml-modules/caqti/driver-mariadb.nix { }; + + caqti-driver-postgresql = callPackage ../development/ocaml-modules/caqti/driver-postgresql.nix { }; + + caqti-driver-sqlite3 = callPackage ../development/ocaml-modules/caqti/driver-sqlite3.nix { }; + + caqti-dynload = callPackage ../development/ocaml-modules/caqti/dynload.nix { }; + + caqti-lwt = callPackage ../development/ocaml-modules/caqti/lwt.nix { }; + + caqti-type-calendar = callPackage ../development/ocaml-modules/caqti/type-calendar.nix { }; + cfstream = callPackage ../development/ocaml-modules/cfstream { }; charInfo_width = callPackage ../development/ocaml-modules/charInfo_width { }; @@ -490,6 +506,8 @@ let kafka = callPackage ../development/ocaml-modules/kafka { }; + kafka_lwt = callPackage ../development/ocaml-modules/kafka/lwt.nix { }; + ke = callPackage ../development/ocaml-modules/ke { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; @@ -564,6 +582,10 @@ let magick = callPackage ../development/ocaml-modules/magick { }; + mariadb = callPackage ../development/ocaml-modules/mariadb { + inherit (pkgs) mariadb; + }; + markup = callPackage ../development/ocaml-modules/markup { }; mdx = callPackage ../development/ocaml-modules/mdx { }; @@ -873,6 +895,10 @@ let posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; + postgresql = callPackage ../development/ocaml-modules/postgresql { + inherit (pkgs) postgresql; + }; + ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; @@ -951,14 +977,11 @@ let ppx_blob = callPackage ../development/ocaml-modules/ppx_blob { }; - ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix {}; + ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix { }; ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {}; - ppx_deriving = - if lib.versionAtLeast ocaml.version "4.02" - then callPackage ../development/ocaml-modules/ppx_deriving {} - else null; + ppx_deriving = callPackage ../development/ocaml-modules/ppx_deriving {}; ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; @@ -990,6 +1013,8 @@ let prof_spacetime = callPackage ../development/ocaml-modules/prof_spacetime { }; + progress = callPackage ../development/ocaml-modules/progress { }; + ptmap = callPackage ../development/ocaml-modules/ptmap { }; ptset = callPackage ../development/ocaml-modules/ptset { }; @@ -1030,6 +1055,8 @@ let sedlex_2 = callPackage ../development/ocaml-modules/sedlex/2.nix { }; + semaphore-compat = callPackage ../development/ocaml-modules/semaphore-compat { }; + sodium = callPackage ../development/ocaml-modules/sodium { }; spelll = callPackage ../development/ocaml-modules/spelll { }; @@ -1050,6 +1077,8 @@ let tcslib = callPackage ../development/ocaml-modules/tcslib { }; + terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; + toml = callPackage ../development/ocaml-modules/toml { }; topkg = callPackage ../development/ocaml-modules/topkg { }; diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index 66bf16d0224a..614cd0b49618 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -6985,6 +6985,23 @@ let }; }; + EmailStuffer = buildPerlPackage { + pname = "Email-Stuffer"; + version = "0.018"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Stuffer-0.018.tar.gz"; + sha256 = "02wapphmcqbl1sg32x2az863lz5bb2dlckibxfqrjdlny27a406h"; + }; + buildInputs = [ Moo TestFatal ]; + propagatedBuildInputs = [ EmailMIME EmailSender ModuleRuntime ParamsUtil ]; + meta = { + homepage = "https://github.com/rjbs/Email-Stuffer"; + description = "A more casual approach to creating and sending Email:: emails"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + EmailValid = buildPerlPackage { pname = "Email-Valid"; version = "1.202"; @@ -8462,10 +8479,10 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.47"; + version = "0.48"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "1ja85hzzl36sjikcyavjqy4m41f2yyrsr1ipypzi5mlw7clhmdi3"; + sha256 = "077jnf5a07x0p30iqcw3kh53xh3dplhb0jyyyq9b4c79ira3ds6r"; }; buildInputs = [ TestRefcount ]; propagatedBuildInputs = [ Future XSParseSublike ]; @@ -10543,11 +10560,11 @@ let ImageExifTool = buildPerlPackage { pname = "Image-ExifTool"; - version = "12.00"; + version = "12.16"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXIFTOOL/Image-ExifTool-12.00.tar.gz"; - sha256 = "0nl5djf6hs6brnp7qnqvj3xwhj1qnjwcv35ih4yqp2mm9b4jqyfh"; + url = "mirror://cpan/authors/id/E/EX/EXIFTOOL/Image-ExifTool-12.16.tar.gz"; + sha256 = "0skm22b3gg1bfk0amklrprpva41m6mkrhqp0gi7z1nmcf9ypjh61"; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -12221,7 +12238,7 @@ let url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.19.tar.gz"; sha256 = "06hm4vgihxr7m4jrq558phnnxy4am6ifba447j0h4p6jym5h7xih"; }; - + propagatedBuildInputs = [ MathBigInt ]; meta = { license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12341,10 +12358,10 @@ let MathPlanePath = buildPerlPackage { pname = "Math-PlanePath"; - version = "127"; + version = "129"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-127.tar.gz"; - sha256 = "1dzywpydigwyr38vz9f4yn7xkkk21vi6lyzjlyqv8iny0y0c7w20"; + url = "mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-129.tar.gz"; + sha256 = "0zirgq9n422wc1j95pijkr88wwmzhll5nxh3sb2vcxsh9l75v8cd"; }; propagatedBuildInputs = [ MathLibm constant-defer ]; buildInputs = [ DataFloat MathBigIntLite NumberFraction ]; @@ -19257,10 +19274,10 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "6.3.0"; + version = "7.0.0"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v6.3.0.tar.gz"; - sha256 = "6333fe3c554322fec5a3e1890b08a4ea4f39b0fbb506b3592688a5785a488f39"; + url = "mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v7.0.0.tar.gz"; + sha256 = "1w3div7p86kz9mmcdzmap7fi8hxvzs4nfglks044ihgi5la14r1y"; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; diff --git a/nixpkgs/pkgs/top-level/php-packages.nix b/nixpkgs/pkgs/top-level/php-packages.nix index 19feb36aa271..3df697d3d560 100644 --- a/nixpkgs/pkgs/top-level/php-packages.nix +++ b/nixpkgs/pkgs/top-level/php-packages.nix @@ -134,6 +134,8 @@ lib.makeScope pkgs.newScope (self: with self; { redis = callPackage ../development/php-packages/redis { }; + smbclient = callPackage ../development/php-packages/smbclient { }; + sqlsrv = callPackage ../development/php-packages/sqlsrv { }; v8 = buildPecl { @@ -501,11 +503,15 @@ lib.makeScope pkgs.newScope (self: with self; { doCheck = false; } { name = "xmlreader"; buildInputs = [ libxml2 ]; - configureFlags = [ "--enable-xmlreader CFLAGS=-I../.." ] + internalDeps = [ php.extensions.dom ]; + NIX_CFLAGS_COMPILE = [ "-I../.." "-DHAVE_DOM" ]; + configureFlags = [ "--enable-xmlreader" ] # Required to build on darwin. ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } { name = "xmlrpc"; buildInputs = [ libxml2 libiconv ]; + # xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc + enable = lib.versionOlder php.version "8.0"; configureFlags = [ "--with-xmlrpc" ] # Required to build on darwin. ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } @@ -516,7 +522,7 @@ lib.makeScope pkgs.newScope (self: with self; { ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } { name = "xsl"; buildInputs = [ libxslt libxml2 ]; - doCheck = !(lib.versionOlder php.version "7.4"); + doCheck = lib.versionOlder php.version "8.0"; configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } { name = "zend_test"; } { name = "zip"; diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 6009f0713025..e3e949cc5cd1 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -206,6 +206,10 @@ in { aioamqp = callPackage ../development/python-modules/aioamqp { }; + ailment = callPackage ../development/python-modules/ailment { }; + + aiocoap = callPackage ../development/python-modules/aiocoap { }; + aioconsole = callPackage ../development/python-modules/aioconsole { }; aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; @@ -254,6 +258,8 @@ in { aioimaplib = callPackage ../development/python-modules/aioimaplib { }; + aioinflux = callPackage ../development/python-modules/aioinflux { }; + aiojobs = callPackage ../development/python-modules/aiojobs { }; aiokafka = callPackage ../development/python-modules/aiokafka { }; @@ -274,6 +280,8 @@ in { aiopulse = callPackage ../development/python-modules/aiopulse { }; + aiorecollect = callPackage ../development/python-modules/aiorecollect { }; + aioredis = callPackage ../development/python-modules/aioredis { }; aioresponses = callPackage ../development/python-modules/aioresponses { }; @@ -455,8 +463,12 @@ in { asn1crypto = callPackage ../development/python-modules/asn1crypto { }; + aspell-python = callPackage ../development/python-modules/aspell-python { }; + aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; + asteval = callPackage ../development/python-modules/asteval { }; + astor = callPackage ../development/python-modules/astor { }; astral = callPackage ../development/python-modules/astral { }; @@ -484,6 +496,8 @@ in { asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; + asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; + asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { }; asyncpg = callPackage ../development/python-modules/asyncpg { }; @@ -559,6 +573,8 @@ in { avea = callPackage ../development/python-modules/avea { }; + avion = callPackage ../development/python-modules/avion { }; + avro3k = callPackage ../development/python-modules/avro3k { }; avro = callPackage ../development/python-modules/avro { }; @@ -929,14 +945,10 @@ in { binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { }; - binwalk = callPackage ../development/python-modules/binwalk { - pyqtgraph = null; - matplotlib = null; - }; + binwalk = callPackage ../development/python-modules/binwalk { }; binwalk-full = appendToName "full" (self.binwalk.override { - pyqtgraph = self.pyqtgraph; - matplotlib = self.matplotlib; + visualizationSupport = true; }); biopython = callPackage ../development/python-modules/biopython { }; @@ -999,6 +1011,8 @@ in { bluepy = callPackage ../development/python-modules/bluepy { }; + bluepy-devices = callPackage ../development/python-modules/bluepy-devices { }; + bme680 = callPackage ../development/python-modules/bme680 { }; bokeh = callPackage ../development/python-modules/bokeh { }; @@ -1052,6 +1066,8 @@ in { brotlipy = callPackage ../development/python-modules/brotlipy { }; + brottsplatskartan = callPackage ../development/python-modules/brottsplatskartan { }; + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { }); @@ -1113,16 +1129,7 @@ in { cachelib = callPackage ../development/python-modules/cachelib { }; - cachetools = let - cachetools' = callPackage ../development/python-modules/cachetools { }; - cachetools_2 = cachetools'.overridePythonAttrs (oldAttrs: rec { - version = "3.1.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; - }; - }); - in if isPy3k then cachetools' else cachetools_2; + cachetools = callPackage ../development/python-modules/cachetools { }; cachy = callPackage ../development/python-modules/cachy { }; @@ -1284,6 +1291,8 @@ in { class-registry = callPackage ../development/python-modules/class-registry { }; + claripy = callPackage ../development/python-modules/claripy { }; + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; cleo = callPackage ../development/python-modules/cleo { }; @@ -1356,6 +1365,8 @@ in { cmdtest = callPackage ../development/python-modules/cmdtest { }; + cmsis-svd = callPackage ../development/python-modules/cmsis-svd { }; + cntk = callPackage ../development/python-modules/cntk { }; cnvkit = callPackage ../development/python-modules/cnvkit { }; @@ -1491,6 +1502,8 @@ in { credstash = callPackage ../development/python-modules/credstash { }; + criticality-score = callPackage ../development/python-modules/criticality-score { }; + croniter = callPackage ../development/python-modules/croniter { }; cryptacular = callPackage ../development/python-modules/cryptacular { }; @@ -1507,6 +1520,8 @@ in { crytic-compile = callPackage ../development/python-modules/crytic-compile { }; + csrmesh = callPackage ../development/python-modules/csrmesh { }; + csscompressor = callPackage ../development/python-modules/csscompressor { }; cssmin = callPackage ../development/python-modules/cssmin { }; @@ -1957,6 +1972,8 @@ in { dpkt = callPackage ../development/python-modules/dpkt { }; + drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { }; + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; drms = callPackage ../development/python-modules/drms { }; @@ -2001,6 +2018,8 @@ in { easywatch = callPackage ../development/python-modules/easywatch { }; + ec2instanceconnectcli = callPackage ../tools/virtualization/ec2instanceconnectcli { }; + eccodes = toPythonModule (pkgs.eccodes.override { enablePython = true; pythonPackages = self; @@ -2082,6 +2101,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; + etebase-server = callPackage ../servers/etebase { }; + etesync = callPackage ../development/python-modules/etesync { }; eth-hash = callPackage ../development/python-modules/eth-hash { }; @@ -2106,6 +2127,8 @@ in { ewmh = callPackage ../development/python-modules/ewmh { }; + exdown = callPackage ../development/python-modules/exdown { }; + exchangelib = callPackage ../development/python-modules/exchangelib { }; execnet = callPackage ../development/python-modules/execnet { }; @@ -2516,6 +2539,8 @@ in { geojson-client = callPackage ../development/python-modules/geojson-client { }; + geomet = callPackage ../development/python-modules/geomet { }; + geopandas = callPackage ../development/python-modules/geopandas { }; geopy = if isPy3k then @@ -2743,7 +2768,9 @@ in { gpyopt = callPackage ../development/python-modules/gpyopt { }; - gradient_sdk = callPackage ../development/python-modules/gradient_sdk { }; + gradient = callPackage ../development/python-modules/gradient { }; + + gradient-utils = callPackage ../development/python-modules/gradient-utils { }; gradient_statsd = callPackage ../development/python-modules/gradient_statsd { }; @@ -2783,6 +2810,8 @@ in { grequests = callPackage ../development/python-modules/grequests { }; + gremlinpython = callPackage ../development/python-modules/gremlinpython { }; + grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { enablePython = true; pythonPackages = self; @@ -2865,6 +2894,8 @@ in { ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + halo = callPackage ../development/python-modules/halo { }; + handout = callPackage ../development/python-modules/handout { }; HAP-python = callPackage ../development/python-modules/HAP-python { }; @@ -2915,6 +2946,8 @@ in { hieroglyph = callPackage ../development/python-modules/hieroglyph { }; + hijri-converter = callPackage ../development/python-modules/hijri-converter { }; + hiredis = callPackage ../development/python-modules/hiredis { }; hiro = callPackage ../development/python-modules/hiro { }; @@ -3092,6 +3125,8 @@ in { imaplib2 = callPackage ../development/python-modules/imaplib2 { }; + imap-tools = callPackage ../development/python-modules/imap-tools { }; + imbalanced-learn = if isPy27 then callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } else @@ -3466,6 +3501,8 @@ in { keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; + keystone-engine = callPackage ../development/python-modules/keystone-engine { }; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src); @@ -3635,6 +3672,8 @@ in { inherit python; })).py; + libpurecool = callPackage ../development/python-modules/libpurecool { }; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -3766,6 +3805,8 @@ in { lockfile = callPackage ../development/python-modules/lockfile { }; + log-symbols = callPackage ../development/python-modules/log-symbols { }; + Logbook = callPackage ../development/python-modules/Logbook { }; logfury = callPackage ../development/python-modules/logfury { }; @@ -4423,6 +4464,8 @@ in { nplusone = callPackage ../development/python-modules/nplusone { }; + npyscreen = callPackage ../development/python-modules/npyscreen { }; + ntc-templates = callPackage ../development/python-modules/ntc-templates { }; ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; @@ -4628,9 +4671,9 @@ in { panel = callPackage ../development/python-modules/panel { }; - papermill = callPackage ../development/python-modules/papermill { }; + panflute = callPackage ../development/python-modules/panflute { }; - paperspace = callPackage ../development/python-modules/paperspace { }; + papermill = callPackage ../development/python-modules/papermill { }; openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { }; openpaperwork-gtk = callPackage ../applications/office/paperwork/openpaperwork-gtk.nix { }; @@ -4739,6 +4782,8 @@ in { pdoc3 = callPackage ../development/python-modules/pdoc3 { }; + pebble = callPackage ../development/python-modules/pebble { }; + pecan = callPackage ../development/python-modules/pecan { }; peewee = callPackage ../development/python-modules/peewee { }; @@ -4859,20 +4904,32 @@ in { inherit (pkgs.libsForQt5) soqt; }; + pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + + pkce = callPackage ../development/python-modules/pkce { }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; }; pkginfo = callPackage ../development/python-modules/pkginfo { }; pkuseg = callPackage ../development/python-modules/pkuseg { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; + + pynuki = callPackage ../development/python-modules/pynuki { }; + pysbd = callPackage ../development/python-modules/pysbd { }; + pyshark = callPackage ../development/python-modules/pyshark { }; + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-csxcad = callPackage ../development/python-modules/python-csxcad { }; python-openems = callPackage ../development/python-modules/python-openems { }; + python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { }; + python-tado = callPackage ../development/python-modules/python-tado { }; pkutils = callPackage ../development/python-modules/pkutils { }; @@ -4901,6 +4958,8 @@ in { pluginbase = callPackage ../development/python-modules/pluginbase { }; + plugwise = callPackage ../development/python-modules/plugwise { }; + plumbum = callPackage ../development/python-modules/plumbum { }; ply = callPackage ../development/python-modules/ply { }; @@ -5034,6 +5093,8 @@ in { prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { }; + promise = callPackage ../development/python-modules/promise { }; prompt_toolkit = let @@ -5142,6 +5203,8 @@ in { pyahocorasick = callPackage ../development/python-modules/pyahocorasick { }; + pyairnow = callPackage ../development/python-modules/pyairnow { }; + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; @@ -5319,6 +5382,8 @@ in { pyechonest = callPackage ../development/python-modules/pyechonest { }; + pyedimax = callPackage ../development/python-modules/pyedimax { }; + pyee = callPackage ../development/python-modules/pyee { }; pyelftools = callPackage ../development/python-modules/pyelftools { }; @@ -5536,6 +5601,8 @@ in { pylibmc = callPackage ../development/python-modules/pylibmc { }; + pylink-square = callPackage ../development/python-modules/pylink-square { }; + pylint-celery = callPackage ../development/python-modules/pylint-celery { }; pylint-django = callPackage ../development/python-modules/pylint-django { }; @@ -5565,6 +5632,8 @@ in { pylutron = callPackage ../development/python-modules/pylutron { }; + pylxd = callPackage ../development/python-modules/pylxd { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymaging = callPackage ../development/python-modules/pymaging { }; @@ -5607,6 +5676,8 @@ in { py-multibase = callPackage ../development/python-modules/py-multibase { }; + py-multicodec = callPackage ../development/python-modules/py-multicodec { }; + py-multihash = callPackage ../development/python-modules/py-multihash { }; pymumble = callPackage ../development/python-modules/pymumble { }; @@ -5676,6 +5747,8 @@ in { pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyopenuv = callPackage ../development/python-modules/pyopenuv { }; + pyopnsense = callPackage ../development/python-modules/pyopnsense { }; pyosf = callPackage ../development/python-modules/pyosf { }; @@ -5745,6 +5818,8 @@ in { pyqrcode = callPackage ../development/python-modules/pyqrcode { }; + pyqt-builder = callPackage ../development/python-modules/pyqt-builder { }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkg-config; }; pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; @@ -5884,6 +5959,8 @@ in { pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; }; + pysma = callPackage ../development/python-modules/pysma { }; + pysmb = callPackage ../development/python-modules/pysmb { }; pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; }; @@ -5892,6 +5969,8 @@ in { pysmi = callPackage ../development/python-modules/pysmi { }; + pysmt = callPackage ../development/python-modules/pysmt { }; + pysnmp = callPackage ../development/python-modules/pysnmp { }; pysnooper = callPackage ../development/python-modules/pysnooper { }; @@ -5958,6 +6037,8 @@ in { pysychonaut = callPackage ../development/python-modules/pysychonaut { }; + pysyncobj = callPackage ../development/python-modules/pysyncobj { }; + pytabix = callPackage ../development/python-modules/pytabix { }; pytado = callPackage ../development/python-modules/pytado { }; @@ -6060,6 +6141,8 @@ in { pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; + pytest-httpserver = callPackage ../development/python-modules/pytest-httpserver { }; + pytest-instafail = callPackage ../development/python-modules/pytest-instafail { }; pytest-isort = callPackage ../development/python-modules/pytest-isort { }; @@ -6081,6 +6164,8 @@ in { pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; + pytest-order = callPackage ../development/python-modules/pytest-order { }; + pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; @@ -6455,6 +6540,10 @@ in { pyvera = callPackage ../development/python-modules/pyvera { }; + pyvesync = callPackage ../development/python-modules/pyvesync { }; + + pyvex = callPackage ../development/python-modules/pyvex { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; pyvips = callPackage ../development/python-modules/pyvips { @@ -6501,6 +6590,8 @@ in { }); in if isPy3k then pyxattr' else pyxattr_2; + pyworld = callPackage ../development/python-modules/pyworld { }; + pyx = callPackage ../development/python-modules/pyx { }; pyxdg = callPackage ../development/python-modules/pyxdg { }; @@ -6515,6 +6606,8 @@ in { pyyaml = callPackage ../development/python-modules/pyyaml { }; + pyzerproc = callPackage ../development/python-modules/pyzerproc { }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; pyzufall = callPackage ../development/python-modules/pyzufall { }; @@ -6610,6 +6703,8 @@ in { rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; + rdkit = callPackage ../development/python-modules/rdkit { }; + re-assert = callPackage ../development/python-modules/re-assert { }; readchar = callPackage ../development/python-modules/readchar { }; @@ -6636,6 +6731,8 @@ in { reflink = callPackage ../development/python-modules/reflink { }; + regenmaschine = callPackage ../development/python-modules/regenmaschine { }; + regex = callPackage ../development/python-modules/regex { }; regional = callPackage ../development/python-modules/regional { }; @@ -7221,6 +7318,8 @@ in { softlayer = callPackage ../development/python-modules/softlayer { }; + solax = callPackage ../development/python-modules/solax { }; + solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); somajo = callPackage ../development/python-modules/somajo { }; @@ -7266,6 +7365,8 @@ in { sphfile = callPackage ../development/python-modules/sphfile { }; + spinners = callPackage ../development/python-modules/spinners { }; + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; @@ -7315,6 +7416,8 @@ in { sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; + sphinx-autobuild = callPackage ../development/python-modules/sphinx-argparse { }; + sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { }; @@ -7613,6 +7716,10 @@ in { textfsm = callPackage ../development/python-modules/textfsm { }; + testing-common-database = callPackage ../development/python-modules/testing-common-database { }; + + testing-postgresql = callPackage ../development/python-modules/testing-postgresql { }; + testpath = callPackage ../development/python-modules/testpath { }; testrepository = callPackage ../development/python-modules/testrepository { }; @@ -7750,7 +7857,7 @@ in { # Used by circus and grab-site, 2020-08-29 tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; - # Used by luigi, 2020-08-29 + # Used by streamlit, graphite_beacon, 2021-01-29 tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; @@ -7834,6 +7941,8 @@ in { twisted = callPackage ../development/python-modules/twisted { }; + twitch-python = callPackage ../development/python-modules/twitch-python { }; + twitter = callPackage ../development/python-modules/twitter { }; twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; @@ -8275,6 +8384,8 @@ in { xattr = callPackage ../development/python-modules/xattr { }; + xboxapi = callPackage ../development/python-modules/xboxapi { }; + xcaplib = callPackage ../development/python-modules/xcaplib { }; xcffib = callPackage ../development/python-modules/xcffib { }; @@ -8382,7 +8493,9 @@ in { yowsup = callPackage ../development/python-modules/yowsup { }; - yq = callPackage ../development/python-modules/yq { }; + yq = callPackage ../development/python-modules/yq { + inherit (pkgs) jq; + }; yt = callPackage ../development/python-modules/yt { }; diff --git a/nixpkgs/pkgs/top-level/qt5-packages.nix b/nixpkgs/pkgs/top-level/qt5-packages.nix index f3708f0ab45f..223132217a5d 100644 --- a/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -95,8 +95,6 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; - libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; - libktorrent = callPackage ../development/libraries/libktorrent { }; liblastfm = callPackage ../development/libraries/liblastfm { }; diff --git a/nixpkgs/pkgs/top-level/release-cross.nix b/nixpkgs/pkgs/top-level/release-cross.nix index df476db0a7a0..639c54a8a1e0 100644 --- a/nixpkgs/pkgs/top-level/release-cross.nix +++ b/nixpkgs/pkgs/top-level/release-cross.nix @@ -150,6 +150,9 @@ in x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon; + ppc64le = mapTestOnCross lib.systems.examples.powernv linuxCommon; + ppc64le-musl = mapTestOnCross lib.systems.examples.musl-power linuxCommon; + android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt linuxCommon; android32 = mapTestOnCross lib.systems.examples.armv7a-android-prebuilt linuxCommon; |